From 0c18bedb7328493040c1a20822b345e624d6041f Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 12 Jun 2015 09:30:14 +0200 Subject: java: 'final static' to 'static final' this is the canonical order, and it makes the code easier to read Change-Id: I272e7f1e140296e582702b6dbf77a03eefb65470 Reviewed-on: https://gerrit.libreoffice.org/16242 Tested-by: Jenkins Reviewed-by: David Ostrovsky --- wizards/com/sun/star/wizards/db/DBMetaData.java | 6 +++--- wizards/com/sun/star/wizards/document/FormHandler.java | 18 +++++++++--------- wizards/com/sun/star/wizards/form/FormDocument.java | 4 ++-- wizards/com/sun/star/wizards/form/StyleApplier.java | 8 ++++---- .../com/sun/star/wizards/table/PrimaryKeyHandler.java | 2 +- .../com/sun/star/wizards/table/ScenarioSelector.java | 4 ++-- wizards/com/sun/star/wizards/ui/ButtonList.java | 2 +- wizards/com/sun/star/wizards/ui/FieldSelection.java | 16 ++++++++-------- wizards/com/sun/star/wizards/ui/FilterComponent.java | 6 +++--- 9 files changed, 33 insertions(+), 33 deletions(-) (limited to 'wizards') diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java index 0d5ec2be32e5..d62a547803c4 100644 --- a/wizards/com/sun/star/wizards/db/DBMetaData.java +++ b/wizards/com/sun/star/wizards/db/DBMetaData.java @@ -130,9 +130,9 @@ public class DBMetaData private int iMaxColumnNameLength = -1; private int iMaxTableNameLength = -1; private boolean bPasswordIsRequired; - private final static int NOLIMIT = 9999999; - protected final static int RID_DB_COMMON = 1000; - private final static int INVALID = 9999999; + private static final int NOLIMIT = 9999999; + protected static final int RID_DB_COMMON = 1000; + private static final int INVALID = 9999999; public TypeInspector oTypeInspector; private NumberFormatter oNumberFormatter = null; private long lDateCorrection = INVALID; diff --git a/wizards/com/sun/star/wizards/document/FormHandler.java b/wizards/com/sun/star/wizards/document/FormHandler.java index 0c4c976395ed..cae352f2b9ef 100644 --- a/wizards/com/sun/star/wizards/document/FormHandler.java +++ b/wizards/com/sun/star/wizards/document/FormHandler.java @@ -67,15 +67,15 @@ public class FormHandler public String[] sModelServices = new String[8]; public static ControlData[] oControlData; - public final static int SOLABEL = 0; - public final static int SOTEXTBOX = 1; - public final static int SOCHECKBOX = 2; - public final static int SODATECONTROL = 3; - public final static int SOTIMECONTROL = 4; - public final static int SONUMERICCONTROL = 5; - public final static int SOGRIDCONTROL = 6; - public final static int SOIMAGECONTROL = 7; - public final static int SODATETIMECONTROL = 8; + public static final int SOLABEL = 0; + public static final int SOTEXTBOX = 1; + public static final int SOCHECKBOX = 2; + public static final int SODATECONTROL = 3; + public static final int SOTIMECONTROL = 4; + public static final int SONUMERICCONTROL = 5; + public static final int SOGRIDCONTROL = 6; + public static final int SOIMAGECONTROL = 7; + public static final int SODATETIMECONTROL = 8; public static String SOSIZETEXT = "The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog."; private int iXPixelFactor = -1; private int iYPixelFactor = -1; diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java index 4f2489fa2b86..532c979b5f61 100644 --- a/wizards/com/sun/star/wizards/form/FormDocument.java +++ b/wizards/com/sun/star/wizards/form/FormDocument.java @@ -56,8 +56,8 @@ public class FormDocument extends TextDocument private int nFormWidth; private int nFormHeight; private Point aMainFormPoint; - private final static String SOMAINFORM = "MainForm"; - private final static String SOSUBFORM = "SubForm"; + private static final String SOMAINFORM = "MainForm"; + private static final String SOSUBFORM = "SubForm"; public FormDocument(XMultiServiceFactory xMSF) { diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java index 0e33f9271063..b61ce95b1383 100644 --- a/wizards/com/sun/star/wizards/form/StyleApplier.java +++ b/wizards/com/sun/star/wizards/form/StyleApplier.java @@ -55,10 +55,10 @@ public class StyleApplier private short iOldLayoutPos; private String[] StyleNames; private String[] FileNames; - private final static int SOBACKGROUNDCOLOR = 0; - private final static int SODBTEXTCOLOR = 1; - private final static int SOLABELTEXTCOLOR = 2; - private final static int SOBORDERCOLOR = 5; + private static final int SOBACKGROUNDCOLOR = 0; + private static final int SODBTEXTCOLOR = 1; + private static final int SOLABELTEXTCOLOR = 2; + private static final int SOBORDERCOLOR = 5; private Short IBorderValue = Short.valueOf((short) 1); public StyleApplier(WizardDialog CurUnoDialog, FormDocument _curFormDocument) diff --git a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java index e715a7732b45..0fa3e29888ad 100644 --- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java +++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java @@ -54,7 +54,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener private String[] fieldnames; private final TableDescriptor curTableDescriptor; private final boolean bAutoPrimaryKeysupportsAutoIncrmentation; - private final static String SAUTOMATICKEYFIELDNAME = "ID"; + private static final String SAUTOMATICKEYFIELDNAME = "ID"; public PrimaryKeyHandler(TableWizard _CurUnoDialog, TableDescriptor _curTableDescriptor) { diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java index ac650759931f..6cd094c13bc6 100644 --- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java +++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java @@ -45,8 +45,8 @@ import com.sun.star.wizards.ui.event.XItemListenerAdapter; */ public class ScenarioSelector extends FieldSelection implements XItemListener, XFieldSelectionListener { - private final static int PRIVATE = 0; - private final static int BUSINESS = 1; + private static final int PRIVATE = 0; + private static final int BUSINESS = 1; private final XRadioButton optBusiness; private XListBox xTableListBox; diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java index a1cce5047218..9e6f365fa3fa 100644 --- a/wizards/com/sun/star/wizards/ui/ButtonList.java +++ b/wizards/com/sun/star/wizards/ui/ButtonList.java @@ -65,7 +65,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener private IImageRenderer renderer; private ListModel listModel; private IRenderer counterRenderer = new SimpleCounterRenderer(); - private final static int LINE_HEIGHT = 8; + private static final int LINE_HEIGHT = 8; public void setName(String _sName) { diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java index 88dea0fe9f14..3fc1ade50974 100644 --- a/wizards/com/sun/star/wizards/ui/FieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java @@ -44,14 +44,14 @@ public class FieldSelection private boolean bisModified = false; - private final static int SOCMDMOVESEL = 1; - private final static int SOCMDMOVEALL = 2; - private final static int SOCMDREMOVESEL = 3; - private final static int SOCMDREMOVEALL = 4; - private final static int SOCMDMOVEUP = 5; - private final static int SOCMDMOVEDOWN = 6; - private final static int SOFLDSLST = 7; - private final static int SOSELFLDSLST = 8; + private static final int SOCMDMOVESEL = 1; + private static final int SOCMDMOVEALL = 2; + private static final int SOCMDREMOVESEL = 3; + private static final int SOCMDREMOVEALL = 4; + private static final int SOCMDMOVEUP = 5; + private static final int SOCMDMOVEDOWN = 6; + private static final int SOFLDSLST = 7; + private static final int SOSELFLDSLST = 8; private class ItemListenerImpl implements com.sun.star.awt.XItemListener diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index 186dcc4ac0a1..ab6fa7a506cc 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -501,9 +501,9 @@ public class FilterComponent private final class ControlRow { - private final static int SOLSTFIELDNAME = 3; - private final static int SOLSTOPERATOR = 4; - private final static int SOTXTVALUE = 5; + private static final int SOLSTFIELDNAME = 3; + private static final int SOLSTOPERATOR = 4; + private static final int SOTXTVALUE = 5; private XInterface[] ControlElements = new XInterface[6]; private boolean m_bEnabled; private String[] FieldNames; -- cgit