[Libreoffice-commits] core.git: 2 commits - android/source bean/qa connectivity/qa dbaccess/qa jurt/com odk/examples qadevOOo/runner qadevOOo/testdocs qadevOOo/tests reportbuilder/java scripting/java sfx2/JunitTest_sfx2_complex.mk sfx2/qa swext/mediawiki sw/qa toolkit/qa vcl/qa wizards/com xmerge/source
Noel Grandin
noel at peralex.com
Mon Jun 15 01:45:37 PDT 2015
android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java | 2
bean/qa/complex/bean/WriterFrame.java | 2
connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java | 4
dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java | 4
jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java | 2
odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java | 14
odk/examples/DevelopersGuide/UCB/ChildrenRetriever.java | 2
odk/examples/DevelopersGuide/UCB/DataStreamRetriever.java | 2
qadevOOo/runner/lib/SimpleStatus.java | 10
qadevOOo/runner/util/DBTools.java | 32 +-
qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java | 6
qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java | 2
qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java | 2
qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java | 2
qadevOOo/tests/java/ifc/util/_XURLTransformer.java | 26 -
qadevOOo/tests/java/mod/_dbaccess/ORowSet.java | 2
qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java | 2
qadevOOo/tests/java/mod/_forms/GenericModelTest.java | 4
qadevOOo/tests/java/mod/_forms/ODatabaseForm.java | 2
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java | 33 --
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java | 32 --
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java | 32 --
qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java | 153 +++------
qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java | 154 +++------
qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java | 158 ++++------
reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler.java | 4
scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java | 2
scripting/java/com/sun/star/script/framework/provider/ScriptContext.java | 8
sfx2/JunitTest_sfx2_complex.mk | 1
sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java | 4
sfx2/qa/complex/sfx2/tools/DialogThread.java | 79 -----
sfx2/qa/complex/sfx2/tools/WriterHelper.java | 126 +++++--
sw/qa/complex/accessibility/AccessibleRelationSet.java | 2
swext/mediawiki/src/com/sun/star/wiki/Helper.java | 70 ++--
toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java | 4
vcl/qa/complex/memCheck/TestDocument.java | 2
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
wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java | 2
wizards/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
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbUtil.java | 6
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java | 12
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java | 8
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java | 22 -
52 files changed, 453 insertions(+), 653 deletions(-)
New commits:
commit 0c18bedb7328493040c1a20822b345e624d6041f
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jun 12 09:30:14 2015 +0200
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 <ci at libreoffice.org>
Reviewed-by: David Ostrovsky <david at ostrovsky.org>
diff --git a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
index eac6b1b..6765928 100644
--- a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
+++ b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
@@ -111,7 +111,7 @@ public class JavaPanZoomController
mTouchEventHandler.destroy();
}
- private final static float easeOut(float t) {
+ private static final float easeOut(float t) {
// ease-out approx.
// -(t-1)^2+1
t = t-1;
diff --git a/bean/qa/complex/bean/WriterFrame.java b/bean/qa/complex/bean/WriterFrame.java
index 77f1959..eb7e477 100644
--- a/bean/qa/complex/bean/WriterFrame.java
+++ b/bean/qa/complex/bean/WriterFrame.java
@@ -30,7 +30,7 @@ import com.sun.star.uno.UnoRuntime;
class WriterFrame extends java.awt.Frame
{
private com.sun.star.comp.beans.OOoBean m_bean;
- private final static String m_sDocURL = "private:factory/swriter";
+ private static final String m_sDocURL = "private:factory/swriter";
/**
@param loadBeforeVisible
diff --git a/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java b/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java
index 5d93118..12330ff 100644
--- a/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java
+++ b/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java
@@ -39,9 +39,9 @@ public class HsqlColumnDescriptor
public final String getForeignColumn() { return ForeignColumn; }
/// determines that a column is required, i.e. not nullable
- public final static int REQUIRED = 1;
+ public static final int REQUIRED = 1;
/// determines that a column is part of the primary key of its table
- public final static int PRIMARY = 2;
+ public static final int PRIMARY = 2;
public HsqlColumnDescriptor( String _Name, String _TypeName )
{
diff --git a/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java b/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
index 581677c..2d05030 100644
--- a/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
+++ b/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
@@ -49,13 +49,13 @@ public class SingleSelectQueryComposer extends CRMBasedTestCase
{
private XSingleSelectQueryComposer m_composer = null;
- private final static String COMPLEXFILTER = "( \"ID\" = 1 AND \"Postal\" = '4' )"
+ private static final String COMPLEXFILTER = "( \"ID\" = 1 AND \"Postal\" = '4' )"
+ " OR ( \"ID\" = 2 AND \"Postal\" = '5' )"
+ " OR ( \"ID\" = 3 AND \"Postal\" = '6' AND \"Address\" = '7' )"
+ " OR ( \"Address\" = '8' )"
+ " OR ( \"Postal\" = '9' )"
+ " OR ( NOW( ) = {d '2010-01-01' } )";
- private final static String INNERPRODUCTSQUERY = "products (inner)";
+ private static final String INNERPRODUCTSQUERY = "products (inner)";
private void createQueries() throws Exception
diff --git a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
index 50c82c9..a43cb09 100644
--- a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
+++ b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
@@ -52,7 +52,7 @@ public class BridgeFactory implements XBridgeFactory/*, XEventListener*/ {
* The name of the service, the <code>JavaLoader</code> accesses this through
* reflection.
*/
- public final static String __serviceName = "com.sun.star.bridge.BridgeFactory";
+ public static final String __serviceName = "com.sun.star.bridge.BridgeFactory";
/**
* Gives a factory for creating the service.
diff --git a/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java b/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java
index 27c578b..90ce8a4 100644
--- a/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java
+++ b/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java
@@ -55,14 +55,14 @@ public class UnoDialogSample2 extends UnoDialogSample {
// define some constants used to set positions and sizes
// of controls. For further information see
// http://ui.openoffice.org/knowledge/DialogSpecificationandGuidelines.odt
- final static int nFixedTextHeight = 8;
- final static int nControlMargin = 6;
- final static int nDialogWidth = 250;
- final static int nDialogHeight = 140;
+ static final int nFixedTextHeight = 8;
+ static final int nControlMargin = 6;
+ static final int nDialogWidth = 250;
+ static final int nDialogHeight = 140;
// the default roadmap width == 80 MAPs
- final static int nRoadmapWidth = 80;
- final static int nButtonHeight = 14;
- final static int nButtonWidth = 50;
+ static final int nRoadmapWidth = 80;
+ static final int nButtonHeight = 14;
+ static final int nButtonWidth = 50;
public UnoDialogSample2(XComponentContext _xContext, XMultiComponentFactory _xMCF, Object _oUnoObject) {
diff --git a/odk/examples/DevelopersGuide/UCB/ChildrenRetriever.java b/odk/examples/DevelopersGuide/UCB/ChildrenRetriever.java
index 9764718..42f0689 100644
--- a/odk/examples/DevelopersGuide/UCB/ChildrenRetriever.java
+++ b/odk/examples/DevelopersGuide/UCB/ChildrenRetriever.java
@@ -123,7 +123,7 @@ public class ChildrenRetriever {
// Fill argument structure...
OpenCommandArgument2 arg = new OpenCommandArgument2();
arg.Mode = OpenMode.ALL; // FOLDER, DOCUMENTS -> simple filter
- arg.Priority = 32768; // Final static for 32768
+ arg.Priority = 32768; // static final for 32768
arg.Properties = props;
XDynamicResultSet set;
diff --git a/odk/examples/DevelopersGuide/UCB/DataStreamRetriever.java b/odk/examples/DevelopersGuide/UCB/DataStreamRetriever.java
index 95fb3e9..f25e6cd 100644
--- a/odk/examples/DevelopersGuide/UCB/DataStreamRetriever.java
+++ b/odk/examples/DevelopersGuide/UCB/DataStreamRetriever.java
@@ -87,7 +87,7 @@ public class DataStreamRetriever {
// Fill argument structure...
OpenCommandArgument2 arg = new OpenCommandArgument2();
arg.Mode = OpenMode.DOCUMENT;
- arg.Priority = 32768; // Final static for 32768
+ arg.Priority = 32768; // static final for 32768
// Create data sink implementation object.
XActiveDataSink dataSink = new MyActiveDataSink();
diff --git a/qadevOOo/runner/lib/SimpleStatus.java b/qadevOOo/runner/lib/SimpleStatus.java
index 6866d7e..9526646 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 e10a896..46af25a 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 16bdfee..98aee0e 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 bcc659e..2727633 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 afb317e..004b014 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 09ebb1f..a3c42cc 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 3955cb9..2f541d3 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 594f0f5..602687e 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
@@ -128,7 +128,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 105fcbd..a9b80c2 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java
@@ -138,7 +138,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 38d148a..850f541 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 d6f7015..ac1b8e7 100644
--- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
+++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
@@ -215,7 +215,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;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/StylesWriter.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/StylesWriter.java
old mode 100644
new mode 100755
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler.java
index d4d49fe..1b7e8cb 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler.java
@@ -32,8 +32,8 @@ import org.xml.sax.SAXException;
public class ObjectOleReadHandler extends ElementReadHandler
{
- private final static String RPT_CHART_CLASS_ID = "80243D39-6741-46C5-926E-069164FF87BB";
- private final static String OOO_CHART_CLASS_ID = "12DCAE26-281F-416F-A234-C3086127382E";
+ private static final String RPT_CHART_CLASS_ID = "80243D39-6741-46C5-926E-069164FF87BB";
+ private static final String OOO_CHART_CLASS_ID = "12DCAE26-281F-416F-A234-C3086127382E";
private final ObjectOleElement element;
public ObjectOleReadHandler(final ObjectOleElement element)
diff --git a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
index e7c6fdb..432d401 100644
--- a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
+++ b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
@@ -44,7 +44,7 @@ import java.util.zip.ZipInputStream;
public class UCBStreamHandler extends URLStreamHandler {
- public final static String separator = "/ucb/";
+ public static final String separator = "/ucb/";
private final XSimpleFileAccess m_xSimpleFileAccess;
private final HashMap<String, InputStream> m_jarStreamMap = new HashMap<String, InputStream>(12);
diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
index 94181e7..d447e66 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
@@ -38,11 +38,11 @@ import com.sun.star.uno.XComponentContext;
public class ScriptContext extends PropertySet implements XScriptContext {
- private final static String HM_DOC_REF = "DocumentReference";
- private final static String HM_DESKTOP = "Desktop";
- private final static String HM_COMPONENT_CONTEXT = "ComponentContext";
+ private static final String HM_DOC_REF = "DocumentReference";
+ private static final String HM_DESKTOP = "Desktop";
+ private static final String HM_COMPONENT_CONTEXT = "ComponentContext";
- private final static String DOC_URI = "SCRIPTING_DOC_URI";
+ private static final String DOC_URI = "SCRIPTING_DOC_URI";
public final XModel m_xModel;
private final XScriptInvocationContext m_xInvocationContext;
diff --git a/sw/qa/complex/accessibility/AccessibleRelationSet.java b/sw/qa/complex/accessibility/AccessibleRelationSet.java
index b1d0b4cc..a2b2e2e 100644
--- a/sw/qa/complex/accessibility/AccessibleRelationSet.java
+++ b/sw/qa/complex/accessibility/AccessibleRelationSet.java
@@ -47,7 +47,7 @@ public class AccessibleRelationSet {
private XAccessible para2 = null;
private XAccessible para3 = null;
private XTextDocument xTextDoc = null;
- private final static String[] types = {"INVALID","CONTENT_FLOWS_FROM","CONTENT_FLOWS_TO","CONTROLLED_BY","CONTROLLER_FOR","LABEL_FOR","LABELED_BY","MEMBER_OF","SUB_WINDOW_OF"};
+ private static final String[] types = {"INVALID","CONTENT_FLOWS_FROM","CONTENT_FLOWS_TO","CONTROLLED_BY","CONTROLLER_FOR","LABEL_FOR","LABELED_BY","MEMBER_OF","SUB_WINDOW_OF"};
@Test public void contents_flows_to() {
XAccessibleRelationSet set = getAccessibleRelation(para1);
diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
index b2c618d..50750de 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
@@ -68,45 +68,45 @@ import org.apache.commons.httpclient.methods.PostMethod;
public class Helper
{
- public final static int GENERALSEND_ERROR = 0;
- public final static int NOWIKIFILTER_ERROR = 1;
- public final static int NOURLCONNECTION_ERROR = 2;
- public final static int WRONGLOGIN_ERROR = 3;
- public final static int INVALIDURL_ERROR = 4;
- public final static int NOURL_ERROR = 5;
+ public static final int GENERALSEND_ERROR = 0;
+ public static final int NOWIKIFILTER_ERROR = 1;
+ public static final int NOURLCONNECTION_ERROR = 2;
+ public static final int WRONGLOGIN_ERROR = 3;
+ public static final int INVALIDURL_ERROR = 4;
+ public static final int NOURL_ERROR = 5;
- public final static int DLG_SENDTITLE = 6;
- public final static int DLG_WIKIARTICLE = 7;
+ public static final int DLG_SENDTITLE = 6;
+ public static final int DLG_WIKIARTICLE = 7;
- public final static int DLG_OK = 9;
+ public static final int DLG_OK = 9;
// 11 is reserved
- public final static int DLG_ADDBUTTON = 12;
- public final static int DLG_EDITBUTTON = 13;
- public final static int DLG_SENDBUTTON = 14;
- public final static int DLG_REMOVEBUTTON = 15;
-
- public final static int DLG_EDITSETTING_URLLABEL = 16;
- public final static int DLG_EDITSETTING_USERNAMELABEL = 17;
- public final static int DLG_EDITSETTING_PASSWORDLABEL = 18;
-
- public final static int DLG_SENDTOMEDIAWIKI_LABEL1 = 20;
- public final static int DLG_SENDTOMEDIAWIKI_LABEL2 = 21;
- public final static int DLG_SENDTOMEDIAWIKI_LABEL3 = 22;
- public final static int DLG_SENDTOMEDIAWIKI_MINORCHECK = 23;
- public final static int DLG_SENDTOMEDIAWIKI_BROWSERCHECK = 24;
- public final static int UNKNOWNCERT_ERROR = 25;
- public final static int DLG_MEDIAWIKI_TITLE = 26;
- public final static int DLG_EDITSETTING_ACCOUNTLINE = 27;
- public final static int DLG_EDITSETTING_WIKILINE = 28;
- public final static int DLG_EDITSETTING_SAVEBOX = 29;
- public final static int CANCELSENDING_ERROR = 30;
- public final static int DLG_MEDIAWIKIEXTENSION_STRING = 31;
- public final static int DLG_WIKIPAGEEXISTS_LABEL1 = 32;
-
- private final static int STRINGS_NUM = 33;
-
- private final static String[] m_pEntryNames = { "GeneralSendError",
+ public static final int DLG_ADDBUTTON = 12;
+ public static final int DLG_EDITBUTTON = 13;
+ public static final int DLG_SENDBUTTON = 14;
+ public static final int DLG_REMOVEBUTTON = 15;
+
+ public static final int DLG_EDITSETTING_URLLABEL = 16;
+ public static final int DLG_EDITSETTING_USERNAMELABEL = 17;
+ public static final int DLG_EDITSETTING_PASSWORDLABEL = 18;
+
+ public static final int DLG_SENDTOMEDIAWIKI_LABEL1 = 20;
+ public static final int DLG_SENDTOMEDIAWIKI_LABEL2 = 21;
+ public static final int DLG_SENDTOMEDIAWIKI_LABEL3 = 22;
+ public static final int DLG_SENDTOMEDIAWIKI_MINORCHECK = 23;
+ public static final int DLG_SENDTOMEDIAWIKI_BROWSERCHECK = 24;
+ public static final int UNKNOWNCERT_ERROR = 25;
+ public static final int DLG_MEDIAWIKI_TITLE = 26;
+ public static final int DLG_EDITSETTING_ACCOUNTLINE = 27;
+ public static final int DLG_EDITSETTING_WIKILINE = 28;
+ public static final int DLG_EDITSETTING_SAVEBOX = 29;
+ public static final int CANCELSENDING_ERROR = 30;
+ public static final int DLG_MEDIAWIKIEXTENSION_STRING = 31;
+ public static final int DLG_WIKIPAGEEXISTS_LABEL1 = 32;
+
+ private static final int STRINGS_NUM = 33;
+
+ private static final String[] m_pEntryNames = { "GeneralSendError",
"NoWikiFilter",
"NoConnectionToURL",
"WrongLogin",
diff --git a/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java b/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java
index 822e094..a2af0ba 100644
--- a/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java
+++ b/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java
@@ -435,7 +435,7 @@ public class TMutableGridDataModel
private final XMutableGridDataModel m_dataModel;
private final GridDataListener m_listener;
- private final static Object[][] m_rowValues = new Object[][] {
+ private static final Object[][] m_rowValues = new Object[][] {
new Object[] { 1, 2, "3", 4, 5 },
new Object[] { 2, 3, 4, "5", 6 },
new Object[] { "3", 4, 5, 6, 7 },
@@ -443,7 +443,7 @@ public class TMutableGridDataModel
new Object[] { 5, "6", 7, 8, 9 },
};
- private final static Object[] m_rowHeadings = new Object[] {
+ private static final Object[] m_rowHeadings = new Object[] {
"1", 2, 3.0, "4", (float)5.0
};
}
diff --git a/vcl/qa/complex/memCheck/TestDocument.java b/vcl/qa/complex/memCheck/TestDocument.java
index ab942e0..7e299b8 100644
--- a/vcl/qa/complex/memCheck/TestDocument.java
+++ b/vcl/qa/complex/memCheck/TestDocument.java
@@ -23,7 +23,7 @@ import org.openoffice.test.OfficeFileUrl;
final class TestDocument
{
- private final static String sPathname = "testdocuments";
+ private static final String sPathname = "testdocuments";
public static String getUrl(String name)
{
return OfficeFileUrl.getAbsolute(new File(sPathname, name));
diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java
index 0d5ec2b..d62a547 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 0c4c976..cae352f 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 4f2489f..532c979 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 0e33f92..b61ce95 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 e715a77..0fa3e29 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 ac65075..6cd094c 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 a1cce50..9e6f365 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 88dea0f..3fc1ade 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 186dcc4..ab6fa7a 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;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
index 765c6f8..4c48e3fe 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
@@ -59,7 +59,7 @@ import java.io.UnsupportedEncodingException;
public final class PalmDB {
/** Number of bytes for the name field in the PDB. */
- public final static int NAME_LENGTH = 32;
+ public static final int NAME_LENGTH = 32;
/** List of {@code Record} objects. */
private Record[] records;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java
index 0d166aa..ba32aed 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java
@@ -50,7 +50,7 @@ public final class PdbEncoder {
private final PalmDB db;
/** The pattern for unique_id=0x00BABE(start). */
- private final static int START_UNIQUE_ID = 0x00BABE;
+ private static final int START_UNIQUE_ID = 0x00BABE;
/**
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbUtil.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbUtil.java
index dd8068d..829c1c7 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbUtil.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbUtil.java
@@ -24,12 +24,12 @@ package org.openoffice.xmerge.converter.palm;
public final class PdbUtil {
/** Difference in seconds from Jan 01, 1904 to Jan 01, 1970. */
- final static long TIME_DIFF = 2082844800;
+ static final long TIME_DIFF = 2082844800;
/** Encoding scheme used. */
- final static String ENCODING = "8859_1";
+ static final String ENCODING = "8859_1";
/** Size of a PDB header in bytes. */
- final static int HEADER_SIZE = 78;
+ static final int HEADER_SIZE = 78;
}
\ No newline at end of file
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java
index fdbbbff..0345ac7 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java
@@ -40,14 +40,14 @@ import org.openoffice.xmerge.util.Debug;
class OfficeZip {
/** File name of the XML file in a zipped document. */
- private final static String CONTENTXML = "content.xml";
+ private static final String CONTENTXML = "content.xml";
- private final static String STYLEXML = "styles.xml";
- private final static String METAXML = "meta.xml";
- private final static String SETTINGSXML = "settings.xml";
- private final static String MANIFESTXML = "META-INF/manifest.xml";
+ private static final String STYLEXML = "styles.xml";
+ private static final String METAXML = "meta.xml";
+ private static final String SETTINGSXML = "settings.xml";
+ private static final String MANIFESTXML = "META-INF/manifest.xml";
- private final static int BUFFERSIZE = 1024;
+ private static final int BUFFERSIZE = 1024;
private final List<Entry> entryList;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
index 0352ee7..cb7167b 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
@@ -59,7 +59,7 @@ public final class PluginFactoryImpl extends PluginFactory
}
/** ConverterCapabilities object for this type of conversion. */
- private final static ConverterCapabilities converterCap =
+ private static final ConverterCapabilities converterCap =
new ConverterCapabilitiesImpl();
/**
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
index 50a34b2..4599a0e 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
@@ -39,14 +39,14 @@ import java.util.Properties;
public final class Debug {
/** Informational messages. */
- public final static int INFO = 0x0001;
+ public static final int INFO = 0x0001;
/** Error messages. */
- public final static int ERROR = 0x0002;
+ public static final int ERROR = 0x0002;
/** Trace messages. */
- public final static int TRACE = 0x0004;
+ public static final int TRACE = 0x0004;
/** To set a flag. */
- private final static boolean SET = true;
+ private static final boolean SET = true;
private static int flags = 0;
private static PrintWriter writer = null;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
index 476f047..00eaf9d 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
@@ -34,17 +34,17 @@ import java.net.JarURLConnection;
*/
public class ConverterInfoReader {
- private final static String TAG_CONVERTER = "converter";
- private final static String ATTRIB_OFFICE_TYPE = "type";
- private final static String ATTRIB_VERSION = "version";
- private final static String TAG_NAME = "converter-display-name";
- private final static String TAG_DESC = "converter-description";
- private final static String TAG_VENDOR = "converter-vendor";
- private final static String TAG_CLASS_IMPL = "converter-class-impl";
- private final static String TAG_TARGET = "converter-target";
- private final static String ATTRIB_DEVICE_TYPE = "type";
- private final static String TAG_XSLT_DESERIAL = "converter-xslt-deserialize";
- private final static String TAG_XSLT_SERIAL = "converter-xslt-serialize";
+ private static final String TAG_CONVERTER = "converter";
+ private static final String ATTRIB_OFFICE_TYPE = "type";
+ private static final String ATTRIB_VERSION = "version";
+ private static final String TAG_NAME = "converter-display-name";
+ private static final String TAG_DESC = "converter-description";
+ private static final String TAG_VENDOR = "converter-vendor";
+ private static final String TAG_CLASS_IMPL = "converter-class-impl";
+ private static final String TAG_TARGET = "converter-target";
+ private static final String ATTRIB_DEVICE_TYPE = "type";
+ private static final String TAG_XSLT_DESERIAL = "converter-xslt-deserialize";
+ private static final String TAG_XSLT_SERIAL = "converter-xslt-serialize";
private final String jarfilename;
private final Document document;
private final ArrayList<ConverterInfo> converterInfoList;
commit 8b85838611ed448ef18a9e4982849bbd702981aa
Author: Noel Grandin <noel at peralex.com>
Date: Thu Jun 11 13:10:09 2015 +0200
java: remove unnecessary threading
there is no point in spawning a thread to load a document and then
waiting for the thread to finish
Change-Id: Icd5d5452471b0a50a8e3525ab2b5f32a500ebdf4
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java
index d9403aa..3e4be0a 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java
@@ -20,7 +20,6 @@ package mod._sc;
import java.io.PrintWriter;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
@@ -40,7 +39,6 @@ import com.sun.star.uno.XInterface;
public class ScAccessibleCsvCell extends TestCase {
- Thread lThread = null;
static XAccessibleAction accAction = null;
/**
@@ -140,33 +138,8 @@ public class ScAccessibleCsvCell extends TestCase {
} catch(com.sun.star.uno.Exception e) {
}
- lThread = new loadThread(SOF, args);
- lThread.start();
- util.utils.pause(2000);
+ String url= utils.getFullTestURL("10test.csv");
+ log.println("loading "+url);
+ SOF.loadDocument(url,args);
}
-
- private class loadThread extends Thread {
-
- private final SOfficeFactory SOF;
- private final PropertyValue[] args;
-
- private loadThread(SOfficeFactory SOF, PropertyValue[] Args) {
- this.SOF = SOF;
- this.args = Args;
- }
-
- @Override
- public void run() {
- try {
- String url= utils.getFullTestURL("10test.csv");
- log.println("loading "+url);
- SOF.loadDocument(url,args);
- } catch (com.sun.star.uno.Exception e) {
- e.printStackTrace();
- throw new StatusException( "Couldn't create document ", e );
- }
- }
- }
-
-
}
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java
index cfb3724..0e7aefc 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java
@@ -20,7 +20,6 @@ package mod._sc;
import java.io.PrintWriter;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
@@ -39,7 +38,6 @@ import com.sun.star.uno.XInterface;
public class ScAccessibleCsvGrid extends TestCase {
- Thread lThread = null;
static XAccessibleAction accAction = null;
/**
@@ -123,33 +121,9 @@ public class ScAccessibleCsvGrid extends TestCase {
} catch(com.sun.star.uno.Exception e) {
}
- lThread = new loadThread(SOF, args);
- lThread.start();
- util.utils.pause(2000);
-
- }
-
- private class loadThread extends Thread {
-
- private final SOfficeFactory SOF;
- private final PropertyValue[] args;
-
- private loadThread(SOfficeFactory SOF, PropertyValue[] Args) {
- this.SOF = SOF;
- this.args = Args;
- }
-
- @Override
- public void run() {
- try {
- String url= utils.getFullTestURL("10test.csv");
- log.println("loading "+url);
- SOF.loadDocument(url,args);
- } catch (com.sun.star.uno.Exception e) {
- e.printStackTrace();
- throw new StatusException( "Couldn't create document ", e );
- }
- }
+ String url= utils.getFullTestURL("10test.csv");
+ log.println("loading "+url);
+ SOF.loadDocument(url,args);
}
}
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java
index fb35f92..d3cd924 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java
@@ -20,7 +20,6 @@ package mod._sc;
import java.io.PrintWriter;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
@@ -42,7 +41,6 @@ import com.sun.star.uno.XInterface;
public class ScAccessibleCsvRuler extends TestCase {
- Thread lThread = null;
static XAccessibleAction accAction = null;
/**
@@ -160,33 +158,9 @@ public class ScAccessibleCsvRuler extends TestCase {
} catch(com.sun.star.uno.Exception e) {
}
- lThread = new loadThread(SOF, args);
- lThread.start();
- util.utils.pause(2000);
-
- }
-
- private class loadThread extends Thread {
-
- private final SOfficeFactory SOF;
- private final PropertyValue[] args;
-
- private loadThread(SOfficeFactory SOF, PropertyValue[] Args) {
- this.SOF = SOF;
- this.args = Args;
- }
-
- @Override
- public void run() {
- try {
- String url= utils.getFullTestURL("10test.csv");
- log.println("loading "+url);
- SOF.loadDocument(url,args);
- } catch (com.sun.star.uno.Exception e) {
- e.printStackTrace();
- throw new StatusException( "Couldn't create document ", e );
- }
- }
+ String url= utils.getFullTestURL("10test.csv");
+ log.println("loading "+url);
+ SOF.loadDocument(url,args);
}
}
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java
index be06bc8..299e366 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java
@@ -43,18 +43,20 @@ import util.AccessibilityTools;
import util.SOfficeFactory;
import util.utils;
-
/**
* Object implements the following interfaces :
* <ul>
- * <li> <code>::com::sun::star::accessibility::XAccessibleExtendedComponent</code></li>
- * <li> <code>::com::sun::star::accessibility::XAccessibleEventBroadcaster</code></li>
- * <li> <code>::com::sun::star::accessibility::XAccessibleComponent</code></li>
- * <li> <code>::com::sun::star::accessibility::XAccessibleValue</code></li>
- * <li> <code>::com::sun::star::accessibility::XAccessibleAction</code></li>
- * <li> <code>::com::sun::star::accessibility::XAccessibleContext</code></li>
- * <li> <code>::com::sun::star::accessibility::XAccessibleText</code></li>
- * </ul> <p>
+ * <li>
+ * <code>::com::sun::star::accessibility::XAccessibleExtendedComponent</code></li>
+ * <li>
+ * <code>::com::sun::star::accessibility::XAccessibleEventBroadcaster</code></li>
+ * <li> <code>::com::sun::star::accessibility::XAccessibleComponent</code></li>
+ * <li> <code>::com::sun::star::accessibility::XAccessibleValue</code></li>
+ * <li> <code>::com::sun::star::accessibility::XAccessibleAction</code></li>
+ * <li> <code>::com::sun::star::accessibility::XAccessibleContext</code></li>
+ * <li> <code>::com::sun::star::accessibility::XAccessibleText</code></li>
+ * </ul>
+ * <p>
*
* @see com.sun.star.accessibility.XAccessibleExtendedComponent
* @see com.sun.star.accessibility.XAccessibleEventBroadcaster
@@ -76,69 +78,85 @@ public class AccessibleButton extends lib.TestCase {
private static XAccessibleAction action = null;
/**
- * Opens 'Printer Settings' dialog using document dispatch provider
- * running in a separate thread. Finds active top window (the dialog
- * window) and finds accessible button 'OK' walking through the
- * accessible component tree.
+ * Opens 'Printer Settings' dialog using document dispatch provider running
+ * in a separate thread. Finds active top window (the dialog window) and
+ * finds accessible button 'OK' walking through the accessible component
+ * tree.
*/
@Override
protected TestEnvironment createTestEnvironment(TestParameters Param,
- PrintWriter log) throws Exception {
+ PrintWriter log) throws Exception {
XInterface oObj = null;
XMultiServiceFactory msf = Param.getMSF();
oObj = (XInterface) msf.createInstance("com.sun.star.awt.Toolkit");
- XExtendedToolkit tk = UnoRuntime.queryInterface(
- XExtendedToolkit.class, oObj);
+ XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class,
+ oObj);
util.utils.waitForEventIdle(Param.getMSF());
- DiagThread psDiag = new DiagThread(xTextDoc, msf);
- psDiag.start();
+ XModel aModel = UnoRuntime.queryInterface(XModel.class, xTextDoc);
+
+ XController xController = aModel.getCurrentController();
- util.utils.pause(Param.getInt("ShortWait"));
+ // Opening PrinterSetupDialog
+ String aSlotID = ".uno:Zoom";
+ XDispatchProvider xDispProv = UnoRuntime.queryInterface(
+ XDispatchProvider.class, xController);
+ XURLTransformer xParser = UnoRuntime.queryInterface(
+ XURLTransformer.class,
+ msf.createInstance("com.sun.star.util.URLTransformer"));
- util.utils.pause(Param.getInt("ShortWait"));
+ // Because it's an in/out parameter
+ // we must use an array of URL objects.
+ URL[] aParseURL = new URL[] { new URL() };
+ aParseURL[0].Complete = aSlotID;
+ xParser.parseStrict(aParseURL);
+
+ XDispatch xDispatcher = xDispProv.queryDispatch(aParseURL[0], "", 0);
+ if (xDispatcher != null) {
+ xDispatcher.dispatch(aParseURL[0], null);
+ }
+
+ util.utils.waitForEventIdle(msf);
Object atw = tk.getActiveTopWindow();
- XWindow xWindow = UnoRuntime.queryInterface(XWindow.class,
- atw);
+ XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw);
XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
-
- AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
- oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON,
- "Cancel");
+ AccessibilityTools.printAccessibleTree(log, xRoot,
+ Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
+ oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot,
+ AccessibleRole.PUSH_BUTTON, "Cancel");
log.println("ImplementationName " + utils.getImplName(oObj));
TestEnvironment tEnv = new TestEnvironment(oObj);
- action = UnoRuntime.queryInterface(
- XAccessibleAction.class, oObj);
+ action = UnoRuntime.queryInterface(XAccessibleAction.class, oObj);
final XAccessibleComponent acomp = UnoRuntime.queryInterface(
- XAccessibleComponent.class,
- oObj);
+ XAccessibleComponent.class, oObj);
- tEnv.addObjRelation("EventProducer",
- new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() {
- public void fireEvent() {
- System.out.println("Grabbing focus ... ");
- acomp.grabFocus();
- }
- });
+ tEnv.addObjRelation(
+ "EventProducer",
+ new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() {
+ public void fireEvent() {
+ System.out.println("Grabbing focus ... ");
+ acomp.grabFocus();
+ }
+ });
- XAccessibleText text = UnoRuntime.queryInterface(
- XAccessibleText.class, oObj);
+ XAccessibleText text = UnoRuntime.queryInterface(XAccessibleText.class,
+ oObj);
tEnv.addObjRelation("XAccessibleText.Text", text.getText());
tEnv.addObjRelation("EditOnly",
- "This method isn't supported in this component");
+ "This method isn't supported in this component");
tEnv.addObjRelation("LimitedBounds", "yes");
@@ -168,59 +186,10 @@ public class AccessibleButton extends lib.TestCase {
* Opens new writer document.
*/
@Override
- protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory(
- Param.getMSF());
+ protected void initialize(TestParameters Param, PrintWriter log)
+ throws Exception {
+ SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
xTextDoc = SOF.createTextDoc(null);
}
-
- /**
- * Thread for opening modal dialog 'Print Settings'.
- */
- private class DiagThread extends Thread {
- private XTextDocument xTextDoc = null;
- private XMultiServiceFactory msf = null;
-
- private DiagThread(XTextDocument xTextDoc, XMultiServiceFactory msf) {
- this.xTextDoc = xTextDoc;
- this.msf = msf;
- }
-
- @Override
- public void run() {
- XModel aModel = UnoRuntime.queryInterface(XModel.class,
- xTextDoc);
-
- XController xController = aModel.getCurrentController();
-
- //Opening PrinterSetupDialog
- try {
- String aSlotID = ".uno:Zoom";
- XDispatchProvider xDispProv = UnoRuntime.queryInterface(
- XDispatchProvider.class,
- xController);
- XURLTransformer xParser = UnoRuntime.queryInterface(
- XURLTransformer.class,
- msf.createInstance(
- "com.sun.star.util.URLTransformer"));
-
- // Because it's an in/out parameter
- // we must use an array of URL objects.
- URL[] aParseURL = new URL[1];
- aParseURL[0] = new URL();
- aParseURL[0].Complete = aSlotID;
- xParser.parseStrict(aParseURL);
-
- URL aURL = aParseURL[0];
- XDispatch xDispatcher = xDispProv.queryDispatch(aURL, "", 0);
-
- if (xDispatcher != null) {
- xDispatcher.dispatch(aURL, null);
- }
- } catch (com.sun.star.uno.Exception e) {
- log.println("Couldn't open dialog");
- }
- }
- }
}
\ No newline at end of file
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java
index 343953e..da6faa3 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java
@@ -44,21 +44,24 @@ import util.AccessibilityTools;
import util.SOfficeFactory;
import util.utils;
-
/**
- * Test for object which is represented by accessible compoent of
- * check box in 'InsertTable' dialog. <p>
+ * Test for object which is represented by accessible compoent of check box in
+ * 'InsertTable' dialog.
+ * <p>
*
* Object implements the following interfaces :
* <ul>
- * <li> <code>::com::sun::star::accessibility::XAccessibleExtendedComponent</code></li>
- * <li> <code>::com::sun::star::accessibility::XAccessibleEventBroadcaster</code></li>
- * <li> <code>::com::sun::star::accessibility::XAccessibleComponent</code></li>
- * <li> <code>::com::sun::star::accessibility::XAccessibleValue</code></li>
- * <li> <code>::com::sun::star::accessibility::XAccessibleAction</code></li>
- * <li> <code>::com::sun::star::accessibility::XAccessibleContext</code></li>
- * <li> <code>::com::sun::star::accessibility::XAccessibleText</code></li>
- * </ul> <p>
+ * <li>
+ * <code>::com::sun::star::accessibility::XAccessibleExtendedComponent</code></li>
+ * <li>
+ * <code>::com::sun::star::accessibility::XAccessibleEventBroadcaster</code></li>
+ * <li> <code>::com::sun::star::accessibility::XAccessibleComponent</code></li>
+ * <li> <code>::com::sun::star::accessibility::XAccessibleValue</code></li>
+ * <li> <code>::com::sun::star::accessibility::XAccessibleAction</code></li>
+ * <li> <code>::com::sun::star::accessibility::XAccessibleContext</code></li>
+ * <li> <code>::com::sun::star::accessibility::XAccessibleText</code></li>
+ * </ul>
+ * <p>
*
* @see com.sun.star.accessibility.XAccessibleExtendedComponent
* @see com.sun.star.accessibility.XAccessibleEventBroadcaster
@@ -78,17 +81,15 @@ import util.utils;
public class AccessibleCheckBox extends TestCase {
private static XTextDocument xTextDoc = null;
private static XAccessibleAction action = null;
- private static DiagThread psDiag = null;
/**
- * Opens 'Insert Table' dialog using document dispatch provider
- * running in a separate thread. Finds active top window (the dialog
- * window) and finds first accessible check box walking through the
- * accessible component tree.
+ * Opens 'Insert Table' dialog using document dispatch provider running in a
+ * separate thread. Finds active top window (the dialog window) and finds
+ * first accessible check box walking through the accessible component tree.
*/
@Override
protected TestEnvironment createTestEnvironment(TestParameters Param,
- PrintWriter log) throws Exception {
+ PrintWriter log) throws Exception {
XMultiServiceFactory msf = Param.getMSF();
log.println("Creating text document");
@@ -105,60 +106,78 @@ public class AccessibleCheckBox extends TestCase {
oObj = (XInterface) msf.createInstance("com.sun.star.awt.Toolkit");
- XExtendedToolkit tk = UnoRuntime.queryInterface(
- XExtendedToolkit.class, oObj);
+ XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class,
+ oObj);
util.utils.waitForEventIdle(Param.getMSF());
log.println("Opening Dialog in second thread");
- psDiag = new DiagThread(xTextDoc, msf);
- psDiag.start();
+ XModel aModel = UnoRuntime.queryInterface(XModel.class, xTextDoc);
+
+ XController xController = aModel.getCurrentController();
- util.utils.pause(Param.getInt("ShortWait"));
+ // Opening PrinterSetupDialog
+ String aSlotID = ".uno:InsertTable";
+ XDispatchProvider xDispProv = UnoRuntime.queryInterface(
+ XDispatchProvider.class, xController);
+ XURLTransformer xParser = UnoRuntime.queryInterface(
+ XURLTransformer.class,
+ msf.createInstance("com.sun.star.util.URLTransformer"));
- util.utils.pause(Param.getInt("ShortWait"));
+ // Because it's an in/out parameter we must use an array of URL
+ // objects.
+ URL[] aParseURL = new URL[] { new URL() };
+ aParseURL[0].Complete = aSlotID;
+ xParser.parseStrict(aParseURL);
+
+ XDispatch xDispatcher = xDispProv.queryDispatch(aParseURL[0], "", 0);
+ if (xDispatcher != null) {
+ xDispatcher.dispatch(aParseURL[0], null);
+ }
+
+ util.utils.waitForEventIdle(msf);
log.println("Getting the active TopWindow");
XWindow xWindow = UnoRuntime.queryInterface(XWindow.class,
- tk.getActiveTopWindow());
+ tk.getActiveTopWindow());
XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
+ AccessibilityTools.printAccessibleTree(log, xRoot,
+ Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
+ oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot,
+ AccessibleRole.PUSH_BUTTON, "Cancel");
- AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
- oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON,
- "Cancel");
-
- action = UnoRuntime.queryInterface(
- XAccessibleAction.class, oObj);
+ action = UnoRuntime.queryInterface(XAccessibleAction.class, oObj);
- oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.CHECK_BOX);
+ oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot,
+ AccessibleRole.CHECK_BOX);
log.println("ImplementationName " + utils.getImplName(oObj));
TestEnvironment tEnv = new TestEnvironment(oObj);
final XAccessibleComponent acomp = UnoRuntime.queryInterface(
- XAccessibleComponent.class,
- oObj);
+ XAccessibleComponent.class, oObj);
- tEnv.addObjRelation("EventProducer",
- new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() {
- public void fireEvent() {
- System.out.println("Grabbing focus ... ");
- acomp.grabFocus();
- }
- });
+ tEnv.addObjRelation(
+ "EventProducer",
+ new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() {
+ public void fireEvent() {
+ System.out.println("Grabbing focus ... ");
+ acomp.grabFocus();
+ }
+ });
- XAccessibleText text = UnoRuntime.queryInterface(
- XAccessibleText.class, oObj);
+ XAccessibleText text = UnoRuntime.queryInterface(XAccessibleText.class,
+ oObj);
tEnv.addObjRelation("XAccessibleText.Text", text.getText());
tEnv.addObjRelation("EditOnly",
- "This method isn't supported in this component");
+ "This method isn't supported in this component");
tEnv.addObjRelation("LimitedBounds", "yes");
@@ -174,8 +193,6 @@ public class AccessibleCheckBox extends TestCase {
try {
log.println("closing dialog");
action.doAccessibleAction(0);
- log.println("interrupting corresponding Thread");
- psDiag.interrupt();
log.println("closing the document");
util.DesktopTools.closeDoc(xTextDoc);
log.println("reinitialize the variable");
@@ -187,51 +204,4 @@ public class AccessibleCheckBox extends TestCase {
}
}
- /**
- * Thread for opening modal dialog 'Insert Table'.
- */
- private class DiagThread extends Thread {
- private XTextDocument xTextDoc = null;
- private XMultiServiceFactory msf = null;
-
- private DiagThread(XTextDocument xTextDoc, XMultiServiceFactory msf) {
- this.xTextDoc = xTextDoc;
- this.msf = msf;
- }
-
- @Override
- public void run() {
- XModel aModel = UnoRuntime.queryInterface(XModel.class,
- xTextDoc);
-
- XController xController = aModel.getCurrentController();
-
- //Opening PrinterSetupDialog
- try {
- String aSlotID = ".uno:InsertTable";
- XDispatchProvider xDispProv = UnoRuntime.queryInterface(
- XDispatchProvider.class,
- xController);
- XURLTransformer xParser = UnoRuntime.queryInterface(
- XURLTransformer.class,
- msf.createInstance(
- "com.sun.star.util.URLTransformer"));
-
- // Because it's an in/out parameter we must use an array of URL objects.
- URL[] aParseURL = new URL[1];
- aParseURL[0] = new URL();
- aParseURL[0].Complete = aSlotID;
- xParser.parseStrict(aParseURL);
-
- URL aURL = aParseURL[0];
- XDispatch xDispatcher = xDispProv.queryDispatch(aURL, "", 0);
-
- if (xDispatcher != null) {
- xDispatcher.dispatch(aURL, null);
- }
- } catch (com.sun.star.uno.Exception e) {
- log.println("Couldn't open dialog");
- }
- }
- }
}
\ No newline at end of file
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java
index da256ab..621ad5c 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java
@@ -28,7 +28,6 @@ import com.sun.star.frame.XController;
import com.sun.star.frame.XDispatch;
import com.sun.star.frame.XDispatchProvider;
import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.text.XTextDocument;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
@@ -44,18 +43,21 @@ import util.AccessibilityTools;
import util.SOfficeFactory;
import util.utils;
-
/**
- * Test for object which is represented by accessible component
- * of the 'Font' combo box in Format->Character... dislog box. <p>
+ * Test for object which is represented by accessible component of the 'Font'
+ * combo box in Format->Character... dislog box.
+ * <p>
*
* Object implements the following interfaces :
* <ul>
- * <li> <code>::com::sun::star::accessibility::XAccessibleExtendedComponent</code></li>
- * <li> <code>::com::sun::star::accessibility::XAccessibleEventBroadcaster</code></li>
- * <li> <code>::com::sun::star::accessibility::XAccessibleComponent</code></li>
- * <li> <code>::com::sun::star::accessibility::XAccessibleContext</code></li>
- * </ul> <p>
+ * <li>
+ * <code>::com::sun::star::accessibility::XAccessibleExtendedComponent</code></li>
+ * <li>
+ * <code>::com::sun::star::accessibility::XAccessibleEventBroadcaster</code></li>
+ * <li> <code>::com::sun::star::accessibility::XAccessibleComponent</code></li>
+ * <li> <code>::com::sun::star::accessibility::XAccessibleContext</code></li>
+ * </ul>
+ * <p>
*
* @see com.sun.star.accessibility.XAccessibleExtendedComponent
* @see com.sun.star.accessibility.XAccessibleEventBroadcaster
@@ -71,45 +73,61 @@ public class AccessibleComboBox extends TestCase {
private static XAccessibleAction action = null;
/**
- * Opens CharacterStyle dialog and
- * finds AccessibleComboBox walking through the
- * accessible component tree.
+ * Opens CharacterStyle dialog and finds AccessibleComboBox walking through
+ * the accessible component tree.
*/
@Override
protected TestEnvironment createTestEnvironment(TestParameters Param,
- PrintWriter log) throws Exception {
+ PrintWriter log) throws Exception {
XInterface oObj = null;
oObj = (XInterface) Param.getMSF().createInstance(
- "com.sun.star.awt.Toolkit");
+ "com.sun.star.awt.Toolkit");
+
+ XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class,
+ oObj);
+
+ XModel aModel = UnoRuntime.queryInterface(XModel.class, xTextDoc);
- XExtendedToolkit tk = UnoRuntime.queryInterface(
- XExtendedToolkit.class, oObj);
+ XController xController = aModel.getCurrentController();
- DiagThread psDiag = new DiagThread(xTextDoc,
- Param.getMSF());
- psDiag.start();
+ // Opening PrinterSetupDialog
+ String aSlotID = ".uno:FontDialog";
+ XDispatchProvider xDispProv = UnoRuntime.queryInterface(
+ XDispatchProvider.class, xController);
+ XURLTransformer xParser = UnoRuntime.queryInterface(
+ XURLTransformer.class,
+ Param.getMSF().createInstance(
+ "com.sun.star.util.URLTransformer"));
- util.utils.pause(Param.getInt("ShortWait"));
+ // Because it's an in/out parameter we must use an array of URL
+ // objects.
+ URL[] aParseURL = new URL[] { new URL() };
+ aParseURL[0].Complete = aSlotID;
+ xParser.parseStrict(aParseURL);
+
+ XDispatch xDispatcher = xDispProv.queryDispatch(aParseURL[0], "", 0);
+ if (xDispatcher != null) {
+ xDispatcher.dispatch(aParseURL[0], null);
+ }
+
+ util.utils.waitForEventIdle(Param.getMSF());
Object atw = tk.getActiveTopWindow();
- XWindow xWindow = UnoRuntime.queryInterface(XWindow.class,
- atw);
+ XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw);
XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
- oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON,
- "Cancel");
- action = UnoRuntime.queryInterface(
- XAccessibleAction.class, oObj);
+ oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot,
+ AccessibleRole.PUSH_BUTTON, "Cancel");
+ action = UnoRuntime.queryInterface(XAccessibleAction.class, oObj);
oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot,
- AccessibleRole.PAGE_TAB_LIST);
+ AccessibleRole.PAGE_TAB_LIST);
XAccessibleSelection xAccSel = UnoRuntime.queryInterface(
- XAccessibleSelection.class,
- oObj);
+ XAccessibleSelection.class, oObj);
try {
xAccSel.selectAccessibleChild(0);
@@ -118,28 +136,28 @@ public class AccessibleComboBox extends TestCase {
}
util.utils.waitForEventIdle(Param.getMSF());
- AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
- oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL, "",
- "AccessibleComboBox");
+ AccessibilityTools.printAccessibleTree(log, xRoot,
+ Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
+ oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot,
+ AccessibleRole.PANEL, "", "AccessibleComboBox");
log.println("ImplementationName " + utils.getImplName(oObj));
TestEnvironment tEnv = new TestEnvironment(oObj);
final XAccessibleComponent acomp = UnoRuntime.queryInterface(
- XAccessibleComponent.class,
- oObj);
+ XAccessibleComponent.class, oObj);
final XAccessibleComponent acomp1 = UnoRuntime.queryInterface(
- XAccessibleComponent.class,
- action);
+ XAccessibleComponent.class, action);
- tEnv.addObjRelation("EventProducer",
- new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() {
- public void fireEvent() {
- acomp1.grabFocus();
- acomp.grabFocus();
- }
- });
+ tEnv.addObjRelation(
+ "EventProducer",
+ new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() {
+ public void fireEvent() {
+ acomp1.grabFocus();
+ acomp.grabFocus();
+ }
+ });
return tEnv;
}
@@ -167,58 +185,10 @@ public class AccessibleComboBox extends TestCase {
* Creates writer doc
*/
@Override
- protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory(
- Param.getMSF());
+ protected void initialize(TestParameters Param, PrintWriter log)
+ throws Exception {
+ SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
xTextDoc = SOF.createTextDoc(null);
}
-
- /**
- * Thread for opening modal dialog 'Character style'.
- */
- private class DiagThread extends Thread {
- private XTextDocument xTextDoc = null;
- private XMultiServiceFactory msf = null;
-
- private DiagThread(XTextDocument xTextDoc, XMultiServiceFactory msf) {
- this.xTextDoc = xTextDoc;
- this.msf = msf;
- }
-
- @Override
- public void run() {
- XModel aModel = UnoRuntime.queryInterface(XModel.class,
- xTextDoc);
-
- XController xController = aModel.getCurrentController();
-
- //Opening PrinterSetupDialog
- try {
- String aSlotID = ".uno:FontDialog";
- XDispatchProvider xDispProv = UnoRuntime.queryInterface(
- XDispatchProvider.class,
- xController);
- XURLTransformer xParser = UnoRuntime.queryInterface(
- XURLTransformer.class,
- msf.createInstance(
- "com.sun.star.util.URLTransformer"));
-
- // Because it's an in/out parameter we must use an array of URL objects.
- URL[] aParseURL = new URL[1];
- aParseURL[0] = new URL();
- aParseURL[0].Complete = aSlotID;
- xParser.parseStrict(aParseURL);
-
- URL aURL = aParseURL[0];
- XDispatch xDispatcher = xDispProv.queryDispatch(aURL, "", 0);
-
- if (xDispatcher != null) {
- xDispatcher.dispatch(aURL, null);
- }
- } catch (com.sun.star.uno.Exception e) {
- log.println("Couldn't open dialog");
- }
- }
- }
}
\ No newline at end of file
diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk
index 1f11298..ee1029e 100644
--- a/sfx2/JunitTest_sfx2_complex.mk
+++ b/sfx2/JunitTest_sfx2_complex.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sfx2_complex,\
sfx2/qa/complex/sfx2/GlobalEventBroadcaster \
sfx2/qa/complex/sfx2/UndoManager \
sfx2/qa/complex/sfx2/DocumentEvents \
- sfx2/qa/complex/sfx2/tools/DialogThread \
sfx2/qa/complex/sfx2/tools/TestDocument \
sfx2/qa/complex/sfx2/tools/WriterHelper \
sfx2/qa/complex/sfx2/undo/CalcDocumentTest \
diff --git a/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java b/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java
index c639ca1..e4154db 100644
--- a/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java
+++ b/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java
@@ -95,7 +95,7 @@ public class GlobalEventBroadcaster {
System.out.println("... done");
}
- @Test public void checkWriter() {
+ @Test public void checkWriter() throws Exception {
System.out.println("-- Checking Writer --");
WriterHelper wHelper = new WriterHelper(m_xMSF);
@@ -156,7 +156,7 @@ public class GlobalEventBroadcaster {
proveExpectation(expected));
System.out.println("... done");
- // TODO: It seems not possible to close the document without interactiv question
+ // TODO: It seems not possible to close the document without interactive question
// there the follow test will not be execute
if (false) {
System.out.println("Opening document with label wizard");
diff --git a/sfx2/qa/complex/sfx2/tools/DialogThread.java b/sfx2/qa/complex/sfx2/tools/DialogThread.java
deleted file mode 100644
index b4a8dda..0000000
--- a/sfx2/qa/complex/sfx2/tools/DialogThread.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package complex.sfx2.tools;
-
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.frame.XController;
-import com.sun.star.frame.XDispatch;
-import com.sun.star.frame.XDispatchProvider;
-import com.sun.star.frame.XModel;
-import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.util.URL;
-import com.sun.star.util.XURLTransformer;
-
-/**
- * This class opens a given dialog in a separate Thread by dispatching an url
- *
- */
-public class DialogThread extends Thread {
- private XComponent m_xDoc = null;
- private XMultiServiceFactory m_xMSF = null;
- private String m_url = "";
-
- public DialogThread(XComponent xDoc, XMultiServiceFactory msf, String url) {
- this.m_xDoc = xDoc;
- this.m_xMSF = msf;
- this.m_url = url;
- }
-
- @Override
- public void run() {
- XModel aModel = UnoRuntime.queryInterface( XModel.class, m_xDoc );
-
- XController xController = aModel.getCurrentController();
-
- //Opening Dialog
- try {
- XDispatchProvider xDispProv = UnoRuntime.queryInterface( XDispatchProvider.class, xController.getFrame() );
- XURLTransformer xParser = UnoRuntime.queryInterface( XURLTransformer.class,
- m_xMSF.createInstance( "com.sun.star.util.URLTransformer" ) );
-
- // Because it's an in/out parameter
- // we must use an array of URL objects.
- URL[] aParseURL = new URL[1];
- aParseURL[0] = new URL();
- aParseURL[0].Complete = m_url;
- xParser.parseStrict(aParseURL);
-
- URL aURL = aParseURL[0];
- XDispatch xDispatcher = xDispProv.queryDispatch(aURL, "", com.sun.star.frame.FrameSearchFlag.SELF |
- com.sun.star.frame.FrameSearchFlag.CHILDREN);
- PropertyValue[] dispatchArguments = new PropertyValue[0];
-
- if (xDispatcher != null) {
- xDispatcher.dispatch(aURL, dispatchArguments);
- } else {
- System.out.println("xDispatcher is null");
- }
- } catch (com.sun.star.uno.Exception e) {
- System.out.println("Couldn't open dialog");
- }
- }
-}
\ No newline at end of file
diff --git a/sfx2/qa/complex/sfx2/tools/WriterHelper.java b/sfx2/qa/complex/sfx2/tools/WriterHelper.java
index d0d47ce..382aebc 100644
--- a/sfx2/qa/complex/sfx2/tools/WriterHelper.java
+++ b/sfx2/qa/complex/sfx2/tools/WriterHelper.java
@@ -23,17 +23,23 @@ import com.sun.star.accessibility.XAccessibleAction;
import com.sun.star.accessibility.XAccessibleContext;
import com.sun.star.awt.XExtendedToolkit;
import com.sun.star.awt.XWindow;
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.frame.XController;
import com.sun.star.frame.XDesktop;
+import com.sun.star.frame.XDispatch;
+import com.sun.star.frame.XDispatchProvider;
+import com.sun.star.frame.XModel;
import com.sun.star.lang.XComponent;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.text.XTextDocument;
import com.sun.star.uno.UnoRuntime;
+import com.sun.star.util.URL;
import com.sun.star.util.XCloseable;
+import com.sun.star.util.XURLTransformer;
import util.AccessibilityTools;
import util.WriterTools;
-
/**
* Methods to open Writer docs
*
@@ -41,26 +47,36 @@ import util.WriterTools;
public class WriterHelper {
private XMultiServiceFactory m_xMSF = null;
- /** Creates a new instance of WriterHelper
- * @param xMSF The MultiServiceFactory gained from the office
+ /**
+ * Creates a new instance of WriterHelper
+ *
+ * @param xMSF
+ * The MultiServiceFactory gained from the office
*/
public WriterHelper(XMultiServiceFactory xMSF) {
this.m_xMSF = xMSF;
}
- /** Opens an empty document
+ /**
+ * Opens an empty document
+ *
* @return a reference to the opened document is returned
*/
public XTextDocument openEmptyDoc() {
return WriterTools.createTextDoc(m_xMSF);
}
- /** Closes a given XTextDocument
- * @param xTextDoc the text document to be closed
- * @return if an error occurs the errormessage is returned and an empty String if not
+ /**
+ * Closes a given XTextDocument
+ *
+ * @param xTextDoc
+ * the text document to be closed
+ * @return if an error occurs the errormessage is returned and an empty
+ * String if not
*/
public String closeDoc(XTextDocument xTextDoc) {
- XCloseable closer = UnoRuntime.queryInterface(XCloseable.class, xTextDoc);
+ XCloseable closer = UnoRuntime.queryInterface(XCloseable.class,
+ xTextDoc);
String err = "";
try {
@@ -74,20 +90,51 @@ public class WriterHelper {
}
private XTextDocument xLocalDoc = null;
- /** a TextDocument is opened by pressing a button in a dialog given by uno-URL
- * @param url the uno-URL of the dialog to be opened
- * @param createButton the language dependent label of the button to be pressed
- * @param destroyLocal if true the document that has been opened to dispatch the dialog is closed before the method returns,
- * otherwise this document remains open
+
+ /**
+ * a TextDocument is opened by pressing a button in a dialog given by
+ * uno-URL
+ *
+ * @param url
+ * the uno-URL of the dialog to be opened
+ * @param createButton
+ * the language dependent label of the button to be pressed
+ * @param destroyLocal
+ * if true the document that has been opened to dispatch the
+ * dialog is closed before the method returns, otherwise this
+ * document remains open
* @return returns the created Textdocument
*/
public XTextDocument openFromDialog(String url, String createButton,
- boolean destroyLocal) {
+ boolean destroyLocal) throws Exception {
xLocalDoc = WriterTools.createTextDoc(m_xMSF);
- XComponent comp = UnoRuntime.queryInterface(XComponent.class, xLocalDoc);
- DialogThread diagThread = new DialogThread(comp, m_xMSF, url);
- diagThread.start();
- util.utils.pause(4000);
+ XComponent comp = UnoRuntime
+ .queryInterface(XComponent.class, xLocalDoc);
+
+ XModel aModel = UnoRuntime.queryInterface(XModel.class, comp);
+
+ XController xController = aModel.getCurrentController();
+
+ // Opening Dialog
+ XDispatchProvider xDispProv = UnoRuntime.queryInterface(
+ XDispatchProvider.class, xController.getFrame());
+ XURLTransformer xParser = UnoRuntime.queryInterface(
+ XURLTransformer.class,
+ m_xMSF.createInstance("com.sun.star.util.URLTransformer"));
+
+ // Because it's an in/out parameter
+ // we must use an array of URL objects.
+ URL[] aParseURL = new URL[] { new URL() };
+ aParseURL[0].Complete = url;
+ xParser.parseStrict(aParseURL);
+
+ XDispatch xDispatcher = xDispProv.queryDispatch(aParseURL[0], "",
+ com.sun.star.frame.FrameSearchFlag.SELF
+ | com.sun.star.frame.FrameSearchFlag.CHILDREN);
+ if (xDispatcher != null) {
+ PropertyValue[] dispatchArguments = new PropertyValue[0];
+ xDispatcher.dispatch(aParseURL[0], dispatchArguments);
+ }
if (createButton.length() > 1) {
XExtendedToolkit tk = getToolkit();
@@ -96,16 +143,16 @@ public class WriterHelper {
XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw);
XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
- XAccessibleContext buttonContext = AccessibilityTools.getAccessibleObjectForRole(
- xRoot,
- AccessibleRole.PUSH_BUTTON,
- createButton);
+ XAccessibleContext buttonContext = AccessibilityTools
+ .getAccessibleObjectForRole(xRoot,
+ AccessibleRole.PUSH_BUTTON, createButton);
- XAccessibleAction buttonAction = UnoRuntime.queryInterface(XAccessibleAction.class, buttonContext);
+ XAccessibleAction buttonAction = UnoRuntime.queryInterface(
+ XAccessibleAction.class, buttonContext);
try {
- System.out.println("Name: " +
- buttonContext.getAccessibleName());
+ System.out
+ .println("Name: " + buttonContext.getAccessibleName());
buttonAction.doAccessibleAction(0);
} catch (com.sun.star.lang.IndexOutOfBoundsException e) {
System.out.println("Couldn't press button");
@@ -116,7 +163,8 @@ public class WriterHelper {
XDesktop xDesktop = getDesktop();
- XTextDocument returnDoc = UnoRuntime.queryInterface(XTextDocument.class, xDesktop.getCurrentComponent());
+ XTextDocument returnDoc = UnoRuntime.queryInterface(
+ XTextDocument.class, xDesktop.getCurrentComponent());
if (destroyLocal) {
closeDoc(xLocalDoc);
@@ -125,18 +173,16 @@ public class WriterHelper {
return returnDoc;
}
- public void closeFromDialog()
- {
+
+ public void closeFromDialog() {
closeDoc(xLocalDoc);
xLocalDoc = null;
}
-
-
-
-
- /** creates an instance of com.sun.star.awt.Toolkit to query the XExtendedToolkit
- * interface
+ /**
+ * creates an instance of com.sun.star.awt.Toolkit to query the
+ * XExtendedToolkit interface
+ *
* @return returns the gained XExtendedToolkit Interface
*/
public XExtendedToolkit getToolkit() {
@@ -146,15 +192,19 @@ public class WriterHelper {
toolkit = m_xMSF.createInstance("com.sun.star.awt.Toolkit");
} catch (com.sun.star.uno.Exception e) {
System.out.println("Couldn't get toolkit");
- e.printStackTrace( System.err );
+ e.printStackTrace(System.err);
}
- XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, toolkit);
+ XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class,
+ toolkit);
return tk;
}
- /** creates an instance of com.sun.star.frame.Desktop to query the XDesktop interface
+ /**
+ * creates an instance of com.sun.star.frame.Desktop to query the XDesktop
+ * interface
+ *
* @return returns the gained XDesktop interface
*/
private XDesktop getDesktop() {
@@ -164,7 +214,7 @@ public class WriterHelper {
desk = m_xMSF.createInstance("com.sun.star.frame.Desktop");
} catch (com.sun.star.uno.Exception e) {
System.out.println("Couldn't get desktop");
- e.printStackTrace( System.err );
+ e.printStackTrace(System.err);
}
XDesktop xDesktop = UnoRuntime.queryInterface(XDesktop.class, desk);
More information about the Libreoffice-commits
mailing list