diff options
author | Noel Grandin <noel@peralex.com> | 2015-06-12 09:30:14 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-10-15 17:12:59 +0200 |
commit | c45c2c8fceee2b302266bf7491e0886ae6464397 (patch) | |
tree | 9cebfcdf24c7d123983318258552e45de3135fba /qadevOOo/tests | |
parent | 047a883a5bf49224d459e3685204cf9cecee9f35 (diff) |
java: 'final static' to 'static final'
this is the canonical order, and it makes the code easier to read
Reviewed-on: https://gerrit.libreoffice.org/16242
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
(cherry picked from commit 0c18bedb7328493040c1a20822b345e624d6041f)
Change-Id: I272e7f1e140296e582702b6dbf77a03eefb65470
Diffstat (limited to 'qadevOOo/tests')
8 files changed, 21 insertions, 21 deletions
diff --git a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java index 40e75d4c7434..3662a5833483 100644 --- a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java +++ b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java @@ -60,7 +60,7 @@ public class CheckModuleAPI extends ComplexTestCase private static String mSRC_ROOT = null; private static boolean mIsInitialized = false; - private final static boolean mContinue = true; + private static final boolean mContinue = true; private static BuildEnvTools bet = null; /** diff --git a/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java b/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java index afb317ed738c..004b0144eff1 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java +++ b/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java @@ -206,7 +206,7 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest { * for the "getPhoneticCandidate" test. Euivalents are only usable for zh,CN locale. */ public static class UnicodeStringPair { - final static int valCount = 78; + static final int valCount = 78; static final String[] sStringEquivalence = new String[valCount]; static final char[] iUnicodeEquivalence = new char[valCount]; diff --git a/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java b/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java index 09ebb1fe92b3..a3c42cc345ed 100644 --- a/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java +++ b/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java @@ -34,7 +34,7 @@ import lib.MultiMethodTest; */ public class _XIdlReflection extends MultiMethodTest{ public XIdlReflection oObj = null; - protected final static String typeName = "com.sun.star.container.XNameAccess"; + protected static final String typeName = "com.sun.star.container.XNameAccess"; /** * Test calls the method and checks returned interface diff --git a/qadevOOo/tests/java/ifc/util/_XURLTransformer.java b/qadevOOo/tests/java/ifc/util/_XURLTransformer.java index 3955cb9c5cbf..2f541d316318 100644 --- a/qadevOOo/tests/java/ifc/util/_XURLTransformer.java +++ b/qadevOOo/tests/java/ifc/util/_XURLTransformer.java @@ -40,21 +40,21 @@ public class _XURLTransformer extends MultiMethodTest { URL url; - final static String user = "user"; - final static String invalidUserPrefix = "1"; - final static String password = "password"; - final static String server = "server"; - final static String invalidServerPrefix = "1"; - final static String port = "8080"; - final static String path = "/pub/path"; - final static String name = "file.txt"; - final static String arguments = "a=b"; - final static String mark = "mark"; - - final static String expectedCompleteHTTP = "http://" + static final String user = "user"; + static final String invalidUserPrefix = "1"; + static final String password = "password"; + static final String server = "server"; + static final String invalidServerPrefix = "1"; + static final String port = "8080"; + static final String path = "/pub/path"; + static final String name = "file.txt"; + static final String arguments = "a=b"; + static final String mark = "mark"; + + static final String expectedCompleteHTTP = "http://" + server + ":" + port + path + "/" + name + "?" + arguments + "#" + mark; - final static String expectedCompleteFTP = "ftp://" + static final String expectedCompleteFTP = "ftp://" + user + ":" + password + "@" + server + ":" + port + path + "/" + name; diff --git a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java index fe3b94bc3a41..95b16e5651d3 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java @@ -129,7 +129,7 @@ public class ORowSet extends TestCase { String tableName = null; DataSourceDescriptor srcInf = null; boolean isMySQLDB = false; - protected final static String dbSourceName = "ORowSetDataSource"; + protected static final String dbSourceName = "ORowSetDataSource"; public XConnection m_connection = null; private Object m_rowSet = null; private DataSource m_dataSource; diff --git a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java index 1e3e3f4130b2..4ef5db870eda 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java @@ -136,7 +136,7 @@ public class OSingleSelectQueryComposer extends TestCase { String tableName = null; DBTools.DataSourceInfo srcInf = null; boolean isMySQLDB = false; - protected final static String dbSourceName = "OSingleSelectQueryComposerDataSource"; + protected static final String dbSourceName = "OSingleSelectQueryComposerDataSource"; public XConnection conn = null; diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java index 0a0f7b3c4233..71cd60a3c018 100644 --- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java +++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java @@ -129,8 +129,8 @@ public class GenericModelTest extends TestCase { /** * This is the name of the Data Base which the test uses: "APITestDatabase" */ - private final static String m_dbSourceName = "APITestDatabase"; - private final static String m_TestDB = "TestDB"; + private static final String m_dbSourceName = "APITestDatabase"; + private static final String m_TestDB = "TestDB"; private DBTools m_dbTools = null; private boolean m_ConnectionColsed = false; diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java index 72755f0cc449..57dec6c5bf5d 100644 --- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java +++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java @@ -216,7 +216,7 @@ import com.sun.star.view.XControlAccess; * @see ifc.sdbc._RowSet */ public class ODatabaseForm extends TestCase { - protected final static String dbSourceName = "ODatabaseFormDataSource"; + protected static final String dbSourceName = "ODatabaseFormDataSource"; private static int uniqueSuffix = 0; private static String origDB = null; private static String tmpDir = null; |