[Libreoffice-commits] core.git: 13 commits - connectivity/qa filter/qa javaunohelper/com javaunohelper/test jurt/com jurt/test nlpsolver/ThirdParty odk/source qadevOOo/runner qadevOOo/tests reportbuilder/java scripting/java swext/mediawiki toolkit/test wizards/com xmerge/source
Noel Grandin
noel at peralex.com
Wed Oct 15 23:17:02 PDT 2014
connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java | 55 ++--
connectivity/qa/connectivity/tools/AbstractDatabase.java | 10
filter/qa/complex/filter/detection/typeDetection/Helper.java | 2
javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java | 3
javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java | 129 +++++-----
javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java | 6
javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java | 9
jurt/com/sun/star/comp/loader/JavaLoader.java | 80 +++---
jurt/com/sun/star/lib/util/NativeLibraryLoader.java | 39 +--
jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java | 12
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java | 3
odk/source/com/sun/star/lib/loader/InstallationFinder.java | 73 +++--
qadevOOo/runner/convwatch/FileHelper.java | 3
qadevOOo/runner/helper/URLHelper.java | 3
qadevOOo/runner/lib/TestParameters.java | 29 +-
qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange.java | 4
qadevOOo/tests/java/ifc/style/_CharacterProperties.java | 3
qadevOOo/tests/java/mod/_defreg/NestedRegistry.java | 3
qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java | 3
qadevOOo/tests/java/mod/_simplereg/uno/SimpleRegistry.java | 3
qadevOOo/tests/java/mod/_simreg/SimpleRegistry.java | 3
reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java | 48 +--
scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java | 3
swext/mediawiki/src/com/sun/star/wiki/Helper.java | 50 +--
toolkit/test/accessibility/AccessibilityTree.java | 86 +++---
toolkit/test/accessibility/AccessibilityTreeModel.java | 3
toolkit/test/accessibility/AccessibleCellHandler.java | 21 -
toolkit/test/accessibility/AccessibleSelectionHandler.java | 97 +++----
toolkit/test/accessibility/AccessibleTextHandler.java | 6
toolkit/test/accessibility/AccessibleTreeCellRenderer.java | 3
toolkit/test/accessibility/Canvas.java | 4
toolkit/test/accessibility/InformationWriter.java | 3
toolkit/test/accessibility/MessageArea.java | 3
toolkit/test/accessibility/TextUpdateListener.java | 6
wizards/com/sun/star/wizards/common/ConfigGroup.java | 4
wizards/com/sun/star/wizards/common/ConfigNode.java | 6
wizards/com/sun/star/wizards/common/Configuration.java | 4
wizards/com/sun/star/wizards/common/Desktop.java | 5
wizards/com/sun/star/wizards/common/Helper.java | 5
wizards/com/sun/star/wizards/common/IRenderer.java | 2
wizards/com/sun/star/wizards/common/Indexable.java | 2
wizards/com/sun/star/wizards/common/JavaTools.java | 5
wizards/com/sun/star/wizards/common/NumberFormatter.java | 4
wizards/com/sun/star/wizards/common/NumericalHelper.java | 16 -
wizards/com/sun/star/wizards/common/PlaceholderTextElement.java | 2
wizards/com/sun/star/wizards/common/SystemDialog.java | 2
wizards/com/sun/star/wizards/common/UCB.java | 9
wizards/com/sun/star/wizards/common/XMLProvider.java | 2
wizards/com/sun/star/wizards/db/ColumnPropertySet.java | 10
wizards/com/sun/star/wizards/db/CommandName.java | 60 ++--
wizards/com/sun/star/wizards/db/QueryMetaData.java | 7
wizards/com/sun/star/wizards/db/RecordParser.java | 2
wizards/com/sun/star/wizards/db/TableDescriptor.java | 9
wizards/com/sun/star/wizards/db/TypeInspector.java | 12
wizards/com/sun/star/wizards/document/Control.java | 2
wizards/com/sun/star/wizards/document/DatabaseControl.java | 2
wizards/com/sun/star/wizards/form/DataEntrySetter.java | 14 -
wizards/com/sun/star/wizards/form/FieldLinker.java | 12
wizards/com/sun/star/wizards/form/Finalizer.java | 10
wizards/com/sun/star/wizards/form/FormConfiguration.java | 14 -
wizards/com/sun/star/wizards/form/FormControlArranger.java | 8
wizards/com/sun/star/wizards/form/FormDocument.java | 10
wizards/com/sun/star/wizards/form/FormWizard.java | 6
wizards/com/sun/star/wizards/form/StyleApplier.java | 28 +-
wizards/com/sun/star/wizards/form/UIControlArranger.java | 19 -
wizards/com/sun/star/wizards/query/Finalizer.java | 13 -
wizards/com/sun/star/wizards/query/QueryWizard.java | 2
wizards/com/sun/star/wizards/report/DBColumn.java | 6
wizards/com/sun/star/wizards/report/Dataimport.java | 4
wizards/com/sun/star/wizards/report/GroupFieldHandler.java | 2
wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java | 28 +-
wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java | 6
wizards/com/sun/star/wizards/report/IReportDocument.java | 76 ++---
wizards/com/sun/star/wizards/report/ReportFinalizer.java | 17 -
wizards/com/sun/star/wizards/report/ReportLayouter.java | 20 -
wizards/com/sun/star/wizards/report/ReportWizard.java | 6
wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java | 11
wizards/com/sun/star/wizards/table/FieldDescription.java | 2
wizards/com/sun/star/wizards/table/FieldFormatter.java | 36 +-
wizards/com/sun/star/wizards/table/Finalizer.java | 22 -
wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java | 24 -
wizards/com/sun/star/wizards/table/ScenarioSelector.java | 15 -
wizards/com/sun/star/wizards/table/TableWizard.java | 2
wizards/com/sun/star/wizards/text/TextDocument.java | 3
wizards/com/sun/star/wizards/text/TextFieldHandler.java | 2
wizards/com/sun/star/wizards/text/TextTableHandler.java | 2
wizards/com/sun/star/wizards/ui/AggregateComponent.java | 16 -
wizards/com/sun/star/wizards/ui/ButtonList.java | 12
wizards/com/sun/star/wizards/ui/CommandFieldSelection.java | 7
wizards/com/sun/star/wizards/ui/ControlScroller.java | 26 +-
wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java | 8
wizards/com/sun/star/wizards/ui/FieldSelection.java | 41 +--
wizards/com/sun/star/wizards/ui/ImageList.java | 77 ++---
wizards/com/sun/star/wizards/ui/PathSelection.java | 6
wizards/com/sun/star/wizards/ui/PeerConfig.java | 2
wizards/com/sun/star/wizards/ui/SortingComponent.java | 31 +-
wizards/com/sun/star/wizards/ui/TitlesComponent.java | 14 -
wizards/com/sun/star/wizards/ui/UnoDialog.java | 21 -
wizards/com/sun/star/wizards/ui/UnoDialog2.java | 2
wizards/com/sun/star/wizards/ui/WizardDialog.java | 30 +-
wizards/com/sun/star/wizards/ui/XCommandSelectionListener.java | 2
wizards/com/sun/star/wizards/ui/XCompletion.java | 8
wizards/com/sun/star/wizards/ui/XFieldSelectionListener.java | 12
wizards/com/sun/star/wizards/ui/XPathSelectionListener.java | 2
wizards/com/sun/star/wizards/ui/event/AbstractListener.java | 5
wizards/com/sun/star/wizards/ui/event/CommonListener.java | 5
wizards/com/sun/star/wizards/ui/event/DataAware.java | 11
wizards/com/sun/star/wizards/ui/event/DataAwareFields.java | 9
wizards/com/sun/star/wizards/ui/event/ListModelBinder.java | 4
wizards/com/sun/star/wizards/ui/event/RadioDataAware.java | 4
wizards/com/sun/star/wizards/ui/event/TaskListener.java | 8
wizards/com/sun/star/wizards/ui/event/UnoDataAware.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java | 32 --
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java | 3
xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java | 3
115 files changed, 904 insertions(+), 899 deletions(-)
New commits:
commit 93c8fff0f145c474b5207fc1ca7b5356b404fee8
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 15 16:26:39 2014 +0200
java: close ResultSet after use
Change-Id: I5b2903cf2928e19be203d80243c2ac2e75be28cb
diff --git a/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java b/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
index 509e5df..457b037 100644
--- a/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
+++ b/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
@@ -53,6 +53,7 @@ public class DatabaseMetaData {
ResultSetMetaData rsMD = rs.getMetaData();
assure( sName + " returns wrong column count" , rsMD.getColumnCount() == nCount);
+ rs.close();
}
else
assure( sName + " returns wrong column count" , false);
@@ -67,33 +68,37 @@ public class DatabaseMetaData {
}
}
- public void test(){
-
- try{
- ResultSet rs = m_xMD.getTables(null,null,"TESTCASE",null);
- while ( rs.next() )
- {
- String catalog = rs.getString( 1 );
- if ( rs.wasNull() )
- catalog = null;
-
- String schema = rs.getString( 2 );
- if ( rs.wasNull() )
- schema = null;
-
- String table = rs.getString( 3 );
- String type = rs.getString( 4 );
- System.out.println("Catalog: " + catalog + " Schema: " + schema + " Table: " + table + " Type: " + type);
- System.out.println("------------------ Columns ------------------");
- ResultSet rsColumns = m_xMD.getColumns(catalog,schema,table,"%");
- while ( rsColumns.next() )
- {
- System.out.println("Column: " + rsColumns.getString( 4 ) + " Type: " + rsColumns.getInt( 5 ) + " TypeName: " + rsColumns.getString( 6 ) );
- }
+ public void test() {
- }
- } catch(Exception e){
+ try {
+ ResultSet rs = m_xMD.getTables(null, null, "TESTCASE", null);
+ while (rs.next()) {
+ String catalog = rs.getString(1);
+ if (rs.wasNull())
+ catalog = null;
+
+ String schema = rs.getString(2);
+ if (rs.wasNull())
+ schema = null;
+
+ String table = rs.getString(3);
+ String type = rs.getString(4);
+ System.out.println("Catalog: " + catalog + " Schema: " + schema
+ + " Table: " + table + " Type: " + type);
+ System.out
+ .println("------------------ Columns ------------------");
+ ResultSet rsColumns = m_xMD.getColumns(catalog, schema, table,
+ "%");
+ while (rsColumns.next()) {
+ System.out.println("Column: " + rsColumns.getString(4)
+ + " Type: " + rsColumns.getInt(5) + " TypeName: "
+ + rsColumns.getString(6));
+ }
}
+ rs.close();
+ } catch (Exception e) {
+
+ }
}
}
commit fa22664be218c211c41342c6296616c316b2c3b1
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 15 16:25:10 2014 +0200
java: always use braces for while loops
Change-Id: Iff896b0cace8b8305528b3b0140004ea856169ce
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
index 9ebcb06..f8e738d 100644
--- a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
@@ -87,8 +87,9 @@ public final class XOutputStreamToByteArrayAdapter
{
if ( externalBuffer )
throw new BufferSizeExceededException("out of buffer space, cannot grow external buffer");
- while ( values.length > size-position )
+ while ( values.length > size-position ) {
size *= 2;
+ }
byte[] newBuffer = new byte[size];
System.arraycopy(buffer, 0, newBuffer, 0, position);
buffer = newBuffer;
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
index 2437f36..10a3969 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
@@ -138,14 +138,16 @@ public class MultiTypeInterfaceContainer
{
it= map.values().iterator();
}
- while (it.hasNext() )
+ while (it.hasNext() ) {
it.next().disposeAndClear(evt);
+ }
}
synchronized public void clear()
{
Iterator<InterfaceContainer> it= map.values().iterator();
- while (it.hasNext())
+ while (it.hasNext()) {
it.next().clear();
+ }
}
}
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
index 7459fae..d948811 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
@@ -571,11 +571,13 @@ public class InterfaceContainer_Test
cont.addAll(list1);
// go to the end of our list and list1
ListIterator it= cont.listIterator();
- while (it.hasNext())
+ while (it.hasNext()) {
it.next();
+ }
ListIterator it_list1= list1.listIterator();
- while (it_list1.hasNext())
+ while (it_list1.hasNext()) {
it_list1.next();
+ }
while (it.hasPrevious())
{
@@ -612,8 +614,9 @@ public class InterfaceContainer_Test
ListIterator it;
cont.addAll(list1);
it= cont.listIterator();
- while (it.hasNext())
+ while (it.hasNext()) {
it.next();
+ }
assertEquals(it.previousIndex(), 2);
it.previous();
diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java b/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java
index 94dfb88..aff5def 100644
--- a/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java
+++ b/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java
@@ -73,8 +73,9 @@ public class ThreadPool_Test {
synchronized(workAt) {
putJob(workAt, false, threadId, "notifyme");
- while(!workAt._notified)
+ while(!workAt._notified) {
workAt.wait();
+ }
}
assertEquals(TestWorkAt.MESSAGES, workAt._counter);
@@ -94,8 +95,9 @@ public class ThreadPool_Test {
synchronized(workAt) {
putJob(workAt, true, threadId, "notifyme");
- while(!workAt._notified)
+ while(!workAt._notified) {
workAt.wait();
+ }
}
assertEquals(TestWorkAt.MESSAGES, workAt._counter);
@@ -161,8 +163,9 @@ public class ThreadPool_Test {
synchronized(workAt) {
putJob(workAt, true, threadId, "notifyme");
- while(!workAt._notified)
+ while(!workAt._notified) {
workAt.wait();
+ }
}
assertTrue(workAt.passedAsyncTest());
@@ -322,8 +325,9 @@ public class ThreadPool_Test {
synchronized(workAt) {
putJob(workAt, false, threadId, "notifyme");
- while(!workAt._notified)
+ while(!workAt._notified) {
workAt.wait();
+ }
}
assertEquals(TestWorkAt.MESSAGES, workAt._async_counter);
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
index fc77d0f..cb33daa 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
@@ -39,8 +39,9 @@ public class GlobalString {
public static String[] tokenize(String input , String tokenKey) {
ArrayList<String> v = new ArrayList<String>();
StringTokenizer t = new StringTokenizer(input, tokenKey);
- while (t.hasMoreTokens())
+ while (t.hasMoreTokens()) {
v.add(t.nextToken());
+ }
return v.toArray(new String[v.size()]);
}
diff --git a/qadevOOo/runner/convwatch/FileHelper.java b/qadevOOo/runner/convwatch/FileHelper.java
index dab33c3..515fe8e 100644
--- a/qadevOOo/runner/convwatch/FileHelper.java
+++ b/qadevOOo/runner/convwatch/FileHelper.java
@@ -277,8 +277,9 @@ public class FileHelper
out = new java.io.FileWriter(outputFile);
int c;
- while ((c = in.read()) != -1)
+ while ((c = in.read()) != -1) {
out.write(c);
+ }
}
finally
diff --git a/qadevOOo/runner/helper/URLHelper.java b/qadevOOo/runner/helper/URLHelper.java
index 4ca56057..fa54496 100644
--- a/qadevOOo/runner/helper/URLHelper.java
+++ b/qadevOOo/runner/helper/URLHelper.java
@@ -139,8 +139,9 @@ public class URLHelper
if (lSubFiles != null)
{
Iterator<File> aSnapshot = lSubFiles.iterator();
- while (aSnapshot.hasNext())
+ while (aSnapshot.hasNext()) {
lFilteredFiles.add(aSnapshot.next());
+ }
}
}
}
diff --git a/qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange.java b/qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange.java
index 7fa5a7f..87f7aee 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange.java
@@ -152,8 +152,8 @@ public class _XArrayFormulaRange extends MultiMethodTest {
s1 = s1.trim() ;
s2 = s2.trim() ;
while (p1 < s1.length() && p2 < s2.length()) {
- while (s1.charAt(p1) == ' ') p1 ++ ;
- while (s2.charAt(p2) == ' ') p2 ++ ;
+ while (s1.charAt(p1) == ' ') { p1 ++; }
+ while (s2.charAt(p2) == ' ') { p2 ++; }
if (s1.charAt(p1) != s2.charAt(p2)) return false ;
p1 ++ ;
p2 ++ ;
diff --git a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java
index 27270b7..6e96833 100644
--- a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java
+++ b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java
@@ -499,8 +499,9 @@ public class _CharacterProperties extends MultiPropertyTest {
int count = members.size();
String[] res = new String[count];
int i=0;
- while(oEnum.hasNext())
+ while(oEnum.hasNext()) {
res[i++] = oEnum.next();
+ }
return res;
}
diff --git a/qadevOOo/tests/java/mod/_defreg/NestedRegistry.java b/qadevOOo/tests/java/mod/_defreg/NestedRegistry.java
index 2aa0248..a6cc37b 100644
--- a/qadevOOo/tests/java/mod/_defreg/NestedRegistry.java
+++ b/qadevOOo/tests/java/mod/_defreg/NestedRegistry.java
@@ -97,8 +97,9 @@ public class NestedRegistry extends TestCase {
byte[] buf = new byte[1024] ;
int bytesRead = 0 ;
- while ((bytesRead = fIn.read(buf)) > 0)
+ while ((bytesRead = fIn.read(buf)) > 0) {
fOut.write(buf, 0, bytesRead) ;
+ }
fIn.close() ;
fOut.close() ;
diff --git a/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java b/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java
index 10e72c0..99caad5 100644
--- a/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java
+++ b/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java
@@ -94,8 +94,9 @@ public class NestedRegistry extends TestCase {
byte[] buf = new byte[1024] ;
int bytesRead = 0 ;
- while ((bytesRead = fIn.read(buf)) > 0)
+ while ((bytesRead = fIn.read(buf)) > 0) {
fOut.write(buf, 0, bytesRead) ;
+ }
fIn.close() ;
fOut.close() ;
diff --git a/qadevOOo/tests/java/mod/_simplereg/uno/SimpleRegistry.java b/qadevOOo/tests/java/mod/_simplereg/uno/SimpleRegistry.java
index 8fd5b48..4e6d8bb 100644
--- a/qadevOOo/tests/java/mod/_simplereg/uno/SimpleRegistry.java
+++ b/qadevOOo/tests/java/mod/_simplereg/uno/SimpleRegistry.java
@@ -76,8 +76,9 @@ public class SimpleRegistry extends TestCase {
byte[] buf = new byte[1024] ;
int bytesRead = 0 ;
- while ((bytesRead = fIn.read(buf)) > 0)
+ while ((bytesRead = fIn.read(buf)) > 0) {
fOut.write(buf, 0, bytesRead) ;
+ }
fIn.close() ;
fOut.close() ;
diff --git a/qadevOOo/tests/java/mod/_simreg/SimpleRegistry.java b/qadevOOo/tests/java/mod/_simreg/SimpleRegistry.java
index edafccc..8f167de 100644
--- a/qadevOOo/tests/java/mod/_simreg/SimpleRegistry.java
+++ b/qadevOOo/tests/java/mod/_simreg/SimpleRegistry.java
@@ -79,8 +79,9 @@ public class SimpleRegistry extends TestCase {
byte[] buf = new byte[1024] ;
int bytesRead = 0 ;
- while ((bytesRead = fIn.read(buf)) > 0)
+ while ((bytesRead = fIn.read(buf)) > 0) {
fOut.write(buf, 0, bytesRead) ;
+ }
fIn.close() ;
fOut.close() ;
diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
index f8b5d0d..93e36a8 100644
--- a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
+++ b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
@@ -233,8 +233,9 @@ public class ParcelDescriptor {
public void setScriptEntries(Iterator<ScriptEntry> scripts) {
clearEntries();
- while (scripts.hasNext())
+ while (scripts.hasNext()) {
addScriptEntry(scripts.next());
+ }
}
private String getLanguageProperty(String name) {
diff --git a/toolkit/test/accessibility/AccessibilityTreeModel.java b/toolkit/test/accessibility/AccessibilityTreeModel.java
index 623507a..55b56fe 100644
--- a/toolkit/test/accessibility/AccessibilityTreeModel.java
+++ b/toolkit/test/accessibility/AccessibilityTreeModel.java
@@ -160,9 +160,10 @@ public class AccessibilityTreeModel
else
{
// depth-first removal of children
- while (aNode.getChildCount() > 0)
+ while (aNode.getChildCount() > 0) {
if ( ! removeChild (aNode.getChildNoCreate (0)))
break;
+ }
// Remove node from its parent.
AccessibleTreeNode aParent = aNode.getParent();
diff --git a/toolkit/test/accessibility/AccessibleTextHandler.java b/toolkit/test/accessibility/AccessibleTextHandler.java
index d29eefd..dfecd97 100644
--- a/toolkit/test/accessibility/AccessibleTextHandler.java
+++ b/toolkit/test/accessibility/AccessibleTextHandler.java
@@ -650,13 +650,15 @@ class TextEditDialog extends TextActionDialog
// count equal characters from front and end
int nFront = 0;
while( (nFront < nMinLength) &&
- (sNew.charAt(nFront) == sOld.charAt(nFront)) )
+ (sNew.charAt(nFront) == sOld.charAt(nFront)) ) {
nFront++;
+ }
int nBack = 0;
while( (nBack < nMinLength) &&
( sNew.charAt(sNew.length()-nBack-1) ==
- sOld.charAt(sOld.length()-nBack-1) ) )
+ sOld.charAt(sOld.length()-nBack-1) ) ) {
nBack++;
+ }
if( nFront + nBack > nMinLength )
nBack = nMinLength - nFront;
diff --git a/toolkit/test/accessibility/AccessibleTreeCellRenderer.java b/toolkit/test/accessibility/AccessibleTreeCellRenderer.java
index c46058c..cd032b9 100644
--- a/toolkit/test/accessibility/AccessibleTreeCellRenderer.java
+++ b/toolkit/test/accessibility/AccessibleTreeCellRenderer.java
@@ -79,8 +79,9 @@ public class AccessibleTreeCellRenderer
*/
public void addChangedLine (int nRow)
{
- while (maChangedLines.size() <= nRow)
+ while (maChangedLines.size() <= nRow) {
maChangedLines.add(null);
+ }
nRow -= 1; // row index is one to large for some reason.
maChangedLines.set (nRow, true);
}
diff --git a/toolkit/test/accessibility/Canvas.java b/toolkit/test/accessibility/Canvas.java
index c600a9e..aca2e1f 100644
--- a/toolkit/test/accessibility/Canvas.java
+++ b/toolkit/test/accessibility/Canvas.java
@@ -144,9 +144,9 @@ class Canvas
public void clear ()
{
- while (maNodes.size() > 0)
+ while (maNodes.size() > 0) {
removeNode (maNodes.get(0));
-
+ }
maNodes.clear();
maObjects.clear();
maObjectList.clear();
diff --git a/toolkit/test/accessibility/InformationWriter.java b/toolkit/test/accessibility/InformationWriter.java
index 8b1a373..27950c2 100644
--- a/toolkit/test/accessibility/InformationWriter.java
+++ b/toolkit/test/accessibility/InformationWriter.java
@@ -222,8 +222,9 @@ public class InformationWriter
{
// Create indentation string.
String sIndent = "";
- while (depth-- > 0)
+ while (depth-- > 0) {
sIndent += " ";
+ }
// Get XAccessibleContext object if given object does not
// already support this interface.
diff --git a/toolkit/test/accessibility/MessageArea.java b/toolkit/test/accessibility/MessageArea.java
index b3108d9..5b3c194 100644
--- a/toolkit/test/accessibility/MessageArea.java
+++ b/toolkit/test/accessibility/MessageArea.java
@@ -76,8 +76,9 @@ public class MessageArea
*/
public static synchronized void print (int nIndentation, String aMessage)
{
- while (nIndentation-- > 0)
+ while (nIndentation-- > 0) {
aMessage = " " + aMessage;
+ }
Instance().printMessage(aMessage);
}
diff --git a/toolkit/test/accessibility/TextUpdateListener.java b/toolkit/test/accessibility/TextUpdateListener.java
index 7ab8deb..61b4996 100644
--- a/toolkit/test/accessibility/TextUpdateListener.java
+++ b/toolkit/test/accessibility/TextUpdateListener.java
@@ -89,13 +89,15 @@ class TextUpdateListener implements TreeModelListener
// count equal characters from front and end
int nFront = 0;
while( (nFront < nMinLength) &&
- (sNew.charAt(nFront) == sOld.charAt(nFront)) )
+ (sNew.charAt(nFront) == sOld.charAt(nFront)) ) {
nFront++;
+ }
int nBack = 0;
while( (nBack < nMinLength) &&
( sNew.charAt(sNew.length()-nBack-1) ==
- sOld.charAt(sOld.length()-nBack-1) ) )
+ sOld.charAt(sOld.length()-nBack-1) ) ) {
nBack++;
+ }
if( nFront + nBack > nMinLength )
nBack = nMinLength - nFront;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
index 706b58d..6d0135a 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
@@ -1062,8 +1062,9 @@ public abstract class OfficeDocument
char[] charArray = new char[4096];
StringBuffer sBuf = new StringBuffer();
int n;
- while ((n=br.read(charArray, 0, charArray.length)) > 0)
+ while ((n=br.read(charArray, 0, charArray.length)) > 0) {
sBuf.append(charArray, 0, n);
+ }
// ensure there is no trailing garbage after the end of the stream.
int sIndex = sBuf.lastIndexOf("</office:document>");
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
index d72c702..3051007 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
@@ -95,8 +95,9 @@ public class OfficeUtil implements OfficeConstants {
// Compute length of space sequence.
int nrSpaces = 2;
while ((nrSpaces < text.length())
- && text.substring(nrSpaces, nrSpaces + 1).equals(" "))
+ && text.substring(nrSpaces, nrSpaces + 1).equals(" ")) {
nrSpaces++;
+ }
Element spaceNode = parentDoc.createElement(TAG_SPACE);
spaceNode.setAttribute(ATTRIBUTE_SPACE_COUNT,
commit 94ae3e827b71da5be77ff04522ff156770801b25
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 15 16:13:09 2014 +0200
java: replace 'new Short' with 'Short.valueOf'
Change-Id: Ic0e3aca1c1459ab938e01f43c0212859d85075e8
diff --git a/wizards/com/sun/star/wizards/query/Finalizer.java b/wizards/com/sun/star/wizards/query/Finalizer.java
index 015f6e0..c91f2eb 100644
--- a/wizards/com/sun/star/wizards/query/Finalizer.java
+++ b/wizards/com/sun/star/wizards/query/Finalizer.java
@@ -64,7 +64,7 @@ public class Finalizer
},
new Object[]
{
- 8, reslblQueryTitle, 95, 27, Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), 52
+ 8, reslblQueryTitle, 95, 27, Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), Short.valueOf(curtabindex++), 52
});
m_aTxtTitle = m_queryWizard.insertTextField("txtQueryTitle", "changeTitle", this, new String[]
{
@@ -72,7 +72,7 @@ public class Finalizer
},
new Object[]
{
- 12, HelpIds.getHelpIdString(curHelpIndex++), 95, 37, Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), 90
+ 12, HelpIds.getHelpIdString(curHelpIndex++), 95, 37, Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), Short.valueOf(curtabindex++), 90
});
m_queryWizard.insertLabel("lblHowGoOn", new String[]
{
@@ -80,7 +80,7 @@ public class Finalizer
},
new Object[]
{
- 16, reslblHowGoOn, Boolean.TRUE, 192, 27, Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), 112
+ 16, reslblHowGoOn, Boolean.TRUE, 192, 27, Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), Short.valueOf(curtabindex++), 112
});
this.xRadioDisplayQuery = m_queryWizard.insertRadioButton("optDisplayQuery",
new String[]
@@ -89,7 +89,7 @@ public class Finalizer
},
new Object[]
{
- 9, HelpIds.getHelpIdString(curHelpIndex++), resoptDisplayQuery, 192, 46, new Short((short) 1), Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), 118
+ 9, HelpIds.getHelpIdString(curHelpIndex++), resoptDisplayQuery, 192, 46, Short.valueOf((short) 1), Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), Short.valueOf(curtabindex++), 118
});
m_queryWizard.insertRadioButton("optModifyQuery",
@@ -99,7 +99,7 @@ public class Finalizer
},
new Object[]
{
- 10, HelpIds.getHelpIdString(curHelpIndex++), resoptModifyQuery, 192, 56, Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), 118
+ 10, HelpIds.getHelpIdString(curHelpIndex++), resoptModifyQuery, 192, 56, Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), Short.valueOf(curtabindex++), 118
});
m_queryWizard.insertFixedLine("flnSummary", new String[]
{
@@ -107,7 +107,7 @@ public class Finalizer
},
new Object[]
{
- 10, resflnSummary, 95, 68, 8, new Short(curtabindex++), 209
+ 10, resflnSummary, 95, 68, 8, Short.valueOf(curtabindex++), 209
});
m_queryWizard.insertTextField("txtSummary", 0, null, new String[]
{
diff --git a/wizards/com/sun/star/wizards/text/TextTableHandler.java b/wizards/com/sun/star/wizards/text/TextTableHandler.java
index bc37487..64e7707 100644
--- a/wizards/com/sun/star/wizards/text/TextTableHandler.java
+++ b/wizards/com/sun/star/wizards/text/TextTableHandler.java
@@ -226,7 +226,7 @@ public class TextTableHandler
xSelection.select(xLocCellRange);
Desktop.dispatchURL(_xMSF, ".Uno:DistributeColumns", xFrame);
Desktop.dispatchURL(_xMSF, ".Uno:SetOptimalColumnWidth", xFrame);
- Helper.setUnoPropertyValue(xTextTable, "HoriOrient", new Short(iHoriOrient));
+ Helper.setUnoPropertyValue(xTextTable, "HoriOrient", Short.valueOf(iHoriOrient));
}
catch (Exception exception)
{
commit 3a0e52283ee0d90e6914daf21cfe8e0842f0914e
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 15 16:11:36 2014 +0200
java: replace 'new Integer' with 'Integer.valueOf'
Change-Id: I85aceccae2ba28d9ef2cbf9fb220c5072e5ed3cf
diff --git a/wizards/com/sun/star/wizards/table/Finalizer.java b/wizards/com/sun/star/wizards/table/Finalizer.java
index 30095c0..5d081ec 100644
--- a/wizards/com/sun/star/wizards/table/Finalizer.java
+++ b/wizards/com/sun/star/wizards/table/Finalizer.java
@@ -51,7 +51,7 @@ public class Finalizer
this.CurUnoDialog = _CurUnoDialog;
this.curtabledescriptor = _curtabledescriptor;
curtabindex = (short) (TableWizard.SOFINALPAGE * 100);
- Integer IFINALSTEP = new Integer(TableWizard.SOFINALPAGE);
+ Integer IFINALSTEP = Integer.valueOf(TableWizard.SOFINALPAGE);
String slblTableName = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 34);
String slblProceed = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 36);
String sWorkWithTable = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 38);
@@ -110,7 +110,7 @@ public class Finalizer
},
new Object[]
{
- 8, slblCatalog, new Integer(nListBoxPosX), 52, IFINALSTEP, Short.valueOf(curtabindex++), 120
+ 8, slblCatalog, Integer.valueOf(nListBoxPosX), 52, IFINALSTEP, Short.valueOf(curtabindex++), 120
});
try
@@ -122,7 +122,7 @@ public class Finalizer
},
new Object[]
{
- Boolean.TRUE, 12, "HID:WIZARDS_HID_DLGTABLE_LST_CATALOG", Short.valueOf(UnoDialog.getListBoxLineCount()), new Integer(nListBoxPosX), 62, IFINALSTEP, sCatalogNames, Short.valueOf(curtabindex++), 80
+ Boolean.TRUE, 12, "HID:WIZARDS_HID_DLGTABLE_LST_CATALOG", Short.valueOf(UnoDialog.getListBoxLineCount()), Integer.valueOf(nListBoxPosX), 62, IFINALSTEP, sCatalogNames, Short.valueOf(curtabindex++), 80
});
int isel = JavaTools.FieldInList(sCatalogNames, sCatalog);
if (isel < 0)
@@ -165,7 +165,7 @@ public class Finalizer
},
new Object[]
{
- 8, slblSchema, new Integer(nListBoxPosX), 52, IFINALSTEP, Short.valueOf(curtabindex++), 80
+ 8, slblSchema, Integer.valueOf(nListBoxPosX), 52, IFINALSTEP, Short.valueOf(curtabindex++), 80
});
try
@@ -177,7 +177,7 @@ public class Finalizer
},
new Object[]
{
- Boolean.TRUE, 12, "HID:WIZARDS_HID_DLGTABLE_LST_SCHEMA", Short.valueOf(UnoDialog.getListBoxLineCount()), new Integer(nListBoxPosX), 62, IFINALSTEP, sSchemaNames, Short.valueOf(curtabindex++), 80
+ Boolean.TRUE, 12, "HID:WIZARDS_HID_DLGTABLE_LST_SCHEMA", Short.valueOf(UnoDialog.getListBoxLineCount()), Integer.valueOf(nListBoxPosX), 62, IFINALSTEP, sSchemaNames, Short.valueOf(curtabindex++), 80
});
int isel = JavaTools.FieldInList(sSchemaNames, sSchema);
if (isel < 0)
@@ -219,7 +219,7 @@ public class Finalizer
},
new Object[]
{
- UIConsts.INTEGERS[8], slblProceed, 97, new Integer(82 + ndiffPosY), IFINALSTEP, Short.valueOf(curtabindex++), 227
+ UIConsts.INTEGERS[8], slblProceed, 97, Integer.valueOf(82 + ndiffPosY), IFINALSTEP, Short.valueOf(curtabindex++), 227
});
optWorkWithTable = CurUnoDialog.insertRadioButton("optWorkWithTable", null,
new String[]
@@ -228,7 +228,7 @@ public class Finalizer
},
new Object[]
{
- UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_WORKWITHTABLE", sWorkWithTable, 101, new Integer(97 + ndiffPosY), Short.valueOf((short) 1), IFINALSTEP, Short.valueOf(curtabindex++), 177
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_WORKWITHTABLE", sWorkWithTable, 101, Integer.valueOf(97 + ndiffPosY), Short.valueOf((short) 1), IFINALSTEP, Short.valueOf(curtabindex++), 177
});
optModifyTable = CurUnoDialog.insertRadioButton("optModifyTable", null,
new String[]
@@ -237,7 +237,7 @@ public class Finalizer
},
new Object[]
{
- UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE", sModifyTable, 101, new Integer(109 + ndiffPosY), IFINALSTEP, Short.valueOf(curtabindex++), 177
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE", sModifyTable, 101, Integer.valueOf(109 + ndiffPosY), IFINALSTEP, Short.valueOf(curtabindex++), 177
});
optStartFormWizard = CurUnoDialog.insertRadioButton("optStartFormWizard", null,
new String[]
@@ -246,7 +246,7 @@ public class Finalizer
},
new Object[]
{
- UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_STARTFORMWIZARD", sStartFormWizard, 101, new Integer(121 + ndiffPosY), IFINALSTEP, Short.valueOf(curtabindex++), 177
+ UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_STARTFORMWIZARD", sStartFormWizard, 101, Integer.valueOf(121 + ndiffPosY), IFINALSTEP, Short.valueOf(curtabindex++), 177
});
}
catch (SQLException e)
commit 973eb2f6db60c0939299a968a3121e3310e6d1f5
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 15 14:43:35 2014 +0200
java: reduce the depth of some deeply nested if blocks
Change-Id: I3c0c7f08d4d8ea594e72fc0d9b93d085d4ab4bf5
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
index b49b28f..48ca6c6 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
@@ -352,27 +352,29 @@ public class InterfaceContainer implements Cloneable
*/
synchronized public int indexOf(Object elem)
{
+ if (elementData == null || elem == null) {
+ return -1;
+ }
+
int index= -1;
- if (elementData != null && elem != null)
+
+ for (int i = 0; i < size; i++)
{
- for (int i = 0; i < size; i++)
+ if (elem == elementData[i])
{
- if (elem == elementData[i])
- {
- index= i;
- break;
- }
+ index= i;
+ break;
}
+ }
- if (index == -1)
+ if (index == -1)
+ {
+ for (int i = 0; i < size; i++)
{
- for (int i = 0; i < size; i++)
+ if (UnoRuntime.areSame(elem, elementData[i]))
{
- if (UnoRuntime.areSame(elem, elementData[i]))
- {
- index= i;
- break;
- }
+ index= i;
+ break;
}
}
}
@@ -408,28 +410,30 @@ public class InterfaceContainer implements Cloneable
*/
synchronized public int lastIndexOf(Object elem)
{
+ if (elementData == null || elem == null) {
+ return -1;
+ }
+
int index= -1;
- if (elementData != null && elem != null)
+
+ for (int i = size-1; i >= 0; i--)
+ {
+ if (elem == elementData[i])
+ {
+ index= i;
+ break;
+ }
+ }
+ if (index == -1)
{
for (int i = size-1; i >= 0; i--)
{
- if (elem == elementData[i])
+ if (UnoRuntime.areSame(elem, elementData[i]))
{
index= i;
break;
}
}
- if (index == -1)
- {
- for (int i = size-1; i >= 0; i--)
- {
- if (UnoRuntime.areSame(elem, elementData[i]))
- {
- index= i;
- break;
- }
- }
- }
}
return index;
}
@@ -535,52 +539,53 @@ public class InterfaceContainer implements Cloneable
synchronized public boolean retainAll(Collection collection)
{
+ if (elementData == null || collection == null) {
+ return false;
+ }
+
boolean retVal= false;
- if (elementData != null && collection != null)
- {
- // iterate over data
- Object[] arRetained= new Object[size];
- int indexRetained= 0;
- for(int i= 0; i < size; i++)
+ // iterate over data
+ Object[] arRetained= new Object[size];
+ int indexRetained= 0;
+ for(int i= 0; i < size; i++)
+ {
+ Object curElem= elementData[i];
+ // try to find the element in collection
+ Iterator itColl= collection.iterator();
+ boolean bExists= false;
+ while (itColl.hasNext())
{
- Object curElem= elementData[i];
- // try to find the element in collection
- Iterator itColl= collection.iterator();
- boolean bExists= false;
- while (itColl.hasNext())
+ if (curElem == itColl.next())
{
- if (curElem == itColl.next())
- {
- // current element is in collection
- bExists= true;
- break;
- }
+ // current element is in collection
+ bExists= true;
+ break;
}
- if (!bExists)
+ }
+ if (!bExists)
+ {
+ itColl= collection.iterator();
+ while (itColl.hasNext())
{
- itColl= collection.iterator();
- while (itColl.hasNext())
+ Object o= itColl.next();
+ if (o != null)
{
- Object o= itColl.next();
- if (o != null)
+ if (UnoRuntime.areSame(o, curElem))
{
- if (UnoRuntime.areSame(o, curElem))
- {
- bExists= true;
- break;
- }
+ bExists= true;
+ break;
}
}
}
- if (bExists)
- arRetained[indexRetained++]= curElem;
- }
- retVal= size != indexRetained;
- if (indexRetained > 0)
- {
- elementData= arRetained;
- size= indexRetained;
}
+ if (bExists)
+ arRetained[indexRetained++]= curElem;
+ }
+ retVal= size != indexRetained;
+ if (indexRetained > 0)
+ {
+ elementData= arRetained;
+ size= indexRetained;
}
return retVal;
}
diff --git a/jurt/com/sun/star/comp/loader/JavaLoader.java b/jurt/com/sun/star/comp/loader/JavaLoader.java
index fb7c6d8..8244d43 100644
--- a/jurt/com/sun/star/comp/loader/JavaLoader.java
+++ b/jurt/com/sun/star/comp/loader/JavaLoader.java
@@ -84,49 +84,49 @@ public class JavaLoader implements XImplementationLoader,
*/
private String expand_url( String url ) throws RuntimeException
{
- if (url != null && url.startsWith( EXPAND_PROTOCOL_PREFIX )) {
- try {
- if (m_xMacroExpander == null) {
- XPropertySet xProps =
- UnoRuntime.queryInterface(
- XPropertySet.class, multiServiceFactory );
- if (xProps == null) {
- throw new com.sun.star.uno.RuntimeException(
- "service manager does not support XPropertySet!",
- this );
- }
- XComponentContext xContext = (XComponentContext)
- AnyConverter.toObject(
- new Type( XComponentContext.class ),
- xProps.getPropertyValue( "DefaultContext" ) );
- m_xMacroExpander = (XMacroExpander)AnyConverter.toObject(
- new Type( XMacroExpander.class ),
- xContext.getValueByName(
- "/singletons/com.sun.star.util.theMacroExpander" )
- );
- }
- // decode uric class chars
- String macro = URLDecoder.decode(
- StringHelper.replace(
- url.substring( EXPAND_PROTOCOL_PREFIX.length() ),
- '+', "%2B" ), "UTF-8" );
- // expand macro string
- String ret = m_xMacroExpander.expandMacros( macro );
- if (DEBUG) {
- System.err.println(
- "JavaLoader.expand_url(): " + url + " => " +
- macro + " => " + ret );
+ if (url == null || !url.startsWith( EXPAND_PROTOCOL_PREFIX )) {
+ return url;
+ }
+ try {
+ if (m_xMacroExpander == null) {
+ XPropertySet xProps =
+ UnoRuntime.queryInterface(
+ XPropertySet.class, multiServiceFactory );
+ if (xProps == null) {
+ throw new com.sun.star.uno.RuntimeException(
+ "service manager does not support XPropertySet!",
+ this );
}
- return ret;
- } catch (com.sun.star.uno.Exception exc) {
- throw new com.sun.star.uno.RuntimeException(
- exc.getMessage(), this );
- } catch (java.lang.Exception exc) {
- throw new com.sun.star.uno.RuntimeException(
- exc.getMessage(), this );
+ XComponentContext xContext = (XComponentContext)
+ AnyConverter.toObject(
+ new Type( XComponentContext.class ),
+ xProps.getPropertyValue( "DefaultContext" ) );
+ m_xMacroExpander = (XMacroExpander)AnyConverter.toObject(
+ new Type( XMacroExpander.class ),
+ xContext.getValueByName(
+ "/singletons/com.sun.star.util.theMacroExpander" )
+ );
+ }
+ // decode uric class chars
+ String macro = URLDecoder.decode(
+ StringHelper.replace(
+ url.substring( EXPAND_PROTOCOL_PREFIX.length() ),
+ '+', "%2B" ), "UTF-8" );
+ // expand macro string
+ String ret = m_xMacroExpander.expandMacros( macro );
+ if (DEBUG) {
+ System.err.println(
+ "JavaLoader.expand_url(): " + url + " => " +
+ macro + " => " + ret );
}
+ return ret;
+ } catch (com.sun.star.uno.Exception exc) {
+ throw new com.sun.star.uno.RuntimeException(
+ exc.getMessage(), this );
+ } catch (java.lang.Exception exc) {
+ throw new com.sun.star.uno.RuntimeException(
+ exc.getMessage(), this );
}
- return url;
}
/**
diff --git a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java b/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
index 099cf69..d948655 100644
--- a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
+++ b/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
@@ -89,33 +89,34 @@ public final class NativeLibraryLoader {
// (scheme://auth/dir1/name). The second step is important in a typical
// OOo installation, where the JAR files are in the program/classes
// directory while the shared libraries are in the program directory.
- if (loader instanceof URLClassLoader) {
- URL[] urls = ((URLClassLoader) loader).getURLs();
- for (int i = 0; i < urls.length; ++i) {
- File path = UrlToFileMapper.mapUrlToFile(urls[i]);
- if (path != null) {
- File dir = path.isDirectory() ? path : path.getParentFile();
+ if (!(loader instanceof URLClassLoader)) {
+ return null;
+ }
+ URL[] urls = ((URLClassLoader) loader).getURLs();
+ for (int i = 0; i < urls.length; ++i) {
+ File path = UrlToFileMapper.mapUrlToFile(urls[i]);
+ if (path != null) {
+ File dir = path.isDirectory() ? path : path.getParentFile();
+ if (dir != null) {
+ path = new File(dir, name);
+ if (path.exists()) {
+ return path;
+ }
+ dir = dir.getParentFile();
if (dir != null) {
path = new File(dir, name);
if (path.exists()) {
return path;
}
- dir = dir.getParentFile();
- if (dir != null) {
- path = new File(dir, name);
+ // On OS X, dir is now the Resources dir,
+ // we want to look in Frameworks
+ if (System.getProperty("os.name").startsWith("Mac")
+ && dir.getName().equals("Resources")) {
+ dir = dir.getParentFile();
+ path = new File(dir, "Frameworks/" + name);
if (path.exists()) {
return path;
}
- // On OS X, dir is now the Resources dir,
- // we want to look in Frameworks
- if (System.getProperty("os.name").startsWith("Mac")
- && dir.getName().equals("Resources")) {
- dir = dir.getParentFile();
- path = new File(dir, "Frameworks/" + name);
- if (path.exists()) {
- return path;
- }
- }
}
}
}
diff --git a/odk/source/com/sun/star/lib/loader/InstallationFinder.java b/odk/source/com/sun/star/lib/loader/InstallationFinder.java
index c889443..eb1c78c 100644
--- a/odk/source/com/sun/star/lib/loader/InstallationFinder.java
+++ b/odk/source/com/sun/star/lib/loader/InstallationFinder.java
@@ -80,41 +80,46 @@ final class InstallationFinder {
// com.sun.star.lib.loader.unopath
// (all platforms)
path = getPathFromProperty( SYSPROP_NAME );
- if ( path == null ) {
- // get the installation path from the UNO_PATH environment variable
- // (all platforms, not working for Java 1.3.1 and Java 1.4)
- path = getPathFromEnvVar( ENVVAR_NAME );
+ if ( path != null ) {
+ return path;
+ }
+ // get the installation path from the UNO_PATH environment variable
+ // (all platforms, not working for Java 1.3.1 and Java 1.4)
+ path = getPathFromEnvVar( ENVVAR_NAME );
+ if ( path != null ) {
+ return path;
+ }
+
+ String osname = null;
+ try {
+ osname = System.getProperty( "os.name" );
+ } catch ( SecurityException e ) {
+ // if a SecurityException was thrown,
+ // return <code>null</code>
+ return null;
+ }
+ if ( osname == null ) {
+ return null;
+ }
+
+ if ( osname.startsWith( "Windows" ) ) {
+ // get the installation path from the Windows Registry
+ // (Windows platform only)
+ path = getPathFromWindowsRegistry();
+ } else {
+ // get the installation path from the PATH environment
+ // variable (Unix/Linux platforms only, not working for
+ // Java 1.3.1 and Java 1.4)
+ path = getPathFromPathEnvVar();
if ( path == null ) {
- String osname = null;
- try {
- osname = System.getProperty( "os.name" );
- } catch ( SecurityException e ) {
- // if a SecurityException was thrown,
- // return <code>null</code>
- return null;
- }
- if ( osname != null ) {
- if ( osname.startsWith( "Windows" ) ) {
- // get the installation path from the Windows Registry
- // (Windows platform only)
- path = getPathFromWindowsRegistry();
- } else {
- // get the installation path from the PATH environment
- // variable (Unix/Linux platforms only, not working for
- // Java 1.3.1 and Java 1.4)
- path = getPathFromPathEnvVar();
- if ( path == null ) {
- // get the installation path from the 'which'
- // command (Unix/Linux platforms only)
- path = getPathFromWhich();
- if ( path == null ) {
- // get the installation path from the
- // .sversionrc file (Unix/Linux platforms only,
- // for older versions than OOo 2.0)
- path = getPathFromSVersionFile();
- }
- }
- }
+ // get the installation path from the 'which'
+ // command (Unix/Linux platforms only)
+ path = getPathFromWhich();
+ if ( path == null ) {
+ // get the installation path from the
+ // .sversionrc file (Unix/Linux platforms only,
+ // for older versions than OOo 2.0)
+ path = getPathFromSVersionFile();
}
}
}
diff --git a/qadevOOo/runner/lib/TestParameters.java b/qadevOOo/runner/lib/TestParameters.java
index a62565f..69bf9fc 100644
--- a/qadevOOo/runner/lib/TestParameters.java
+++ b/qadevOOo/runner/lib/TestParameters.java
@@ -76,22 +76,23 @@ public class TestParameters extends HashMap<String,Object> {
* @return The value of this key, cast to a boolean type.
*/
public boolean getBool(Object key) {
- Object val = super.get(key);
- if (val != null) {
- if (val instanceof String) {
- String sVal = (String)val;
- if (sVal.equalsIgnoreCase("true") ||
- sVal.equalsIgnoreCase("yes")) {
- return true;
- }
- else if (sVal.equalsIgnoreCase("false") ||
- sVal.equalsIgnoreCase("no")) {
- return false;
- }
+ final Object val = super.get(key);
+ if (val == null) {
+ return false;
+ }
+ if (val instanceof String) {
+ String sVal = (String)val;
+ if (sVal.equalsIgnoreCase("true") ||
+ sVal.equalsIgnoreCase("yes")) {
+ return true;
+ }
+ else if (sVal.equalsIgnoreCase("false") ||
+ sVal.equalsIgnoreCase("no")) {
+ return false;
}
- if (val instanceof Boolean)
- return ((Boolean)val).booleanValue();
}
+ else if (val instanceof Boolean)
+ return ((Boolean)val).booleanValue();
return false;
}
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java
index ca4dbd9..1029b14 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java
@@ -143,37 +143,37 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget
return;
}
final String namespace = ReportTargetUtil.getNamespaceFromAttribute(attrs);
- if (!isFilteredNamespace(namespace))
+ if (isFilteredNamespace(namespace))
+ return;
+
+ final String elementType = ReportTargetUtil.getElemenTypeFromAttribute(attrs);
+ // if this is the report namespace, write out a table definition ..
+ if (OfficeNamespaces.TABLE_NS.equals(namespace))
{
- final String elementType = ReportTargetUtil.getElemenTypeFromAttribute(attrs);
- // if this is the report namespace, write out a table definition ..
- if (OfficeNamespaces.TABLE_NS.equals(namespace))
- {
- if (OfficeToken.TABLE.equals(elementType) || OfficeToken.TABLE_ROWS.equals(elementType))
- {
- return;
- }
- else if (isFiltered(elementType))
- {
- inFilterElements = false;
- if (tableCount > 1)
- {
- return;
- }
- }
- }
- else if (OfficeNamespaces.CHART_NS.equals(namespace) && "chart".equals(elementType))
+ if (OfficeToken.TABLE.equals(elementType) || OfficeToken.TABLE_ROWS.equals(elementType))
{
return;
}
- if (inFilterElements && tableCount > 1)
+ else if (isFiltered(elementType))
{
- return;
+ inFilterElements = false;
+ if (tableCount > 1)
+ {
+ return;
+ }
}
- final XmlWriter xmlWriter = getXmlWriter();
- xmlWriter.writeCloseTag();
- --closeTags;
}
+ else if (OfficeNamespaces.CHART_NS.equals(namespace) && "chart".equals(elementType))
+ {
+ return;
+ }
+ if (inFilterElements && tableCount > 1)
+ {
+ return;
+ }
+ final XmlWriter xmlWriter = getXmlWriter();
+ xmlWriter.writeCloseTag();
+ --closeTags;
}
@Override
diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
index 1eb4204..9d58de7 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
@@ -331,39 +331,39 @@ public class Helper
//scrape the HTML source and find the EditURL
// TODO/LATER: Use parser in future
- String sResultURL = "";
int nInd = sWebPage.indexOf( "http-equiv=\"refresh\"" );
- if ( nInd != -1 )
+ if ( nInd == -1 )
+ return "";
+
+ String sResultURL = "";
+ int nContent = sWebPage.indexOf( "content=", nInd );
+ if ( nContent > 0 )
{
- int nContent = sWebPage.indexOf( "content=", nInd );
- if ( nContent > 0 )
+ int nURL = sWebPage.indexOf( "URL=", nContent );
+ if ( nURL > 0 )
{
- int nURL = sWebPage.indexOf( "URL=", nContent );
- if ( nURL > 0 )
- {
- int nEndURL = sWebPage.indexOf('"', nURL );
- if ( nEndURL > 0 )
- sResultURL = sWebPage.substring( nURL + 4, nEndURL );
- }
+ int nEndURL = sWebPage.indexOf('"', nURL );
+ if ( nEndURL > 0 )
+ sResultURL = sWebPage.substring( nURL + 4, nEndURL );
}
+ }
- try
- {
- URL aURL = new URL( sURL );
- if ( !sResultURL.startsWith( aURL.getProtocol() ))
- {
- //if the url is only relative then complete it
- if ( sResultURL.startsWith( "/" ) )
- sResultURL = aURL.getProtocol() + "://" + aURL.getHost() + sResultURL;
- else
- sResultURL = aURL.getProtocol() + "://" + aURL.getHost() + aURL.getPath() + sResultURL;
- }
- }
- catch ( MalformedURLException ex )
+ try
+ {
+ URL aURL = new URL( sURL );
+ if ( !sResultURL.startsWith( aURL.getProtocol() ))
{
- ex.printStackTrace();
+ //if the url is only relative then complete it
+ if ( sResultURL.startsWith( "/" ) )
+ sResultURL = aURL.getProtocol() + "://" + aURL.getHost() + sResultURL;
+ else
+ sResultURL = aURL.getProtocol() + "://" + aURL.getHost() + aURL.getPath() + sResultURL;
}
}
+ catch ( MalformedURLException ex )
+ {
+ ex.printStackTrace();
+ }
return sResultURL;
diff --git a/toolkit/test/accessibility/AccessibilityTree.java b/toolkit/test/accessibility/AccessibilityTree.java
index 6f94847..72944e3 100644
--- a/toolkit/test/accessibility/AccessibilityTree.java
+++ b/toolkit/test/accessibility/AccessibilityTree.java
@@ -243,53 +243,53 @@ public class AccessibilityTree
public boolean popupTrigger( MouseEvent e )
{
boolean bIsPopup = e.isPopupTrigger();
- if( bIsPopup )
+ if( !bIsPopup )
+ return false;
+
+ int selRow = maTree.getComponent().getRowForLocation(e.getX(), e.getY());
+ if (selRow == -1)
+ return bIsPopup;
+
+ TreePath aPath = maTree.getComponent().getPathForLocation(e.getX(), e.getY());
+
+ // check for actions
+ Object aObject = aPath.getLastPathComponent();
+ JPopupMenu aMenu = new JPopupMenu();
+ if( aObject instanceof AccTreeNode )
+ {
+ AccTreeNode aNode = (AccTreeNode)aObject;
+
+ ArrayList<String> aActions = new ArrayList<String>();
+ aMenu.add (new AccessibilityTree.ShapeExpandAction(maTree, aNode));
+ aMenu.add (new AccessibilityTree.SubtreeExpandAction(maTree, aNode));
+
+ aNode.getActions(aActions);
+ for( int i = 0; i < aActions.size(); i++ )
+ {
+ aMenu.add( new NodeAction(
+ aActions.get(i),
+ aNode, i ) );
+ }
+ }
+ else if (aObject instanceof AccessibleTreeNode)
{
- int selRow = maTree.getComponent().getRowForLocation(e.getX(), e.getY());
- if (selRow != -1)
+ AccessibleTreeNode aNode = (AccessibleTreeNode)aObject;
+ String[] aActionNames = aNode.getActions();
+ int nCount=aActionNames.length;
+ if (nCount > 0)
{
- TreePath aPath = maTree.getComponent().getPathForLocation(e.getX(), e.getY());
-
- // check for actions
- Object aObject = aPath.getLastPathComponent();
- JPopupMenu aMenu = new JPopupMenu();
- if( aObject instanceof AccTreeNode )
- {
- AccTreeNode aNode = (AccTreeNode)aObject;
-
- ArrayList<String> aActions = new ArrayList<String>();
- aMenu.add (new AccessibilityTree.ShapeExpandAction(maTree, aNode));
- aMenu.add (new AccessibilityTree.SubtreeExpandAction(maTree, aNode));
-
- aNode.getActions(aActions);
- for( int i = 0; i < aActions.size(); i++ )
- {
- aMenu.add( new NodeAction(
- aActions.get(i),
- aNode, i ) );
- }
- }
- else if (aObject instanceof AccessibleTreeNode)
- {
- AccessibleTreeNode aNode = (AccessibleTreeNode)aObject;
- String[] aActionNames = aNode.getActions();
- int nCount=aActionNames.length;
- if (nCount > 0)
- {
- for (int i=0; i<nCount; i++)
- aMenu.add( new NodeAction(
- aActionNames[i],
- aNode,
- i));
- }
- else
- aMenu = null;
- }
- if (aMenu != null)
- aMenu.show (maTree.getComponent(),
- e.getX(), e.getY());
+ for (int i=0; i<nCount; i++)
+ aMenu.add( new NodeAction(
+ aActionNames[i],
+ aNode,
+ i));
}
+ else
+ aMenu = null;
}
+ if (aMenu != null)
+ aMenu.show (maTree.getComponent(),
+ e.getX(), e.getY());
return bIsPopup;
}
diff --git a/toolkit/test/accessibility/AccessibleCellHandler.java b/toolkit/test/accessibility/AccessibleCellHandler.java
index 6ba28a1..d99fdbf 100644
--- a/toolkit/test/accessibility/AccessibleCellHandler.java
+++ b/toolkit/test/accessibility/AccessibleCellHandler.java
@@ -27,21 +27,20 @@ class AccessibleCellHandler extends NodeHandler
@Override
public NodeHandler createHandler (XAccessibleContext xContext)
{
+ if (xContext == null)
+ return null;
+
AccessibleCellHandler aCellHandler = null;
- if (xContext != null)
+ XAccessible xParent = xContext.getAccessibleParent();
+ if (xParent != null)
{
- XAccessible xParent = xContext.getAccessibleParent();
- if (xParent != null)
- {
- XAccessibleTable xTable =
- UnoRuntime.queryInterface (
- XAccessibleTable.class, xParent.getAccessibleContext());
- if (xTable != null)
- aCellHandler = new AccessibleCellHandler (xTable);
- }
+ XAccessibleTable xTable =
+ UnoRuntime.queryInterface (
+ XAccessibleTable.class, xParent.getAccessibleContext());
+ if (xTable != null)
+ aCellHandler = new AccessibleCellHandler (xTable);
}
return aCellHandler;
-
}
public AccessibleCellHandler ()
diff --git a/toolkit/test/accessibility/AccessibleSelectionHandler.java b/toolkit/test/accessibility/AccessibleSelectionHandler.java
index 2d4f64f..ece8153 100644
--- a/toolkit/test/accessibility/AccessibleSelectionHandler.java
+++ b/toolkit/test/accessibility/AccessibleSelectionHandler.java
@@ -51,71 +51,70 @@ class AccessibleSelectionHandler
public AccessibleTreeNode createChild( AccessibleTreeNode aParent,
int nIndex )
{
+ if( !(aParent instanceof AccTreeNode) )
+ return null;
+
+ XAccessibleSelection xSelection = ((AccTreeNode)aParent).getSelection();
+ if( xSelection == null )
+ return null;
+
AccessibleTreeNode aChild = null;
- if( aParent instanceof AccTreeNode )
+ switch( nIndex )
{
- XAccessibleSelection xSelection =
- ((AccTreeNode)aParent).getSelection();
- if( xSelection != null )
+ case 0:
+ aChild = new StringNode(
+ "getSelectedAccessibleChildCount: " +
+ xSelection.getSelectedAccessibleChildCount(),
+ aParent );
+ break;
+ case 1:
{
- switch( nIndex )
+ VectorNode aVNode =
+ new VectorNode( "Selected Children", aParent);
+ int nSelected = 0;
+ int nCount = ((AccTreeNode)aParent).getContext().
+ getAccessibleChildCount();
+ try
{
- case 0:
- aChild = new StringNode(
- "getSelectedAccessibleChildCount: " +
- xSelection.getSelectedAccessibleChildCount(),
- aParent );
- break;
- case 1:
+ for( int i = 0; i < nCount; i++ )
{
- VectorNode aVNode =
- new VectorNode( "Selected Children", aParent);
- int nSelected = 0;
- int nCount = ((AccTreeNode)aParent).getContext().
- getAccessibleChildCount();
try
{
- for( int i = 0; i < nCount; i++ )
+ if( xSelection.isAccessibleChildSelected( i ) )
{
- try
- {
- if( xSelection.isAccessibleChildSelected( i ) )
- {
- XAccessible xSelChild = xSelection.
- getSelectedAccessibleChild(nSelected);
- XAccessible xNChild =
- ((AccTreeNode)aParent).
- getContext().getAccessibleChild( i );
- aVNode.addChild( new StringNode(
- i + ": " +
- xNChild.getAccessibleContext().
- getAccessibleDescription() + " (" +
- (xSelChild.equals(xNChild) ? "OK" : "XXX") +
- ")", aParent ) );
- }
- }
- catch (com.sun.star.lang.DisposedException e)
- {
- aVNode.addChild( new StringNode(
- i + ": caught DisposedException while creating",
- aParent ));
- }
+ XAccessible xSelChild = xSelection.
+ getSelectedAccessibleChild(nSelected);
+ XAccessible xNChild =
+ ((AccTreeNode)aParent).
+ getContext().getAccessibleChild( i );
+ aVNode.addChild( new StringNode(
+ i + ": " +
+ xNChild.getAccessibleContext().
+ getAccessibleDescription() + " (" +
+ (xSelChild.equals(xNChild) ? "OK" : "XXX") +
+ ")", aParent ) );
}
- aChild = aVNode;
}
- catch( IndexOutOfBoundsException e )
+ catch (com.sun.star.lang.DisposedException e)
{
- aChild = new StringNode( "IndexOutOfBounds",
- aParent );
+ aVNode.addChild( new StringNode(
+ i + ": caught DisposedException while creating",
+ aParent ));
}
}
- break;
- default:
- aChild = new StringNode( "ERROR", aParent );
- break;
+ aChild = aVNode;
+ }
+ catch( IndexOutOfBoundsException e )
+ {
+ aChild = new StringNode( "IndexOutOfBounds",
+ aParent );
}
}
+ break;
+ default:
+ aChild = new StringNode( "ERROR", aParent );
+ break;
}
return aChild;
diff --git a/wizards/com/sun/star/wizards/db/CommandName.java b/wizards/com/sun/star/wizards/db/CommandName.java
index 2621b96..1db9979 100644
--- a/wizards/com/sun/star/wizards/db/CommandName.java
+++ b/wizards/com/sun/star/wizards/db/CommandName.java
@@ -82,48 +82,48 @@ public class CommandName
{
try
{
- if (this.setMetaDataAttributes())
- {
- this.DisplayName = _DisplayName;
- int iIndex;
- if (oCommandMetaData.xDBMetaData.supportsCatalogsInDataManipulation())
- { // ...dann Catalog mit in TableName
- iIndex = _DisplayName.indexOf(sCatalogSep);
- if (iIndex >= 0)
- {
- if (bCatalogAtStart)
- {
- CatalogName = _DisplayName.substring(0, iIndex);
- _DisplayName = _DisplayName.substring(iIndex + 1, _DisplayName.length());
- }
- else
- {
- CatalogName = _DisplayName.substring(iIndex + 1, _DisplayName.length());
- _DisplayName = _DisplayName.substring(0, iIndex);
- }
- }
- }
- if (oCommandMetaData.xDBMetaData.supportsSchemasInDataManipulation())
+ if (!setMetaDataAttributes())
+ return;
+
+ this.DisplayName = _DisplayName;
+ int iIndex;
+ if (oCommandMetaData.xDBMetaData.supportsCatalogsInDataManipulation())
+ { // ...dann Catalog mit in TableName
+ iIndex = _DisplayName.indexOf(sCatalogSep);
+ if (iIndex >= 0)
{
- String[] NameList;
- NameList = new String[0];
- NameList = JavaTools.ArrayoutofString(_DisplayName, ".");
- if (NameList.length > 1)
+ if (bCatalogAtStart)
{
- SchemaName = NameList[0];
- TableName = NameList[1];
+ CatalogName = _DisplayName.substring(0, iIndex);
+ _DisplayName = _DisplayName.substring(iIndex + 1, _DisplayName.length());
}
else
{
- TableName = _DisplayName;
+ CatalogName = _DisplayName.substring(iIndex + 1, _DisplayName.length());
+ _DisplayName = _DisplayName.substring(0, iIndex);
}
}
+ }
+ if (oCommandMetaData.xDBMetaData.supportsSchemasInDataManipulation())
+ {
+ String[] NameList;
+ NameList = new String[0];
+ NameList = JavaTools.ArrayoutofString(_DisplayName, ".");
+ if (NameList.length > 1)
+ {
+ SchemaName = NameList[0];
+ TableName = NameList[1];
+ }
else
{
TableName = _DisplayName;
}
- setComposedCommandName();
}
+ else
+ {
+ TableName = _DisplayName;
+ }
+ setComposedCommandName();
}
catch (Exception exception)
{
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java
index ac7ba52..cf9fad8 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java
@@ -151,28 +151,20 @@ public final class Record {
*/
@Override
public boolean equals(Object obj) {
-
- boolean bool = false;
-
- if (obj instanceof Record) {
-
- Record rec = (Record) obj;
-
- checkLabel: {
-
- if (rec.getAttributes() != attributes) {
- break checkLabel;
- }
- if (rec.getSize() == data.length) {
- for (int i = 0; i < data.length; i++) {
- if (data[i] != rec.data[i]) {
- break checkLabel;
- }
- }
- bool = true;
+ if (!(obj instanceof Record)) {
+ return false;
+ }
+ Record rec = (Record) obj;
+ if (rec.getAttributes() != attributes) {
+ return false;
+ }
+ if (rec.getSize() == data.length) {
+ for (int i = 0; i < data.length; i++) {
+ if (data[i] != rec.data[i]) {
+ return false;
}
}
}
- return bool;
+ return false;
}
}
\ No newline at end of file
commit fa652cdd2314f485359119a8ff081a7afd1c01b0
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 15 14:26:02 2014 +0200
java: no need to explicitly code default constructors
the compiler will do it automatically
Change-Id: I6ee57c3500a4c1c1b96919a69b569686e6c0ead9
diff --git a/wizards/com/sun/star/wizards/common/Desktop.java b/wizards/com/sun/star/wizards/common/Desktop.java
index a40ed76..665b23e 100644
--- a/wizards/com/sun/star/wizards/common/Desktop.java
+++ b/wizards/com/sun/star/wizards/common/Desktop.java
@@ -45,11 +45,6 @@ import com.sun.star.i18n.XCharacterClassification;
public class Desktop
{
- /** Creates a new instance of Desktop */
- public Desktop()
- {
- }
-
public static XDesktop getDesktop(XMultiServiceFactory xMSF)
{
com.sun.star.uno.XInterface xInterface = null;
diff --git a/wizards/com/sun/star/wizards/common/Helper.java b/wizards/com/sun/star/wizards/common/Helper.java
index 798378e..9b62dd0 100644
--- a/wizards/com/sun/star/wizards/common/Helper.java
+++ b/wizards/com/sun/star/wizards/common/Helper.java
@@ -36,11 +36,6 @@ import com.sun.star.util.XNumberFormatter;
public class Helper
{
- /** Creates a new instance of Helper */
- public Helper()
- {
- }
-
public static long convertUnoDatetoInteger(com.sun.star.util.Date DateValue)
{
java.util.Calendar oCal = java.util.Calendar.getInstance();
diff --git a/wizards/com/sun/star/wizards/common/JavaTools.java b/wizards/com/sun/star/wizards/common/JavaTools.java
index 0a48d74..cca608a 100644
--- a/wizards/com/sun/star/wizards/common/JavaTools.java
+++ b/wizards/com/sun/star/wizards/common/JavaTools.java
@@ -29,11 +29,6 @@ import java.net.URL;
public class JavaTools
{
- /** Creates a new instance of JavaTools */
- public JavaTools()
- {
- }
-
public static String[] copyStringArray(String[] FirstArray)
{
if (FirstArray != null)
diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java b/wizards/com/sun/star/wizards/ui/ImageList.java
index 050653b..def1e0b 100644
--- a/wizards/com/sun/star/wizards/ui/ImageList.java
+++ b/wizards/com/sun/star/wizards/ui/ImageList.java
@@ -102,8 +102,6 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener
class OMouseListener implements XMouseListener
{
- public OMouseListener()
- {}
public void mousePressed(MouseEvent arg0)
{
focus(getImageIndexFor(getSelected()));
diff --git a/wizards/com/sun/star/wizards/ui/event/AbstractListener.java b/wizards/com/sun/star/wizards/ui/event/AbstractListener.java
index bfe2c41..cfbd831 100644
--- a/wizards/com/sun/star/wizards/ui/event/AbstractListener.java
+++ b/wizards/com/sun/star/wizards/ui/event/AbstractListener.java
@@ -43,11 +43,6 @@ public class AbstractListener
private HashMap<String,MethodInvocation> mHashtable = new HashMap<String,MethodInvocation>();
- /** Creates a new instance of AbstractListener */
- public AbstractListener()
- {
- }
-
public void add(String componentName, String eventName, String methodName, Object target)
{
try
diff --git a/wizards/com/sun/star/wizards/ui/event/CommonListener.java b/wizards/com/sun/star/wizards/ui/event/CommonListener.java
index d0387f7..8b455b5 100644
--- a/wizards/com/sun/star/wizards/ui/event/CommonListener.java
+++ b/wizards/com/sun/star/wizards/ui/event/CommonListener.java
@@ -23,11 +23,6 @@ import com.sun.star.lang.EventObject;
public class CommonListener extends AbstractListener implements XActionListener, XItemListener, XTextListener, EventNames, XWindowListener, XMouseListener, XFocusListener, XKeyListener
{
- /** Creates a new instance of CommonListener */
- public CommonListener()
- {
- }
-
/**
* Implementation of com.sun.star.awt.XActionListener
*/
commit 48633151ff104e867bae6fcd403a2c8d4a87b509
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 15 14:24:30 2014 +0200
java: methods in interfaces are implicitly public
Change-Id: I543fe5b8890668f60d6528a2a7ae6d099d5b4945
diff --git a/wizards/com/sun/star/wizards/common/Indexable.java b/wizards/com/sun/star/wizards/common/Indexable.java
index b20fd17..d838c35 100644
--- a/wizards/com/sun/star/wizards/common/Indexable.java
+++ b/wizards/com/sun/star/wizards/common/Indexable.java
@@ -25,6 +25,6 @@ package com.sun.star.wizards.common;
public interface Indexable {
- public int getIndex();
+ int getIndex();
}
diff --git a/wizards/com/sun/star/wizards/common/UCB.java b/wizards/com/sun/star/wizards/common/UCB.java
index ecd3e4f..717ba77 100644
--- a/wizards/com/sun/star/wizards/common/UCB.java
+++ b/wizards/com/sun/star/wizards/common/UCB.java
@@ -240,9 +240,8 @@ public class UCB
XContentProvider.class,ucb).queryContent(id);
}
- public static interface Verifier
+ public interface Verifier
{
-
- public boolean verify(Object object);
+ boolean verify(Object object);
}
}
diff --git a/wizards/com/sun/star/wizards/common/XMLProvider.java b/wizards/com/sun/star/wizards/common/XMLProvider.java
index 063cb7a..287e861 100644
--- a/wizards/com/sun/star/wizards/common/XMLProvider.java
+++ b/wizards/com/sun/star/wizards/common/XMLProvider.java
@@ -28,5 +28,5 @@ import org.w3c.dom.Node;
public interface XMLProvider
{
- public Node createDOM(Node parent);
+ Node createDOM(Node parent);
}
diff --git a/wizards/com/sun/star/wizards/db/QueryMetaData.java b/wizards/com/sun/star/wizards/db/QueryMetaData.java
index a098eea..c3befda 100644
--- a/wizards/com/sun/star/wizards/db/QueryMetaData.java
+++ b/wizards/com/sun/star/wizards/db/QueryMetaData.java
@@ -41,11 +41,10 @@ public class QueryMetaData extends CommandMetaData
};
public int Type = QueryType.SODETAILQUERY;
- public static interface QueryType
+ public interface QueryType
{
-
- final static int SOSUMMARYQUERY = 0;
- final static int SODETAILQUERY = 1;
+ int SOSUMMARYQUERY = 0;
+ int SODETAILQUERY = 1;
}
public QueryMetaData(XMultiServiceFactory xMSF, Locale CharLocale, NumberFormatter oNumberFormatter)
diff --git a/wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java b/wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java
index 3038e4a..aa81c48 100644
--- a/wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java
+++ b/wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java
@@ -32,17 +32,17 @@ public interface IReportDefinitionReadAccess
* Gives access to a ReportDefinition, if initialized.
* @return a ReportDefinition or null.
*/
- public XReportDefinition getReportDefinition(); /* should throw NullPointerException but does not. */
+ XReportDefinition getReportDefinition(); /* should throw NullPointerException but does not. */
/**
* This ServiceFactory is the 'global' Service Factory, which knows all and every thing in the program.
* @return the global service factory of the program
*/
- public XMultiServiceFactory getGlobalMSF();
+ XMultiServiceFactory getGlobalMSF();
/**
* Returns the file path to the default report definition, we need this name for early initialisation
*/
- public String getDefaultHeaderLayout();
+ String getDefaultHeaderLayout();
}
diff --git a/wizards/com/sun/star/wizards/report/IReportDocument.java b/wizards/com/sun/star/wizards/report/IReportDocument.java
index 662d3ff..0c124a2 100644
--- a/wizards/com/sun/star/wizards/report/IReportDocument.java
+++ b/wizards/com/sun/star/wizards/report/IReportDocument.java
@@ -33,7 +33,7 @@ public interface IReportDocument
// initialisation
- public void initialize(
+ void initialize(
final XDatabaseDocumentUI i_documentUI,
final Resource i_resource
);
@@ -44,22 +44,22 @@ public interface IReportDocument
/**
* Gives access to the DB Values
*/
- public com.sun.star.wizards.db.RecordParser getRecordParser();
+ com.sun.star.wizards.db.RecordParser getRecordParser();
/**
* Give access to the parent document
* It is a document in the old Wizard
* It is a Report Builder in the new Wizard
*/
- public com.sun.star.awt.XWindowPeer getWizardParent();
+ com.sun.star.awt.XWindowPeer getWizardParent();
/**
*
* @return the Frame of the document Window or Report Builder Window
*/
- public com.sun.star.frame.XFrame getFrame();
+ com.sun.star.frame.XFrame getFrame();
- public XComponent getComponent();
+ XComponent getComponent();
// First step: After entering the table name, select fields
@@ -67,17 +67,17 @@ public interface IReportDocument
/**
* Is called after first step, set Tablename and the fields, which should occur in the Report.
*/
- public void initializeFieldColumns(final int _aType, final String TableName, final String[] FieldNames);
+ void initializeFieldColumns(final int _aType, final String TableName, final String[] FieldNames);
/**
* Empties the report document
*/
- public void clearDocument();
+ void clearDocument();
/**
* Empties the report document, if we called back, don't remove Grouping/Sorting
*/
- public void removeTextTableAndTextSection();
+ void removeTextTableAndTextSection();
// Second step: Label field titles
@@ -85,7 +85,7 @@ public interface IReportDocument
/**
* Set new names for the titles
*/
- public void setFieldTitles(final String[] sFieldTitles);
+ void setFieldTitles(final String[] sFieldTitles);
/**
* Change a the name of the 'title' of one field.
@@ -93,7 +93,7 @@ public interface IReportDocument
* element title of a given element name.
* This is only used as a preview
*/
- public void liveupdate_changeUserFieldContent(final String FieldName, final String TitleName);
+ void liveupdate_changeUserFieldContent(final String FieldName, final String TitleName);
// Third step: Grouping
@@ -102,52 +102,52 @@ public interface IReportDocument
/**
* Called by press ('greater then') add a group to the group list
*/
- public boolean liveupdate_addGroupNametoDocument(String[] GroupNames, String CurGroupTitle, ArrayList<String> GroupFieldVector, ArrayList<String> ReportPath, int iSelCount);
+ boolean liveupdate_addGroupNametoDocument(String[] GroupNames, String CurGroupTitle, ArrayList<String> GroupFieldVector, ArrayList<String> ReportPath, int iSelCount);
- public void refreshGroupFields(String[] _sNewNames);
+ void refreshGroupFields(String[] _sNewNames);
/**
* Called by press ('less then') Removes an already set Groupname out of the list
*/
- public void liveupdate_removeGroupName(String[] NewSelGroupNames, String CurGroupTitle, java.util.ArrayList<String> GroupFieldVector);
+ void liveupdate_removeGroupName(String[] NewSelGroupNames, String CurGroupTitle, java.util.ArrayList<String> GroupFieldVector);
/**
* set the list how to group
*/
- public void setGrouping(String[] aGroupList);
+ void setGrouping(String[] aGroupList);
// Fourth step: Sorting
/**
* Set the list how to sort
*/
- public void setSorting(String[][] aSort);
+ void setSorting(String[][] aSort);
// Fivth step: Templates / Layout
/* Template Page */
- public void setPageOrientation(int nOrientation) throws com.sun.star.lang.IllegalArgumentException;
+ void setPageOrientation(int nOrientation) throws com.sun.star.lang.IllegalArgumentException;
- public int getDefaultPageOrientation();
+ int getDefaultPageOrientation();
- public ArrayList<String> getReportPath();
+ ArrayList<String> getReportPath();
- public String getLayoutPath();
+ String getLayoutPath();
- public String getContentPath();
+ String getContentPath();
/**
* Called if a new Layout is selected
*/
- public void liveupdate_changeLayoutTemplate(String LayoutTemplatePath/*, String BitmapPath*/);
+ void liveupdate_changeLayoutTemplate(String LayoutTemplatePath/*, String BitmapPath*/);
/**
* Called if a new Template is selected
*/
- public void liveupdate_changeContentTemplate(String ContentTemplatePath);
+ void liveupdate_changeContentTemplate(String ContentTemplatePath);
- public void layout_selectFirstPage();
+ void layout_selectFirstPage();
- public void layout_setupRecordSection(String TemplateName);
+ void layout_setupRecordSection(String TemplateName);
// finishing
@@ -157,63 +157,63 @@ public interface IReportDocument
* Set the Title into the document from the 'Create Report Page'
* BUG: The Title is empty after create Report.
*/
- public void liveupdate_updateReportTitle(String _sTitleName);
+ void liveupdate_updateReportTitle(String _sTitleName);
/**
* Store the document by the given name
*/
- public void store(String Name, int OpenMode) throws com.sun.star.uno.Exception;
+ void store(String Name, int OpenMode) throws com.sun.star.uno.Exception;
/**
* The current report is added to the DB View under the given name
*
* TODO: add Name to this functionality
*/
- public void addReportToDBView();
+ void addReportToDBView();
- public void importReportData(ReportWizard aWizard);
+ void importReportData(ReportWizard aWizard);
/**
* Create the final Report document
*/
- public void createAndOpenReportDocument(
+ void createAndOpenReportDocument(
final String Name,
final boolean _bAsTemplate,
final boolean _bOpenInDesign
);
- public void dispose();
+ void dispose();
// Garbage dump
/* DataImport */
// ???
// ???
- public boolean reconnectToDatabase(XMultiServiceFactory xMSF, PropertyValue[] Properties);
+ boolean reconnectToDatabase(XMultiServiceFactory xMSF, PropertyValue[] Properties);
// ???
- public void insertDatabaseDatatoReportDocument(XMultiServiceFactory xMSF);
+ void insertDatabaseDatatoReportDocument(XMultiServiceFactory xMSF);
// ???
/**
* set a internal variable to stop a maybe longer DB access.
*/
- public void StopProcess(); // cancel
+ void StopProcess(); // cancel
/**
* Returns a string list of layouts.
*/
- public String[][] getDataLayout();
+ String[][] getDataLayout();
/**
* Returns a string list of header layouts
*/
- public String[][] getHeaderLayout();
+ String[][] getHeaderLayout();
- public void setCommandType(int CommandType);
+ void setCommandType(int CommandType);
- public void setCommand(String Command);
+ void setCommand(String Command);
/**
* check internal invariants
*/
- public void checkInvariants() throws java.lang.Exception;
+ void checkInvariants() throws java.lang.Exception;
}
diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java b/wizards/com/sun/star/wizards/ui/ImageList.java
index 7005479..050653b 100644
--- a/wizards/com/sun/star/wizards/ui/ImageList.java
+++ b/wizards/com/sun/star/wizards/ui/ImageList.java
@@ -790,14 +790,14 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener
};
}
- public static interface IImageRenderer extends IRenderer
+ public interface IImageRenderer extends IRenderer
{
/**
* @return two resource ids for an image referenced in the imaglist resourcefile of the
* wizards project; The second one of them is designed to be used for High Contrast Mode.
*/
- public Object[] getImageUrls(Object listItem);
+ Object[] getImageUrls(Object listItem);
}
private static class SimpleCounterRenderer implements IRenderer
diff --git a/wizards/com/sun/star/wizards/ui/XCommandSelectionListener.java b/wizards/com/sun/star/wizards/ui/XCommandSelectionListener.java
index 2731e0b..c666d0e 100644
--- a/wizards/com/sun/star/wizards/ui/XCommandSelectionListener.java
+++ b/wizards/com/sun/star/wizards/ui/XCommandSelectionListener.java
@@ -20,5 +20,5 @@ package com.sun.star.wizards.ui;
public interface XCommandSelectionListener
{
- public void CommandSelected(String CommandName);
+ void CommandSelected(String CommandName);
}
diff --git a/wizards/com/sun/star/wizards/ui/XCompletion.java b/wizards/com/sun/star/wizards/ui/XCompletion.java
index af444f7..6239d26 100644
--- a/wizards/com/sun/star/wizards/ui/XCompletion.java
+++ b/wizards/com/sun/star/wizards/ui/XCompletion.java
@@ -20,11 +20,11 @@ package com.sun.star.wizards.ui;
public interface XCompletion
{
- public void setcompleted(int _ndialogpage, boolean _biscompleted);
+ void setcompleted(int _ndialogpage, boolean _biscompleted);
- public boolean iscompleted(int _ndialogpage);
+ boolean iscompleted(int _ndialogpage);
- public void setmodified(int _ndialogpage, Object ooldValue, Object onewValue);
+ void setmodified(int _ndialogpage, Object ooldValue, Object onewValue);
- public boolean ismodified(int _ndialogpage);
+ boolean ismodified(int _ndialogpage);
}
diff --git a/wizards/com/sun/star/wizards/ui/XFieldSelectionListener.java b/wizards/com/sun/star/wizards/ui/XFieldSelectionListener.java
index 3e0c0fe..a0c3714 100644
--- a/wizards/com/sun/star/wizards/ui/XFieldSelectionListener.java
+++ b/wizards/com/sun/star/wizards/ui/XFieldSelectionListener.java
@@ -21,15 +21,15 @@ package com.sun.star.wizards.ui;
public interface XFieldSelectionListener
{
- public void shiftFromLeftToRight(String[] SelItems, String[] NewItems);
+ void shiftFromLeftToRight(String[] SelItems, String[] NewItems);
- public void shiftFromRightToLeft(String[] OldSelItems, String[] NewItems);
+ void shiftFromRightToLeft(String[] OldSelItems, String[] NewItems);
- public void moveItemUp(String Selitem);
+ void moveItemUp(String Selitem);
- public void moveItemDown(String Selitem);
+ void moveItemDown(String Selitem);
- public void setID(String sIncSuffix);
+ void setID(String sIncSuffix);
- public int getID();
+ int getID();
}
diff --git a/wizards/com/sun/star/wizards/ui/XPathSelectionListener.java b/wizards/com/sun/star/wizards/ui/XPathSelectionListener.java
index 248b46b..6a9d4ad 100644
--- a/wizards/com/sun/star/wizards/ui/XPathSelectionListener.java
+++ b/wizards/com/sun/star/wizards/ui/XPathSelectionListener.java
@@ -21,5 +21,5 @@ package com.sun.star.wizards.ui;
public interface XPathSelectionListener
{
- public void validatePath();
+ void validatePath();
}
diff --git a/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java b/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java
index 31d8ed5..d2b4b98 100644
--- a/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java
+++ b/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java
@@ -134,10 +134,10 @@ public class ListModelBinder implements ListDataListener
remove((short) lde.getIndex0(), (short) lde.getIndex1());
}
- public static interface Renderer
+ public interface Renderer
{
- public String render(Object item);
+ String render(Object item);
}
public static void fillList(Object list, Object[] items, Renderer renderer)
diff --git a/wizards/com/sun/star/wizards/ui/event/TaskListener.java b/wizards/com/sun/star/wizards/ui/event/TaskListener.java
index bb2292b..61c8b2b 100644
--- a/wizards/com/sun/star/wizards/ui/event/TaskListener.java
+++ b/wizards/com/sun/star/wizards/ui/event/TaskListener.java
@@ -22,14 +22,14 @@ import java.util.EventListener;
public interface TaskListener extends EventListener
{
- public void taskStarted(TaskEvent te);
+ void taskStarted(TaskEvent te);
- public void taskFinished(TaskEvent te);
+ void taskFinished(TaskEvent te);
/**
* is called when the status of the task has advanced.
*/
- public void taskStatusChanged(TaskEvent te);
+ void taskStatusChanged(TaskEvent te);
- public void subtaskNameChanged(TaskEvent te);
+ void subtaskNameChanged(TaskEvent te);
}
commit 4b5cb7ef35648eb33d14f40a7f4cc1b47aea53a4
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 15 14:21:23 2014 +0200
remove unnecessary catch block
Change-Id: Id33384cee3444924e7e8de7d496f117f120b1876
diff --git a/connectivity/qa/connectivity/tools/AbstractDatabase.java b/connectivity/qa/connectivity/tools/AbstractDatabase.java
index 08b710b..3207daf 100644
--- a/connectivity/qa/connectivity/tools/AbstractDatabase.java
+++ b/connectivity/qa/connectivity/tools/AbstractDatabase.java
@@ -123,14 +123,8 @@ public abstract class AbstractDatabase implements DatabaseAccess
if (m_databaseDocumentFile != null)
{
- try
- {
- final File file = new File(m_databaseDocumentFile);
- file.delete();
- }
- catch (Exception e)
- {
- }
+ final File file = new File(m_databaseDocumentFile);
+ file.delete();
}
}
diff --git a/wizards/com/sun/star/wizards/common/ConfigNode.java b/wizards/com/sun/star/wizards/common/ConfigNode.java
index 4803ec1..0d2abd8 100644
--- a/wizards/com/sun/star/wizards/common/ConfigNode.java
+++ b/wizards/com/sun/star/wizards/common/ConfigNode.java
@@ -35,9 +35,9 @@ public interface ConfigNode
* to be used in a tree like way, reading objects and subobjects and so on,
* it might be practical to be able to pass an extra parameter, for a free use.
*/
- public void readConfiguration(Object configurationView, Object param);
+ void readConfiguration(Object configurationView, Object param);
- public void writeConfiguration(Object configurationView, Object param);
+ void writeConfiguration(Object configurationView, Object param);
- public void setRoot(Object root);
+ void setRoot(Object root);
}
diff --git a/wizards/com/sun/star/wizards/common/IRenderer.java b/wizards/com/sun/star/wizards/common/IRenderer.java
index c4513ea..c704ed6 100644
--- a/wizards/com/sun/star/wizards/common/IRenderer.java
+++ b/wizards/com/sun/star/wizards/common/IRenderer.java
@@ -26,5 +26,5 @@ package com.sun.star.wizards.common;
public interface IRenderer
{
- public String render(Object object);
+ String render(Object object);
}
diff --git a/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java b/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java
index 6ccb7c5..8f1446f 100644
--- a/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java
+++ b/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java
@@ -29,78 +29,78 @@ public interface IReportBuilderLayouter
* This name identifies the layout in the internal access list.
* @return the internal layout name.
*/
- public String getName();
+ String getName();
/**
* Get the localized name of the layout, which is shown in the layout page of the report wizard.
* This name comes out of the resource and will be translate in different languages.
* @return localized name of the layout.
*/
- public String getLocalizedName();
+ String getLocalizedName();
/**
* For Landscape give nOrientation == com.sun.star.wizards.report.ReportLayouter.SOOPTLANDSCAPE
* All other numbers are interpreted as portrait format.
*/
- public void setPageOrientation(int nOrientation);
+ void setPageOrientation(int nOrientation);
/**
* dispose the layouter
*/
- public void dispose();
+ void dispose();
/**
* Set the table name of the report
* This is the name to the database table.
* @param _nType something of com.sun.star.sdb.CommandType
*/
- public void setTableName(int _nType, String TableName);
+ void setTableName(int _nType, String TableName);
/**
* Insert the field names, these are the field names out of a given datebase table
*/
- public void insertFieldNames(final String[] FieldNames);
+ void insertFieldNames(final String[] FieldNames);
/**
* Insert the field type (Varchar, int, ...) as internal an int representation.
*/
- public void insertFieldTypes(int[] FieldTypes);
+ void insertFieldTypes(int[] FieldTypes);
/**
* Insert the field width in count of chars as given in the database.
*/
- public void insertFieldWidths(int[] FieldWidths);
+ void insertFieldWidths(int[] FieldWidths);
/**
* Insert the titles of the field names. This names are free formed
*/
- public void insertFieldTitles(String[] _aFieldTitles);
+ void insertFieldTitles(String[] _aFieldTitles);
/**
* Insert the names of the groups, the group names are names out of the field names.
*
* If a group name is given here, it will not shown in the fields/titles, but must be in the field string list.
*/
- public void insertGroupNames(String[] _aGroupFieldNames);
+ void insertGroupNames(String[] _aGroupFieldNames);
/**
* Insert the names of the groups which should be used as sorting, the group names are names out of the field names.
*
* If a group name is given here, it will not shown in the fields/titles, but must be in the field string list.
*/
- public void insertSortingNames(String[][] _aSortFieldNames);
+ void insertSortingNames(String[][] _aSortFieldNames);
/**
* This method redraws the whole layout with all its content
*/
- public void layout();
+ void layout();
/**
* Initialize the current Layouter with data's out of an other Layouter.
*
* This Method copies the internal fields, groups and titles
*/
- public void initializeData(IReportBuilderLayouter aOtherLayouter);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list