summaryrefslogtreecommitdiff
path: root/qadevOOo
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-06-12 09:30:14 +0200
committerAndras Timar <andras.timar@collabora.com>2015-10-15 17:12:59 +0200
commitc45c2c8fceee2b302266bf7491e0886ae6464397 (patch)
tree9cebfcdf24c7d123983318258552e45de3135fba /qadevOOo
parent047a883a5bf49224d459e3685204cf9cecee9f35 (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')
-rw-r--r--qadevOOo/runner/lib/SimpleStatus.java10
-rw-r--r--qadevOOo/runner/util/DBTools.java32
-rw-r--r--qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java6
-rw-r--r--qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java2
-rw-r--r--qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java2
-rw-r--r--qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java2
-rw-r--r--qadevOOo/tests/java/ifc/util/_XURLTransformer.java26
-rw-r--r--qadevOOo/tests/java/mod/_dbaccess/ORowSet.java2
-rw-r--r--qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/GenericModelTest.java4
-rw-r--r--qadevOOo/tests/java/mod/_forms/ODatabaseForm.java2
11 files changed, 45 insertions, 45 deletions
diff --git a/qadevOOo/runner/lib/SimpleStatus.java b/qadevOOo/runner/lib/SimpleStatus.java
index 6866d7e7a24d..9526646c7de7 100644
--- a/qadevOOo/runner/lib/SimpleStatus.java
+++ b/qadevOOo/runner/lib/SimpleStatus.java
@@ -29,29 +29,29 @@ class SimpleStatus {
/**
* The constatnt represents PASSED runtime state.
*/
- public final static int PASSED = 0;
+ public static final int PASSED = 0;
/**
* The constant represents EXCEPTION runtime state.
*/
- public final static int EXCEPTION = 3;
+ public static final int EXCEPTION = 3;
/**
* The constant represents SKIPPED runtime state.
*/
- public final static int SKIPPED = 1;
+ public static final int SKIPPED = 1;
/**
* This is a private indicator for a user defined runtime state
*/
- private final static int USER_DEFINED = 4;
+ private static final int USER_DEFINED = 4;
/* Test states */
/**
* The constant represents FAILED state.
*/
- public final static boolean FAILED = false;
+ public static final boolean FAILED = false;
diff --git a/qadevOOo/runner/util/DBTools.java b/qadevOOo/runner/util/DBTools.java
index e10a896075a3..46af25a99f97 100644
--- a/qadevOOo/runner/util/DBTools.java
+++ b/qadevOOo/runner/util/DBTools.java
@@ -44,30 +44,30 @@ public class DBTools {
private final XMultiServiceFactory xMSF;
private XNamingService dbContext;
//JDBC driver
- public final static String TST_JDBC_DRIVER = "org.gjt.mm.mysql.Driver";
+ public static final String TST_JDBC_DRIVER = "org.gjt.mm.mysql.Driver";
// constants for TestDB table column indexes
- public final static int TST_STRING = 1 ;
- public final static int TST_INT = 2 ;
- private final static int TST_DOUBLE = 5 ;
- private final static int TST_DATE = 6 ;
- private final static int TST_BOOLEAN = 10 ;
- private final static int TST_CHARACTER_STREAM = 11 ;
- private final static int TST_BINARY_STREAM = 12 ;
+ public static final int TST_STRING = 1 ;
+ public static final int TST_INT = 2 ;
+ private static final int TST_DOUBLE = 5 ;
+ private static final int TST_DATE = 6 ;
+ private static final int TST_BOOLEAN = 10 ;
+ private static final int TST_CHARACTER_STREAM = 11 ;
+ private static final int TST_BINARY_STREAM = 12 ;
// constants for TestDB columns names
- public final static String TST_STRING_F = "_TEXT" ;
- public final static String TST_INT_F = "_INT" ;
- public final static String TST_DOUBLE_F = "_DOUBLE" ;
- public final static String TST_DATE_F = "_DATE" ;
- private final static String TST_BOOLEAN_F = "_BOOL" ;
- private final static String TST_CHARACTER_STREAM_F = "_MEMO1" ;
- public final static String TST_BINARY_STREAM_F = "_MEMO2" ;
+ public static final String TST_STRING_F = "_TEXT" ;
+ public static final String TST_INT_F = "_INT" ;
+ public static final String TST_DOUBLE_F = "_DOUBLE" ;
+ public static final String TST_DATE_F = "_DATE" ;
+ private static final String TST_BOOLEAN_F = "_BOOL" ;
+ private static final String TST_CHARACTER_STREAM_F = "_MEMO1" ;
+ public static final String TST_BINARY_STREAM_F = "_MEMO2" ;
/**
* Values for filling test table.
*/
- public final static Object[][] TST_TABLE_VALUES = new Object[][] {
+ public static final Object[][] TST_TABLE_VALUES = new Object[][] {
{"String1", Integer.valueOf(1), null, null, new Double(1.1),
new Date((short) 1,(short) 1, (short) 2001), null, null, null,
Boolean.TRUE, null, null},
diff --git a/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java b/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java
index ab739aeb3595..734e47c3ef59 100644
--- a/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java
+++ b/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java
@@ -36,9 +36,9 @@ import com.sun.star.util.XTimeStamped;
public class JavaSystemBackend implements XSingleLayerStratum, XTypeProvider,
XServiceInfo, XTimeStamped, XComponent {
- public final static String __serviceName = "com.sun.star.configuration.backend.PlatformBackend";
- public final static String __implName = "org.openoffice.JavaSystemBackend";
- public final static String testComponent = "org.openoffice.Office.Common";
+ public static final String __serviceName = "com.sun.star.configuration.backend.PlatformBackend";
+ public static final String __implName = "org.openoffice.JavaSystemBackend";
+ public static final String testComponent = "org.openoffice.Office.Common";
protected static XMultiServiceFactory msf = null;
protected XLayer aLayer = null;
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;