diff options
author | Noel Grandin <noel@peralex.com> | 2014-12-18 11:03:04 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-01-05 08:23:30 +0200 |
commit | 46540d08b16f0e2e663734506cc072fe868ece82 (patch) | |
tree | baca7dfe2e192ef2dd986cb641a45051f0612fb3 /wizards | |
parent | a49b2ba1a6a9467aa75d320b45671ae1e87314d3 (diff) |
java: these fields can become local variables
found by PMD
Change-Id: Id852cfec984a181b91aca1c00a41e342b720a4bf
Diffstat (limited to 'wizards')
4 files changed, 4 insertions, 17 deletions
diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java index 2187d174db54..0d5ec2be32e5 100644 --- a/wizards/com/sun/star/wizards/db/DBMetaData.java +++ b/wizards/com/sun/star/wizards/db/DBMetaData.java @@ -127,7 +127,6 @@ public class DBMetaData }; private int iMaxColumnsInSelect; - private int iMaxColumnsInGroupBy; private int iMaxColumnNameLength = -1; private int iMaxTableNameLength = -1; private boolean bPasswordIsRequired; @@ -419,15 +418,6 @@ public class DBMetaData } } - private void setMaxColumnsInGroupBy() throws SQLException - { - iMaxColumnsInGroupBy = xDBMetaData.getMaxColumnsInGroupBy(); - if (iMaxColumnsInGroupBy == 0) - { - iMaxColumnsInGroupBy = DBMetaData.NOLIMIT; - } - } - public int getMaxColumnsInTable() throws SQLException { int iMaxColumnsInTable = xDBMetaData.getMaxColumnsInTable(); @@ -444,7 +434,6 @@ public class DBMetaData { xDBMetaData = DBConnection.getMetaData(); getDataSourceInterfaces(); - setMaxColumnsInGroupBy(); setMaxColumnsInSelect(); } catch (SQLException e) diff --git a/wizards/com/sun/star/wizards/db/FieldColumn.java b/wizards/com/sun/star/wizards/db/FieldColumn.java index 1978a4d0cfb3..8ff86fdb5927 100644 --- a/wizards/com/sun/star/wizards/db/FieldColumn.java +++ b/wizards/com/sun/star/wizards/db/FieldColumn.java @@ -40,7 +40,6 @@ public class FieldColumn // field meta data private int FieldWidth; - private int StandardFormatKey; private boolean bIsNumberFormat; private static boolean bFormatKeysInitialized = false; @@ -223,6 +222,7 @@ public class FieldColumn private void getTyperelatedFieldData() { + int StandardFormatKey = 0; try { switch ( getFieldType() ) diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java index 9fb9ef678bf5..ec6120936b53 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java +++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java @@ -63,7 +63,6 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen private TextStyleHandler oTextStyleHandler; public TextFieldHandler oTextFieldHandler; public ViewHandler oViewHandler; - private NumberFormatter oNumberFormatter; public static final String TBLRECORDSECTION = "Tbl_RecordSection"; public static final String TBLGROUPSECTION = "Tbl_GroupField"; public static final String RECORDSECTION = "RecordSection"; @@ -96,7 +95,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen oViewHandler = new ViewHandler(xTextDocument); oTextFieldHandler = new TextFieldHandler(xMSFDoc, xTextDocument); DBColumnsVector = new java.util.ArrayList<DBColumn>(); - oNumberFormatter = oTextTableHandler.getNumberFormatter(); + NumberFormatter oNumberFormatter = oTextTableHandler.getNumberFormatter(); CurDBMetaData = _aRecordParser; long lDateCorrection = oNumberFormatter.getNullDateCorrection(); oNumberFormatter.setBooleanReportDisplayNumberFormat(); diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index 854d144f15f5..186dcc4ac0a1 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -101,7 +101,6 @@ public class FilterComponent private static final int SO_FOURTHBOOLFIELDNAME = 256 + 4; private int SOI_MATCHALL = 0; private int SOI_MATCHANY = 1; - private int curHelpID; class ItemListenerImpl implements com.sun.star.awt.XItemListener { @@ -364,7 +363,7 @@ public class FilterComponent */ public FilterComponent(WizardDialog CurUnoDialog, int iStep, int iPosX, int iPosY, int FilterCount, QueryMetaData _oQueryMetaData, int _firstHelpID) { - this.curHelpID = _firstHelpID; + int curHelpID = _firstHelpID; this.IStep = Integer.valueOf(iStep); curtabindex = UnoDialog.setInitialTabindex(iStep); @@ -440,7 +439,7 @@ public class FilterComponent for (int i = 0; i < FilterCount; i++) { bEnabled = (i == 0); - oControlRows[i] = new ControlRow(iPosX, iPosY + 20, i, bEnabled, (this.curHelpID + (i * 3))); + oControlRows[i] = new ControlRow(iPosX, iPosY + 20, i, bEnabled, (curHelpID + (i * 3))); iPosY += 43; } } |