diff options
| author | Noel Grandin <noel@peralex.com> | 2014-08-11 15:58:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-08-14 10:59:48 +0200 |
| commit | ac5954d7c540f34702033d7d951d1d16cb96730a (patch) | |
| tree | 310ba9698a10c74662de0714db683f932de32b0c | |
| parent | 89c0a2b2f65beeb6f42d3334662100a13169a8d6 (diff) | |
java: remove commented out code
Change-Id: I05c907a38b562231e968c17f14e09ef80e0a6ed1
184 files changed, 65 insertions, 1084 deletions
diff --git a/bean/com/sun/star/beans/LocalOfficeWindow.java b/bean/com/sun/star/beans/LocalOfficeWindow.java index 0d2021b92f5e..9283b013a43e 100644 --- a/bean/com/sun/star/beans/LocalOfficeWindow.java +++ b/bean/com/sun/star/beans/LocalOfficeWindow.java @@ -205,7 +205,6 @@ public class LocalOfficeWindow if ( isShowing() ) { // create direct parent relationship - //setVisible( true ); parentPeer = new JavaWindowPeerFake( getNativeWindow(), type); bPeer = true; } diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java index 790ddd00372e..2cbde53431f8 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java @@ -186,7 +186,6 @@ public class LocalOfficeWindow if ( isShowing() ) { // create direct parent relationship - //setVisible( true ); parentPeer = new JavaWindowPeerFake(getWrappedWindowHandle(), type); bPeer = true; } diff --git a/bean/qa/complex/bean/OOoBeanTest.java b/bean/qa/complex/bean/OOoBeanTest.java index 2b180a615e48..141f63d0ddc9 100644 --- a/bean/qa/complex/bean/OOoBeanTest.java +++ b/bean/qa/complex/bean/OOoBeanTest.java @@ -543,7 +543,6 @@ public class OOoBeanTest } else { - // Thread.sleep(2000); } } finally { diff --git a/bean/test/applet/oooapplet/OOoViewer.java b/bean/test/applet/oooapplet/OOoViewer.java index 4fdf1c07d089..c2eaaa5e71b3 100644 --- a/bean/test/applet/oooapplet/OOoViewer.java +++ b/bean/test/applet/oooapplet/OOoViewer.java @@ -137,7 +137,6 @@ final class CustomURLClassLoader extends URLClassLoader { // this.findClass, after this.loadClass has already called // super.findClass, so no need to call super.findClass again: throw new ClassNotFoundException( name ); -// return super.findClass(name); } diff --git a/bridges/test/lib/TestBed.java b/bridges/test/lib/TestBed.java index 4f6bf13621d3..3e3323568666 100644 --- a/bridges/test/lib/TestBed.java +++ b/bridges/test/lib/TestBed.java @@ -37,7 +37,6 @@ import java.io.PrintStream; public final class TestBed { public boolean execute(XInstanceProvider provider, boolean waitForServer, Class client, long wait) throws Exception { - // assert client.isAssignableFrom(client) && wait >= 0; synchronized (lock) { server = new Server(provider); server.start(); @@ -45,10 +44,6 @@ public final class TestBed { } Process p = Runtime.getRuntime().exec(new String[] { "java", "-classpath", System.getProperty("java.class.path"), -/* - "-Xdebug", - "-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n", -*/ client.getName() }); pipe(p.getInputStream(), System.out, "CO> "); pipe(p.getErrorStream(), System.err, "CE> "); diff --git a/chart2/qa/TestCaseOldAPI.java b/chart2/qa/TestCaseOldAPI.java index a640b87d8f48..29662004d0f2 100644 --- a/chart2/qa/TestCaseOldAPI.java +++ b/chart2/qa/TestCaseOldAPI.java @@ -347,7 +347,6 @@ public class TestCaseOldAPI extends ComplexTestCase { fMax1 = AnyConverter.toDouble( oMax ); log.println( "Maximum retrieved: " + fMax1 ); //todo: the view has to be built before there is an explicit value -// assure( "Max is 0.0", fMax1 > 0.0 ); xProp.setPropertyValue( "AutoMax", new Boolean( false )); oMax = xProp.getPropertyValue( "Max" ); assure( "No Maximum set", AnyConverter.isDouble( oMax )); @@ -546,13 +545,6 @@ public class TestCaseOldAPI extends ComplexTestCase { xDiaProp.getPropertyValue( "Vertical" ))); } - // reset to bar-chart -// aMyServiceName = new String( "com.sun.star.chart.BarDiagram" ); -// XDiagram xDia = (XDiagram) UnoRuntime.queryInterface( -// XDiagram.class, xFact.createInstance( aMyServiceName )); -// assure( aMyServiceName + " could not be created", xDia != null ); - -// mxOldDoc.setDiagram( xDia ); } catch( Exception ex ) { diff --git a/connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java b/connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java index 8ff5cc48ee84..09f7cac22716 100644 --- a/connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java +++ b/connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java @@ -55,9 +55,6 @@ public class DBaseSqlTests extends SubTestCase execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where 0 < 1"); execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where 2 > 1"); execute(xRowRes,"1,1+1,'a' + 'b' FROM \"biblio\" \"biblio\" where 2 > 1"); - // execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where (0 = 0) is true"); - // execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where not (0 = 0) is not true"); - // execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where 1 between 0 and 2"); execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where not \"Identifier\" is NULL"); execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where \"Identifier\" is not NULL"); execute(xRowRes,"1 FROM \"biblio\" \"biblio\" where \"Identifier\" = \"Identifier\""); diff --git a/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java b/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java index 65bf5cfb4e72..6982395671a0 100644 --- a/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java +++ b/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java @@ -71,8 +71,6 @@ public class DatabaseMetaData { public void test(){ - // try { - try{ ResultSet rs = m_xMD.getTables(null,null,"TESTCASE",null); while ( rs.next() ) @@ -99,66 +97,5 @@ public class DatabaseMetaData { } catch(Exception e){ } - //testMethod("getTypeInfo", zclass,empty,17); -/* - Class[] zclass = new Class[]{}; - Object[] empty = new Object[]{}; - testMethod("getCatalogs", zclass,empty,1); - - testMethod("getSchemas", zclass,empty,2); - testMethod("getTableTypes", zclass,empty,1); - Class[] a4 = new Class[4]; - Object[] o4 = new Object[4]; - a4[0] = Class.forName("java.lang.Object"); - a4[1] = Class.forName("java.lang.String"); - a4[2] = Class.forName("java.lang.String"); - a4[3] = Class.forName("java.lang.String"); - - o4[0] = null; - o4[1] = null; - o4[2] = null; - o4[3] = "%"; - testMethod("getColumnPrivileges", a4,o4,7); - testMethod("getColumns", a4,o4,18); - testMethod("getProcedureColumns", a4,o4,13); - testMethod("getColumns", a4,o4,18); - - Class[] a3 = new Class[3]; - Object[] o3 = new Object[3]; - a3[0] = Class.forName("java.lang.Object"); - a3[1] = Class.forName("java.lang.String"); - a3[2] = Class.forName("java.lang.String"); - - o3[0] = null; - o3[1] = null; - o3[2] = "%"; - - testMethod("getExportedKeys", a3,o3,14); - testMethod("getImportedKeys", a3,o3,14); - testMethod("getPrimaryKeys", a3,o3,14); - testMethod("getProcedures", a3,o3,5); - testMethod("getTablePrivileges", a3,o3,6); - testMethod("getVersionColumns", a3,o3,7); - // testMethod("getCrossReference", a3,o3,14); - - } catch( java.lang.ClassNotFoundException ex) { - assure("ClassNotFoundException: " + ex.getMessage() ,false); - } - */ - } -/* - public com.sun.star.sdbc.XResultSet getCrossReference(Object obj, String str, String str2, Object obj3, String str4, String str5) { - } - public com.sun.star.sdbc.XResultSet getIndexInfo(Object obj, String str, String str2, boolean param, boolean param4) { } - - public com.sun.star.sdbc.XResultSet getTables(Object obj, String str, String str2, String[] str3) { - } - - public com.sun.star.sdbc.XResultSet getUDTs(Object obj, String str, String str2, int[] values) { - } - - public com.sun.star.sdbc.XResultSet getBestRowIdentifier(Object obj, String str, String str2, int param, boolean param4) throws com.sun.star.sdbc.SQLException { - } - */ } diff --git a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java index c8c28162f3f7..57ce3f95372e 100644 --- a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java +++ b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java @@ -136,8 +136,6 @@ public class TestCacheSize { sStatement = null; cConnection = null; - //Class.forName("org.hsqldb.jdbcDriver"); - if (filedb) { cConnection = drv.connect(url,info); @@ -147,9 +145,6 @@ public class TestCacheSize { sStatement.execute("SET LOGSIZE " + 0); sStatement.execute("SHUTDOWN"); cConnection.close(); -// props.setProperty("hsqldb.cache_scale", "" + cacheScale); -// props.setProperty("hsqldb.cache_size_scale", - //"" + cacheSizeScale); } } catch (Exception e) { e.printStackTrace(); @@ -255,7 +250,6 @@ public class TestCacheSize { System.out.println("multi key table"); } -// sStatement.execute("CREATE INDEX idx3 ON tempTEST (zip);"); System.out.println("Setup time: " + sw.elapsedTime()); fillUpBigTable(filler, randomgen); @@ -339,9 +333,6 @@ public class TestCacheSize { } } -// sStatement.execute("INSERT INTO test SELECT * FROM temptest;"); -// sStatement.execute("DROP TABLE temptest;"); -// sStatement.execute(ddl7); System.out.println("Total insert: " + i); System.out.println("Insert time: " + sw.elapsedTime() + " rps: " + (i * 1000 / (sw.elapsedTime() + 1))); diff --git a/connectivity/qa/connectivity/tools/FlatFileDatabase.java b/connectivity/qa/connectivity/tools/FlatFileDatabase.java index 31f263a1196b..4a292c009234 100644 --- a/connectivity/qa/connectivity/tools/FlatFileDatabase.java +++ b/connectivity/qa/connectivity/tools/FlatFileDatabase.java @@ -73,7 +73,6 @@ class FlatFileDatabase extends AbstractDatabase documentFile.delete(); m_tableFileLocation = new File(documentFile.getParent() + File.separator + documentFile.getName().replace(".odb", "") + File.separator ); m_tableFileLocation.mkdir(); - //subPath.deleteOnExit(); m_databaseDocumentFile = URLHelper.getFileURLFromSystemPath(documentFile); final String path = URLHelper.getFileURLFromSystemPath( m_tableFileLocation.getPath() ); diff --git a/dbaccess/qa/complex/dbaccess/DataSource.java b/dbaccess/qa/complex/dbaccess/DataSource.java index 8adff3a23ed4..3b18cd2fae8d 100644 --- a/dbaccess/qa/complex/dbaccess/DataSource.java +++ b/dbaccess/qa/complex/dbaccess/DataSource.java @@ -81,7 +81,6 @@ public class DataSource extends TestCase } catch (Exception ex) { - // Logger.getLogger(DataSource.class.getName()).log(Level.SEVERE, null, ex); fail(); } } diff --git a/embeddedobj/test/Container1/EmbedContApp.java b/embeddedobj/test/Container1/EmbedContApp.java index f9bbd9563b6e..6eb9267f1e55 100644 --- a/embeddedobj/test/Container1/EmbedContApp.java +++ b/embeddedobj/test/Container1/EmbedContApp.java @@ -260,9 +260,6 @@ public class EmbedContApp extends Applet m_aNativeView.resize( 800, 600 ); this.add( m_aNativeView ); - // Handle mouse clicks in our window. -// addMouseListener( this ); - } public void actionPerformed( ActionEvent evt ) { @@ -845,8 +842,6 @@ public class EmbedContApp extends Applet { super.paint( g ); - // m_aNativeView.paint( g ); - createVclWindow(); } diff --git a/forms/qa/integration/forms/CellBinding.java b/forms/qa/integration/forms/CellBinding.java index fc9f14de9cb7..784355b89173 100644 --- a/forms/qa/integration/forms/CellBinding.java +++ b/forms/qa/integration/forms/CellBinding.java @@ -290,7 +290,6 @@ public class CellBinding extends complexlib.ComplexTestCase setCellText( sourceCol, (short)( row + 0 ), "Oranges" ); setCellText( sourceCol, (short)( row + 1 ), "Peaches" ); - //setListSource( listBox, sourceCol, row, (short)( row + 2 ) ); // TODO: this is currently prone to deadlocks @@ -332,7 +331,6 @@ public class CellBinding extends complexlib.ComplexTestCase setCellText( sourceCol, (short)( row + 0 ), "Bananas" ); setCellText( sourceCol, (short)( row + 1 ), "Strawberries" ); - //setListSource( listBox, sourceCol, row, (short)( row + 2 ) ); // TODO: this is currently prone to deadlocks diff --git a/forms/qa/integration/forms/FormControlTest.java b/forms/qa/integration/forms/FormControlTest.java index 5c870689edf6..b6932e316a7b 100644 --- a/forms/qa/integration/forms/FormControlTest.java +++ b/forms/qa/integration/forms/FormControlTest.java @@ -923,7 +923,6 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE { xProducer.addConsumer( compareImages ); xProducer.startProduction(); -// wait(); } xProducer.removeConsumer( compareImages ); diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java index b7e5fe304bfa..f7e0f546a620 100644 --- a/framework/qa/complex/XUserInputInterception/EventTest.java +++ b/framework/qa/complex/XUserInputInterception/EventTest.java @@ -166,28 +166,6 @@ public class EventTest { } /** - * creates a chart document and check the <CODE>XMouseClickHandler</CODE> and - * <CODE>XKeyHandler</CODE> - * @see com.sun.star.awt.XKeyHandler - * @see com.sun.star.awt.XMouseClickHandler - */ -// TODO! -// @Test public void checkChartDocument(){ -// -// XChartDocument xDoc = null; -// -// try{ -// xDoc = m_SOF.createChartDoc("ChartTest"); -// } catch (com.sun.star.uno.Exception e){ -// fail("Could not create a chart document: " +e.toString()); -// } -// -// checkListener(xDoc); -// -// closeDoc(xDoc); -// } - - /** * creates a math document and check the <CODE>XMouseClickHandler</CODE> and * <CODE>XKeyHandler</CODE> * @see com.sun.star.awt.XKeyHandler diff --git a/framework/qa/complex/api_internal/CheckAPI.java b/framework/qa/complex/api_internal/CheckAPI.java index ce73df14cea4..c2a5f5f95476 100644 --- a/framework/qa/complex/api_internal/CheckAPI.java +++ b/framework/qa/complex/api_internal/CheckAPI.java @@ -67,7 +67,6 @@ public class CheckAPI { @Test public void checkAPI() { System.out.println("Start with test"); // if test is idle for 5 minutes, assume that it hangs and kill it. - // param.put("TimeOut", new Integer("300000")); XMultiServiceFactory xMSF = getMSF(); Object oObj = null; try { diff --git a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java index 59d8abc6b58d..2f96fe716191 100644 --- a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java +++ b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java @@ -199,12 +199,10 @@ public class CheckContextMenuInterceptor } catch (com.sun.star.uno.RuntimeException ex) { - // ex.printStackTrace(); fail("Runtime exception caught!" + ex.getMessage()); } catch (java.lang.Exception ex) { - // ex.printStackTrace(); fail("Java lang exception caught!" + ex.getMessage()); } } diff --git a/framework/qa/complex/desktop/DesktopTerminate.java b/framework/qa/complex/desktop/DesktopTerminate.java index dc75566355b9..f11923312d27 100644 --- a/framework/qa/complex/desktop/DesktopTerminate.java +++ b/framework/qa/complex/desktop/DesktopTerminate.java @@ -150,7 +150,6 @@ public class DesktopTerminate { System.out.println("tearDownConnection()"); // don't do a tearDown here, desktop is already terminated. - // connection.tearDown(); } private static final OfficeConnection connection = new OfficeConnection(); diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java b/framework/qa/complex/dispatches/checkdispatchapi.java index 32f91388ceec..62d43e2bea0a 100644 --- a/framework/qa/complex/dispatches/checkdispatchapi.java +++ b/framework/qa/complex/dispatches/checkdispatchapi.java @@ -398,7 +398,6 @@ public class checkdispatchapi catch (java.lang.Throwable ex) { fail("Exception caught during using XDispatchInformationProvider."); - // ex.printStackTrace(); } } diff --git a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java index 031dfd5d4469..8600c0248e31 100644 --- a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java +++ b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java @@ -90,7 +90,6 @@ public class GetServiceWhileDisposingOffice { System.out.println("tearDownConnection()"); // Office is already terminated. - // connection.tearDown(); } private static final OfficeConnection connection = new OfficeConnection(); diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java index 955fa0b1dd38..622f33588abc 100644 --- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java +++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java @@ -241,22 +241,16 @@ public class CheckXComponentLoader File aSysFile = new File(m_sTestDocPath, aSnapshot.next()); String sURL = URLHelper.getFileURLFromSystemPath(aSysFile); - if (/*! (sURL.endsWith(".jpg") || - sURL.endsWith(".gif"))*/ - true - ) + loadURL(m_xLoader, RESULT_VALID_DOC, sURL, "_blank", 0, lProps); + // Its not needed to reset this using states! + // Its done internally ... + if (!xIndicator.wasUsed()) { - loadURL(m_xLoader, RESULT_VALID_DOC, sURL, "_blank", 0, lProps); - // Its not needed to reset this using states! - // Its done internally ... - if (!xIndicator.wasUsed()) - { - System.out.println("External progress was not used for loading."); - } - if (xHandler.wasUsed()) - { - System.out.println("External interaction handler was not used for loading."); - } + System.out.println("External progress was not used for loading."); + } + if (xHandler.wasUsed()) + { + System.out.println("External interaction handler was not used for loading."); } } } diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java b/framework/qa/complex/path_settings/PathSettingsTest.java index 1e1bc5f4c4b3..995d43084f3f 100644 --- a/framework/qa/complex/path_settings/PathSettingsTest.java +++ b/framework/qa/complex/path_settings/PathSettingsTest.java @@ -126,7 +126,6 @@ public class PathSettingsTest { System.out.println(e.getClass().getName()); System.out.println("Message: " + e.getMessage()); - // fail("Could not create an instance of the test object."); } catch (Exception e) { diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java index 14f887f82011..ca03a7cbf9a2 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java @@ -119,8 +119,6 @@ public final class PropertySetMixin { XComponentContext context, XInterface object, Type type, String[] absentOptional) { - // assert context != null && object != null && type != null - // && type.getTypeClass() == TypeClass.INTERFACE; this.context = context; this.object = object; this.type = type; @@ -881,8 +879,6 @@ public final class PropertySetMixin { boolean isAmbiguous, boolean wrapDefaulted, boolean isDefaulted, boolean wrapOptional) { - // assert (wrapAmbiguous || !isAmbiguous) - // && (wrapDefaulted || !isDefaulted); if (wrapAmbiguous && type.getName().startsWith("com.sun.star.beans.Ambiguous<")) { diff --git a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java index 3b1f589fa142..a0f69d850923 100644 --- a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java +++ b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java @@ -156,7 +156,6 @@ public class SharedLibraryLoader_Test { passed = test_instantiateSharedLibraryLoader() && passed; passed = test_loadNativeServiceManager() && passed; passed = test_loadNativeSimpleRegistry() && passed; - //passed = test_registerSharedLibraryLoader() && passed; System.err.println("SharedLibraryLoader test passed? " + passed); diff --git a/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java b/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java index cde06ab1f56c..a8dd0ad8949d 100644 --- a/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java +++ b/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java @@ -109,9 +109,6 @@ public final class pipeAcceptor implements XAcceptor { com.sun.star.lang.IllegalArgumentException { throw new java.lang.NoSuchMethodError( "pipeAcceptor not fully implemented yet" ); - - //try { return new PipeConnection( connectionDescription ); } - //catch ( java.io.IOException e ) { return null; } } /** diff --git a/jurt/com/sun/star/lib/uno/environments/java/java_environment.java b/jurt/com/sun/star/lib/uno/environments/java/java_environment.java index 01285c257e84..654b9ad51158 100644 --- a/jurt/com/sun/star/lib/uno/environments/java/java_environment.java +++ b/jurt/com/sun/star/lib/uno/environments/java/java_environment.java @@ -118,13 +118,6 @@ public final class java_environment implements IEnvironment { */ public void list() { // TODO??? -// synchronized (proxies) { -// System.err.println("##### " + getClass().getName() + ".list: " -// + getName() + ", " + getContext()); -// for (Iterator it = proxies.values().iterator(); it.hasNext();) { -// System.err.println("#### entry: " + it.next()); -// } -// } } /** diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java b/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java index d9127e3804cc..a8290af77324 100644 --- a/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java +++ b/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java @@ -67,7 +67,7 @@ public final class Marshaling_Test { new Any(new Type(Integer.class), new Integer(10)), // Any as Any null, new TestPrimitiveStruct(), - x, //new TestPrimitiveSeqStruct(), + x, new byte[]{1,2,3,4,5,6,7}, // primitive sequence new int[]{7,6,5,4,3,2,1}, // primitive sequence new Object[]{new Integer(123), new String("hallo")}, // any sequence diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java index d1ede927c4b6..36e4ebba91a8 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java @@ -116,7 +116,6 @@ public class GlobalFile { public static ArrayList<ArrayList<Double>> getCurveDataFromFile(String fileName) { File file = new File(fileName); if(!file.exists()){ - //showMessage(); return null; } //open data file @@ -126,7 +125,6 @@ public class GlobalFile { inStream = new FileInputStream(file); inReader = new BufferedReader(new InputStreamReader(inStream)); }catch(Exception e){ - //showMessage(); return null;//Data file open error. } ArrayList<Double> xaxes = new ArrayList<Double>(1); @@ -158,7 +156,6 @@ public class GlobalFile { xaxis = Double.valueOf(s); xaxes.add(xaxis); }catch(NumberFormatException e){ - //showMessage(); inReader.close(); inStream.close(); return null;//Data file data format error. @@ -168,7 +165,6 @@ public class GlobalFile { yaxis = Double.valueOf(s); yaxes.add(yaxis); }catch(NumberFormatException e){ - //showMessage(); inReader.close(); inStream.close(); return null;//Data file data format error. @@ -177,7 +173,6 @@ public class GlobalFile { } inReader.close(); }catch(Exception e){ - //showMessage(); return null;//Uncertain data file error. } ArrayList<ArrayList<Double>> curveData = new ArrayList<ArrayList<Double>>(2); diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java index 48d3b6d799e5..549d9e14c89d 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java @@ -68,7 +68,6 @@ public static double doubleRangeRandom(double lowLimit,double upLimit){ if(times<=0) return new int[0]; int realTimes = Math.min(maxNum, times); boolean[] flags = new boolean[maxNum]; -// Arrays.fill(flags, false); boolean isBelowHalf = times<maxNum*0.5; int virtualTimes = realTimes; if(!isBelowHalf) { diff --git a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java index 6fc9d90e62d4..099391a104c0 100644 --- a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java +++ b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java @@ -169,7 +169,6 @@ public class DialogComponent { //XServiceInfo public String getImplementationName() { - // return DialogComponent.class.getName(); return _DialogComponent.class.getName(); } diff --git a/odk/examples/DevelopersGuide/Database/CodeSamples.java b/odk/examples/DevelopersGuide/Database/CodeSamples.java index d714aadfce57..f41f2ff11b71 100644 --- a/odk/examples/DevelopersGuide/Database/CodeSamples.java +++ b/odk/examples/DevelopersGuide/Database/CodeSamples.java @@ -102,7 +102,6 @@ public class CodeSamples } displayTableStructure( con ); } - // printDataSources(); } catch(Exception e) { diff --git a/odk/examples/DevelopersGuide/Database/Sales.java b/odk/examples/DevelopersGuide/Database/Sales.java index ef1be66ae4f2..ff1ec6555761 100644 --- a/odk/examples/DevelopersGuide/Database/Sales.java +++ b/odk/examples/DevelopersGuide/Database/Sales.java @@ -113,10 +113,6 @@ public class Sales { // example for a programmatic way to do updates. XStatement stmt = con.createStatement(); -// stmt.executeUpdate("INSERT INTO SALES " + -// "VALUES (4, 102, 5, 'FTOP Darjeeling tea', '2002-01-02',150)"); -// -// stmt = con.createStatement(); XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,stmt); xProp.setPropertyValue("ResultSetType", new java.lang.Integer(ResultSetType.SCROLL_INSENSITIVE)); xProp.setPropertyValue("ResultSetConcurrency", new java.lang.Integer(ResultSetConcurrency.UPDATABLE)); diff --git a/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java b/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java index 1d394a43e3a4..7f4652a2545d 100644 --- a/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java +++ b/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java @@ -710,9 +710,6 @@ public class SpreadsheetSample extends SpreadsheetDocHelper aAutoFormatObj = xAutoFormatsNA.getByName( aAutoFormatName ); else { - // create a new auto format (with document service manager!) -// xDocServiceManager = (com.sun.star.lang.XMultiServiceFactory) -// UnoRuntime.queryInterface( com.sun.star.lang.XMultiServiceFactory.class, getDocument() ); aAutoFormatObj = xDocServiceManager.createInstance( "com.sun.star.sheet.TableAutoFormat" ); xAutoFormatsNA.insertByName( aAutoFormatName, aAutoFormatObj ); diff --git a/odk/examples/java/ConverterServlet/ConverterServlet.java b/odk/examples/java/ConverterServlet/ConverterServlet.java index 607fc140ab5a..be1b5cbc4ea2 100644 --- a/odk/examples/java/ConverterServlet/ConverterServlet.java +++ b/odk/examples/java/ConverterServlet/ConverterServlet.java @@ -312,12 +312,6 @@ public class ConverterServlet extends HttpServlet { xComponent.dispose(); } -// } -// catch( Exception exception ) { -// exception.printStackTrace(); -// return( "" ); -// } - if ( stringConvertedFile.startsWith( "file:///" ) ) { // Truncating the beginning of the file name stringConvertedFile = stringConvertedFile.substring( 8 ); diff --git a/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java b/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java index 5c01baf71aa7..fad4b844466a 100644 --- a/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java +++ b/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java @@ -124,7 +124,6 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie m_aObjectMenu.add( aItem ); // Handle mouse clicks in our window. -// addMouseListener( new MouseWatcher() ); addMouseListener( this ); } diff --git a/odk/examples/java/Inspector/UnoNode.java b/odk/examples/java/Inspector/UnoNode.java index 51e99324ccad..965f8aa0ad0a 100644 --- a/odk/examples/java/Inspector/UnoNode.java +++ b/odk/examples/java/Inspector/UnoNode.java @@ -316,10 +316,8 @@ public class UnoNode{ private static Type sequenceComponentType(Type sequenceType) { -// assert sequenceType.getTypeClass() == TypeClass.SEQUENCE; String n = sequenceType.getTypeName(); final String PREFIX = "[]"; -// assert n.startsWith(PREFIX); return new Type(n.substring(PREFIX.length())); } diff --git a/odk/examples/java/Spreadsheet/SCalc.java b/odk/examples/java/Spreadsheet/SCalc.java index 51c869e6eec8..8f4e1d98982c 100644 --- a/odk/examples/java/Spreadsheet/SCalc.java +++ b/odk/examples/java/Spreadsheet/SCalc.java @@ -315,7 +315,6 @@ public class SCalc { XPropertySet oTPS = UnoRuntime.queryInterface( XPropertySet.class, xChart.getTitle() ); oTPS.setPropertyValue("String","The new title"); - //oDiag.Dim3D(); } catch (Exception e){ System.err.println("Changin Properties failed "+e); e.printStackTrace(System.err); diff --git a/odk/examples/java/ToDo/ToDo.java b/odk/examples/java/ToDo/ToDo.java index 71a628316daf..e40dfc8873f4 100644 --- a/odk/examples/java/ToDo/ToDo.java +++ b/odk/examples/java/ToDo/ToDo.java @@ -581,7 +581,6 @@ public class ToDo { private String getStringFromGregorianCalendar( GregorianCalendar gregCal ) { String sDate = ( gregCal.get( Calendar.MONTH ) + 1 ) + STRING_SEPARATOR + gregCal.get( Calendar.DATE ) -// + STRING_SEPARATOR + ( gregCal.get( Calendar.MONTH ) + 1 ) + STRING_SEPARATOR + gregCal.get( Calendar.YEAR ); return sDate; diff --git a/package/qa/ofopxmlstorages/TestHelper.java b/package/qa/ofopxmlstorages/TestHelper.java index 8836fc65ba54..7fbf01203c3f 100644 --- a/package/qa/ofopxmlstorages/TestHelper.java +++ b/package/qa/ofopxmlstorages/TestHelper.java @@ -234,11 +234,6 @@ public class TestHelper { public boolean checkRelations( StringPair[][] aStorRels, StringPair[][] aTestRels ) { - // Message( "StorageRels:" ); - // PrintRelations( aStorRels ); - // Message( "TestRels:" ); - // PrintRelations( aTestRels ); - if ( aStorRels.length != aTestRels.length ) { Error( "The provided relations sequence has different size than the storage's one!" ); diff --git a/qadevOOo/runner/base/java_complex.java b/qadevOOo/runner/base/java_complex.java index ba0ab703453b..4dbf07085e85 100644 --- a/qadevOOo/runner/base/java_complex.java +++ b/qadevOOo/runner/base/java_complex.java @@ -89,8 +89,6 @@ public class java_complex implements TestBase // and the office was killed. // In complex tests just use "ThreadTimeOut" as timout. - // param.put("TimeOut", new Integer(0)); - for (int i = 0; i < entries.length; i++) { diff --git a/qadevOOo/runner/convwatch/ConvWatchStarter.java b/qadevOOo/runner/convwatch/ConvWatchStarter.java index 1cd17991d1f9..2adce7504d97 100644 --- a/qadevOOo/runner/convwatch/ConvWatchStarter.java +++ b/qadevOOo/runner/convwatch/ConvWatchStarter.java @@ -301,7 +301,6 @@ public class ConvWatchStarter extends EnhancedComplexTestCase GlobalLogWriter.get().println("Set office watcher"); OfficeWatcher aWatcher = (OfficeWatcher)param.get("Watcher"); GlobalLogWriter.get().setWatcher(aWatcher); - // initializeWatcher(param); String sStatusRunThrough = ""; String sStatusMessage = ""; diff --git a/qadevOOo/runner/convwatch/DB.java b/qadevOOo/runner/convwatch/DB.java index 23f258e0bcbe..a743f8a4be7c 100644 --- a/qadevOOo/runner/convwatch/DB.java +++ b/qadevOOo/runner/convwatch/DB.java @@ -263,7 +263,6 @@ public class DB extends DBHelper { String sError = e.getMessage(); GlobalLogWriter.get().println("DB: Original SQL error: " + sError); - // throw new ValueNotFoundException("Can't execute SQL: " + _sSQL); } return aResultList; } diff --git a/qadevOOo/runner/convwatch/DBHelper.java b/qadevOOo/runner/convwatch/DBHelper.java index e6381f027ccf..6323582e2981 100644 --- a/qadevOOo/runner/convwatch/DBHelper.java +++ b/qadevOOo/runner/convwatch/DBHelper.java @@ -141,7 +141,6 @@ public class DBHelper if (sPart.startsWith("db:")) { m_sDBName = sPart.substring(3); - // GlobalLogWriter.get().println("DB: source version: " + m_sSourceVersion); } else if (sPart.startsWith("user:")) { diff --git a/qadevOOo/runner/convwatch/DocumentConverter.java b/qadevOOo/runner/convwatch/DocumentConverter.java index b088d9177f72..f449b578849f 100644 --- a/qadevOOo/runner/convwatch/DocumentConverter.java +++ b/qadevOOo/runner/convwatch/DocumentConverter.java @@ -141,9 +141,6 @@ public class DocumentConverter extends EnhancedComplexTestCase // check if all need software is installed and accessible checkEnvironment(mustInstalledSoftware()); - // test_removeFirstDirectorysAndBasenameFrom(); - // Get the MultiServiceFactory. - // XMultiServiceFactory xMSF = (XMultiServiceFactory)param.getMSF(); GraphicalTestArguments aGTA = getGraphicalTestArguments(); if (aGTA == null) { diff --git a/qadevOOo/runner/convwatch/FileHelper.java b/qadevOOo/runner/convwatch/FileHelper.java index 3cf88eb267b4..18426526a724 100644 --- a/qadevOOo/runner/convwatch/FileHelper.java +++ b/qadevOOo/runner/convwatch/FileHelper.java @@ -120,42 +120,6 @@ public class FileHelper return ""; } -/* - static ArrayList files = new ArrayList(); - public static Object[] traverse( String afileDirectory ) - { - - File fileDirectory = new File(afileDirectory); - // Testing, if the file is a directory, and if so, it throws an exception - if ( !fileDirectory.isDirectory() ) - { - throw new IllegalArgumentException( "not a directory: " + fileDirectory.getName() ); - } - - // Getting all files and directories in the current directory - File[] entries = fileDirectory.listFiles(); - - // Iterating for each file and directory - for ( int i = 0; i < entries.length; ++i ) - { - // adding file to List - try - { - // Composing the URL by replacing all backslashs - String stringUrl = "file:///" - + entries[ i ].getAbsolutePath().replace( '\\', '/' ); - files.add(stringUrl); - } - catch( Exception exception ) - { - exception.printStackTrace(); - } - } - return files.toArray(); - } -*/ - - // makeDirectories("", "/tmp/a/b"); // creates all directories /tmp/a/b public static void makeDirectories(String first, String path) @@ -285,7 +249,6 @@ public class FileHelper { boolean bDebug = false; String sTmpPath = util.utils.getUsersTempDir(); - //util.utils.getUsersTempDir(); String fs = System.getProperty("file.separator"); String sName = sTmpPath + fs + "DOC_COMPARATOR_DEBUG"; File aFile = new File(sName); diff --git a/qadevOOo/runner/convwatch/ImageHelper.java b/qadevOOo/runner/convwatch/ImageHelper.java index 1a297704249a..914c70ef7a4f 100644 --- a/qadevOOo/runner/convwatch/ImageHelper.java +++ b/qadevOOo/runner/convwatch/ImageHelper.java @@ -94,7 +94,6 @@ class ImageHelper "Cannot construct object with current Java version " + javaVersion + ": " + ex.getMessage()); } -// aImage = ImageIO.read(aFile); return new ImageHelper(aImage); } } diff --git a/qadevOOo/runner/convwatch/IniFile.java b/qadevOOo/runner/convwatch/IniFile.java index dc3b55a50774..1e7795d4abd5 100644 --- a/qadevOOo/runner/convwatch/IniFile.java +++ b/qadevOOo/runner/convwatch/IniFile.java @@ -179,7 +179,7 @@ class IniFile continue; } - if (sLine.startsWith("[") /* && sLine.endsWith("]") */) + if (sLine.startsWith("[")) { // found end. break; @@ -212,7 +212,7 @@ class IniFile continue; } - if (sLine.startsWith("[") /* && sLine.endsWith("]") */) + if (sLine.startsWith("[")) { // found end. return j; diff --git a/qadevOOo/runner/convwatch/MSOfficePrint.java b/qadevOOo/runner/convwatch/MSOfficePrint.java index 90c0b93a3c52..7ccf7d0370f3 100644 --- a/qadevOOo/runner/convwatch/MSOfficePrint.java +++ b/qadevOOo/runner/convwatch/MSOfficePrint.java @@ -177,7 +177,6 @@ public class MSOfficePrint String sOfficeType = getOfficeType(_sInputFile); // special case, if xml we prefer word, but with DEFAULT_XML_FORMAT_APP=excel it's changeable. - // if (_aGTA.getDefaultXMLFormatApp().toLowerCase().equals("excel")) if (sOfficeType.equals("excel")) { aStartCommand = createExcelPrintHelper(); diff --git a/qadevOOo/runner/convwatch/OfficePrint.java b/qadevOOo/runner/convwatch/OfficePrint.java index 83da79d511d6..9279f6457552 100644 --- a/qadevOOo/runner/convwatch/OfficePrint.java +++ b/qadevOOo/runner/convwatch/OfficePrint.java @@ -309,7 +309,6 @@ public class OfficePrint { String _sOutputURL, String _sPrintFileURL) { - // waitInSeconds(1); boolean bBack = false; XComponent aDoc = loadFromURL(_aGTA, _sInputURL); diff --git a/qadevOOo/runner/graphical/BuildID.java b/qadevOOo/runner/graphical/BuildID.java index 1e08fb8c20bc..3b73b335b596 100644 --- a/qadevOOo/runner/graphical/BuildID.java +++ b/qadevOOo/runner/graphical/BuildID.java @@ -57,7 +57,6 @@ public class BuildID sOfficePath = _sApp; } } - // GlobalLogWriter.get().println("Office path: " + sOfficePath); return sOfficePath; } @@ -75,7 +74,6 @@ public class BuildID if (aSOfficeFile.exists()) { String sOfficePath = FileHelper.getPath(_sOfficePath); - // ok. System.out.println("directory: " + sOfficePath); sBuildID = getBuildIDFromBootstrap(sOfficePath, _sIniSection); if (sBuildID.length() == 0) { @@ -87,7 +85,6 @@ public class BuildID GlobalLogWriter.println("soffice executable not found."); } -// int dummy = 0; return sBuildID; } diff --git a/qadevOOo/runner/graphical/FileHelper.java b/qadevOOo/runner/graphical/FileHelper.java index 440e6273743a..64e5b1dfd651 100644 --- a/qadevOOo/runner/graphical/FileHelper.java +++ b/qadevOOo/runner/graphical/FileHelper.java @@ -130,7 +130,6 @@ public class FileHelper } - // makeDirectories("", "/tmp/a/b"); // creates all directories /tmp/a/b public static void makeDirectories(String first, String path) @@ -260,7 +259,6 @@ public class FileHelper { boolean bDebug = false; String sTmpPath = util.utils.getUsersTempDir(); - //util.utils.getUsersTempDir(); String fs = System.getProperty("file.separator"); String sName = sTmpPath + fs + "DOC_COMPARATOR_DEBUG"; File aFile = new File(sName); diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java index 326365adb832..2b6ecc33a02e 100644 --- a/qadevOOo/runner/graphical/IniFile.java +++ b/qadevOOo/runner/graphical/IniFile.java @@ -231,7 +231,7 @@ public class IniFile implements Enumeration<String> { continue; } - if (sLine.startsWith("[") /* && sLine.endsWith("]") */) + if (sLine.startsWith("[") ) { // TODO: due to the fact we would like to insert an empty line before new sections // TODO: we should check if we are in an empty line and if, go back one line. @@ -267,7 +267,7 @@ public class IniFile implements Enumeration<String> continue; } - if (sLine.startsWith("[") /* && sLine.endsWith("]") */) + if (sLine.startsWith("[")) { // found end. return j; diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java index 13db6222dbee..8d9e8c9ecd4a 100644 --- a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java @@ -422,7 +422,6 @@ public class MSOfficePostscriptCreator implements IOffice String sTmpPath = util.utils.getUsersTempDir(); String ls = System.getProperty("line.separator"); - // ArrayList aList = new ArrayList(); String sSaveViaWord = "saveViaWord.pl"; ArrayList<String> aList = searchLocalFile(sSaveViaWord); @@ -520,8 +519,6 @@ public class MSOfficePostscriptCreator implements IOffice File aFile = new File(sName); FileWriter out = new FileWriter(aFile); - // out.write( "eval 'exec perl -wS $0 ${1+\"$@\"}' " + ls ); - // out.write( " if 0; " + ls ); out.write("#BEGIN" + ls); out.write("#{" + ls); out.write("#" + ls); @@ -589,9 +586,6 @@ public class MSOfficePostscriptCreator implements IOffice out.write( "{" + ls); out.write( " print FILE \"name=$ARGV[0]\\n\";" + ls); out.write( " print FILE \"ExcelVersion=$sVersion\\n\";" + ls); -// out.write( " print FILE \"WordStartTime=$stopWordTime\\n\";" + ls); -// out.write( " print FILE \"WordLoadTime=$stopLoadWordTime\\n\";" + ls); -// out.write( " print FILE \"WordPrintTime=$stopPrintWordTime\\n\";" + ls); out.write( " close(FILE);" + ls); out.write( "}" + ls); out.close(); @@ -889,7 +883,6 @@ public class MSOfficePostscriptCreator implements IOffice GlobalLogWriter.println("Error: unknown root node: '" + sRootNodeName + "' please check the document. Try to use Word as default."); sType = "word"; // default } - // printNodesFromList( ndList ); } catch (java.lang.Exception e) { diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java index 126c3b78b20a..9b224b82120f 100644 --- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java @@ -224,7 +224,6 @@ public class OpenOfficePostscriptCreator implements IOffice showProperty(ReadOnly); GlobalLogWriter.println(DateHelper.getDateTimeForHumanreadableLog() + " Load document"); - // GlobalLogWriter.flush(); XComponentLoader aCompLoader = UnoRuntime.queryInterface( XComponentLoader.class, aDesktop); diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java index 2d1d01497046..c33bfd7c54b3 100644 --- a/qadevOOo/runner/helper/OfficeProvider.java +++ b/qadevOOo/runner/helper/OfficeProvider.java @@ -330,7 +330,6 @@ public class OfficeProvider implements AppProvider final XMultiComponentFactory xLocalServiceManager = xcomponentcontext.getServiceManager(); // create a connector, so that it can contact the office -// XUnoUrlResolver urlResolver = UnoUrlResolver.create(xcomponentcontext); final Object xUrlResolver = xLocalServiceManager.createInstanceWithContext("com.sun.star.bridge.UnoUrlResolver", xcomponentcontext); final XUnoUrlResolver urlResolver = UnoRuntime.queryInterface(XUnoUrlResolver.class, xUrlResolver); diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java index 35b32999cb4a..012a38fd0a47 100644 --- a/qadevOOo/runner/helper/ProcessHandler.java +++ b/qadevOOo/runner/helper/ProcessHandler.java @@ -380,7 +380,6 @@ public class ProcessHandler if (sOutputText.length() == memText.length()) { changedText = false; - // dbg("runCommand Could not detect changes in output stream!!!"); } hangcheck = 10; memText = this.getOutputText(); @@ -670,11 +669,6 @@ public class ProcessHandler log.println("Process has been destroyed!"); } } -// Removed as hung up in SDK test 'PathSettings' -// try { -// stdout.join(); -// stderr.join(); -// } catch (InterruptedException e) {} return isFinished(); } diff --git a/qadevOOo/runner/helper/StreamSimulator.java b/qadevOOo/runner/helper/StreamSimulator.java index b5b025932436..1b53d4a9a492 100644 --- a/qadevOOo/runner/helper/StreamSimulator.java +++ b/qadevOOo/runner/helper/StreamSimulator.java @@ -36,7 +36,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { /** - * @member m_sFileName name of the corrsponding file on disk + * @member m_sFileName name of the corresponding file on disk * @member m_xInStream the internal input stream for reading * @member m_xOutStream the internal input stream for writing * @member m_xSeek points at runtime to m_xInStream or m_xOutStream and make it seekable @@ -79,16 +79,12 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , public StreamSimulator( String sFileName , boolean bInput , lib.TestParameters param ) throws com.sun.star.io.NotConnectedException { - ////m_aProtocol = new ComplexTestEnvironment(); m_sFileName = sFileName ; try { XSimpleFileAccess xHelper = UnoRuntime.queryInterface(XSimpleFileAccess.class, param.getMSF().createInstance("com.sun.star.ucb.SimpleFileAccess")); -/* com.sun.star.ucb.XSimpleFileAccess xHelper = (com.sun.star.ucb.XSimpleFileAccess)OfficeConnect.createRemoteInstance( - com.sun.star.ucb.XSimpleFileAccess.class, - "com.sun.star.ucb.SimpleFileAccess");*/ if (xHelper == null) throw new com.sun.star.io.NotConnectedException("ucb helper not available. Can't create streams."); @@ -110,7 +106,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch(com.sun.star.uno.Exception exUno) { - ////m_aProtocol.log("\tstream not open. throw NotConnectedException\n\n\tfailed\n}\n"); throw new com.sun.star.io.NotConnectedException("Could not open the file."); } } @@ -136,13 +131,13 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { nRead = m_xInStream.readBytes(lData,nBytesToRead); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } return nRead; @@ -155,11 +150,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.BufferSizeExceededException , com.sun.star.io.IOException { - //m_aProtocol.log("readSomeBytes(lData["+lData.length+"]["+lData[0]+"],"+nMaxBytesToRead+")\n{\n"); - if (m_xInStream == null) { - //m_aProtocol.log("\tstream not open. throw NotConnectedException\n\tfailed\n}\n"); throw new com.sun.star.io.NotConnectedException("stream not open"); } @@ -168,20 +160,15 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { nRead = m_xInStream.readSomeBytes(lData,nMaxBytesToRead); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } - //m_aProtocol.log("\treads "+nRead+" bytes\n\tOK\n}\n"); - - //if (nRead != nMaxBytesToRead) - //m_aProtocol.log("there are some missing bytes for reading!"); - return nRead; } @@ -191,11 +178,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.BufferSizeExceededException , com.sun.star.io.IOException { - //m_aProtocol.log("skipBytes("+nBytesToSkip+")\n{\n"); - if (m_xInStream == null) { - //m_aProtocol.log("\tstream not open. throw NotConnectedException\n\tfailed\n}\n"); throw new com.sun.star.io.NotConnectedException("stream not open"); } @@ -203,16 +187,14 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xInStream.skipBytes(nBytesToSkip); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } - - //m_aProtocol.log("\tOK\n}\n"); } @@ -220,11 +202,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , public int available() throws com.sun.star.io.NotConnectedException, com.sun.star.io.IOException { - //m_aProtocol.log("available()\n{\n"); - if (m_xInStream == null) { - //m_aProtocol.log("\tstream not open. throw NotConnectedException\n\tfailed\n}\n"); throw new com.sun.star.io.NotConnectedException("stream not open"); } @@ -233,14 +212,13 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { nAvailable = m_xInStream.available(); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n"); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } - //m_aProtocol.log("\treturns "+nAvailable+" bytes\n\tOK\n}\n"); return nAvailable; } @@ -249,11 +227,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , public void closeInput() throws com.sun.star.io.NotConnectedException, com.sun.star.io.IOException { - //m_aProtocol.log("closeInput()\n{\n"); - if (m_xInStream == null) { - //m_aProtocol.log("\tstream not open. throw NotConnectedException\n\tfailed\n}\n"); throw new com.sun.star.io.NotConnectedException("stream not open"); } @@ -261,14 +236,12 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xInStream.closeInput(); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n"); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } - - //m_aProtocol.log("\tOK\n}\n"); } @@ -282,11 +255,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.BufferSizeExceededException , com.sun.star.io.IOException { - //m_aProtocol.log("writeBytes(lData["+lData.length+"])\n{\n"); - if (m_xOutStream == null) { - //m_aProtocol.log("\tstream not open. throw NotConnectedException\n\tfailed\n}\n"); throw new com.sun.star.io.NotConnectedException("stream not open"); } @@ -294,16 +264,14 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xOutStream.writeBytes(lData); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } - - //m_aProtocol.log("\tOK\n}\n"); } @@ -312,11 +280,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.BufferSizeExceededException , com.sun.star.io.IOException { - //m_aProtocol.log("flush()\n{\n"); - if (m_xOutStream == null) { - //m_aProtocol.log("\tstream not open. throw NotConnectedException\n\tfailed\n}\n"); throw new com.sun.star.io.NotConnectedException("stream not open"); } @@ -324,15 +289,14 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xOutStream.flush(); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } - //m_aProtocol.log("\tOK\n}\n"); } @@ -341,11 +305,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.BufferSizeExceededException, com.sun.star.io.IOException { - //m_aProtocol.log("closeOutput()\n{\n"); - if (m_xOutStream == null) { - //m_aProtocol.log("\tstream not open. throw NotConnectedException\n\tfailed\n}\n"); throw new com.sun.star.io.NotConnectedException("stream not open"); } @@ -353,16 +314,14 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xOutStream.closeOutput(); } - catch (com.sun.star.io.NotConnectedException exConnect) { //m_aProtocol.log("\tgot NotConnectedException\n\tfailed\n}\n" ); throw exConnect; + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { //m_aProtocol.log("\tgot BufferSizeExceededException\n\tfailed\n}\n"); throw exBuffer; + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } - - //m_aProtocol.log("\tOK\n}\n"); } @@ -375,11 +334,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , public void seek( /*IN*/long nLocation ) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.io.IOException { - //m_aProtocol.log("seek("+nLocation+")\n{\n"); - if (m_xSeek == null) { - //m_aProtocol.log("\tstream not seekable. throw IOException\n\tfailed\n}\n"); throw new com.sun.star.io.IOException("stream not seekable"); } @@ -387,25 +343,20 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xSeek.seek(nLocation); } - catch (com.sun.star.lang.IllegalArgumentException exArg ) { //m_aProtocol.log("\tgot IllegalArgumentException\n\tfailed\n}\n" ); throw exArg; + catch (com.sun.star.lang.IllegalArgumentException exArg ) { } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } - - //m_aProtocol.log("\tOK\n}\n"); } public long getPosition() throws com.sun.star.io.IOException { - //m_aProtocol.log("getPosition()\n{\n"); - if (m_xSeek == null) { - //m_aProtocol.log("\tstream not seekable. throw IOException\n\tfailed\n}\n"); throw new com.sun.star.io.IOException("stream not seekable"); } @@ -414,12 +365,11 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { nPos = m_xSeek.getPosition(); } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n"); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } - //m_aProtocol.log("\treturns pos="+nPos+"\n\tOK\n}\n"); return nPos; } @@ -427,11 +377,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , public long getLength() throws com.sun.star.io.IOException { - //m_aProtocol.log("getLength()\n{\n"); - if (m_xSeek == null) { - //m_aProtocol.log("\tstream not seekable. throw IOException\n\tfailed\n}\n"); throw new com.sun.star.io.IOException("stream not seekable"); } @@ -440,12 +387,11 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { nLen = m_xSeek.getLength(); } - catch (com.sun.star.io.IOException exIO ) { //m_aProtocol.log("\tgot IOException\n\tfailed\n}\n" ); throw exIO; + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n"); throw exRuntime; + catch (com.sun.star.uno.RuntimeException exRuntime) { } - //m_aProtocol.log("\treturns len="+nLen+"\n\tOK\n}\n"); return nLen; } } diff --git a/qadevOOo/runner/lib/Parameters.java b/qadevOOo/runner/lib/Parameters.java index 1866b2646dac..a233e0f83f33 100644 --- a/qadevOOo/runner/lib/Parameters.java +++ b/qadevOOo/runner/lib/Parameters.java @@ -160,13 +160,6 @@ public class Parameters implements XPropertySet { throw new IllegalArgumentException( "Wrong key " + key + ", it should be of String type"); } - -/* Object value = params.get(key); - - if (!(value instanceof String)) { - throw new IllegalArgumentException( - "Wrong value " + value + ", it should be of String type"); - } */ } } diff --git a/qadevOOo/runner/org/openoffice/RunnerService.java b/qadevOOo/runner/org/openoffice/RunnerService.java index cb82c3b86763..3f50ccffb19c 100644 --- a/qadevOOo/runner/org/openoffice/RunnerService.java +++ b/qadevOOo/runner/org/openoffice/RunnerService.java @@ -231,10 +231,6 @@ public class RunnerService implements XJob, XServiceInfo, int startIndex = entry.indexOf("objdsc/") + 7; int endIndex = entry.lastIndexOf('/'); -/* int endIndex = entry.indexOf('.'); - module = entry.substring(startIndex, endIndex); - startIndex = 0; - endIndex = module.lastIndexOf('/'); */ module = entry.substring(startIndex, endIndex); // special cases @@ -249,14 +245,6 @@ public class RunnerService implements XJob, XServiceInfo, endIndex = object.lastIndexOf('.'); } } -/* else if (entry.indexOf("/xmloff/") != -1) { - endIndex = entry.indexOf(".csv"); - object = entry.substring(0, endIndex); - endIndex = entry.lastIndexOf('.'); - while (object.indexOf('.') != endIndex) { - object = object.substring(object.indexOf('.')+1); - } - } */ else { startIndex = 0; endIndex = entry.indexOf(".csv"); diff --git a/qadevOOo/runner/stats/OutProducerFactory.java b/qadevOOo/runner/stats/OutProducerFactory.java index a657a116f3d5..3f60e73b53ca 100644 --- a/qadevOOo/runner/stats/OutProducerFactory.java +++ b/qadevOOo/runner/stats/OutProducerFactory.java @@ -118,11 +118,4 @@ public class OutProducerFactory { return name.substring(0,1).toUpperCase() + name.substring(1); } -/* public static void main(String[] args) { - Hashtable p = new Hashtable(); - p.put("DataBaseOut", "yes"); - p.put("TestBase", "java_complex"); - p.put("Version", "srx645gggg"); - createDataBaseOutProducer(p); - } */ } diff --git a/qadevOOo/runner/util/compare/DocComparatorFactory.java b/qadevOOo/runner/util/compare/DocComparatorFactory.java index 368892071356..a6f216289292 100644 --- a/qadevOOo/runner/util/compare/DocComparatorFactory.java +++ b/qadevOOo/runner/util/compare/DocComparatorFactory.java @@ -33,15 +33,8 @@ public class DocComparatorFactory { return GraphicalComparator.getInstance(aParams); } -/* - else if (s.toLowerCase().equals("xml")) - { - return new XMLCompare.create(aParams); - } -*/ else if (s.toLowerCase().equals("pdf")) { - // return new PDFComparator.create(aParams); throw new IllegalArgumentException("PDF not implemented yet."); } else diff --git a/qadevOOo/tests/java/ifc/awt/_XScrollBar.java b/qadevOOo/tests/java/ifc/awt/_XScrollBar.java index d061aae384ad..f385db27719e 100644 --- a/qadevOOo/tests/java/ifc/awt/_XScrollBar.java +++ b/qadevOOo/tests/java/ifc/awt/_XScrollBar.java @@ -177,9 +177,6 @@ public class _XScrollBar extends MultiMethodTest { acc.getAccessibleContext()); Point location = aCom.getLocationOnScreen(); - //Point location = (Point) tEnv.getObjRelation("Location"); - //XAccessibleComponent aCom = (XAccessibleComponent) tEnv.getObjRelation("Location"); - //Point location = aCom.getLocationOnScreen(); try { Robot rob = new Robot(); rob.mouseMove(location.X + 50, location.Y + 75); diff --git a/qadevOOo/tests/java/ifc/awt/_XSpinValue.java b/qadevOOo/tests/java/ifc/awt/_XSpinValue.java index e889fe4242bf..b8a2765627f3 100644 --- a/qadevOOo/tests/java/ifc/awt/_XSpinValue.java +++ b/qadevOOo/tests/java/ifc/awt/_XSpinValue.java @@ -168,9 +168,6 @@ public class _XSpinValue extends MultiMethodTest { acc.getAccessibleContext()); Point location = aCom.getLocationOnScreen(); - //Point location = (Point) tEnv.getObjRelation("Location"); - //XAccessibleComponent aCom = (XAccessibleComponent) tEnv.getObjRelation("Location"); - //Point location = aCom.getLocationOnScreen(); try { Robot rob = new Robot(); rob.mouseMove(location.X + 20, location.Y + 10); diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java index 7b000c059a2e..4b2a03f1c104 100644 --- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java @@ -88,7 +88,6 @@ public class _XMultiPropertySet extends MultiMethodTest { */ public class MyChangeListener implements XPropertiesChangeListener { public void propertiesChange(PropertyChangeEvent[] e) { - //_log.println("Listener was called"); propertiesChanged = true; } public void disposing (EventObject obj) {} @@ -170,8 +169,6 @@ public class _XMultiPropertySet extends MultiMethodTest { // Change one of the property to be sure, that this event was cauched. - //Random rnd = new Random(); - //int idx = rnd.nextInt(testPropsAmount); for (int i=0; i<testPropsAmount;i++) { log.print("Trying to change property " + testPropsNames[i]); try { diff --git a/qadevOOo/tests/java/ifc/container/_XContainer.java b/qadevOOo/tests/java/ifc/container/_XContainer.java index b7c987d4e1d3..f3277e9da837 100644 --- a/qadevOOo/tests/java/ifc/container/_XContainer.java +++ b/qadevOOo/tests/java/ifc/container/_XContainer.java @@ -131,15 +131,12 @@ public class _XContainer extends MultiMethodTest { */ public class MyListener implements XContainerListener { public void elementInserted(ContainerEvent e) { - //_log.println("Element was inserted"); bElementInserted = true; } public void elementRemoved(ContainerEvent e) { - //_log.println("Element was removed"); bElementRemoved = true; } public void elementReplaced(ContainerEvent e) { - //_log.println("Element was replaced"); bElementReplaced = true; } public void disposing (EventObject obj) {} diff --git a/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java b/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java index 4b6409845b0d..e2de9f6c5d00 100644 --- a/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java +++ b/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java @@ -40,7 +40,6 @@ public class _XViewDataSupplier extends MultiMethodTest { public void _getViewData() { xAccess = oObj.getViewData(); -// util.dbg.printInterfaces(xAccess); if (xAccess != null) { setViewID(xAccess, myview); } diff --git a/qadevOOo/tests/java/ifc/drawing/_LineShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_LineShapeDescriptor.java index feb8a8d8847a..a619b952f271 100644 --- a/qadevOOo/tests/java/ifc/drawing/_LineShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_LineShapeDescriptor.java @@ -83,9 +83,7 @@ public class _LineShapeDescriptor extends MultiMethodTest { Object ValueToSet = null; try { - //waitForAllThreads(); gValue = oObj.getPropertyValue(name); - //waitForAllThreads(); if ( (name.equals("LineEnd")) || (name.equals("LineStart")) ) { if (gValue == null) gValue = newPoints(null); ValueToSet = newPoints( (Point[]) gValue); @@ -93,7 +91,6 @@ public class _LineShapeDescriptor extends MultiMethodTest { else { ValueToSet = ValueChanger.changePValue(gValue); } - //waitForAllThreads(); oObj.setPropertyValue(name,ValueToSet); sValue = oObj.getPropertyValue(name); diff --git a/qadevOOo/tests/java/ifc/drawing/_ShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_ShapeDescriptor.java index 5e3049c73495..1ffc66ee2624 100644 --- a/qadevOOo/tests/java/ifc/drawing/_ShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_ShapeDescriptor.java @@ -75,15 +75,12 @@ public class _ShapeDescriptor extends MultiMethodTest { try { - //waitForAllThreads(); gValue = oObj.getPropertyValue(name); - //waitForAllThreads(); if (!ro) { ValueToSet = ValueChanger.changePValue(gValue); if ( name.equals("Style") ) { ValueToSet = newStyle(gValue); } - //waitForAllThreads(); oObj.setPropertyValue(name,ValueToSet); sValue = oObj.getPropertyValue(name); } diff --git a/qadevOOo/tests/java/ifc/drawing/_XShape.java b/qadevOOo/tests/java/ifc/drawing/_XShape.java index 64c4310eed5f..97e9b3611140 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XShape.java +++ b/qadevOOo/tests/java/ifc/drawing/_XShape.java @@ -132,7 +132,6 @@ public class _XShape extends MultiMethodTest { log.println("Expected: "+sNew.Height+";"+sNew.Width); log.println("Getting: "+gSize.Height+";"+gSize.Width); - //result &= util.ValueComparer.equalValue(sNew, gSize) ; //errors in calculation from points/twips less then 1 are acceptable result &= (sNew.Height-gSize.Height <= 2) && (sNew.Width-gSize.Width <= 2); diff --git a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java index 43f46d128be0..6be1bbbead7b 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java +++ b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java @@ -534,13 +534,5 @@ public class _XCalendar extends MultiMethodTest { tRes.tested("isValid()", res); } - /** - * Method returns locale for a given language and country. - * @param localeIndex index of needed locale. - */ -/* public Locale getLocale(int localeIndex) { - return new Locale(languages[localeIndex], countries[localeIndex], ""); - }*/ - } diff --git a/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java b/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java index 8f454c7a2e75..2664c0422241 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java +++ b/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java @@ -163,19 +163,6 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest { res &= localres; } - -/* log.println("\tTrying to load 'dummy' algorithm"); - - boolean localres = !oObj.loadAlgorithm(locales[i], "dummy", - CollatorOptions.CollatorOptions_IGNORE_WIDTH); - - if (!localres) { - log.println("\t ... didn't work as expected - FAILED"); - } else { - log.println("\t ... worked - OK"); - } - - res &= localres;*/ } tRes.tested("loadAlgorithm()", res); diff --git a/qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor.java index 4ddeae4db611..6a8f402e741f 100644 --- a/qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor.java +++ b/qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor.java @@ -68,11 +68,8 @@ public class _DatabaseImportDescriptor extends MultiMethodTest { try { - //waitForAllThreads(); gValue = props[nr].Value; - //waitForAllThreads(); ValueToSet = ValueChanger.changePValue(gValue); - //waitForAllThreads(); props[nr].Value=ValueToSet; sValue = props[nr].Value; diff --git a/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java b/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java index 5afd917ca7fe..9b0ecd43c084 100644 --- a/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java +++ b/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java @@ -113,12 +113,9 @@ public class _FunctionDescription extends MultiMethodTest { try { - //waitForAllThreads(); gValue = oObj.getPropertyValue( name ); - //waitForAllThreads(); ValueToSet = ValueChanger.changePValue( gValue ); - //waitForAllThreads(); oObj.setPropertyValue( name, ValueToSet ); sValue = oObj.getPropertyValue( name ); diff --git a/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java index 1bc0eaab69bb..83bfe72a665d 100644 --- a/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java +++ b/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java @@ -69,7 +69,6 @@ public class _SheetSortDescriptor extends MultiMethodTest { } public void _SortAscending() { - //changeProp("SortAscending",3); log.println("Property 'SortAscending' is not part of the "+ "property array"); log.println("Available properties:"); @@ -98,14 +97,11 @@ public class _SheetSortDescriptor extends MultiMethodTest { try { - //waitForAllThreads(); gValue = props[nr].Value; if ( name.equals("OutputPosition")) { gInt = ((CellAddress) gValue).Row; } - //waitForAllThreads(); ValueToSet = ValueChanger.changePValue(gValue); - //waitForAllThreads(); props[nr].Value=ValueToSet; sValue = props[nr].Value; if ( name.equals("OutputPosition")) { diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java index 9fa571f48af6..dbcd70bdd543 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java @@ -342,7 +342,6 @@ public class _XDataPilotDescriptor extends MultiMethodTest { requiredMethod("getDataPilotFields()"); XIndexAccess IA = oObj.getPageFields(); boolean bResult = (IA != null); - // boolean bResult = CheckNames(IA, 4); tRes.tested("getPageFields()", bResult); } diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java b/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java index 5be2edee32ce..ea2eec6a845e 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java @@ -103,7 +103,6 @@ public class _XSheetAuditing extends MultiMethodTest { public void _hidePrecedents() { requiredMethod("showPrecedents()"); -// requiredMethod("showPrecedents()"); oObj.hidePrecedents(address); tRes.tested("hidePrecedents()", hasRightAmountOfShapes(0)); } diff --git a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java index 5a6114888f15..49370918ace9 100644 --- a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java +++ b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java @@ -352,7 +352,6 @@ public class _CharacterProperties extends MultiPropertyTest { Object ValueToSet = null; try { - //waitForAllThreads(); gValue = oProps.getPropertyValue(name); if ( (gValue == null) || (utils.isVoid(gValue)) ) { @@ -360,7 +359,6 @@ public class _CharacterProperties extends MultiPropertyTest { gValue = newVal; } - //waitForAllThreads(); if (name.equals("CharRotation")) { Short s1 = new Short((short) 0); Short s2 = new Short((short) 900); @@ -381,7 +379,6 @@ public class _CharacterProperties extends MultiPropertyTest { } } - //waitForAllThreads(); oProps.setPropertyValue(name,ValueToSet); sValue = get.getPropertyValue(name); if (sValue == null) { diff --git a/qadevOOo/tests/java/ifc/text/_XText.java b/qadevOOo/tests/java/ifc/text/_XText.java index c33505668670..b34374ac1167 100644 --- a/qadevOOo/tests/java/ifc/text/_XText.java +++ b/qadevOOo/tests/java/ifc/text/_XText.java @@ -78,8 +78,6 @@ public class _XText extends MultiMethodTest { } catch( com.sun.star.lang.IllegalArgumentException iaE ){ throw new StatusException("Couldn't insert textcontent",iaE); - //Status.failed(iaE.toString()); - //return; } // get indexaccess to the tablecollection @@ -144,7 +142,6 @@ public class _XText extends MultiMethodTest { log.println( "test for removeTextContent" ); try { oObj.removeTextContent( (XTextContent)oInt ); - //oObj.removeTextContent( (XTextContent)oInt ); } catch( com.sun.star.container.NoSuchElementException nseE ){ // Some exception.FAILED diff --git a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java index fd9cf81b7b36..9849f1f7f51c 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java +++ b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java @@ -221,8 +221,7 @@ public class _XContentProviderManager extends MultiMethodTest { ContentProviderInfo[] providersInfo = oObj.queryContentProviders(); for (int i = 0; i < providersInfo.length; i++) { - if (result.equals(providersInfo[i].ContentProvider) - /*&& myScheme.equals(providersInfo[i].Scheme)*/) { + if (result.equals(providersInfo[i].ContentProvider)) { found = true; break; } diff --git a/qadevOOo/tests/java/ifc/util/_XImportable.java b/qadevOOo/tests/java/ifc/util/_XImportable.java index f913375d7e57..6a36526db9e6 100644 --- a/qadevOOo/tests/java/ifc/util/_XImportable.java +++ b/qadevOOo/tests/java/ifc/util/_XImportable.java @@ -54,7 +54,6 @@ public class _XImportable extends MultiMethodTest { log.print("Getting when calling createImportDescriptor(true) --"); - //printPropertyValue(descriptor); log.println("done"); log.print("Checking PropertyNames -- "); @@ -71,7 +70,6 @@ public class _XImportable extends MultiMethodTest { log.print("Getting when calling createImportDescriptor(false) -- "); - //printPropertyValue(descriptor); log.println("done"); log.print("Checking PropertyNames -- "); diff --git a/qadevOOo/tests/java/ifc/util/_XSearchDescriptor.java b/qadevOOo/tests/java/ifc/util/_XSearchDescriptor.java index f1761ce755c1..b9a8f558ed4d 100644 --- a/qadevOOo/tests/java/ifc/util/_XSearchDescriptor.java +++ b/qadevOOo/tests/java/ifc/util/_XSearchDescriptor.java @@ -70,7 +70,6 @@ public class _XSearchDescriptor extends MultiMethodTest { cmpSearchStr = oObj.getSearchString(); if(!(cmpSearchStr.equals(oldSearchStr))){ bResult = true; } - //oObj.setSearchString(oldSearchStr); tRes.tested("setSearchString()", bResult); } diff --git a/qadevOOo/tests/java/ifc/view/_XPrintable.java b/qadevOOo/tests/java/ifc/view/_XPrintable.java index 3efd4c3e9a40..cc00ae30940d 100644 --- a/qadevOOo/tests/java/ifc/view/_XPrintable.java +++ b/qadevOOo/tests/java/ifc/view/_XPrintable.java @@ -91,7 +91,6 @@ public class _XPrintable extends MultiMethodTest { tRes.tested("setPrinter()",false); } - //oObj.setPrinter(the_printer); the_printer = oObj.getPrinter() ; propIdx = 0 ; diff --git a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java index 17e90db4c1e7..ada48739a0ae 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java @@ -158,8 +158,6 @@ public class OQueryDesign extends TestCase { } UnoRuntime.queryInterface(XDocumentDataSource.class, oDataSource); -// Frame = xMod.getCurrentController().getFrame(); - xFrame = DesktopTools.getCurrentFrame(xMSF); SOfficeFactory SOF = null; @@ -272,8 +270,6 @@ public class OQueryDesign extends TestCase { throw new StatusException("Could not set controller", e) ; } - //xCont.attachFrame(xFrame); - return UnoRuntime.queryInterface(XInitialization.class, oQueryDesign); } diff --git a/qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java b/qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java index 1e02a2c8b2ae..9d38135367cc 100644 --- a/qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java +++ b/qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java @@ -81,7 +81,6 @@ public class Dynamic extends TestCase { tEnv.addObjRelation("ImplementationLoader", loader) ; String url = "servicename=com.sun.star.loader.SharedLibrary,link=mylink"; - //util.utils.getFullTestURL("solibrary.jar"); tEnv.addObjRelation("ImplementationUrl", url) ; tEnv.addObjRelation("ImplementationName", "com.sun.star.io.Pipe") ; diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java index adca7192509b..954b4b8127e2 100644 --- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java +++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java @@ -532,8 +532,6 @@ public class ODatabaseForm extends TestCase { // INSTANCEn : _XNameContainer; _XNameReplace log.println("adding INSTANCEn as obj relation to environment"); - //XComponent xComp = (XComponent) - // UnoRuntime.queryInterface(XComponent.class, xDrawDoc); String tc = (String) Param.get("THRCNT"); int THRCNT = 1; diff --git a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java index d5d474f0f261..0212485f1eae 100644 --- a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java +++ b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java @@ -245,12 +245,6 @@ public class OGridControlModel extends GenericModelTest { }); -// HashSet exclude = new HashSet(); - -// exclude.add("FormatKey"); - -// tEnv.addObjRelation("XUpdateBroadcaster.Checker", -// new Checker(m_XFormLoader, m_XPS, m_XCtrl, m_ChangePropertyName, m_ChangePropertyValue)); return tEnv; } @@ -404,17 +398,11 @@ class OGridControlModelold extends TestCase { // adding relation for XNameContainer tEnv.addObjRelation("XNameContainer.AllowDuplicateNames", new Object()); - // OK tEnv.addObjRelation("OBJNAME", "stardiv.one.form.component." + objName); - - // adding relation for XContainer tEnv.addObjRelation("INSTANCE", aControl3); tEnv.addObjRelation("INSTANCE2", aControl4); - //adding ObjRelation for XPersistObject - // OK tEnv.addObjRelation("PSEUDOPERSISTENT", new Boolean(true)); // OK - return tEnv; } // finish method getTestEnvironment } // finish class OGridControlModel diff --git a/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java b/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java index 8bcf58dd2a07..50da47dbd208 100644 --- a/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java @@ -71,29 +71,6 @@ public class ControlMenuController extends TestCase { } -/* log.println("Creating instance..."); - - xTextDoc = WriterTools.createTextDoc(xMSF); - -/* XText xText = xTextDoc.getText(); - XTextCursor xTextCursor = xText.createTextCursor(); - - for (int i = 0; i < 11; i++) { - xText.insertString(xTextCursor, "A sample text and why not? ", false); - } - - XModel xModel = (XModel)UnoRuntime.queryInterface(XModel.class, xTextDoc); - - // the supplier is available from the model - XUIConfigurationManagerSupplier xSupplier = - (XUIConfigurationManagerSupplier)UnoRuntime.queryInterface( - XUIConfigurationManagerSupplier.class, xModel); - - xManager = xSupplier.getUIConfigurationManager(); - - // just to make sure, it's the right one. - log.println("TestObject: " + util.utils.getImplName(xManager)); - tEnv = new TestEnvironment(xManager); */ log.println("TestObject: " + utils.getImplName(oObj)); tEnv = new TestEnvironment(oObj); return tEnv; diff --git a/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java b/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java index 3ad6575386df..f23830ce6144 100644 --- a/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java +++ b/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java @@ -106,8 +106,6 @@ public class RegistryTypeDescriptionProvider extends TestCase { log.println("Service not available" ); } - //oObj = (XInterface) oInterface; - log.println( " creating a new environment for object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider.java b/qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider.java index 7a035cd25e2a..dc66c1741b8b 100644 --- a/qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider.java +++ b/qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider.java @@ -101,8 +101,6 @@ public class RegistryTypeDescriptionProvider extends TestCase { log.println("Service not available" ); } - //oObj = (XInterface) oInterface; - log.println( " creating a new environment for object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java index 10ac369daa7c..4d2f1464745a 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java @@ -194,7 +194,6 @@ public class various extends TestCase { int idx = cncstr.indexOf("host=") + 5 ; // select the port -// curPort; //utils.getNextFreePort(basePort); log.println("Choose Port nr: " + curPort); connectString = "socket,host=" + diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java b/qadevOOo/tests/java/mod/_remotebridge/various.java index ee259f68a505..06e9eaca4a7c 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/various.java @@ -186,7 +186,6 @@ public class various extends TestCase { int idx = cncstr.indexOf("host=") + 5 ; // select the port -// curPort; //utils.getNextFreePort(basePort); log.println("Choose Port nr: " + curPort); connectString = "socket,host=" + diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java index 8c477ebbe3cd..129504654821 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java @@ -87,8 +87,6 @@ public class ScAccessibleCsvCell extends TestCase { oObj = AccessibilityTools.getAccessibleObjectForRole (xRoot, AccessibleRole.TABLE, true); - //util.dbg.printInterfaces(oObj); - XAccessibleContext cont = UnoRuntime.queryInterface(XAccessibleContext.class, oObj); String name = ""; diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java index 6ceae7c89b03..0dc1d8754ff5 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java @@ -84,18 +84,6 @@ public class ScAccessibleCsvGrid extends TestCase { accAction = UnoRuntime.queryInterface(XAccessibleAction.class, oObj); - /*int count = accAction.getAccessibleActionCount(); - - for (int i = 0; i<count; i++) { - try { - System.out.println(i+": "+accAction.getAccessibleActionDescription(i)); - } catch (com.sun.star.lang.IndexOutOfBoundsException iae) {} - }*/ - - //util.dbg.printInterfaces(oObj); - - //AccessibilityTools.printAccessibleTree(log, xRoot); - oObj = AccessibilityTools.getAccessibleObjectForRole (xRoot, AccessibleRole.TABLE, true); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java index 701067dcc145..917607dc29fc 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java @@ -103,7 +103,6 @@ public class ScAccessibleCsvRuler extends TestCase { } - //util.dbg.printInterfaces(oObj); AccessibilityTools.printAccessibleTree(log, xRoot); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TEXT, "Ruler", true); @@ -144,12 +143,6 @@ public class ScAccessibleCsvRuler extends TestCase { */ @Override protected void cleanup( TestParameters Param, PrintWriter log) { -/* log.println( " closing Dialog " ); - try { - accAction.doAccessibleAction(0); - } catch (com.sun.star.lang.IndexOutOfBoundsException iae) { - log.println("Couldn't close dialog"); - } */ } /** diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java index 44eae77ce32d..84cbd224402e 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java @@ -278,7 +278,6 @@ public class ScDataPilotFieldGroupItemObj extends TestCase { XDataPilotDescriptor xDPT = UnoRuntime.queryInterface (XDataPilotDescriptor.class,xIA.getByIndex (0)); IA = xDPT.getRowFields (); - //getSRange(IA); System.out.println ("COUNT: "+IA.getCount ()); datapilotfield = (XInterface) AnyConverter.toObject ( new Type (XInterface.class), IA.getByIndex (0)); diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java index fc480b869092..17e0d1554f17 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java @@ -277,7 +277,6 @@ public class ScDataPilotFieldGroupObj extends TestCase { XDataPilotDescriptor xDPT = UnoRuntime.queryInterface (XDataPilotDescriptor.class,xIA.getByIndex (0)); IA = xDPT.getRowFields (); - //getSRange(IA); System.out.println ("COUNT: "+IA.getCount ()); datapilotfield = (XInterface) AnyConverter.toObject ( new Type (XInterface.class), IA.getByIndex (0)); diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java index 296cfe25b25c..46dec68f6496 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java @@ -277,7 +277,6 @@ public class ScDataPilotFieldGroupsObj extends TestCase { XDataPilotDescriptor xDPT = UnoRuntime.queryInterface (XDataPilotDescriptor.class,xIA.getByIndex (0)); IA = xDPT.getRowFields (); - //getSRange(IA); System.out.println ("COUNT: "+IA.getCount ()); datapilotfield = (XInterface) AnyConverter.toObject ( new Type (XInterface.class), IA.getByIndex (0)); diff --git a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java index dade91ebdfde..5f953ad77129 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java @@ -170,10 +170,8 @@ public class ScDatabaseRangeObj extends TestCase { } - //CellRangeAddress aRange = new CellRangeAddress((short)0, 0, 0, 0, 13); CellRangeAddress aRange = null; - //dbRanges.addNewByName("dbRange", aRange); XNameAccess dbrNA = UnoRuntime.queryInterface( XNameAccess.class, dbRanges); try { diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java index a46139417843..579c5956dc42 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java @@ -187,9 +187,6 @@ public class ScIndexEnumeration_TableChartsEnumeration extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); -// tEnv.addObjRelation("RECT", oRect); -// tEnv.addObjRelation("ADDR", oAddr); - return tEnv; } diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java b/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java index 466b4374e06d..d6dd310dabf8 100644 --- a/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java +++ b/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java @@ -231,9 +231,6 @@ public class SdUnoPresView extends TestCase { tEnv.addObjRelation("FirstPage", oDrawPage); tEnv.addObjRelation("SecondPage", secondDrawPage); - //tEnv.addObjRelation("First", shape1); - //tEnv.addObjRelation("Second", shape2); - tEnv.addObjRelation("Pages", the_pages); //Adding ObjRelations for XController diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java index 455be5adc371..55b6903c39ca 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java @@ -90,8 +90,6 @@ public class AccessibleControlShape extends TestCase { AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); -// oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE, -// "Button"); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "Button"); // create test environment here diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java index 2ddab77ed271..a75bd7ed03a8 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java @@ -93,8 +93,6 @@ public class AccessibleGraphicShape extends TestCase { XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); -// oObj = at.getAccessibleObjectForRole -// (xRoot, AccessibleRole.SHAPE, "GraphicObject"); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "GraphicObject"); // create test environment here diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java index ade6fa7c5f4f..0f371ebd4208 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java @@ -115,8 +115,6 @@ public class AccessibleOLEShape extends TestCase { AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); -// oObj = at.getAccessibleObjectForRole -// (xRoot, AccessibleRole.SHAPE, "OLEShape"); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "OLEShape"); // create test environment here diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java index 7683a3ba500e..ee2fcd7f5974 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java @@ -89,17 +89,11 @@ public class AccessiblePageShape extends TestCase { AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); -// oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE, -// "PageShape"); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "PageShape"); // create test environment here TestEnvironment tEnv = new TestEnvironment( oObj ); - //at.getAccessibleObjectForRole(xRoot, AccessibleRole.SCROLLBAR); - //final XAccessibleValue xAccVal = (XAccessibleValue) - // UnoRuntime.queryInterface - // (XAccessibleValue.class, at.SearchedContext) ; oPage = DrawTools.getDrawPage(xDrawDoc,0); final XPropertySet PageProps = UnoRuntime.queryInterface(XPropertySet.class, oPage); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java index 912705a6aa1d..20e5423baa30 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java @@ -105,15 +105,11 @@ public class AccessiblePresentationGraphicShape extends TestCase { } catch (com.sun.star.beans.UnknownPropertyException e) { } - //DrawTools.getShapes(DrawTools.getDrawPage(xDoc,0)).add(oShape); - new AccessibilityTools(); XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); -// oObj = at.getAccessibleObjectForRole -// (xRoot, AccessibleRole.SHAPE, "GraphicObject"); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "GraphicObject"); // create test environment here diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java index c9fe78910256..4f8b3878c161 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java @@ -92,8 +92,6 @@ public class AccessiblePresentationOLEShape extends TestCase { } - //DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape); - XPropertySet oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,oShape); try { oShapeProps.setPropertyValue("IsEmptyPresentationObject", new Boolean(false)); @@ -121,8 +119,6 @@ public class AccessiblePresentationOLEShape extends TestCase { XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); -// oObj = at.getAccessibleObjectForRole -// (xRoot, AccessibleRole.SHAPE, "ImpressOLE"); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "ImpressOLE"); // create test environment here diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java index 2bef30f86950..42c56abc0ece 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java @@ -108,8 +108,6 @@ public class AccessiblePresentationShape extends TestCase { XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); -// oObj = at.getAccessibleObjectForRole -// (xRoot, AccessibleRole.SHAPE, "ImpressHandout"); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "ImpressHandout"); log.println("Implementation Name: "+utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java index 0bab2ea5db25..43a9edd97cd3 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java @@ -93,8 +93,6 @@ public class AccessibleShape extends TestCase { AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); -// oObj = at.getAccessibleObjectForRole -// (xRoot, AccessibleRole.SHAPE, "Rectangle"); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "Rectangle"); // create test environment here diff --git a/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java b/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java index 03f858bd8a8a..26cb0bcf291e 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java +++ b/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java @@ -207,10 +207,6 @@ public class SvxDrawPage extends TestCase { // adding relation for XMasterPageTarget - /*XMasterPagesSupplier oMPS = (XMasterPagesSupplier) - UnoRuntime.queryInterface(XMasterPagesSupplier.class, xDoc); - XDrawPages oGroup = oMPS.getMasterPages(); - tEnv.addObjRelation("MasterPageSupplier",oGroup); */ return tEnv; } // finish method getTestEnvironment } // finish class SvxDrawPage diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java b/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java index 8dfec5f4be84..2d4de811228b 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java @@ -120,7 +120,6 @@ public class SvxShapeDimensioning extends TestCase { oObj = oShape ; - //SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)tParam.getMSF()) ; oShape = SOF.createShape(xDrawDoc,5000,3500,7500,5000,"Line"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape) ; } diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java b/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java index e10949afbb8c..e23897985fe2 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java @@ -167,8 +167,6 @@ public class SvxShapeGroup extends TestCase { ShapeDsc sDsc = new ShapeDsc(5000,3500,7500,10000,"Rectangle"); log.println( "adding Shape as mod relation to environment" ); tEnv.addObjRelation("Shape", new InstCreator( xDrawDoc, sDsc)); - //tEnv.addObjRelation("DrawPage", oObj); - //tEnv.addObjRelation("MasterPageSupplier",oGroup); tEnv.addObjRelation("Style1",aStyle1); tEnv.addObjRelation("Style2",aStyle2); diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java index e2a3018d573e..97a5cd03c56c 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java @@ -183,8 +183,6 @@ public class SvxShapePolyPolygon extends TestCase { try { // adding some shapes for testing. - //SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); - //oShape = SOF.createShape(xDrawDoc,6000,6000,5000,5000,"PolyPolygon"); XMultiServiceFactory xMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, xDrawDoc) ; XInterface oInst = (XInterface) xMSF.createInstance ("com.sun.star.drawing.PolyPolygonShape") ; diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java index b5bebdbcd0a9..ca2b3c790abd 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java @@ -228,7 +228,6 @@ public class SvxShapePolyPolygonBezier extends TestCase { shapeProps.setPropertyValue("PolyPolygonBezier",coords); - //SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)tParam.getMSF()) ; oShape = SOF.createShape(xDrawDoc,5000,3500,7500,5000,"Line"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape) ; } diff --git a/qadevOOo/tests/java/mod/_sw/PageStyle.java b/qadevOOo/tests/java/mod/_sw/PageStyle.java index b41875765fcc..1e989ecf5cbd 100644 --- a/qadevOOo/tests/java/mod/_sw/PageStyle.java +++ b/qadevOOo/tests/java/mod/_sw/PageStyle.java @@ -114,7 +114,6 @@ public class PageStyle extends TestCase { XMultiServiceFactory oMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDoc); XInterface oInt = (XInterface) oMSF.createInstance("com.sun.star.style.PageStyle"); -// oMSF.createInstanceWithArguments("com.sun.star.style.PageStyle",new Object[]{oStyle}); oMyStyle = UnoRuntime.queryInterface(XStyle.class, oInt); } catch ( com.sun.star.uno.Exception e ) { log.println("Error: exception occurred."); diff --git a/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java b/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java index a95ce939baf3..ec7d533d84ed 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java +++ b/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java @@ -101,8 +101,6 @@ public class SwXChapterNumbering extends TestCase { e.printStackTrace(); } - //instance1[0].Value = new Short((short)5); - TestEnvironment tEnv = new TestEnvironment( oObj ); tEnv.addObjRelation("INSTANCE1", instance1); diff --git a/qadevOOo/tests/java/mod/_sw/XMLContentImporter.java b/qadevOOo/tests/java/mod/_sw/XMLContentImporter.java index 1cca405298da..049519ce976e 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLContentImporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLContentImporter.java @@ -122,9 +122,6 @@ public class XMLContentImporter extends TestCase { try { oInt = xMSF.createInstance ("com.sun.star.comp.Writer.XMLContentImporter") ; - //XImporter imp = (XImporter) UnoRuntime.queryInterface - // (XImporter.class, oInt) ; - //imp.setTargetDocument(xTextDoc) ; } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log) ; throw new StatusException("Can't create component.", e) ; diff --git a/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java index 39c142119b75..1c20d090d246 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java @@ -125,9 +125,6 @@ public class XMLMetaImporter extends TestCase { try { oInt = xMSF.createInstance ("com.sun.star.comp.Writer.XMLMetaImporter") ; - //XImporter imp = (XImporter) UnoRuntime.queryInterface - // (XImporter.class, oInt) ; - //imp.setTargetDocument(xTextDoc) ; } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log) ; throw new StatusException("Can't create component.", e) ; diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java index b22dd6b98dd4..d6b547e7ce37 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java @@ -163,8 +163,6 @@ public class AccessibleEdit extends TestCase { tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { - // buttonAccComp.grabFocus(); - // acomp.grabFocus(); edText.setText("firing event ..."); edText.setText("firing event ... 2"); edText.setText("AccessibleEdit"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java index 46ff5cda834e..e7d780d83a3a 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java @@ -125,7 +125,6 @@ public class AccessibleMenuItem extends TestCase { } - //oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.MENUITEM); log.println("ImplementationName " + utils.getImplName(oObj)); TestEnvironment tEnv = new TestEnvironment(oObj); diff --git a/qadevOOo/tests/java/mod/_toolkit/Toolkit.java b/qadevOOo/tests/java/mod/_toolkit/Toolkit.java index 33b4b4c45051..84297114f950 100644 --- a/qadevOOo/tests/java/mod/_toolkit/Toolkit.java +++ b/qadevOOo/tests/java/mod/_toolkit/Toolkit.java @@ -101,8 +101,6 @@ public class Toolkit extends TestCase { try { win = cntrlr.getFrame().getContainerWindow(); - - //win = (XWindow) UnoRuntime.queryInterface(XWindow.class, ctrl) ; the_win = the_access.getControl(the_Model).getPeer(); oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.Toolkit"); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java index 9ad723e77751..8215d7f6d119 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java @@ -149,8 +149,6 @@ public class UnoTreeControl extends TestCase { aDialog.start(); -// xDialog.execute(); - } catch (com.sun.star.uno.Exception ex) { ex.printStackTrace(); } diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java index de74a68716a7..6f474395b1e0 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java @@ -165,12 +165,7 @@ public class XMLStylesImporter extends TestCase { logF.println("No ways to check styles import were not found."); logF.println(" TRUE returned."); return true ; -/* } catch (com.sun.star.uno.Exception e) { - logF.println("Exception occurred while checking filter :") ; - e.printStackTrace(logF) ; - return false ; - } -*/ } + } }) ; diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java index a6ec9130dabf..a2009b40ffcc 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java @@ -136,7 +136,6 @@ public class XMLContentExporter extends TestCase { "com.sun.star.comp.Draw.XMLContentExporter", new Object[] {arg}); XExporter xEx = UnoRuntime.queryInterface(XExporter.class,oObj); - //xEx.setSourceDocument(xDrawDoc); XDrawPagesSupplier supp = UnoRuntime.queryInterface(XDrawPagesSupplier.class, xDrawDoc); XDrawPages set = supp.getDrawPages(); diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java index dbc6657fbce3..5a50e3cf769a 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java @@ -137,16 +137,6 @@ public class XMLSettingsExporter extends TestCase { xPropSet.setPropertyValue("IsLayerMode", new Boolean (NewDataValue)); -/* XViewDataSupplier xViewDataSupp = (XViewDataSupplier) - UnoRuntime.queryInterface(XViewDataSupplier.class, xImpressDoc); - XIndexAccess xViewData = xViewDataSupp.getViewData(); - PropertyValue[] xData = (PropertyValue[]) xViewData.getByIndex(0); - NewDataValue = ! ((Boolean) xData[1].Value).booleanValue(); - xData[1].Value = new Boolean(NewDataValue); - XIndexReplace xViewDataReplacable = (XIndexReplace) - UnoRuntime.queryInterface(XIndexReplace.class, xViewData); - xViewDataReplacable.replaceByIndex(0,xData); -*/ } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log) ; diff --git a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java index bdf03b0323ce..45bfb1b6b7a3 100644 --- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java +++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java @@ -444,8 +444,6 @@ public class SDBCReportDataFactory implements DataSourceFactory final ArrayList<?> masterValues = (ArrayList<?>) parameters.get(MASTER_VALUES); if (masterValues != null && !masterValues.isEmpty() && paramDef.parameterIndex.size() != detailColumns.size()) { - // Vector masterColumns = (Vector) parameters.get("master-columns"); - // create the new filter final String quote = connection.getMetaData().getIdentifierQuoteString(); final StringBuffer oldFilter = new StringBuffer(); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java b/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java index 7bbbd7c1ad7f..d6cde5da4776 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java @@ -125,7 +125,6 @@ public final class SOFormulaParser extends ComponentBase parserAllOpCodes.put(opCode.Token.OpCode, opCode); specialOpCodes.add(opCode); } - // addOpCodes(names, opCodes,SPECIAL,false); } catch (Exception ex) { diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java index 6baada276f0c..5cd4470a0d5d 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java @@ -127,7 +127,6 @@ public class TableCellLayoutController extends SectionLayoutController } catch (final ParseException e) { - //LOGGER.debug("Parse Exception", e); return false; } } diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java index 8704a4e312cf..e0e4d2d4a34a 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java @@ -1054,7 +1054,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget DOMSource source = new DOMSource(document); transformer.transform(source, result); - //IOUtils.getInstance().copyStreams(inputStream, outputMetaStream); outputMetaStream.flush(); outputMetaStream.close(); } diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java index 44d33cd48bbf..e6c234503c22 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java @@ -215,7 +215,6 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget for (int i = 0; i < rowHeights.size(); i++) { len.add(rowHeights.get(i)); - // val += (rowHeights.get(i)).getValue(); } rowHeights.clear(); @@ -683,8 +682,6 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget // do this after we close the tag final XmlWriter xmlWriter = getXmlWriter(); - // final Object attribute = attrs.getAttribute(OfficeNamespaces.TABLE_NS,NUMBERCOLUMNSSPANNED); - // final int span = TextUtilities.parseInt((String) attribute, 0); final int span = currentSpan; currentSpan = 0; for (int i = 1; i < span; i++) diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java index 266f59eeaed7..f45eca92a47f 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java @@ -250,8 +250,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget currentMasterPage = masterPageFactory.createMasterPage(STANDARD, activePageHeader, activePageFooter); -// LOGGER.debug("Created a new master-page: " + currentMasterPage.getStyleName()); - // todo: Store the page-layouts as well. // The page layouts are derived from a common template, but as the // header-heights differ, we have to derive these beasts instead @@ -385,14 +383,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget columns.setAttribute(OfficeNamespaces.STYLE_NS, "column-gap", "0cm"); sectionProperties.addNode(columns); -// final Section columnSep = new Section(); -// columnSep.setNamespace(OfficeNamespaces.STYLE_NS); -// columnSep.setType("column-sep"); -// columnSep.setAttribute(OfficeNamespaces.STYLE_NS, "width", "0.035cm"); -// columnSep.setAttribute(OfficeNamespaces.STYLE_NS, "color", "#000000"); -// columnSep.setAttribute(OfficeNamespaces.STYLE_NS, "height", "100%"); -// columns.addNode(columnSep); - for (int i = 0; i < columnCount; i++) { final Section column = new Section(); @@ -596,8 +586,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget final String varType = (String) attrs.getAttribute(OfficeNamespaces.OFFICE_NS, FormatValueUtility.VALUE_TYPE); final String newVarName = variablesDeclarations.produceVariable(varName, varType); attrs.setAttribute(OfficeNamespaces.TEXT_NS, NAME, newVarName); - // this one must not be written, as the DTD does not declare it. - // attrs.setAttribute(OfficeNamespaces.OFFICE_NS, FormatValueUtility.VALUE_TYPE, null); } } @@ -605,7 +593,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget { // This cannot happen as long as the report sections only contain tables. But at some point in the // future they will be made of paragraphs, and then we are prepared .. - // LOGGER.debug("Variables-Section in own paragraph " + variables); StyleUtilities.copyStyle(OfficeToken.PARAGRAPH, TextRawReportTarget.VARIABLES_HIDDEN_STYLE_WITH_KEEPWNEXT, getStylesCollection(), @@ -696,7 +683,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget graphicProperties.setAttribute(OfficeNamespaces.STYLE_NS, "flow-with-text", "false"); graphicProperties.setAttribute(OfficeNamespaces.DRAWING_NS, "ole-draw-aspect", "1"); - // attrs.setAttribute(OfficeNamespaces.DRAWING_NS, OfficeToken.STYLE_NAME, predefAutoStyle.getStyleName()); } } @@ -711,7 +697,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget && !isRepeatingSection() && ReportTargetUtil.isElementOfType(OfficeNamespaces.TEXT_NS, OfficeToken.P, attrs)) { - //LOGGER.debug("Variables-Section in existing cell " + variables); xmlWriter.writeText(variables); variables = null; } @@ -725,7 +710,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget expectedTableRowCount -= 1; final String rowStyle = (String) attrs.getAttribute(OfficeNamespaces.TABLE_NS, OfficeToken.STYLE_NAME); final CSSNumericValue rowHeight = computeRowHeight(rowStyle); - // LOGGER.debug("Adding row-Style: " + rowStyle + " " + rowHeight); sectionHeight.add(rowHeight); // process the styles as usual @@ -810,7 +794,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget else if (isPagebreakPending() && currentRole != OfficeDocumentReportTarget.ROLE_REPEATING_GROUP_HEADER && currentRole != OfficeDocumentReportTarget.ROLE_REPEATING_GROUP_FOOTER) { // Derive an automatic style for the pagebreak. -// LOGGER.debug("Manual pagebreak (within the section): " + getCurrentRole()); breakDefinition = getPagebreakDefinition(); setPagebreakDefinition(null); masterPageName = createMasterPage(true, true); @@ -841,7 +824,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget // write a paragraph that uses the VARIABLES_HIDDEN_STYLE as // primary style. Derive that one and add the manual pagebreak. // The predefined style already has the 'keep-together' flags set. -// LOGGER.debug("Variables-Section with new Master-Page " + variables + " " + masterPageName); final OfficeStyle style = deriveStyle(OfficeToken.PARAGRAPH, TextRawReportTarget.VARIABLES_HIDDEN_STYLE_WITH_KEEPWNEXT); style.setAttribute(OfficeNamespaces.STYLE_NS, "master-page-name", masterPageName); @@ -875,7 +857,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget { // Write a paragraph without adding the pagebreak. We can reuse the global style, but we have to make // sure that the style is part of the current 'auto-style' collection. -// LOGGER.debug("Variables-Section " + variables); StyleUtilities.copyStyle(OfficeToken.PARAGRAPH, TextRawReportTarget.VARIABLES_HIDDEN_STYLE_WITH_KEEPWNEXT, getStylesCollection(), @@ -901,7 +882,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget if (masterPageName != null) { -// LOGGER.debug("Starting a new MasterPage: " + masterPageName); // Patch the current styles. // This usually only happens on Table-Styles or Paragraph-Styles style.setAttribute(OfficeNamespaces.STYLE_NS, "master-page-name", masterPageName); @@ -1314,7 +1294,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget { // This cannot happen as long as the report sections only contain tables. But at some point in the // future they will be made of paragraphs, and then we are prepared .. - //LOGGER.debug("Variables-Section " + variables); final String tag; if (sectionKeepTogether && expectedTableRowCount > 0) { diff --git a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java index cbd2d5b341fd..58a93af9a410 100644 --- a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java +++ b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java @@ -182,8 +182,6 @@ public class ReportDesignerTest @Test public void firsttest() { - // convwatch.GlobalLogWriter.set(log); - // -------------------- preconditions, try to find an office -------------------- String sUser = System.getProperty("user.name"); @@ -216,7 +214,7 @@ public class ReportDesignerTest FileURL aFileURL = new FileURL(_sDocument); assertTrue("Test File doesn't '" + _sDocument + "'exist.", aFileURL.exists()); - String sFileURL = _sDocument; // URLHelper.getFileURLFromSystemPath(_sDocument); + String sFileURL = _sDocument; System.out.println("File URL: " + sFileURL); XComponent xDocComponent = loadComponent(sFileURL, getXDesktop(), null); diff --git a/sc/qa/complex/dataPilot/CheckDataPilot.java b/sc/qa/complex/dataPilot/CheckDataPilot.java index ee499c30c495..aee79e1d0891 100644 --- a/sc/qa/complex/dataPilot/CheckDataPilot.java +++ b/sc/qa/complex/dataPilot/CheckDataPilot.java @@ -134,7 +134,6 @@ public class CheckDataPilot { new _XDataPilotTable(xDataPilotTable/*, log*/, param); assertTrue("before failed.", _xDataPilotTable.before()); assertTrue("_getOutputRange failed.", _xDataPilotTable._getOutputRange()) ; -// assertTrue("_refresh failed.", _xDataPilotTable._refresh()) ; // _XDataPilotDescriptor XDataPilotDescriptor xDataPilotDescriptor = diff --git a/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java b/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java index abb0a4e375c8..3fcee41580db 100644 --- a/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java +++ b/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java @@ -126,11 +126,6 @@ public class _XDataPilotDescriptor { * </ul> */ public boolean _setSourceRange(){ -/* executeMethod("getColumnFields()") ; - executeMethod("getRowFields()") ; - executeMethod("getDataFields()") ; - executeMethod("getHiddenFields()") ; - executeMethod("getPageFields()") ; */ oObj.setSourceRange(CRA); diff --git a/sc/qa/complex/dataPilot/_XPropertySet.java b/sc/qa/complex/dataPilot/_XPropertySet.java index 8ccad66268a1..473e5910f782 100644 --- a/sc/qa/complex/dataPilot/_XPropertySet.java +++ b/sc/qa/complex/dataPilot/_XPropertySet.java @@ -229,8 +229,6 @@ public class _XPropertySet { */ public boolean _addVetoableChangeListener() { -// requiredMethod("getPropertySetInfo()"); - vetoableChanged = false; boolean result = true; @@ -285,8 +283,6 @@ public class _XPropertySet { */ public boolean _setPropertyValue() { -// requiredMethod("getPropertySetInfo()"); - Object gValue = null; Object sValue = null; @@ -337,8 +333,6 @@ public class _XPropertySet { */ public boolean _getPropertyValue() { -// requiredMethod("getPropertySetInfo()"); - boolean result = true; String toCheck = PTT.normal; @@ -379,8 +373,6 @@ public class _XPropertySet { */ public boolean _removePropertyChangeListener() { -// requiredMethod("addPropertyChangeListener()"); - propertyChanged = false; boolean result = true; @@ -437,8 +429,6 @@ public class _XPropertySet { */ public boolean _removeVetoableChangeListener() { -// requiredMethod("addVetoableChangeListener()"); - vetoableChanged = false; boolean result = true; diff --git a/sc/qa/complex/sc/CalcRTL.java b/sc/qa/complex/sc/CalcRTL.java index ea391bd2e991..586d01505fe5 100644 --- a/sc/qa/complex/sc/CalcRTL.java +++ b/sc/qa/complex/sc/CalcRTL.java @@ -206,9 +206,6 @@ public class CalcRTL /* extends ComplexTestCase */ * this method opens a calc document and sets the corresponding class variable xSheetDoc */ protected boolean openSpreadsheetDocument() { - // SOfficeFactory SOF = SOfficeFactory.getFactory( - // (XMultiServiceFactory) param.getMSF()); - final XMultiServiceFactory xMsf = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); SOfficeFactory SOF = SOfficeFactory.getFactory(xMsf); @@ -468,8 +465,6 @@ public class CalcRTL /* extends ComplexTestCase */ } else { return false; } - - //tRes.tested(propName, false); } else { System.out.println("Property '" + propName + "' OK"); @@ -542,8 +537,6 @@ public class CalcRTL /* extends ComplexTestCase */ final XMultiServiceFactory xMsf = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); SOfficeFactory SOF = SOfficeFactory.getFactory(xMsf); - // SOfficeFactory SOF = SOfficeFactory.getFactory( - // (XMultiServiceFactory) param.getMSF()); XComponent xComp = UnoRuntime.queryInterface( XComponent.class, xSheetDoc); insertedShape = SOF.createShape(xComp, 5000, 3500, 700, 500, diff --git a/scripting/examples/java/Newsgroup/OfficeAttachment.java b/scripting/examples/java/Newsgroup/OfficeAttachment.java index c6b6fc9befab..41ccfd3dd591 100644 --- a/scripting/examples/java/Newsgroup/OfficeAttachment.java +++ b/scripting/examples/java/Newsgroup/OfficeAttachment.java @@ -60,7 +60,6 @@ public class OfficeAttachment String firstPart = templocationURL.substring( 0, sepPos ); String lastPart = templocationURL.substring( sepPos + 1, templocationURL.length() ); templocationURL = firstPart + "/" + lastPart; - //JOptionPane.showMessageDialog( null, "Temp Location URL is: " + templocationURL + "\nfirstPart is: " + firstPart + "\nlastPart is: " + lastPart ); } } @@ -86,7 +85,6 @@ public class OfficeAttachment } else { - //int lastSep = attachmentName.lastIndexOf( System.getProperty( "file.separator" ) ); int lastSep = attachmentName.lastIndexOf( "/" ); attachmentName = attachmentName.substring( lastSep + 1, attachmentName.length() ); int dot = attachmentName.indexOf( "." ); @@ -147,18 +145,12 @@ public class OfficeAttachment { if( homefiles[i].getName().equals( attachmentName + ".sxw" ) ) { - //officeFile = new File( homefiles[i].getAbsolutePath() ); - //JOptionPane.showMessageDialog( null, "Found .sxw" ); file = homefiles[i].getAbsolutePath(); } } officeFile = new File( file ); - //officeFile = new File( filename + ".sxw" ); - //officeFile = new File (storedDoc.getLocation() ); } - //status.setStatus( 10, "Attachments successfully created" ); - } catch( SecurityException se ) { @@ -255,14 +247,6 @@ public class OfficeAttachment public File[] getAttachments() { - /* - if( htmlFile == null && officeFile == null ) - { - System.out.println( "Error: Document(s) have not been saved." ); - return null; - } - */ - //(officeDoc) ? (number = 2) : (number = 1); statusLine = "Retrieving temp docs"; status.setStatus( 8, statusLine ); diff --git a/scripting/examples/java/Newsgroup/PostNewsgroup.java b/scripting/examples/java/Newsgroup/PostNewsgroup.java index 5f069b44dd19..83e90ad5aa36 100644 --- a/scripting/examples/java/Newsgroup/PostNewsgroup.java +++ b/scripting/examples/java/Newsgroup/PostNewsgroup.java @@ -381,7 +381,6 @@ public class PostNewsgroup extends JFrame } JPanel optionPanel = new JPanel(); - //optionPanel.setLayout( new GridLayout( 1, 3, 20, 0 ) ); optionPanel.setBorder( new TitledBorder( new EtchedBorder(), "Document Format" ) ); optionPanel.setLayout( new GridBagLayout() ); GridBagConstraints constraints = new GridBagConstraints(); @@ -423,7 +422,6 @@ public class PostNewsgroup extends JFrame StatusWindow statusWindow = new StatusWindow( window, "Posting to Newsgroup", FRAMEX, FRAMEY ); statusWindow.setVisible( true ); - //statusWindow.requestFocusInWindow(); statusLine = "Ready to send..."; statusWindow.setStatus( 0, statusLine ); @@ -456,7 +454,6 @@ public class PostNewsgroup extends JFrame } else { - //int position = newsgroupComboBox.getSelectedIndex(); host = subscribedNewsgroups[ position ].getHostName(); group = subscribedNewsgroups[ position ].getNewsgroupName(); } @@ -585,7 +582,6 @@ public class PostNewsgroup extends JFrame } else { - //int position = newsgroupComboBox.getSelectedIndex(); newsgroupString = subscribedNewsgroups[ position ].getNewsgroupName(); } if( newsgroupString.length() == 0 ) diff --git a/scripting/examples/java/Newsgroup/StatusWindow.java b/scripting/examples/java/Newsgroup/StatusWindow.java index e83b7ef5c98e..b95fb3a91b07 100644 --- a/scripting/examples/java/Newsgroup/StatusWindow.java +++ b/scripting/examples/java/Newsgroup/StatusWindow.java @@ -69,9 +69,7 @@ public class StatusWindow extends JFrame statusLabel.setColumns( 25 ); statusLabel.setEditable( false ); statusLabel.setBorder( null ); - //statusLabel.setBorder( LineBorder.createGrayLineBorder() ); JPanel statusPanel = new JPanel(); - //statusPanel.setBorder( LineBorder.createBlackLineBorder() ); statusPanel.setLayout( new BorderLayout() ); statusPanel.add( statusLabel, "West" ); @@ -120,7 +118,6 @@ public class StatusWindow extends JFrame this.pack(); this.setResizable( false ); - //this.setVisible( true ); } diff --git a/scripting/examples/java/Newsgroup/SubscribedNewsgroups.java b/scripting/examples/java/Newsgroup/SubscribedNewsgroups.java index e73ea3310eca..a4f230becee7 100644 --- a/scripting/examples/java/Newsgroup/SubscribedNewsgroups.java +++ b/scripting/examples/java/Newsgroup/SubscribedNewsgroups.java @@ -88,7 +88,6 @@ public class SubscribedNewsgroups { } // Check that at least one News directory exists and remove nulls boolean newsFound = false; - //Vector nonNullNews = new Vector(); for( int i=0; i < allNewsDirs.length; i++ ) { if( allNewsDirs[i] != null ) { newsFound = true; diff --git a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java index 437b3265345b..12be9bc19592 100644 --- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java @@ -100,7 +100,6 @@ public class ParcelBrowseNode extends PropertySet catch ( com.sun.star.uno.Exception e ) { // TODO propagate potential errors - // Pthrow new com.sun.star.uno.RuntimeException( e.toString() ); LogUtils.DEBUG( "Caught exception creating ParcelBrowseNode " + e ); LogUtils.DEBUG( LogUtils.getTrace( e ) ); } diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java index 6f1e136959b5..208ee4766d67 100644 --- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java +++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java @@ -279,7 +279,6 @@ class ScriptImpl implements XScript catch (JavaScriptException jse) { LogUtils.DEBUG( "Caught JavaScriptException exception for JavaScript type = " + jse.getClass() ); String message = jse.getMessage(); - //int lineNo = jse.getLineNumber(); Object wrap = jse.getValue(); LogUtils.DEBUG( "\t message " + message ); LogUtils.DEBUG( "\t wrapped type " + wrap.getClass() ); diff --git a/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java b/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java index 9f4610bb252d..a78ef0e11191 100644 --- a/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java +++ b/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java @@ -38,13 +38,6 @@ public class BinaryOnlyFilter implements FileFilter { @Override public String toString() { - /* StringBuffer buf = new StringBuffer(DESCRIPTION + ": "); - - for (int i = 0; i < EXTENSIONS.length - 1; i++) - buf.append("<" + EXTENSIONS[i] + "> "); - buf.append("<" + EXTENSIONS[EXTENSIONS.length - 1] + ">"); - - return buf.toString(); */ return DESCRIPTION; } } diff --git a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java index dac253f470f2..1a73873cb243 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java @@ -110,7 +110,6 @@ public class OpenOfficeDocFileSystem attr = defattr; list = defattr; - // transfer = new TransferImpl(); setRefreshTime(REFRESH_OFF); } @@ -1032,9 +1031,7 @@ System.out.println(" exception: " + ioe.getMessage()); public void rename(String name) throws IOException { -// throw new IOException( -// "cannot rename readonly file: " + getName()); // I18N - // BUG: this is the design bug. Cache has to mamage such kind + // BUG: this is the design bug. Cache has to manage such kind // of operation in order to keep the data integrity. this.name = name; } diff --git a/scripting/java/org/openoffice/netbeans/modules/office/nodes/ScriptNode.java b/scripting/java/org/openoffice/netbeans/modules/office/nodes/ScriptNode.java index f4f83409d34d..3e95cef8949c 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/nodes/ScriptNode.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/nodes/ScriptNode.java @@ -117,82 +117,7 @@ public class ScriptNode extends AbstractNode { return value; } - /* public void setValue(Object obj) { - System.out.println("Setting value to: " + obj.toString()); - - if ((value instanceof String) != true) - throw new IllegalArgumentException(name + - " property must be of type String"); - - value = obj.toString(); - if (name.equals(LOGICAL_NAME)) { - sn.setName(value); - sn.setDisplayName(value.substring(value.lastIndexOf(".") + 1)); - sn.setShortDescription(value); - } - } */ } - /* public boolean canRename() { - return true; - } - - public void setName(String nue) { - // Update visible name, fire property changes: - super.setName(nue); - } */ - - /* - public boolean canDestroy() { - return true; - } - public void destroy() throws IOException { - // Actually remove the node itself and fire property changes: - super.destroy(); - // perform additional actions, i.e. delete underlying object - } */ - - // Handle copying and cutting specially: - /* - public boolean canCopy() { - return true; - } - public boolean canCut() { - return true; - } - public Transferable clipboardCopy() { - // Add to, do not replace, the default node copy flavor: - ExTransferable et = ExTransferable.create(super.clipboardCopy()); - et.put(new ExTransferable.Single(DataFlavor.stringFlavor) { - protected Object getData() { - return ScriptNode.this.getDisplayName(); - } - }); - return et; - } - public Transferable clipboardCut() { - // Add to, do not replace, the default node cut flavor: - ExTransferable et = ExTransferable.create(super.clipboardCut()); - // This is not so useful because this node will not be destroyed afterwards - // (it is up to the paste type to decide whether to remove the "original", - // and it is not safe to assume that getData will only be called once): - et.put(new ExTransferable.Single(DataFlavor.stringFlavor) { - protected Object getData() { - return ScriptNode.this.getDisplayName(); - } - }); - return et; - } - */ - - // Permit user to customize whole node at once (instead of per-property): - /* - public boolean hasCustomizer() { - return true; - } - public Component getCustomizer() { - return new MyCustomizingPanel(this); - } - */ } diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java b/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java index 7fbcd34bfe97..a48ff2d1592f 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java @@ -62,8 +62,6 @@ public class ParcelContentsIterator implements TemplateWizard.Iterator { protected WizardDescriptor.Panel[] createPanels() { return new WizardDescriptor.Panel[] { - // keep the default 2nd panel: - // wiz.targetChooser(), new ParcelPropertiesPanel(), }; } diff --git a/scripting/workben/installer/ExecCmd.java b/scripting/workben/installer/ExecCmd.java index 9dc7613942b7..c812ae6229b7 100644 --- a/scripting/workben/installer/ExecCmd.java +++ b/scripting/workben/installer/ExecCmd.java @@ -75,7 +75,6 @@ public class ExecCmd String buff = null; while ((buff = br_err.readLine()) != null) { System.out.println("Process err :" + buff); - /*try {Thread.sleep(100); } catch(Exception e) {}*/ } System.out.println("finished reading err"); } catch (IOException ioe) { diff --git a/scripting/workben/installer/IdeVersion.java b/scripting/workben/installer/IdeVersion.java index 6c1df1ce866c..72635e25c721 100644 --- a/scripting/workben/installer/IdeVersion.java +++ b/scripting/workben/installer/IdeVersion.java @@ -47,10 +47,7 @@ public class IdeVersion extends javax.swing.JPanel implements ActionListener, Ta try { - //props = InstUtil.getNetbeansLocation(); - Properties netbeansProps = InstUtil.getNetbeansLocation(); - //Properties jeditProps = InstUtil.getJeditLocation(); Properties ideProps = new Properties(); if(netbeansProps!=null ) { diff --git a/scripting/workben/installer/InstallWizard.java b/scripting/workben/installer/InstallWizard.java index 26459d4664b7..c02f5f13b904 100644 --- a/scripting/workben/installer/InstallWizard.java +++ b/scripting/workben/installer/InstallWizard.java @@ -87,10 +87,8 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener exitForm(); } - //setBackground(Color.WHITE); setBackground(new Color(0,0,0)); locations = new ArrayList<String>(); - //Point center = GraphicsEnvironment.getLocalGraphicsEnvironment().getCenterPoint(); Point center = new Point( 400, 400 ); int windowWidth=200; int windowHeight=300; @@ -133,9 +131,6 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener gridBagConstraints1 = new java.awt.GridBagConstraints(); gridBagConstraints1.gridx = 6; gridBagConstraints1.gridy = 0; - //navigation.add(navNext, gridBagConstraints1); - //navigation.add(navBack, gridBagConstraints1); - //navigation.add(navCancel, gridBagConstraints1); getContentPane().add(navigation, java.awt.BorderLayout.SOUTH); screens.setLayout(new java.awt.CardLayout()); @@ -145,7 +140,6 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener _final = new Final(this); screens.add(FINAL, _final); - //boolean hasIDEInstallation = (InstUtil.hasNetbeansInstallation() || InstUtil.hasJeditInstallation()) ; boolean hasIDEInstallation = ( InstUtil.hasNetbeansInstallation() ) ; if( hasIDEInstallation ) diff --git a/sfx2/qa/complex/sfx2/DocumentProperties.java b/sfx2/qa/complex/sfx2/DocumentProperties.java index 3269408f32f5..653c54092a25 100644 --- a/sfx2/qa/complex/sfx2/DocumentProperties.java +++ b/sfx2/qa/complex/sfx2/DocumentProperties.java @@ -182,7 +182,6 @@ public class DocumentProperties "Description", "Modern internal company memorandum in full-blocked style", xDP.getDescription()); -// assertEquals("Language", "", xDP.getLanguage()); assertEquals( "ModifiedBy", "Karl-Heinz Mustermann", xDP.getModifiedBy()); assertEquals( @@ -206,13 +205,6 @@ public class DocumentProperties fromArray(new Object[] { "Asien", "Memo", "Reis" }))); NamedValue[] ds = xDP.getDocumentStatistics(); -/* for (int i = 0; i < ds.length; ++i) { - System.out.println("nv: " + ds[i].Name + " " + ds[i].Value); - } - NamedValue nv1 = new NamedValue("WordCount", new Integer(23)); - NamedValue nv2 = new NamedValue("WordCount", new Integer(23)); - System.out.println("eq: " + nv1.equals(nv2)); // grrr, this is false... -*/ assertTrue("DocumentStatistics:WordCount", containsNV(ds, new NamedValue("WordCount", new Integer(23)))); assertTrue("DocumentStatistics:PageCount", containsNV(ds, diff --git a/stoc/test/javavm/testcomponent/TestComponent.java b/stoc/test/javavm/testcomponent/TestComponent.java index 958037eac0c9..d976323c5f76 100644 --- a/stoc/test/javavm/testcomponent/TestComponent.java +++ b/stoc/test/javavm/testcomponent/TestComponent.java @@ -79,11 +79,7 @@ public class TestComponent implements XServiceInfo, XTypeProvider }catch( IOException e) { String s= e.getMessage(); System.out.println(s); - }/*catch( SandboxSecurityException sse) { - String s= sse.getMessage(); - System.out.println("s"); } -*/ return __serviceName; } diff --git a/sw/qa/complex/writer/TextPortionEnumerationTest.java b/sw/qa/complex/writer/TextPortionEnumerationTest.java index 1c7d93af8627..973b976cc55e 100644 --- a/sw/qa/complex/writer/TextPortionEnumerationTest.java +++ b/sw/qa/complex/writer/TextPortionEnumerationTest.java @@ -1317,9 +1317,7 @@ public class TextPortionEnumerationTest { String name = mkName("frame"); TreeNode root = new TreeNode(); -// TreeNode text = new TextNode(""); // necessary? TreeNode fram = new FrameNode(name, AT_CHARACTER); -// root.appendChild(text); root.appendChild(fram); doTest(root); } @@ -1482,8 +1480,6 @@ public class TextPortionEnumerationTest StringPair id = new StringPair("content.xml", mkName("id")); TreeNode root = new TreeNode(); TreeNode meta = new MetaNode(id); -// TreeNode text = new TextNode(""); -// meta.appendChild(text); root.appendChild(meta); doTest(root); } @@ -1505,8 +1501,6 @@ public class TextPortionEnumerationTest StringPair id = new StringPair("content.xml", mkName("id")); TreeNode root = new TreeNode(); TreeNode meta = new MetaFieldNode(id); -// TreeNode text = new TextNode(""); -// meta.appendChild(text); root.appendChild(meta); doTest(root); } @@ -2971,7 +2965,6 @@ public class TextPortionEnumerationTest TreeNode text = new TextNode("12AB6789"); inserter.insertRange( new Range(0, 0, text) ); MetaNode meta = new MetaNode( mkId("id") ); -// inserter.insertRange( new Range(3, 5, met2) ); XTextContent xMeta = inserter.makeMeta(); XText xDocText = m_xDoc.getText(); @@ -2979,7 +2972,6 @@ public class TextPortionEnumerationTest xDocTextCursor.goRight((short)3, false); xDocTextCursor.goRight((short)2, true); xDocText.insertTextContent(xDocTextCursor, xMeta, true); -// xMeta.attach(xDocTextCursor); XMetadatable xMetadatable = UnoRuntime.queryInterface(XMetadatable.class, xMeta); xMetadatable.setMetadataReference(meta.getXmlId()); @@ -3599,7 +3591,6 @@ public class TextPortionEnumerationTest } if (!helper.isAttribute()) { -// xText.setString("AB"); xStart = xText.getStart(); xEnd = xText.getEnd(); @@ -3809,7 +3800,6 @@ public class TextPortionEnumerationTest loadProps[0].Value = new Boolean(true); xComp = util.DesktopTools.loadDoc(m_xMSF, file, loadProps); -// xComp = util.DesktopTools.getCLoader(m_xMSF).loadComponentFromURL(file, "_blank", 0, loadProps); XTextDocument xTextDoc = UnoRuntime.queryInterface(XTextDocument.class, xComp); @@ -4090,8 +4080,6 @@ public class TextPortionEnumerationTest new TreeInserter(xDoc).insertTree(intree); } -//Thread.sleep(10000); - XText xText = xDoc.getText(); XEnumerationAccess xTextEA = UnoRuntime.queryInterface(XEnumerationAccess.class, xText); XEnumeration xTextEnum = xTextEA.createEnumeration(); diff --git a/swext/mediawiki/src/com/sun/star/wiki/Settings.java b/swext/mediawiki/src/com/sun/star/wiki/Settings.java index b7e4e2537a44..3d87446e93e5 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/Settings.java +++ b/swext/mediawiki/src/com/sun/star/wiki/Settings.java @@ -57,7 +57,6 @@ public class Settings { if ( m_instance == null ) m_instance = new Settings( ctx ); - // m_instance.loadSettings(); return m_instance; } diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java b/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java index 0b150125d9d8..d293cb278621 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java @@ -97,8 +97,6 @@ public class WikiArticle // in case of loading the html contents are used // in case of saving the contents should be checked whether they are empty InitArticleHTML(); - - // getArticleWiki(); } public String GetMainURL() @@ -207,8 +205,6 @@ public class WikiArticle PostMethod aPost = new PostMethod(); aPost.setPath( aURI.getEscapedPathQuery() ); - // aPost.addParameter( "title", m_sTitle ); - // aPost.addParameter( "action", "submit" ); aPost.addParameter( "wpTextbox1", sWikiCode ); aPost.addParameter( "wpSummary", sWikiComment ); aPost.addParameter( "wpSection", "" ); diff --git a/testtools/source/servicetests/TestBase.java b/testtools/source/servicetests/TestBase.java index 56ef66fe5709..20532ff4d32c 100644 --- a/testtools/source/servicetests/TestBase.java +++ b/testtools/source/servicetests/TestBase.java @@ -41,72 +41,15 @@ public abstract class TestBase extends ComplexTestCase { t.setProp1(0); assure(t.getProp1() == 0); assure(t.getProp2() == 2); - /*try { - t.getProp3Void(); - failed(); - } catch (VoidPropertyException e) { - }*/ assure(t.getProp3Long() == 3); - /*try { - t.getProp4None(); - failed(); - } catch (OptionalPropertyException e) { - }*/ assure(t.getProp4Long() == 4); - /*try { - t.getProp5None(); - failed(); - } catch (OptionalPropertyException e) { - } - try { - t.getProp5Void(); - failed(); - } catch (VoidPropertyException e) { - }*/ assure(t.getProp5Long() == 5); assure(t.getProp6() == 6); - /*t.clearProp6(); - try { - t.getProp6(); - failed(); - } catch (VoidPropertyException e) { - }*/ t.setProp6(0); assure(t.getProp6() == 0); - /*try { - t.getProp7None(); - failed(); - } catch (OptionalPropertyException e) { - } - try { - t.setProp7None(0); - failed(); - } catch (OptionalPropertyException e) { - } - try { - t.clearProp7None(); - failed(); - } catch (OptionalPropertyException e) { - }*/ assure(t.getProp7() == 7); - /*t.clearProp7(); - try { - t.getProp7(); - failed(); - } catch (VoidPropertyException e) { - }*/ t.setProp7(0); assure(t.getProp7() == 0); - /*try { - t.getProp8None(); - failed(); - } catch (OptionalPropertyException e) { - } - try { - t.setProp8None(0); - failed(); - } catch (OptionalPropertyException e) { - }*/ assure(t.getProp8Long() == 8); t.setProp8Long(0); assure(t.getProp8Long() == 0); diff --git a/testtools/source/servicetests/TestService.java b/testtools/source/servicetests/TestService.java index 6124aaade59e..8d3c4c5203a5 100644 --- a/testtools/source/servicetests/TestService.java +++ b/testtools/source/servicetests/TestService.java @@ -70,101 +70,40 @@ public final class TestService implements XServiceInfo, XSingleComponentFactory return 2; } - /*public int getProp3Void() throws VoidPropertyException { - throw new VoidPropertyException("Prop3Void", this); - }*/ - - public int getProp3Long() /*throws VoidPropertyException*/ { + public int getProp3Long(){ return 3; } - - /*public int getProp4None() throws OptionalPropertyException { - throw new OptionalPropertyException("Prop4None", this); - }*/ - - public int getProp4Long() /*throws OptionalPropertyException*/ { + public int getProp4Long(){ return 4; } - /*public int getProp5None() - throws OptionalPropertyException, VoidPropertyException - { - throw new OptionalPropertyException("Prop4None", this); - }*/ - - /*public int getProp5Void() - throws OptionalPropertyException, VoidPropertyException - { - throw new VoidPropertyException("Prop4None", this); - }*/ - public int getProp5Long() - /*throws OptionalPropertyException, VoidPropertyException*/ { return 5; } - public int getProp6() /*throws VoidPropertyException*/ { - /*if (prop6 == null) { - throw new VoidPropertyException("Prop6", this); - } else {*/ + public int getProp6() { return prop6.intValue(); - /*}*/ } public void setProp6(int value) { prop6 = new Integer(value); } - /*public void clearProp6() { - prop6 = null; - }*/ - - /*public int getProp7None() - throws OptionalPropertyException, VoidPropertyException - { - throw new OptionalPropertyException("Prop7None", this); - }*/ - - /*public void setProp7None(int value) throws OptionalPropertyException { - throw new OptionalPropertyException("Prop7None", this); - }*/ - - /*public void clearProp7None() throws OptionalPropertyException { - throw new OptionalPropertyException("Prop7None", this); - }*/ - public int getProp7() - /*throws OptionalPropertyException, VoidPropertyException*/ { - /*if (prop7 == null) { - throw new VoidPropertyException("Prop7", this); - } else {*/ return prop7.intValue(); - /*}*/ } - public void setProp7(int value) /*throws OptionalPropertyException*/ { + public void setProp7(int value) { prop7 = new Integer(value); } - /*public void clearProp7() throws OptionalPropertyException { - prop7 = null; - }*/ - - /*public int getProp8None() throws OptionalPropertyException { - throw new OptionalPropertyException("Prop8None", this); - }*/ - - /*public void setProp8None(int value) throws OptionalPropertyException { - throw new OptionalPropertyException("Prop8None", this); - }*/ - - public int getProp8Long() /*throws OptionalPropertyException*/ { + public int getProp8Long() { return prop8; } - public void setProp8Long(int value) /*throws OptionalPropertyException*/ + public void setProp8Long(int value) { prop8 = value; } diff --git a/toolkit/test/accessibility/AccessibilityTree.java b/toolkit/test/accessibility/AccessibilityTree.java index 091209e349c9..b21249a36466 100644 --- a/toolkit/test/accessibility/AccessibilityTree.java +++ b/toolkit/test/accessibility/AccessibilityTree.java @@ -54,11 +54,6 @@ public class AccessibilityTree maTree.setModel (aModel); maCellRenderer = new AccessibleTreeCellRenderer(); - // setCellRenderer (maCellRenderer); - - // allow editing of XAccessibleText interfaces - // setEditable (true); - // maTreeModel.addTreeModelListener( new TextUpdateListener() ); maTree.addMouseListener (new MouseListener (this)); diff --git a/toolkit/test/accessibility/AccessibilityWorkBench.java b/toolkit/test/accessibility/AccessibilityWorkBench.java index e466f568204c..98f9e5e2f750 100644 --- a/toolkit/test/accessibility/AccessibilityWorkBench.java +++ b/toolkit/test/accessibility/AccessibilityWorkBench.java @@ -126,7 +126,6 @@ public class AccessibilityWorkBench // Accessible Tree. maAccessibilityTree = new AccessibilityTree (); - // maAccessibilityTree.getComponent().setMinimumSize (new Dimension (250,300)); JScrollPane aTreeScrollPane = new JScrollPane( maAccessibilityTree.getComponent(), JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, @@ -136,7 +135,6 @@ public class AccessibilityWorkBench // Object view shows details about the currently selected accessible // object. maObjectViewContainer = new ObjectViewContainer (); - // maObjectViewContainer.setPreferredSize (new Dimension (300,100)); JScrollPane aObjectViewContainerScrollPane = new JScrollPane( maObjectViewContainer, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, @@ -172,7 +170,6 @@ public class AccessibilityWorkBench // Text output area. maMessageArea = MessageArea.Instance (); - // maMessageArea.setPreferredSize (new Dimension (300,50)); // Split pane for the two views and the message area. JSplitPane aSplitPane = new JSplitPane (JSplitPane.VERTICAL_SPLIT, diff --git a/toolkit/test/accessibility/AccessibleContextHandler.java b/toolkit/test/accessibility/AccessibleContextHandler.java index a6f32efdd786..01770209b298 100644 --- a/toolkit/test/accessibility/AccessibleContextHandler.java +++ b/toolkit/test/accessibility/AccessibleContextHandler.java @@ -70,12 +70,6 @@ class AccessibleContextHandler case 2: XAccessible xParent = xContext.getAccessibleParent(); sChild = "Has parent: " + (xParent!=null ? "yes" : "no"); - /* if (xParent != ((AccTreeNode)aParent).getAccessible()) - { - sChild += " but that is inconsistent" - + "#" + xParent + " # " + ((AccTreeNode)aParent).getAccessible(); - } - */ break; case 3: sChild = ""; @@ -96,10 +90,6 @@ class AccessibleContextHandler else sChild += "no state set"; sChild = "State set: " + sChild; - - /* case 3: - sChild = "Child count: " + xContext.getAccessibleChildCount(); - break;*/ } } return new StringNode (sChild, aParent); diff --git a/toolkit/test/accessibility/AccessibleTextHandler.java b/toolkit/test/accessibility/AccessibleTextHandler.java index 6fc9b832eed0..731bfdca3905 100644 --- a/toolkit/test/accessibility/AccessibleTextHandler.java +++ b/toolkit/test/accessibility/AccessibleTextHandler.java @@ -501,7 +501,6 @@ abstract class TextActionDialog extends JDialog aNode = aNd; sName = sButtonText; init( sExplanation, aNode.getText().getText(), sButtonText ); -// setSize( getPreferredSize() ); setSize( 350, 225 ); } @@ -514,7 +513,6 @@ abstract class TextActionDialog extends JDialog // vertical stacking of the elements Container aContent = getContentPane(); - // aContent.setLayout( new BorderLayout() ); // label with explanation if( sExplanation.length() > 0 ) diff --git a/toolkit/test/accessibility/InformationWriter.java b/toolkit/test/accessibility/InformationWriter.java index 4fb968c8e0ec..90e7f73c7d8c 100644 --- a/toolkit/test/accessibility/InformationWriter.java +++ b/toolkit/test/accessibility/InformationWriter.java @@ -310,9 +310,6 @@ public class InformationWriter else MessageArea.println ("object has no accessible context."); - // showInfo (xContext); - // showServices (xContext); - // showInterfaces (xContext); } catch (Exception e) { diff --git a/toolkit/test/accessibility/TextLogger.java b/toolkit/test/accessibility/TextLogger.java index f26ecd164b28..f58b233fcac1 100644 --- a/toolkit/test/accessibility/TextLogger.java +++ b/toolkit/test/accessibility/TextLogger.java @@ -27,8 +27,7 @@ class TextLogger public TextLogger () throws java.io.IOException { -// maDocument = getEditorKit().createDefaultDocument(); - super ("http://localhost"); + super ("http://localhost"); try { // setPage (new URL ("http://www.spiegel.de")); diff --git a/toolkit/test/accessibility/ov/ObjectViewContainer.java b/toolkit/test/accessibility/ov/ObjectViewContainer.java index 0ce15e629eaa..e8d6272ad906 100644 --- a/toolkit/test/accessibility/ov/ObjectViewContainer.java +++ b/toolkit/test/accessibility/ov/ObjectViewContainer.java @@ -45,7 +45,6 @@ public class ObjectViewContainer System.out.println ("ObjectViewContainer"); RegisterView (ContextView.class); - // RegisterView (StateSetView.class); RegisterView (FocusView.class); RegisterView (TextView.class); } diff --git a/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java index ae82a7b63f82..613469e4f78b 100644 --- a/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java +++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java @@ -145,15 +145,6 @@ public class CheckTransientDocumentsDocumentContent { titleSetCommand.Argument = titleProp; xFolderCommandProcessor.execute(titleSetCommand, 0, null); - // 2do: check all this stuff! - // commit changes -/* InsertCommandArgument insertArgs = new InsertCommandArgument(); - insertArgs.Data = null; - insertArgs.ReplaceExisting = true; - Command commitCommand = new Command(); - commitCommand.Name = "insert"; - commitCommand.Argument = insertArgs; - xFolderCommandProcessor.execute(commitCommand, 0, null); */ } catch (com.sun.star.uno.Exception e) { e.printStackTrace(); diff --git a/ucb/qa/complex/tdoc/_XCommandProcessor.java b/ucb/qa/complex/tdoc/_XCommandProcessor.java index ad54704ba498..b745a0568267 100644 --- a/ucb/qa/complex/tdoc/_XCommandProcessor.java +++ b/ucb/qa/complex/tdoc/_XCommandProcessor.java @@ -174,22 +174,6 @@ public class _XCommandProcessor { log.println("Command '" + commandName + "' was not executed correctly."); } } -/* log.println("testing execute with wrong command"); - - Command badCommand = new Command("bad command", -1, null); - - try { - oObj.execute(badCommand, 0, null); - } catch (CommandAbortedException e) { - log.println("CommandAbortedException thrown - OK"); - } catch (UnsupportedCommandException e) { - log.println("UnsupportedCommandException thrown - OK"); - } catch (Exception e) { - log.println("Wrong exception thrown " + e.getMessage()); - e.printStackTrace((java.io.PrintWriter)log); - throw new StatusException("Unexpected exception", e); - } -*/ return returnVal; } diff --git a/unotools/qa/complex/tempfile/Test02.java b/unotools/qa/complex/tempfile/Test02.java index 24868c0b6560..17d5577dc85a 100644 --- a/unotools/qa/complex/tempfile/Test02.java +++ b/unotools/qa/complex/tempfile/Test02.java @@ -70,7 +70,6 @@ public class Test02 implements TempFileTest { m_aTestHelper.CloseTempFile( xTempFile ); //check that the file is still available. - //xTempFile.seek(0); m_aTestHelper.ReadDirectlyFromTempFile( pBytesOut, pBytesIn.length + 1, m_xSFA, sFileURL ); for ( int i = 0; i < pBytesIn.length; i++ ) { if ( pBytesOut[0][i] != pBytesIn[i] ) { diff --git a/unoxml/qa/complex/unoxml/DOMTest.java b/unoxml/qa/complex/unoxml/DOMTest.java index 4d4c9bcaa2ac..47671659326a 100644 --- a/unoxml/qa/complex/unoxml/DOMTest.java +++ b/unoxml/qa/complex/unoxml/DOMTest.java @@ -2750,7 +2750,6 @@ public class DOMTest MockNode[] m_children; String m_localname; -// MockNode() { ; } void init(MockDoc doc, MockNode parent, MockNode prev, MockNode next, MockNode[] children) { diff --git a/vcl/qa/complex/memCheck/CheckMemoryUsage.java b/vcl/qa/complex/memCheck/CheckMemoryUsage.java index 24ebf5f41c82..94d369e2ae59 100644 --- a/vcl/qa/complex/memCheck/CheckMemoryUsage.java +++ b/vcl/qa/complex/memCheck/CheckMemoryUsage.java @@ -139,7 +139,6 @@ public class CheckMemoryUsage /* extends ComplexTestCase */ } // get the temp dir for creating the command scripts. - // sTempDir = System.getProperty("java.io.tmpdir"); m_aTempDir = new TempDir(util.utils.getOfficeTemp/*Dir*/(xMsf)); // get the file extension, export filter connection @@ -436,7 +435,6 @@ public class CheckMemoryUsage /* extends ComplexTestCase */ final String sMemoryMonitor = "pmap <processID> |tee <pmapoutputfile> | grep total"; String sOfficeMemoryCommand = null; sOfficeMemoryCommand = FileHelper.appendPath(m_aTempDir.getTempDir(), "getPmap"); - // sOfficeMemoryCommand = FileHelper.getJavaCompatibleFilename(sOfficeMemoryCommand); String command = sMemoryMonitor.replaceAll("<processID>", getOfficeProcessID()); String sPmapOutputFile = FileHelper.appendPath(m_aTempDir.getTempDir(), "pmap_" + _sMode + ".txt"); command = command.replaceAll("<pmapoutputfile>", sPmapOutputFile); diff --git a/wizards/com/sun/star/wizards/document/GridControl.java b/wizards/com/sun/star/wizards/document/GridControl.java index f7bab37436e5..ce7ef674abf7 100644 --- a/wizards/com/sun/star/wizards/document/GridControl.java +++ b/wizards/com/sun/star/wizards/document/GridControl.java @@ -61,7 +61,6 @@ public class GridControl extends Shape xGridColumnFactory = UnoRuntime.queryInterface( XGridColumnFactory.class, oGridModel ); xComponent = UnoRuntime.queryInterface( XComponent.class, oGridModel ); -// Helper.setUnoPropertyValue(oGridModel, PropertyNames.PROPERTY_NAME, _sname); for (int i = 0; i < fieldcolumns.length; i++) { FieldColumn curfieldcolumn = fieldcolumns[i]; diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java index 295a5c6879f8..62ef353c8001 100644 --- a/wizards/com/sun/star/wizards/form/FormDocument.java +++ b/wizards/com/sun/star/wizards/form/FormDocument.java @@ -160,7 +160,6 @@ public class FormDocument extends TextDocument adjustMainFormSize(_NBorderType); final ControlForm aSubControlForm = new ControlForm(this, SOSUBFORM, getSubFormPoint(), getSubFormSize()); oControlForms.add(aSubControlForm); - /* ((ControlForm) oControlForms.get(1))*/ aSubControlForm.initialize(curUIControlArranger.getSelectedArrangement(1), _NBorderType); } else if (_bModifySubForm) @@ -260,7 +259,6 @@ public class FormDocument extends TextDocument } else { -// oSubControlForm.oFormController.adjustYPositions(_idiffheight); oSubControlForm.setStartPoint(new Point(oSubControlForm.aStartPoint.X, oMainControlForm.getActualFormHeight() + oMainControlForm.aStartPoint.Y + SOFORMGAP)); oSubControlForm.oFormController.positionControls(oSubControlForm.curArrangement, oSubControlForm.aStartPoint, curUIControlArranger.getAlignValue(), _NBorderType); } diff --git a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java index d62fe3f2165d..e992e99150a0 100644 --- a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java +++ b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java @@ -137,7 +137,7 @@ public class GroupFieldHandler extends FieldSelection } - /* protected */ private class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener + private class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener { public void moveItemDown(String Selitem) @@ -174,7 +174,6 @@ public class GroupFieldHandler extends FieldSelection String[] NewSelGroupNames = xSelectedFieldsListBox.getItems(); CurUnoDialog.setControlProperty("lblBlindTextNote_1", PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(NewSelGroupNames.length == 0)); - // CurReportDocument.refreshGroupFields(xSelectedFieldsListBox.getItems()); } } diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java index 475e2d554f19..84328628d24c 100644 --- a/wizards/com/sun/star/wizards/report/ReportLayouter.java +++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java @@ -260,7 +260,6 @@ public class ReportLayouter break; case SOOPTLANDSCAPE: - // CurReportDocument.getDoc().changePageOrientation(true); try { CurReportDocument.setPageOrientation(SOOPTLANDSCAPE); diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java index f052ce219dce..fcd6bae0b244 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java +++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java @@ -99,12 +99,10 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen oTextFieldHandler = new TextFieldHandler(xMSFDoc, xTextDocument); DBColumnsVector = new java.util.ArrayList<DBColumn>(); oNumberFormatter = oTextTableHandler.getNumberFormatter(); - // CurDBMetaData = new RecordParser(xMSF); //, CharLocale, oNumberFormatter); CurDBMetaData = _aRecordParser; long lDateCorrection = oNumberFormatter.getNullDateCorrection(); oNumberFormatter.setBooleanReportDisplayNumberFormat(); oNumberFormatter.setNullDateCorrection(lDateCorrection); - // sMsgInvalidTextField = oResource.getResText(UIConsts.RID_REPORT + 73); sMsgTableNotExisting = oResource.getResText(UIConsts.RID_REPORT + 61); sMsgCommonReportError = oResource.getResText(UIConsts.RID_REPORT + 72); sMsgCommonReportError = JavaTools.replaceSubString(sMsgCommonReportError, String.valueOf((char) 13), "<BR>"); @@ -157,8 +155,6 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen if (CurDBMetaData.getCommandType() == CommandType.QUERY) { oFormHandler.insertHiddenControl(xNameAccess, xNamedForm, PropertyNames.COMMAND, ""); - //DBMetaData.CommandObject oCommand = CurDBMetaData.getQueryByName(CurDBMetaData.getCommandName()); - //oFormHandler.insertHiddenControl(xNameAccess, xNamedForm, COMMAND, CurDBMetaData.Command); } else { diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java index 74dcbebe16cd..ee477c473205 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java +++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java @@ -491,7 +491,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme public void setPageOrientation(int nOrientation) throws com.sun.star.lang.IllegalArgumentException { // LLA: should we lock controllers here? - // CurReportDocument.getDoc().xTextDocument.lockControllers(); if (nOrientation == ReportLayouter.SOOPTLANDSCAPE) { getDoc().changePageOrientation(true); diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java index 1dc886b437da..945fdeb14fa9 100644 --- a/wizards/com/sun/star/wizards/report/ReportWizard.java +++ b/wizards/com/sun/star/wizards/report/ReportWizard.java @@ -188,7 +188,6 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener case SOTITLEPAGE: String[] sFieldTitles = CurTitlesComponent.getFieldTitles(); // set new field name titles - // CurReportDocument.getRecordParser().setFieldTitles(sFieldTitles); m_reportDocument.setFieldTitles(sFieldTitles); break; @@ -196,13 +195,11 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener // TODO: DESIGN!!! a getter should return a value!!! CurGroupFieldHandler.getGroupFieldNames(m_reportDocument.getRecordParser()); String[] aGroupFieldNames = m_reportDocument.getRecordParser().GroupFieldNames; - // CurReportDocument.getRecordParser().prependSortFieldNames(aGroupFieldNames); m_reportDocument.setGrouping(aGroupFieldNames); break; case SOSORTPAGE: String[][] aSortFieldNames = CurSortingComponent.getSortFieldNames(); - // CurReportDocument.getRecordParser().SortFieldNames = aSortFieldNames; m_reportDocument.setSorting(aSortFieldNames); // TODO: why do we make a switch here super.enablefromStep(SOTEMPLATEPAGE, true); @@ -308,7 +305,6 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener private void buildSteps() { - // CurReportDocument.getDoc().xProgressBar.setValue(30); CurDBCommandFieldSelection = new CommandFieldSelection(this, m_reportDocument.getRecordParser(), 100, slblFields, slblSelFields, slblTables, true, 34330); CurDBCommandFieldSelection.addFieldSelectionListener(new FieldSelectionListener()); if (!isReportBuilderInstalled()) @@ -509,7 +505,6 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener } if (bexecute) { - // CurDataimport.insertDatabaseDatatoReportDocument(xMSF); m_reportDocument.insertDatabaseDatatoReportDocument(xMSF); } @@ -596,7 +591,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener boolean bEnabled = NewItems.length > 0; setControlProperty("btnWizardNext", PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(bEnabled)); setControlProperty("btnWizardFinish", PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(bEnabled)); - enableRoadmapItems(bEnabled); // Note: Performancewise this could be improved + enableRoadmapItems(bEnabled); // Note: Performance-wise this could be improved } public void textChanged(TextEvent xTextEvent) @@ -606,7 +601,6 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener Object oModel = UnoDialog.getModel(xTextEvent.Source); String sContent = (String) Helper.getUnoPropertyValue(oModel, "Text"); String fieldname = this.CurTitlesComponent.getFieldNameByTitleControl(oModel); - // CurReportDocument.getDoc().oTextFieldHandler.changeUserFieldContent(fieldname, sfieldtitle); m_reportDocument.liveupdate_changeUserFieldContent(fieldname, sContent); } catch (Exception exception) diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java index bef28fae4032..bfdf6e523b0e 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java @@ -1186,8 +1186,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter // but there seems some problems, we have to control. copyProperties(aComponent, aClone); - // aShape.setPosition(aComponent.getPosition()); - // aShape.setSize(aComponent.getSize()); _xToSection.add(aShape); } } diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java b/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java index ed676f1aa3c6..593ae72609a0 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java @@ -107,7 +107,6 @@ public class Tabular extends ReportBuilderLayouter xGroup = UnoRuntime.queryInterface(XGroup.class, xGroups.getByIndex(lastGroupPostion)); // We don't need to copy the GroupProperties, because this is done in the insertGroup() member function - // copyGroupProperties(0); aSO = getDesignTemplate().getGroupLabel(lastGroupPostion); } diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java index ea61d6757c0e..7644935a8163 100644 --- a/wizards/com/sun/star/wizards/table/TableWizard.java +++ b/wizards/com/sun/star/wizards/table/TableWizard.java @@ -213,30 +213,6 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener } } -/* - public static void main(String args[]) - { - String ConnectStr = "uno:socket,host=localhost,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.NamingService"; - PropertyValue[] curproperties = null; - try - { - XMultiServiceFactory xLocMSF = com.sun.star.wizards.common.Desktop.connect(ConnectStr); - TableWizard CurTableWizard = new TableWizard(xLocMSF); - if (xLocMSF != null) - { - System.out.println("Connected to " + ConnectStr); - curproperties = new PropertyValue[1]; - curproperties[0] = Properties.createProperty("DataSourceName", "Bibliography"); - //curproperties[0] = Properties.createProperty("DatabaseLocation", "file:///path/to/database.odb"); - CurTableWizard.startTableWizard(xLocMSF, curproperties); - } - } - catch (Exception exception) - { - exception.printStackTrace(System.err); - } - } -*/ private void buildSteps() { curScenarioSelector = new ScenarioSelector(this, this.curTableDescriptor, slblFields, slblSelFields); diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java b/wizards/com/sun/star/wizards/text/TextDocument.java index 181314aade12..b34e1e06cc6f 100644 --- a/wizards/com/sun/star/wizards/text/TextDocument.java +++ b/wizards/com/sun/star/wizards/text/TextDocument.java @@ -197,7 +197,6 @@ public class TextDocument xFrame = _textDocument.getCurrentController().getFrame(); xComponent = UnoRuntime.queryInterface(XComponent.class, _textDocument); xTextDocument = UnoRuntime.queryInterface(XTextDocument.class, xComponent); - //PosSize = xFrame.getComponentWindow().getPosSize(); if (bshowStatusIndicator) { XStatusIndicatorFactory xStatusIndicatorFactory = UnoRuntime.queryInterface(XStatusIndicatorFactory.class, xFrame); diff --git a/wizards/com/sun/star/wizards/text/TextSectionHandler.java b/wizards/com/sun/star/wizards/text/TextSectionHandler.java index 4c4a9ff10b48..ddbe78a3f6c4 100644 --- a/wizards/com/sun/star/wizards/text/TextSectionHandler.java +++ b/wizards/com/sun/star/wizards/text/TextSectionHandler.java @@ -208,7 +208,6 @@ public class TextSectionHandler { XTextCursor xTextCursor = xText.createTextCursor(); xText.insertControlCharacter(xTextCursor, ControlCharacter.PARAGRAPH_BREAK, false); - // Helper.setUnoPropertyValue(xTextCursor, "PageDescName", "First Page"); xTextCursor.collapseToEnd(); } XTextCursor xSecondTextCursor = xText.createTextCursor(); diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index 9c416f02df8f..4c7a399b172d 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -454,11 +454,9 @@ public class FilterComponent for (i = 0; i < RowCount; i++) { oControlRows[i].setFieldNames(_fieldnames); - // oControlRows[i].setFieldNames(aFieldNamesWithAdditionalEmpty); } this.filterconditions = _filterconditions; PropertyValue[] curfilterconditions; - // int a; if (_filterconditions.length == 1) { curfilterconditions = filterconditions[0]; @@ -759,7 +757,6 @@ public class FilterComponent sValue = JavaTools.replaceSubString(sValue, PropertyNames.EMPTY_STRING, "' }"); try { - //Helper.setUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "EffectiveValue", ); oQueryMetaData.getNumberFormatter().convertStringToNumber(iDateFormat, sValue); } catch (java.lang.Exception ex) @@ -774,7 +771,6 @@ public class FilterComponent sValue = JavaTools.replaceSubString(sValue, PropertyNames.EMPTY_STRING, "' }"); try { - //Helper.setUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "EffectiveValue", ); oQueryMetaData.getNumberFormatter().convertStringToNumber(iTimeFormat, sValue); } catch (java.lang.Exception ex) @@ -786,7 +782,6 @@ public class FilterComponent //TODO: other datetime formats? else { - //Helper.setUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "EffectiveValue", sValue); } } else if (AnyConverter.isBoolean(_filtercondition.Value)) diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java b/wizards/com/sun/star/wizards/ui/ImageList.java index 011c9ecce72a..0b45dc4cc626 100644 --- a/wizards/com/sun/star/wizards/ui/ImageList.java +++ b/wizards/com/sun/star/wizards/ui/ImageList.java @@ -523,7 +523,6 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener public void intervalRemoved(ListDataEvent event) { - //contentsChanged(event); } /** Registers ItemListener to receive events. diff --git a/wizards/com/sun/star/wizards/ui/PathSelection.java b/wizards/com/sun/star/wizards/ui/PathSelection.java index e3b14186d3f4..2c108687bd0c 100644 --- a/wizards/com/sun/star/wizards/ui/PathSelection.java +++ b/wizards/com/sun/star/wizards/ui/PathSelection.java @@ -79,7 +79,6 @@ public class PathSelection { Boolean.valueOf(Enabled), 12, TxtHelpURL, new Integer(XPos), new Integer(YPos + 10), new Integer(DialogStep), new Short((short) (CurTabIndex + 1)), new Integer(Width - 26) }); - //CurUnoDialog.setControlProperty("txtSavePath", PropertyNames.READ_ONLY, Boolean.TRUE); CurUnoDialog.setControlProperty("txtSavePath", PropertyNames.PROPERTY_ENABLED, Boolean.FALSE); CurUnoDialog.insertButton("cmdSelectPath", "triggerPathPicker", this, new String[] { diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java index aac598d1c532..115e94fc1e9c 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.java +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java @@ -80,8 +80,6 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL super(xMSF); hid = hid_; oWizardResource = new Resource(xMSF, "Common", "dbw"); - - //new Resource(xMSF,"Common","com"); } @Override @@ -258,13 +256,6 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL return sRMItemLabels; } - /* public void insertRoadmapItems(int StartIndex, int RMCount) - { - Object oRoadmapItem; - boolean bEnabled; - for (int i = StartIndex; i < (StartIndex + RMCount); i++) - insertSingleRoadmapItem(i, true, sRMItemLabels[i], i); - }*/ public int insertRoadmapItem(int _Index, boolean _bEnabled, int _LabelID, int _CurItemID) { return insertRoadmapItem(_Index, _bEnabled, sRMItemLabels[_LabelID], _CurItemID); diff --git a/wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java b/wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java index 6767682a176d..0595820f4006 100644 --- a/wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java @@ -31,44 +31,12 @@ public class SimpleDataAware extends DataAware controlValue = controlValue_; } - /* - protected void enableControls(Object value) { - Boolean b = getBoolean(value); - for (int i = 0; i<disableObjects.length; i++) - UIHelper.setEnabled(disableObjects[i],b); - } - */ @Override protected void setToUI(Object value) { controlValue.set(value, control); } - /** - * Try to get from an arbitrary object a boolean value. - * Null returns Boolean.FALSE; - * A Boolean object returns itself. - * An Array returns true if it not empty. - * An Empty String returns Boolean.FALSE. - * everything else returns a Boolean.TRUE. - * @param value - * @return - */ - /*protected Boolean getBoolean(Object value) { - if (value==null) - return Boolean.FALSE; - if (value instanceof Boolean) - return (Boolean)value; - else if (value.getClass().isArray()) - return ((short[])value).length != 0 ? Boolean.TRUE : Boolean.FALSE; - else if (value.equals(PropertyNames.EMPTY_STRING)) return Boolean.FALSE; - else return Boolean.TRUE; - } - - public void disableControls(Object[] controls) { - disableObjects = controls; - } - */ @Override protected Object getFromUI() { |