diff options
1317 files changed, 3116 insertions, 15 deletions
diff --git a/bean/com/sun/star/beans/LocalOfficeWindow.java b/bean/com/sun/star/beans/LocalOfficeWindow.java index 8ea7ad6a2eac..2db466a96bf0 100644 --- a/bean/com/sun/star/beans/LocalOfficeWindow.java +++ b/bean/com/sun/star/beans/LocalOfficeWindow.java @@ -157,6 +157,7 @@ public class LocalOfficeWindow class ComponentEventHandler extends java.awt.event.ComponentAdapter { + @Override public void componentHidden( java.awt.event.ComponentEvent e) { // only when we become invisible, we might lose our system window @@ -167,6 +168,7 @@ public class LocalOfficeWindow {} // ignore } + @Override public void componentShown( java.awt.event.ComponentEvent e) { // only when we become visible, we get a system window @@ -175,6 +177,7 @@ public class LocalOfficeWindow } /// Overriding java.awt.Component.setVisible() due to Java bug (no showing event). + @Override public void setVisible( boolean b ) { super.setVisible(b); @@ -277,6 +280,7 @@ public class LocalOfficeWindow throw new InterruptedException(); } + @Override public void run() { while ( aWatchedThread != null ) diff --git a/bean/com/sun/star/comp/beans/CallWatchThread.java b/bean/com/sun/star/comp/beans/CallWatchThread.java index 31f3a8cdb1e0..b9de0a826384 100644 --- a/bean/com/sun/star/comp/beans/CallWatchThread.java +++ b/bean/com/sun/star/comp/beans/CallWatchThread.java @@ -74,6 +74,7 @@ public class CallWatchThread extends Thread notify(); } + @Override public void run() { dbgPrint( "CallWatchThread(" + this + ".run(" + aTag + ") ***** STARTED *****" ); diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index c06dd2daba31..1094a7bae81c 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java @@ -739,6 +739,7 @@ public class LocalOfficeConnection start(); } + @Override public void run() { java.io.BufferedReader r = new java.io.BufferedReader( new java.io.InputStreamReader(m_in) ); diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java index eae4ea5df338..2058860ece8e 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java @@ -158,6 +158,7 @@ public class LocalOfficeWindow /// Overriding java.awt.Component.setVisible() due to Java bug (no showing event). + @Override public void setVisible( boolean b ) { super.setVisible(b); @@ -220,6 +221,7 @@ public class LocalOfficeWindow /** We make sure that the office window is notified that the parent * will be removed. */ + @Override public void removeNotify() { try { diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java index 1635717fd156..75931911c683 100644 --- a/bean/com/sun/star/comp/beans/OOoBean.java +++ b/bean/com/sun/star/comp/beans/OOoBean.java @@ -288,6 +288,7 @@ public class OOoBean final OfficeConnection iConn = getOOoConnection(); Thread aConnectorThread = new Thread() { + @Override public void run() { com.sun.star.lang.XMultiComponentFactory aFactory = @@ -1306,6 +1307,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); /** @deprecated */ + @Override public void paint( java.awt.Graphics aGraphics ) { } @@ -1429,6 +1431,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); } /// watching the connection + @Override public void run() { dbgPrint( "EventListener(" + aTag + ").run()" ); diff --git a/bean/qa/complex/bean/OOoBeanTest.java b/bean/qa/complex/bean/OOoBeanTest.java index da83a9bdf04a..d565cd2fff34 100644 --- a/bean/qa/complex/bean/OOoBeanTest.java +++ b/bean/qa/complex/bean/OOoBeanTest.java @@ -669,6 +669,7 @@ public class OOoBeanTest setLayout(new BorderLayout()); add(b, BorderLayout.CENTER); } + @Override public Dimension getPreferredSize() { return new Dimension(200, 200); diff --git a/bean/test/Test.java b/bean/test/Test.java index 94f277069ce5..ea3a0e25b3d6 100644 --- a/bean/test/Test.java +++ b/bean/test/Test.java @@ -38,6 +38,7 @@ public class Test f.validate(); f.addWindowListener(new WindowAdapter() { + @Override public void windowClosing( java.awt.event.WindowEvent e){ b.stopOOoConnection(); System.exit(0); diff --git a/bean/test/applet/oooapplet/OOoViewer.java b/bean/test/applet/oooapplet/OOoViewer.java index 2395edf8c983..4fdf1c07d089 100644 --- a/bean/test/applet/oooapplet/OOoViewer.java +++ b/bean/test/applet/oooapplet/OOoViewer.java @@ -32,6 +32,7 @@ public class OOoViewer extends Applet { Object m_objBean; + @Override public void init() { try { if (m_loader == null) { @@ -59,6 +60,7 @@ public class OOoViewer extends Applet { } } + @Override public void start() { try { Class beanClass = m_loader.loadClass("com.sun.star.comp.beans.OOoBean"); @@ -94,6 +96,7 @@ public class OOoViewer extends Applet { validate(); } + @Override public void stop() { try { Method methStop = m_objBean.getClass().getMethod( @@ -110,9 +113,11 @@ public class OOoViewer extends Applet { } + @Override public void destroy() { } + @Override public void paint(Graphics g) { } } @@ -126,6 +131,7 @@ final class CustomURLClassLoader extends URLClassLoader { super( urls ); } + @Override protected Class findClass( String name ) throws ClassNotFoundException { // This is only called via this.loadClass -> super.loadClass -> // this.findClass, after this.loadClass has already called @@ -136,6 +142,7 @@ final class CustomURLClassLoader extends URLClassLoader { + @Override protected Class loadClass( String name, boolean resolve ) throws ClassNotFoundException { @@ -163,6 +170,7 @@ final class CustomURLClassLoader extends URLClassLoader { resourcePaths.add(rurl); } + @Override public URL getResource(String name) { if (resourcePaths == null) return null; diff --git a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java index dd5f3511347c..99fd9bcfd008 100644 --- a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java +++ b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java @@ -50,6 +50,7 @@ public final class JNI_info_holder private native void finalize( long jni_info_handle ); + @Override protected void finalize() { finalize( s_jni_info_handle ); diff --git a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java index 82731b54b635..ba8eb10b6caa 100644 --- a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java +++ b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java @@ -94,6 +94,7 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler private native void finalize( long bridge_handle ); + @Override public void finalize() { AsynchronousFinalizer.add(new AsynchronousFinalizer.Job() { diff --git a/bridges/test/java_remote/Bug107753_Test.java b/bridges/test/java_remote/Bug107753_Test.java index e96152cf9d34..06e764b0ebb3 100644 --- a/bridges/test/java_remote/Bug107753_Test.java +++ b/bridges/test/java_remote/Bug107753_Test.java @@ -36,10 +36,12 @@ import test.lib.TestBed; * object, they must have the same hash code.</p> */ public final class Bug107753_Test extends ComplexTestCase { + @Override public String getTestObjectName() { return getClass().getName(); } + @Override public String[] getTestMethodNames() { return new String[] { "test" }; } @@ -54,6 +56,7 @@ public final class Bug107753_Test extends ComplexTestCase { new Client().execute(); } + @Override protected boolean run(XComponentContext context) throws Throwable { boolean success = true; XTransport transport = UnoRuntime.queryInterface( diff --git a/bridges/test/java_remote/Bug108825_Test.java b/bridges/test/java_remote/Bug108825_Test.java index 000270a80c85..e4343c55fcdb 100644 --- a/bridges/test/java_remote/Bug108825_Test.java +++ b/bridges/test/java_remote/Bug108825_Test.java @@ -37,10 +37,12 @@ import test.lib.TestBed; * the code.</p> */ public final class Bug108825_Test extends ComplexTestCase { + @Override public String getTestObjectName() { return getClass().getName(); } + @Override public String[] getTestMethodNames() { return new String[] { "test" }; } @@ -55,6 +57,7 @@ public final class Bug108825_Test extends ComplexTestCase { new Client().execute(); } + @Override protected boolean run(XComponentContext context) throws Throwable { XTest test = UnoRuntime.queryInterface( XTest.class, getBridge(context).getInstance("Test")); @@ -84,6 +87,7 @@ public final class Bug108825_Test extends ComplexTestCase { } private final class Dummy implements XDummy { + @Override protected void finalize() { synchronized (lock) { ++finalizedCount; diff --git a/bridges/test/java_remote/Bug110892_Test.java b/bridges/test/java_remote/Bug110892_Test.java index 3216ea96ef26..e43ea5a0830e 100644 --- a/bridges/test/java_remote/Bug110892_Test.java +++ b/bridges/test/java_remote/Bug110892_Test.java @@ -43,6 +43,7 @@ import test.lib.TestBed; * has not garbage-collected the object by then.</p> */ public final class Bug110892_Test extends ComplexTestCase { + @Override public String[] getTestMethodNames() { return new String[] { "test" }; } @@ -58,6 +59,7 @@ public final class Bug110892_Test extends ComplexTestCase { new Client().execute(); } + @Override protected boolean run(XComponentContext context) throws Throwable { XTest test = UnoRuntime.queryInterface( XTest.class, getBridge(context).getInstance("Test")); diff --git a/bridges/test/java_remote/Bug111153_Test.java b/bridges/test/java_remote/Bug111153_Test.java index d8bfbfa02036..8fe8be0e7314 100644 --- a/bridges/test/java_remote/Bug111153_Test.java +++ b/bridges/test/java_remote/Bug111153_Test.java @@ -36,6 +36,7 @@ import test.lib.TestBed; * short-cutting to the local object.</P> */ public final class Bug111153_Test extends ComplexTestCase { + @Override public String[] getTestMethodNames() { return new String[] { "test" }; } @@ -50,6 +51,7 @@ public final class Bug111153_Test extends ComplexTestCase { new Client().execute(); } + @Override protected boolean run(XComponentContext context) throws Throwable { XTransport t = UnoRuntime.queryInterface( XTransport.class, getBridge(context).getInstance("Transport")); diff --git a/bridges/test/java_remote/Bug114133_Test.java b/bridges/test/java_remote/Bug114133_Test.java index 01a34dc5cb29..84088839bef5 100644 --- a/bridges/test/java_remote/Bug114133_Test.java +++ b/bridges/test/java_remote/Bug114133_Test.java @@ -35,6 +35,7 @@ import test.lib.TestBed; * a fresh, unterminated bridge.</p> */ public final class Bug114133_Test extends ComplexTestCase { + @Override public String[] getTestMethodNames() { return new String[] { "test" }; } @@ -50,6 +51,7 @@ public final class Bug114133_Test extends ComplexTestCase { new Client().execute(); } + @Override protected boolean run(XComponentContext context) throws Throwable { new WaitUnreachable(getBridge(context).getInstance("Test")). waitUnreachable(); diff --git a/bridges/test/java_remote/Bug51323_Test.java b/bridges/test/java_remote/Bug51323_Test.java index bf177fdfc5ff..dc59be6c9551 100644 --- a/bridges/test/java_remote/Bug51323_Test.java +++ b/bridges/test/java_remote/Bug51323_Test.java @@ -36,6 +36,7 @@ import test.lib.TestBed; * create different bridges.</p> */ public final class Bug51323_Test extends ComplexTestCase { + @Override public String[] getTestMethodNames() { return new String[] { "test" }; } @@ -51,6 +52,7 @@ public final class Bug51323_Test extends ComplexTestCase { new Client().execute(); } + @Override protected boolean run(XComponentContext context) throws Throwable { XConnection connection = Connector.create(context).connect(getConnectionDescription()); diff --git a/bridges/test/java_remote/Bug92174_Test.java b/bridges/test/java_remote/Bug92174_Test.java index 2e26ce14cc99..5ddf4b323c52 100644 --- a/bridges/test/java_remote/Bug92174_Test.java +++ b/bridges/test/java_remote/Bug92174_Test.java @@ -28,6 +28,7 @@ import complexlib.ComplexTestCase; import test.lib.TestBed; public final class Bug92174_Test extends ComplexTestCase { + @Override public String[] getTestMethodNames() { return new String[] { "test" }; } @@ -42,6 +43,7 @@ public final class Bug92174_Test extends ComplexTestCase { new Client().execute(); } + @Override protected boolean run(XComponentContext context) throws Throwable { XTransport t = UnoRuntime.queryInterface( XTransport.class, getBridge(context).getInstance("Transport")); diff --git a/bridges/test/java_remote/Bug97697_Test.java b/bridges/test/java_remote/Bug97697_Test.java index fc1173a5e189..233efe116ebf 100644 --- a/bridges/test/java_remote/Bug97697_Test.java +++ b/bridges/test/java_remote/Bug97697_Test.java @@ -41,10 +41,12 @@ import test.lib.TestBed; * considers the process hanging if it has not completed by then.</p> */ public final class Bug97697_Test extends ComplexTestCase { + @Override public String getTestObjectName() { return getClass().getName(); } + @Override public String[] getTestMethodNames() { return new String[] { "test" }; } @@ -59,6 +61,7 @@ public final class Bug97697_Test extends ComplexTestCase { new Client().execute(); } + @Override protected boolean run(XComponentContext context) throws Throwable { XTransport transport = UnoRuntime.queryInterface( XTransport.class, getBridge(context).getInstance("Transport")); diff --git a/bridges/test/java_remote/Bug98508_Test.java b/bridges/test/java_remote/Bug98508_Test.java index b429a8cbb95e..ea0fa7c9a62b 100644 --- a/bridges/test/java_remote/Bug98508_Test.java +++ b/bridges/test/java_remote/Bug98508_Test.java @@ -44,10 +44,12 @@ import test.lib.TestBed; * considers the process hanging if it has not completed by then.</p> */ public final class Bug98508_Test extends ComplexTestCase { + @Override public String getTestObjectName() { return getClass().getName(); } + @Override public String[] getTestMethodNames() { return new String[] { "test" }; } @@ -62,6 +64,7 @@ public final class Bug98508_Test extends ComplexTestCase { new Client().execute(); } + @Override protected boolean run(XComponentContext context) throws Throwable { Test98508Interface ifc = UnoRuntime.queryInterface( @@ -83,6 +86,7 @@ public final class Bug98508_Test extends ComplexTestCase { public Object getInstance(String instanceName) { return new Test98508Interface() { + @Override public Test98508Struct get() { testBed.serverDone(true); return new Test98508Struct(Boolean.FALSE); diff --git a/bridges/test/java_remote/MethodIdTest.java b/bridges/test/java_remote/MethodIdTest.java index 537cb66965f1..212fc3b7ecc8 100644 --- a/bridges/test/java_remote/MethodIdTest.java +++ b/bridges/test/java_remote/MethodIdTest.java @@ -36,6 +36,7 @@ import test.lib.TestBed; * short-cutting to the local object.</P> */ public final class MethodIdTest extends ComplexTestCase { + @Override public String[] getTestMethodNames() { return new String[] { "test" }; } @@ -51,6 +52,7 @@ public final class MethodIdTest extends ComplexTestCase { new Client().execute(); } + @Override protected boolean run(XComponentContext context) throws Throwable { XTest t = UnoRuntime.queryInterface( XTest.class, getBridge(context).getInstance("Test")); diff --git a/bridges/test/java_remote/PolyStructTest.java b/bridges/test/java_remote/PolyStructTest.java index 146d14fea644..c0b2e9b22a44 100644 --- a/bridges/test/java_remote/PolyStructTest.java +++ b/bridges/test/java_remote/PolyStructTest.java @@ -27,6 +27,7 @@ import complexlib.ComplexTestCase; import test.lib.TestBed; public final class PolyStructTest extends ComplexTestCase { + @Override public String[] getTestMethodNames() { return new String[] { "test" }; } @@ -42,6 +43,7 @@ public final class PolyStructTest extends ComplexTestCase { new Client().execute(); } + @Override protected boolean run(XComponentContext context) throws Throwable { TestTransport t = UnoRuntime.queryInterface( TestTransport.class, getBridge(context).getInstance("")); diff --git a/bridges/test/java_remote/StopMessageDispatcherTest.java b/bridges/test/java_remote/StopMessageDispatcherTest.java index d1c6a3654a8b..4d62fa297ccf 100644 --- a/bridges/test/java_remote/StopMessageDispatcherTest.java +++ b/bridges/test/java_remote/StopMessageDispatcherTest.java @@ -35,6 +35,7 @@ import test.lib.TestBed; public final class StopMessageDispatcherTest extends ComplexTestCase { public StopMessageDispatcherTest() {} + @Override public String[] getTestMethodNames() { return new String[] { "test" }; } @@ -50,6 +51,7 @@ public final class StopMessageDispatcherTest extends ComplexTestCase { new Client().execute(); } + @Override protected boolean run(XComponentContext context) throws Throwable { XTest test = UnoRuntime.queryInterface( XTest.class, getBridge(context).getInstance("Test")); diff --git a/bridges/test/java_uno/any/TestAny.java b/bridges/test/java_uno/any/TestAny.java index 956c07c171bb..d77e866f64a6 100644 --- a/bridges/test/java_uno/any/TestAny.java +++ b/bridges/test/java_uno/any/TestAny.java @@ -2095,6 +2095,7 @@ final class TestAny { this.unboxInner = unboxInner; } + @Override public boolean equal(Object o1, Object o2) { if (o1 instanceof Any) { return o2 instanceof Any @@ -2141,6 +2142,7 @@ final class TestAny { this.unboxInner = unboxInner; } + @Override public boolean equal(Object o1, Object o2) { return new CompareBoxed(unboxInner).equal(((Any) o1).getObject(), o2); @@ -2154,6 +2156,7 @@ final class TestAny { this.specific = specific; } + @Override public boolean equal(Object o1, Object o2) { return new CompareBoxed().equal(specific, o2); } @@ -2166,6 +2169,7 @@ final class TestAny { this.clazz = clazz; } + @Override public boolean equal(Object o1, Object o2) { return o2 != null && o2.getClass() == clazz; } @@ -2182,24 +2186,28 @@ final class TestAny { return new Enum1(); } + @Override public boolean equals(Object obj) { return obj != null && obj.getClass() == Enum1.class; } } public static class Enum2 extends Enum1 { + @Override public boolean equals(Object obj) { return obj != null && obj.getClass() == Enum2.class; } } public static class BaseStruct { + @Override public boolean equals(Object obj) { return obj != null && obj.getClass() == BaseStruct.class; } } public static class DerivedStruct extends BaseStruct { + @Override public boolean equals(Object obj) { return obj != null && obj.getClass() == DerivedStruct.class; } @@ -2212,6 +2220,7 @@ final class TestAny { super(message); } + @Override public boolean equals(Object obj) { return obj != null && obj.getClass() == BaseException.class; } @@ -2224,6 +2233,7 @@ final class TestAny { super(message); } + @Override public boolean equals(Object obj) { return obj != null && obj.getClass() == DerivedException.class; } @@ -2238,6 +2248,7 @@ final class TestAny { super(message); } + @Override public boolean equals(Object obj) { return obj != null && obj.getClass() == BaseRuntimeException.class; @@ -2252,6 +2263,7 @@ final class TestAny { super(message); } + @Override public boolean equals(Object obj) { return obj != null && obj.getClass() == DerivedRuntimeException.class; diff --git a/bridges/test/java_uno/any/TestRemote.java b/bridges/test/java_uno/any/TestRemote.java index 9dd2aaa28d3b..15226c37e295 100644 --- a/bridges/test/java_uno/any/TestRemote.java +++ b/bridges/test/java_uno/any/TestRemote.java @@ -39,6 +39,7 @@ public final class TestRemote { new Client().execute(); } + @Override protected boolean run(XComponentContext context) throws Throwable { XTransport transport = UnoRuntime.queryInterface( XTransport.class, getBridge(context).getInstance("Transport")); diff --git a/bridges/test/java_uno/equals/TestEquals.java b/bridges/test/java_uno/equals/TestEquals.java index 4775f2c9695a..5e6c49023c32 100644 --- a/bridges/test/java_uno/equals/TestEquals.java +++ b/bridges/test/java_uno/equals/TestEquals.java @@ -79,6 +79,7 @@ public final class TestEquals { new Client().execute(); } + @Override protected boolean run(XComponentContext context) throws Throwable { XTestFrame f = UnoRuntime.queryInterface( XTestFrame.class, getBridge(context).getInstance("TestFrame")); @@ -146,6 +147,7 @@ public final class TestEquals { final Object object2) { new Thread() { + @Override public void run() { try { Object test1Aa = object1; diff --git a/bridges/test/java_uno/nativethreadpool/Relay.java b/bridges/test/java_uno/nativethreadpool/Relay.java index d15d0d4b8ef2..8e371b203957 100644 --- a/bridges/test/java_uno/nativethreadpool/Relay.java +++ b/bridges/test/java_uno/nativethreadpool/Relay.java @@ -58,6 +58,7 @@ public final class Relay implements XRelay, XSource { throw new WrappedTargetRuntimeException(e.toString(), this, e); } new Thread() { + @Override public void run() { try { // Use "127.0.0.1" instead of "localhost", see #i32281#: diff --git a/bridges/test/lib/TestBed.java b/bridges/test/lib/TestBed.java index 17eb4751c836..4f6bf13621d3 100644 --- a/bridges/test/lib/TestBed.java +++ b/bridges/test/lib/TestBed.java @@ -84,6 +84,7 @@ public final class TestBed { private void pipe(final InputStream in, final PrintStream out, final String prefix) { new Thread("Pipe: " + prefix) { + @Override public void run() { BufferedReader r = new BufferedReader(new InputStreamReader(in)); @@ -151,6 +152,7 @@ public final class TestBed { this.provider = provider; } + @Override public void run() { try { XComponentContext context diff --git a/chart2/qa/TestCaseOldAPI.java b/chart2/qa/TestCaseOldAPI.java index cef8aa51b7f7..a640b87d8f48 100644 --- a/chart2/qa/TestCaseOldAPI.java +++ b/chart2/qa/TestCaseOldAPI.java @@ -54,6 +54,7 @@ public class TestCaseOldAPI extends ComplexTestCase { * In this case it is the actual name of the service. * @return The tested service. */ + @Override public String getTestObjectName() { return testedServiceName; } @@ -64,6 +65,7 @@ public class TestCaseOldAPI extends ComplexTestCase { * Return all test methods. * @return The test methods. */ + @Override public String[] getTestMethodNames() { // For some tests a view needs to be created. Accessing the model via // this program and the view may lead to problems diff --git a/cli_ure/qa/climaker/ClimakerTestCase.java b/cli_ure/qa/climaker/ClimakerTestCase.java index 344433d65545..d04412054a97 100644 --- a/cli_ure/qa/climaker/ClimakerTestCase.java +++ b/cli_ure/qa/climaker/ClimakerTestCase.java @@ -23,6 +23,7 @@ import complexlib.ComplexTestCase; public class ClimakerTestCase extends ComplexTestCase { + @Override public String[] getTestMethodNames() { // TODO think about trigger of sub-tests from outside @@ -75,6 +76,7 @@ class Reader extends Thread start(); } + @Override public void run() { try diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java index 62e17e252a2c..c8e7d5d84b03 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java @@ -34,26 +34,32 @@ public class NativeInputStreamHelper extends java.io.InputStream{ in = new StorageNativeInputStream(key,file); } + @Override public int read() throws java.io.IOException { return in.read(key,file); } + @Override public int read(byte[] b, int off, int len) throws java.io.IOException { return in.read(key,file,b,off,len); } + @Override public void close() throws java.io.IOException { in.close(key,file); } + @Override public long skip(long n) throws java.io.IOException { return in.skip(key,file,n); } + @Override public int available() throws java.io.IOException { return in.available(key,file); } + @Override public int read(byte[] b) throws java.io.IOException { return in.read(key,file,b); } diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java index 922e7111355a..24776f25c2f4 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java @@ -36,22 +36,27 @@ public class NativeOutputStreamHelper extends java.io.OutputStream{ out = new StorageNativeOutputStream(file,key); } + @Override public void write(byte[] b, int off, int len) throws java.io.IOException{ out.write(key,file,b, off, len); } + @Override public void write(byte[] b) throws java.io.IOException{ out.write(key,file,b); } + @Override public void close() throws java.io.IOException{ out.close(key,file); } + @Override public void write(int b) throws java.io.IOException{ out.write(key,file,b); } + @Override public void flush() throws java.io.IOException{ out.flush(key,file); } diff --git a/connectivity/qa/complex/connectivity/DBaseDriverTest.java b/connectivity/qa/complex/connectivity/DBaseDriverTest.java index 096676e3b130..6afada84890c 100644 --- a/connectivity/qa/complex/connectivity/DBaseDriverTest.java +++ b/connectivity/qa/complex/connectivity/DBaseDriverTest.java @@ -27,6 +27,7 @@ import share.LogWriter; public class DBaseDriverTest extends ComplexTestCase implements TestCase { + @Override public String[] getTestMethodNames() { return new String[] diff --git a/connectivity/qa/complex/connectivity/HsqlDriverTest.java b/connectivity/qa/complex/connectivity/HsqlDriverTest.java index 65115aa0c53d..a0ff160b1fb8 100644 --- a/connectivity/qa/complex/connectivity/HsqlDriverTest.java +++ b/connectivity/qa/complex/connectivity/HsqlDriverTest.java @@ -38,6 +38,7 @@ import connectivity.tools.HsqlDatabase; public class HsqlDriverTest extends ComplexTestCase { + @Override public String[] getTestMethodNames() { return new String[] { "test" }; } diff --git a/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java index 6e2c214692e6..9b827529a4e2 100644 --- a/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java +++ b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java @@ -35,6 +35,7 @@ import complexlib.ComplexTestCase; public class JdbcLongVarCharTest extends ComplexTestCase { + @Override public String[] getTestMethodNames() { return new String[] diff --git a/dbaccess/qa/complex/dbaccess/DatabaseDocument.java b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java index faaad37a9842..0f7b435d4198 100644 --- a/dbaccess/qa/complex/dbaccess/DatabaseDocument.java +++ b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java @@ -246,6 +246,7 @@ public class DatabaseDocument extends TestCase implements com.sun.star.document. + @Override @Before public void before() throws java.lang.Exception { @@ -274,6 +275,7 @@ public class DatabaseDocument extends TestCase implements com.sun.star.document. } + @Override @After public void after() throws java.lang.Exception { diff --git a/extensions/qa/integration/extensions/ConsoleWait.java b/extensions/qa/integration/extensions/ConsoleWait.java index d9eb5dcb2d17..b68290c83acd 100644 --- a/extensions/qa/integration/extensions/ConsoleWait.java +++ b/extensions/qa/integration/extensions/ConsoleWait.java @@ -44,6 +44,7 @@ public class ConsoleWait implements com.sun.star.lang.XEventListener return m_done; } + @Override public void run() { try diff --git a/extensions/qa/integration/extensions/ObjectInspector.java b/extensions/qa/integration/extensions/ObjectInspector.java index bc35f19a389d..f0f1f3104215 100644 --- a/extensions/qa/integration/extensions/ObjectInspector.java +++ b/extensions/qa/integration/extensions/ObjectInspector.java @@ -42,6 +42,7 @@ public class ObjectInspector extends complexlib.ComplexTestCase } /* ------------------------------------------------------------------ */ + @Override public String[] getTestMethodNames() { return new String[] { @@ -50,6 +51,7 @@ public class ObjectInspector extends complexlib.ComplexTestCase } /* ------------------------------------------------------------------ */ + @Override public String getTestObjectName() { return "Test Skeleton"; diff --git a/extensions/qa/integration/extensions/TestSkeleton.java b/extensions/qa/integration/extensions/TestSkeleton.java index 798a67612eb8..6d4ab7a3052a 100644 --- a/extensions/qa/integration/extensions/TestSkeleton.java +++ b/extensions/qa/integration/extensions/TestSkeleton.java @@ -30,6 +30,7 @@ public class TestSkeleton extends complexlib.ComplexTestCase } /* ------------------------------------------------------------------ */ + @Override public String[] getTestMethodNames() { return new String[] { @@ -38,6 +39,7 @@ public class TestSkeleton extends complexlib.ComplexTestCase } /* ------------------------------------------------------------------ */ + @Override public String getTestObjectName() { return "Test Skeleton"; diff --git a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java index 02f50aedc300..57558c41d78e 100644 --- a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java +++ b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java @@ -186,6 +186,7 @@ public class TypeDetection extends ComplexTestCase { * A function to tell the framework, which test functions are available. * @return All test methods. */ + @Override public String[] getTestMethodNames() { return new String[]{"checkByURLonly", "checkPreselectedType", diff --git a/forms/qa/integration/forms/CellBinding.java b/forms/qa/integration/forms/CellBinding.java index 0f24220bfea6..fc9f14de9cb7 100644 --- a/forms/qa/integration/forms/CellBinding.java +++ b/forms/qa/integration/forms/CellBinding.java @@ -51,6 +51,7 @@ public class CellBinding extends complexlib.ComplexTestCase { } + @Override public String[] getTestMethodNames() { return new String[] { @@ -64,6 +65,7 @@ public class CellBinding extends complexlib.ComplexTestCase }; } + @Override public String getTestObjectName() { return "Form Control Spreadsheet Cell Binding Test"; diff --git a/forms/qa/integration/forms/ControlValidation.java b/forms/qa/integration/forms/ControlValidation.java index 733f4978ea16..6946307578ba 100644 --- a/forms/qa/integration/forms/ControlValidation.java +++ b/forms/qa/integration/forms/ControlValidation.java @@ -39,6 +39,7 @@ public class ControlValidation extends complexlib.ComplexTestCase implements com { } + @Override public String[] getTestMethodNames() { return new String[] { @@ -46,6 +47,7 @@ public class ControlValidation extends complexlib.ComplexTestCase implements com }; } + @Override public String getTestObjectName() { return "Form Control Validation Test"; diff --git a/forms/qa/integration/forms/FormControlTest.java b/forms/qa/integration/forms/FormControlTest.java index 0b826977a1bd..5c870689edf6 100644 --- a/forms/qa/integration/forms/FormControlTest.java +++ b/forms/qa/integration/forms/FormControlTest.java @@ -61,6 +61,7 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE private final String m_dataSourceName = "integration.forms.FormControlTest"; /* ------------------------------------------------------------------ */ + @Override public String[] getTestMethodNames() { return new String[] { @@ -75,6 +76,7 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE } /* ------------------------------------------------------------------ */ + @Override public String getTestObjectName() { return "Database Form Controls Test"; diff --git a/forms/qa/integration/forms/FormPropertyBags.java b/forms/qa/integration/forms/FormPropertyBags.java index 184fd35be2d5..8d6781b78aaa 100644 --- a/forms/qa/integration/forms/FormPropertyBags.java +++ b/forms/qa/integration/forms/FormPropertyBags.java @@ -50,6 +50,7 @@ public class FormPropertyBags extends complexlib.ComplexTestCase implements XPro } /* ------------------------------------------------------------------ */ + @Override public String[] getTestMethodNames() { return new String[] { @@ -58,6 +59,7 @@ public class FormPropertyBags extends complexlib.ComplexTestCase implements XPro } /* ------------------------------------------------------------------ */ + @Override public String getTestObjectName() { return "Form Component Property Bag Test"; diff --git a/forms/qa/integration/forms/ListBox.java b/forms/qa/integration/forms/ListBox.java index aff906105cd8..8d3bcc7d5d0d 100644 --- a/forms/qa/integration/forms/ListBox.java +++ b/forms/qa/integration/forms/ListBox.java @@ -52,6 +52,7 @@ public class ListBox extends TestCase } /* ------------------------------------------------------------------ */ + @Override public String[] getTestMethodNames() { return new String[] { @@ -112,6 +113,7 @@ public class ListBox extends TestCase } /* ------------------------------------------------------------------ */ + @Override public void before() throws Exception, java.lang.Exception { super.before(); @@ -119,6 +121,7 @@ public class ListBox extends TestCase } /* ------------------------------------------------------------------ */ + @Override protected void prepareDocument() throws com.sun.star.uno.Exception, java.lang.Exception { super.prepareDocument(); diff --git a/forms/qa/integration/forms/ListSelection.java b/forms/qa/integration/forms/ListSelection.java index 64fef4894987..2529b08c31e9 100644 --- a/forms/qa/integration/forms/ListSelection.java +++ b/forms/qa/integration/forms/ListSelection.java @@ -45,6 +45,7 @@ public class ListSelection extends integration.forms.TestCase } /* ------------------------------------------------------------------ */ + @Override public String[] getTestMethodNames() { return new String[] { @@ -53,6 +54,7 @@ public class ListSelection extends integration.forms.TestCase } /* ------------------------------------------------------------------ */ + @Override public String getTestObjectName() { return "Form Control List Selection Test"; @@ -213,6 +215,7 @@ public class ListSelection extends integration.forms.TestCase } /* ------------------------------------------------------------------ */ + @Override protected void prepareDocument() throws com.sun.star.uno.Exception, java.lang.Exception { super.prepareDocument(); diff --git a/forms/qa/integration/forms/MasterDetailForms.java b/forms/qa/integration/forms/MasterDetailForms.java index 6d8222a85e90..b45d60402419 100644 --- a/forms/qa/integration/forms/MasterDetailForms.java +++ b/forms/qa/integration/forms/MasterDetailForms.java @@ -65,6 +65,7 @@ public class MasterDetailForms extends complexlib.ComplexTestCase implements com } /* ------------------------------------------------------------------ */ + @Override public String[] getTestMethodNames() { return new String[] { @@ -80,6 +81,7 @@ public class MasterDetailForms extends complexlib.ComplexTestCase implements com } /* ------------------------------------------------------------------ */ + @Override public String getTestObjectName() { return "Form Control Spreadsheet Cell Binding Test"; diff --git a/forms/qa/integration/forms/RadioButtons.java b/forms/qa/integration/forms/RadioButtons.java index bd915ad42627..0aff6e7bd870 100644 --- a/forms/qa/integration/forms/RadioButtons.java +++ b/forms/qa/integration/forms/RadioButtons.java @@ -42,6 +42,7 @@ public class RadioButtons extends complexlib.ComplexTestCase } /* ------------------------------------------------------------------ */ + @Override public String[] getTestMethodNames() { return new String[] { @@ -53,6 +54,7 @@ public class RadioButtons extends complexlib.ComplexTestCase } /* ------------------------------------------------------------------ */ + @Override public String getTestObjectName() { return "Form Radio Buttons Test"; diff --git a/forms/qa/integration/forms/TableCellTextBinding.java b/forms/qa/integration/forms/TableCellTextBinding.java index 2fe0736bb929..5e28bc8ccba8 100644 --- a/forms/qa/integration/forms/TableCellTextBinding.java +++ b/forms/qa/integration/forms/TableCellTextBinding.java @@ -130,6 +130,7 @@ public class TableCellTextBinding /** runs the thread */ + @Override public void run() { try diff --git a/forms/qa/integration/forms/TestCase.java b/forms/qa/integration/forms/TestCase.java index e3cf9d813237..c2c18d2889df 100644 --- a/forms/qa/integration/forms/TestCase.java +++ b/forms/qa/integration/forms/TestCase.java @@ -36,6 +36,7 @@ public abstract class TestCase extends complexlib.ComplexTestCase implements com } /* ------------------------------------------------------------------ */ + @Override public String getTestObjectName() { return this.getClass().getName(); diff --git a/forms/qa/integration/forms/TestSkeleton.java b/forms/qa/integration/forms/TestSkeleton.java index 4c8df12923f4..d0a9e0980ba1 100644 --- a/forms/qa/integration/forms/TestSkeleton.java +++ b/forms/qa/integration/forms/TestSkeleton.java @@ -28,6 +28,7 @@ public class TestSkeleton extends TestCase } /* ------------------------------------------------------------------ */ + @Override public String[] getTestMethodNames() { return new String[] { @@ -36,6 +37,7 @@ public class TestSkeleton extends TestCase } /* ------------------------------------------------------------------ */ + @Override public String getTestObjectName() { return "Test Skeleton"; @@ -47,18 +49,21 @@ public class TestSkeleton extends TestCase } /* ------------------------------------------------------------------ */ + @Override public void before() throws Exception, java.lang.Exception { super.before(); } /* ------------------------------------------------------------------ */ + @Override public void after() throws Exception, java.lang.Exception { super.before(); } /* ------------------------------------------------------------------ */ + @Override protected void prepareDocument() throws com.sun.star.uno.Exception, java.lang.Exception { super.prepareDocument(); diff --git a/forms/qa/integration/forms/ValueBinding.java b/forms/qa/integration/forms/ValueBinding.java index 4df2c566068a..7f1a2104252b 100644 --- a/forms/qa/integration/forms/ValueBinding.java +++ b/forms/qa/integration/forms/ValueBinding.java @@ -43,6 +43,7 @@ public class ValueBinding extends integration.forms.TestCase } /* ------------------------------------------------------------------ */ + @Override public String[] getTestMethodNames() { return new String[] { @@ -51,12 +52,14 @@ public class ValueBinding extends integration.forms.TestCase } /* ------------------------------------------------------------------ */ + @Override public String getTestObjectName() { return "Form Control Value Binding Test"; } /* ------------------------------------------------------------------ */ + @Override public void before() throws com.sun.star.uno.Exception, java.lang.Exception { super.before(); @@ -64,6 +67,7 @@ public class ValueBinding extends integration.forms.TestCase } /* ------------------------------------------------------------------ */ + @Override public void after() throws com.sun.star.uno.Exception, java.lang.Exception { super.waitForUserInput(); @@ -76,6 +80,7 @@ public class ValueBinding extends integration.forms.TestCase } /* ------------------------------------------------------------------ */ + @Override protected void prepareDocument() throws com.sun.star.uno.Exception, java.lang.Exception { super.prepareDocument(); diff --git a/forms/qa/integration/forms/WaitForInput.java b/forms/qa/integration/forms/WaitForInput.java index 1559575b4093..4c56b6eda746 100644 --- a/forms/qa/integration/forms/WaitForInput.java +++ b/forms/qa/integration/forms/WaitForInput.java @@ -33,6 +33,7 @@ class WaitForInput extends java.lang.Thread return m_bDone; } + @Override public void run() { try diff --git a/forms/qa/integration/forms/XMLFormSettings.java b/forms/qa/integration/forms/XMLFormSettings.java index 1d26ff2a5090..31ab48e0a790 100644 --- a/forms/qa/integration/forms/XMLFormSettings.java +++ b/forms/qa/integration/forms/XMLFormSettings.java @@ -52,6 +52,7 @@ public class XMLFormSettings extends complexlib.ComplexTestCase } /* ------------------------------------------------------------------ */ + @Override public String[] getTestMethodNames() { return new String[] { @@ -60,6 +61,7 @@ public class XMLFormSettings extends complexlib.ComplexTestCase } /* ------------------------------------------------------------------ */ + @Override public String getTestObjectName() { return "Form Control Spreadsheet Cell Binding Test"; diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java index 3e5694d48a0e..b7e5fe304bfa 100644 --- a/framework/qa/complex/XUserInputInterception/EventTest.java +++ b/framework/qa/complex/XUserInputInterception/EventTest.java @@ -461,6 +461,7 @@ public class EventTest { * </LI> * </UL> */ + @Override public void run(){ switch (this.eventType){ diff --git a/framework/qa/complex/framework/autosave/AutoSave.java b/framework/qa/complex/framework/autosave/AutoSave.java index 1125755ec45b..4ca6eda2a26b 100644 --- a/framework/qa/complex/framework/autosave/AutoSave.java +++ b/framework/qa/complex/framework/autosave/AutoSave.java @@ -361,6 +361,7 @@ public class AutoSave DocThread() {} + @Override public void run() { impl_checkConcurrentAutoSaveToNormalUISave(); diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java index 352621bf7df7..b1acaa46311e 100644 --- a/framework/qa/complex/framework/autosave/Protocol.java +++ b/framework/qa/complex/framework/autosave/Protocol.java @@ -183,6 +183,7 @@ public class Protocol extends JComponent } /** format this line as an ascii string for writing log files */ + @Override public synchronized String toString() { StringBuffer sLine = new StringBuffer(1000); diff --git a/framework/qa/complex/framework/recovery/CrashThread.java b/framework/qa/complex/framework/recovery/CrashThread.java index 0daf3bd1f2a5..56af134c039b 100644 --- a/framework/qa/complex/framework/recovery/CrashThread.java +++ b/framework/qa/complex/framework/recovery/CrashThread.java @@ -41,6 +41,7 @@ public class CrashThread extends Thread { this.msf = msf; } + @Override public void run() { try{ XModel xModel = UnoRuntime.queryInterface(XModel.class, xDoc); diff --git a/framework/qa/complex/framework/recovery/KlickButtonThread.java b/framework/qa/complex/framework/recovery/KlickButtonThread.java index 47eeef17819f..e5683efc6b6d 100644 --- a/framework/qa/complex/framework/recovery/KlickButtonThread.java +++ b/framework/qa/complex/framework/recovery/KlickButtonThread.java @@ -37,6 +37,7 @@ public class KlickButtonThread extends Thread { this.buttonName = buttonName; } + @Override public void run() { try{ UITools oUITools = new UITools(xMSF, xWindow); diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java index 7a5d2acdec9f..07c9a51c7d9d 100644 --- a/framework/qa/complex/framework/recovery/RecoveryTest.java +++ b/framework/qa/complex/framework/recovery/RecoveryTest.java @@ -83,6 +83,7 @@ public class RecoveryTest extends ComplexTestCase { * @todo: after a second start after the crash there should no documents recovered anymore * @todo: enable remove of recovery files */ + @Override public String[] getTestMethodNames() { return new String[]{"testCrash"}; } diff --git a/framework/qa/complex/framework/recovery/TimeoutThread.java b/framework/qa/complex/framework/recovery/TimeoutThread.java index d4b1af22274c..239e48e10bd0 100644 --- a/framework/qa/complex/framework/recovery/TimeoutThread.java +++ b/framework/qa/complex/framework/recovery/TimeoutThread.java @@ -25,6 +25,7 @@ public class TimeoutThread extends Thread{ this.timeOut = timeOut; } + @Override public void run(){ util.utils.shortWait(timeOut); } diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java index c11a415b386b..7b466b011c52 100644 --- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java +++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java @@ -330,6 +330,7 @@ public class Bootstrap { final InputStream in, final PrintStream out, final String prefix ) { new Thread( "Pipe: " + prefix) { + @Override public void run() { BufferedReader r = new BufferedReader( new InputStreamReader( in ) ); diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java index 80af78871797..56c84dc3b36c 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java +++ b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java @@ -45,6 +45,7 @@ public class XInputStreamToInputStreamAdapter extends InputStream { xin = in; } + @Override public int available() throws IOException { int bytesAvail; @@ -58,6 +59,7 @@ public class XInputStreamToInputStreamAdapter extends InputStream { return(bytesAvail); } + @Override public void close() throws IOException { try { xin.closeInput(); @@ -66,6 +68,7 @@ public class XInputStreamToInputStreamAdapter extends InputStream { } } + @Override public int read () throws IOException { byte [][] tmp = new byte [1][1]; try { @@ -86,6 +89,7 @@ public class XInputStreamToInputStreamAdapter extends InputStream { } } + @Override public int read (byte[] b) throws IOException { byte [][] tmp = new byte [1][b.length]; @@ -107,6 +111,7 @@ public class XInputStreamToInputStreamAdapter extends InputStream { return (bytesRead); } + @Override public int read(byte[] b, int off, int len) throws IOException { byte [][] tmp = new byte [1][b.length]; try { @@ -138,6 +143,7 @@ public class XInputStreamToInputStreamAdapter extends InputStream { } } + @Override public long skip(long n) throws IOException { int avail; @@ -180,14 +186,17 @@ public class XInputStreamToInputStreamAdapter extends InputStream { * * @returns false */ + @Override public boolean markSupported() { return false; } + @Override public void mark(int readlimit) { // Not supported. } + @Override public void reset() throws IOException { // Not supported. } diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java index c9b9701e6ca8..ecfee86d6003 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java +++ b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java @@ -46,6 +46,7 @@ public class XOutputStreamToOutputStreamAdapter extends OutputStream { xout = out; } + @Override public void close() throws IOException { try { xout.closeOutput(); @@ -54,6 +55,7 @@ public class XOutputStreamToOutputStreamAdapter extends OutputStream { } } + @Override public void flush() throws IOException { try { xout.flush(); @@ -62,6 +64,7 @@ public class XOutputStreamToOutputStreamAdapter extends OutputStream { } } + @Override public void write(byte[] b) throws IOException { try { @@ -71,6 +74,7 @@ public class XOutputStreamToOutputStreamAdapter extends OutputStream { } } + @Override public void write(byte[] b, int off, int len) throws IOException { byte[] tmp = new byte[len]; @@ -86,6 +90,7 @@ public class XOutputStreamToOutputStreamAdapter extends OutputStream { } } + @Override public void write(int b) throws IOException { byte [] oneByte = new byte [1]; diff --git a/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java b/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java index 9423e039f3d7..0f222d7d3506 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java @@ -123,6 +123,7 @@ public class ComponentBase extends WeakBase implements XComponent } } + @Override protected void finalize() throws Throwable { if ( ! bInDispose && ! bDisposed) diff --git a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java index 02b926539d6a..caf5cdc9b2f3 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java @@ -440,6 +440,7 @@ public class InterfaceContainer implements Cloneable * * @return a clone of this <tt>List</tt> instance. */ + @Override synchronized public Object clone() { Object ret= null; diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java index fb2c6e105e20..19d73e49e523 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java @@ -297,6 +297,7 @@ XMultiPropertySet /** Makes sure that listeners which are kept in aBoundLC (XPropertyChangeListener) and aVetoableLC * (XVetoableChangeListener) receive a disposing call. Also those listeners are relesased. */ + @Override protected void postDisposing() { // Create an event with this as sender diff --git a/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java b/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java index 3ed65cdf30e0..8b89b492b1d2 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java @@ -53,6 +53,7 @@ public class WeakBase implements XWeak, XTypeProvider * then the garbage collector calls this method. Thereby causing the adapter object * to be notified. The adapter, in turn, notifies all listeners (com.sun.star.uno.XReference) */ + @Override protected void finalize() throws java.lang.Throwable { if (m_adapter != null) diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java index b24ebdf9c5c2..465769be3768 100644 --- a/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java +++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java @@ -124,6 +124,7 @@ final class ProxyFactory { } } + @Override protected void finalize() { AsynchronousFinalizer.add(new AsynchronousFinalizer.Job() { public void run() throws Throwable { diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java index a189115b47ec..87b3ea19d1fc 100644 --- a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java +++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java @@ -39,6 +39,7 @@ class XConnectionInputStream_Adapter extends InputStream { _xConnection = xConnection; } + @Override public int read() throws IOException { int len; diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java index 3bc7e49975a5..3730722eb12b 100644 --- a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java +++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java @@ -37,6 +37,7 @@ class XConnectionOutputStream_Adapter extends OutputStream { _xConnection = xConnection; } + @Override public void write(int b) throws IOException { _bytes[0] = (byte)b; diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java index e997fa48d55d..5cdb282c9991 100644 --- a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java +++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java @@ -85,6 +85,7 @@ public class java_remote_bridge super("MessageDispatcher"); } + @Override public void run() { try { for (;;) { 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 e02f0cebf2c9..01285c257e84 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 @@ -153,6 +153,7 @@ public final class java_environment implements IEnvironment { // bridges forbids to transparently share proxies between bridges, and using // different java_environment instances for different bridges is the way to // enforce this. + @Override public boolean equals(Object obj) { return false; } diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java index 6cd54f0b2e1a..c81739248ca7 100644 --- a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java +++ b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java @@ -78,6 +78,7 @@ public class JobQueue { return _threadId; } + @Override public void run() { if(DEBUG) System.err.println("ThreadPool$JobDispatcher.run: " + Thread.currentThread()); diff --git a/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java b/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java index 1657ecfc3199..28c32bbe35ce 100644 --- a/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java +++ b/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java @@ -69,6 +69,7 @@ public final class AsynchronousFinalizer { static { Thread t = new Thread() { + @Override public void run() { for (;;) { Job j; diff --git a/jurt/test/com/sun/star/comp/connections/PipedConnection_Test.java b/jurt/test/com/sun/star/comp/connections/PipedConnection_Test.java index 1f649e54e50a..6d9027a4423e 100644 --- a/jurt/test/com/sun/star/comp/connections/PipedConnection_Test.java +++ b/jurt/test/com/sun/star/comp/connections/PipedConnection_Test.java @@ -52,6 +52,7 @@ public final class PipedConnection_Test { _pipedConnection = pipedConnection; } + @Override public void run() { try { for (byte v = 0;; v++) { @@ -81,6 +82,7 @@ public final class PipedConnection_Test { _pipedConnection = pipedConnection; } + @Override public void run() { try { byte v = 0; diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test.java b/jurt/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test.java index ce98137245c4..b6d2633ee99b 100644 --- a/jurt/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test.java +++ b/jurt/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test.java @@ -27,6 +27,7 @@ public final class JavaThreadPoolFactory_Test { assertEquals(i1, JavaThreadPoolFactory.getThreadId()); final ThreadId[] i2 = new ThreadId[1]; new Thread() { + @Override public void run() { synchronized (i2) { i2[0] = JavaThreadPoolFactory.getThreadId(); diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java b/jurt/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java index 87e69a765cc1..23b6fa537c71 100644 --- a/jurt/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java +++ b/jurt/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java @@ -206,6 +206,7 @@ public final class JobQueue_Test { waitTime = 0; } + @Override public void run() { synchronized (lock) { state = STATE_STARTED; diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java b/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java index 43323bc1dc72..94dfb884392f 100644 --- a/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java +++ b/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java @@ -233,6 +233,7 @@ public class ThreadPool_Test { this.count = count; } + @Override public void run() { try { for (int i = 0; i < count; ++i) { @@ -249,6 +250,7 @@ public class ThreadPool_Test { } Stress stress1 = new Stress(50) { + @Override protected void runTest() throws InterruptedException { testThreadAsync(); } @@ -256,6 +258,7 @@ public class ThreadPool_Test { stress1.start(); Stress stress2 = new Stress(50) { + @Override protected void runTest() throws InterruptedException { testDynamicThreadSync(); } @@ -263,6 +266,7 @@ public class ThreadPool_Test { stress2.start(); Stress stress3 = new Stress(50) { + @Override protected void runTest() throws InterruptedException { testStaticThreadSync(); } @@ -270,6 +274,7 @@ public class ThreadPool_Test { stress3.start(); Stress stress4 = new Stress(50) { + @Override protected void runTest() throws InterruptedException { testDynamicThreadAsyncSyncOrder(); } @@ -277,6 +282,7 @@ public class ThreadPool_Test { stress4.start(); Stress stress5 = new Stress(50) { + @Override protected void runTest() throws InterruptedException { testStaticThreadAsyncSyncOrder(); } @@ -284,6 +290,7 @@ public class ThreadPool_Test { stress5.start(); Stress stress6 = new Stress(500) { + @Override protected void runTest() throws InterruptedException { testDispose(); } @@ -348,6 +355,7 @@ public class ThreadPool_Test { _iThreadPool = iThreadPool; } + @Override public void run() { _threadId = _iThreadPool.getThreadId(); diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java b/jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java index b1be2aea8535..a7ee1e511c6d 100644 --- a/jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java +++ b/jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java @@ -255,6 +255,7 @@ public final class Protocol_Test { { protocol = new urp(bridge, null, input, output); new Thread() { + @Override public void run() { for (;;) { Object o; diff --git a/jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java b/jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java index e90168cfa469..c48ec4f34ab3 100644 --- a/jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java +++ b/jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java @@ -39,6 +39,7 @@ public final class NativeLibraryLoader_Test { File file2 = NativeLibraryLoader.getResource( new ClassLoader() { + @Override public URL getResource(String name) { return url; } @@ -61,6 +62,7 @@ public final class NativeLibraryLoader_Test { File file2 = NativeLibraryLoader.getResource( new ClassLoader() { + @Override public URL getResource(String name) { return url; } diff --git a/jurt/test/com/sun/star/uno/WeakReference_Test.java b/jurt/test/com/sun/star/uno/WeakReference_Test.java index 6d076ea60bc6..a990f449b288 100644 --- a/jurt/test/com/sun/star/uno/WeakReference_Test.java +++ b/jurt/test/com/sun/star/uno/WeakReference_Test.java @@ -43,6 +43,7 @@ public final class WeakReference_Test { return adapter; } + @Override protected void finalize() { adapter.dispose(); } diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java index 7867fdb49db2..3c1a12a0be9b 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java @@ -3,8 +3,13 @@ #Supported parameters: NAME VALUE_type Range DefaultV Description +<<<<<<< HEAD FACTOR real (0, 1.2] 0.5 DEAgent: scale constant CR real [0, 1] 0.9 DEAgent: crossover constant +======= + FACTOR real (0, 1.2] 0.5 DEAgent: scale constant + CR real [0, 1] 0.9 DEAgent: crossover constant +>>>>>>> java: add @Override annotation to overriding methods //Other choices for FACTOR and CR: (0.5, 0.1) * @@ -46,6 +51,7 @@ public class DEGTBehavior extends AbsGTBehavior implements ILibEngine { pbest_t = pbest; } + @Override public void generateBehavior(SearchPoint trailPoint, ProblemEncoder problemEncoder) { SearchPoint gbest_t = socialLib.getGbest(); @@ -66,6 +72,7 @@ public class DEGTBehavior extends AbsGTBehavior implements ILibEngine { } } + @Override public void testBehavior(SearchPoint trailPoint, IGoodnessCompareEngine qualityComparator) { Library.replace(qualityComparator, trailPoint, pbest_t); } diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java index c1e8db0123ae..68c3270adb79 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java @@ -83,6 +83,7 @@ public class PSGTBehavior extends AbsGTBehavior { pold_t = pold; } + @Override public void generateBehavior(SearchPoint trailPoint, ProblemEncoder problemEncoder) { SearchPoint gbest_t = socialLib.getGbest(); DesignSpace designSpace = problemEncoder.getDesignSpace(); @@ -107,6 +108,7 @@ public class PSGTBehavior extends AbsGTBehavior { } } + @Override public void testBehavior(SearchPoint trailPoint, IGoodnessCompareEngine qualityComparator) { Library.replace(qualityComparator, trailPoint, pbest_t); pold_t.importLocation(pcurrent_t); diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/UnconstrainedProblemEncoder.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/UnconstrainedProblemEncoder.java index 03b621ec05d7..f5193336789e 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/UnconstrainedProblemEncoder.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/UnconstrainedProblemEncoder.java @@ -32,6 +32,7 @@ public abstract class UnconstrainedProblemEncoder extends ProblemEncoder { setDefaultYAt(0, BasicBound.MINDOUBLE, BasicBound.MINDOUBLE); } + @Override protected double calcTargetAt(int index, double[] VX) { return calcTarget(VX); } diff --git a/odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java b/odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java index 0188cb165ccb..9cfeb9e81f1f 100644 --- a/odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java +++ b/odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java @@ -183,6 +183,7 @@ public class SelectionChangeListener implements XSelectionChangeListener { mMCF = xMCF; } + @Override public void run() { XDesktop aDesktop = null; XInterface aToolKit = null; diff --git a/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java b/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java index a063a0b9bed6..c59942ce0c35 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java +++ b/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java @@ -314,7 +314,8 @@ public class AsyncJob extends WeakBase implements XServiceInfo, XAsyncJob }; new Thread( doRun ) { - public void run() { javax.swing.SwingUtilities.invokeLater(doRun); } + @Override + public void run() { javax.swing.SwingUtilities.invokeLater(doRun); } }.start(); } diff --git a/odk/examples/DevelopersGuide/Config/ConfigExamples.java b/odk/examples/DevelopersGuide/Config/ConfigExamples.java index d7c5792176e0..13a314254160 100644 --- a/odk/examples/DevelopersGuide/Config/ConfigExamples.java +++ b/odk/examples/DevelopersGuide/Config/ConfigExamples.java @@ -363,6 +363,7 @@ public class ConfigExamples public int subdivision_x; public int subdivision_y; + @Override public String toString() { StringBuffer aBuffer = new StringBuffer(); aBuffer.append("[ Grid is "); aBuffer.append(visible ? "VISIBLE" : "HIDDEN"); diff --git a/odk/examples/DevelopersGuide/Forms/ControlLock.java b/odk/examples/DevelopersGuide/Forms/ControlLock.java index efce0c990462..b917039bf242 100644 --- a/odk/examples/DevelopersGuide/Forms/ControlLock.java +++ b/odk/examples/DevelopersGuide/Forms/ControlLock.java @@ -60,6 +60,7 @@ class LockControlModels extends ComponentTreeTraversal } /* ------------------------------------------------------------------ */ + @Override protected boolean shouldStepInto( XIndexContainer xContainer ) throws com.sun.star.uno.Exception { if ( !super.shouldStepInto( xContainer ) ) @@ -75,6 +76,7 @@ class LockControlModels extends ComponentTreeTraversal } /* ------------------------------------------------------------------ */ + @Override public void handle( Object aFormComponent ) throws com.sun.star.uno.Exception { // entering this nesting level diff --git a/odk/examples/DevelopersGuide/Forms/ControlValidation.java b/odk/examples/DevelopersGuide/Forms/ControlValidation.java index ea92c1c3ca8f..0ef0702eba20 100644 --- a/odk/examples/DevelopersGuide/Forms/ControlValidation.java +++ b/odk/examples/DevelopersGuide/Forms/ControlValidation.java @@ -29,6 +29,7 @@ public class ControlValidation extends DocumentBasedExample /* ------------------------------------------------------------------ */ /* public test methods */ /* ------------------------------------------------------------------ */ + @Override protected void prepareDocument() throws com.sun.star.uno.Exception, java.lang.Exception { super.prepareDocument(); diff --git a/odk/examples/DevelopersGuide/Forms/DataAwareness.java b/odk/examples/DevelopersGuide/Forms/DataAwareness.java index 749c8c900195..494591853f72 100644 --- a/odk/examples/DevelopersGuide/Forms/DataAwareness.java +++ b/odk/examples/DevelopersGuide/Forms/DataAwareness.java @@ -73,6 +73,7 @@ class PrintComponentTree extends ComponentTreeTraversal m_sPrefix = new String(); } + @Override public void handle( Object aFormComponent ) throws com.sun.star.uno.Exception { // the name of the child @@ -117,6 +118,7 @@ class RevokeButtons extends ComponentTreeTraversal m_aOperator = aOperator; } + @Override public void handle( Object aFormComponent ) throws com.sun.star.uno.Exception { // check if it's a button @@ -343,6 +345,7 @@ public class DataAwareness extends DocumentBasedExample implements XPropertyChan /* ------------------------------------------------------------------ */ // XEventListener overridables /* ------------------------------------------------------------------ */ + @Override public void disposing( EventObject aEvent ) { // simply disambiguate @@ -681,6 +684,7 @@ public class DataAwareness extends DocumentBasedExample implements XPropertyChan /* ------------------------------------------------------------------ */ /** creates our sample document */ + @Override protected void prepareDocument() throws com.sun.star.uno.Exception, java.lang.Exception { super.prepareDocument(); @@ -887,6 +891,7 @@ public class DataAwareness extends DocumentBasedExample implements XPropertyChan } /* ------------------------------------------------------------------ */ + @Override protected void onFormsAlive() { m_aOperator.onFormsAlive(); @@ -895,6 +900,7 @@ public class DataAwareness extends DocumentBasedExample implements XPropertyChan /* ------------------------------------------------------------------ */ /** performs any cleanup before exiting the program */ + @Override protected void cleanUp( ) throws java.lang.Exception { // remove the listeners at the buttons diff --git a/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java b/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java index 0a4e46e48e3b..e349892d3ea9 100644 --- a/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java +++ b/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java @@ -219,6 +219,7 @@ public class HsqlDatabase return new RowSet( m_context, getDocumentURL(), _commandType, _command ); } + @Override protected void finalize() throws Throwable { closeAndDelete(); diff --git a/odk/examples/DevelopersGuide/Forms/SpreadsheetValueBinding.java b/odk/examples/DevelopersGuide/Forms/SpreadsheetValueBinding.java index e3555b308a0c..8baca5dca0d5 100644 --- a/odk/examples/DevelopersGuide/Forms/SpreadsheetValueBinding.java +++ b/odk/examples/DevelopersGuide/Forms/SpreadsheetValueBinding.java @@ -35,6 +35,7 @@ public class SpreadsheetValueBinding extends DocumentBasedExample } /* ------------------------------------------------------------------ */ + @Override protected void prepareDocument() throws com.sun.star.uno.Exception, java.lang.Exception { super.prepareDocument(); diff --git a/odk/examples/DevelopersGuide/Forms/TableCellTextBinding.java b/odk/examples/DevelopersGuide/Forms/TableCellTextBinding.java index 4b9fc6b84cdf..3b47da5ebc86 100644 --- a/odk/examples/DevelopersGuide/Forms/TableCellTextBinding.java +++ b/odk/examples/DevelopersGuide/Forms/TableCellTextBinding.java @@ -127,6 +127,7 @@ public class TableCellTextBinding /** runs the thread */ + @Override public void run() { try diff --git a/odk/examples/DevelopersGuide/Forms/ValueBinding.java b/odk/examples/DevelopersGuide/Forms/ValueBinding.java index 3cf649cce543..e86e6bc72372 100644 --- a/odk/examples/DevelopersGuide/Forms/ValueBinding.java +++ b/odk/examples/DevelopersGuide/Forms/ValueBinding.java @@ -35,6 +35,7 @@ public class ValueBinding extends DocumentBasedExample } /* ------------------------------------------------------------------ */ + @Override protected void prepareDocument() throws com.sun.star.uno.Exception, java.lang.Exception { super.prepareDocument(); diff --git a/odk/examples/DevelopersGuide/Forms/WaitForInput.java b/odk/examples/DevelopersGuide/Forms/WaitForInput.java index bb5674fb07e9..55284d04ba15 100644 --- a/odk/examples/DevelopersGuide/Forms/WaitForInput.java +++ b/odk/examples/DevelopersGuide/Forms/WaitForInput.java @@ -31,6 +31,7 @@ class WaitForInput extends java.lang.Thread return m_bDone; } + @Override public void run() { try diff --git a/odk/examples/DevelopersGuide/GUI/UnoMenu2.java b/odk/examples/DevelopersGuide/GUI/UnoMenu2.java index 6c3cb0c60828..24b0aabab04e 100644 --- a/odk/examples/DevelopersGuide/GUI/UnoMenu2.java +++ b/odk/examples/DevelopersGuide/GUI/UnoMenu2.java @@ -85,13 +85,16 @@ public UnoMenu2(XComponentContext _xContext, XMultiComponentFactory _xMCF) { e.printStackTrace(); }} + @Override protected void closeDialog(){ xDialog.endExecute(); } + @Override public void mouseReleased(MouseEvent mouseEvent) { } + @Override public void mousePressed(MouseEvent mouseEvent) { if (mouseEvent.PopupTrigger){ Rectangle aPos = new Rectangle(mouseEvent.X, mouseEvent.Y, 0, 0); @@ -100,12 +103,15 @@ public UnoMenu2(XComponentContext _xContext, XMultiComponentFactory _xMCF) { } } + @Override public void mouseExited(MouseEvent mouseEvent) { } + @Override public void mouseEntered(MouseEvent mouseEvent) { } + @Override public void disposing(EventObject eventObject) { } } diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java index b72f30ac755c..66481a697583 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java @@ -300,6 +300,7 @@ public class DocumentView extends JFrame /** * Overridden so we can react for window closing of this view. */ + @Override protected void processWindowEvent(WindowEvent aEvent) { if (aEvent.getID()!=WindowEvent.WINDOW_CLOSING) diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java index ed900c7eb0f4..712abb91fcc3 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java @@ -79,6 +79,7 @@ public class NativeView extends java.awt.Canvas * can be called more than ones - but call native code one times only * and safe the handle and the system type on our members maHandle/maSystem! */ + @Override public void setVisible(boolean bState) { getHWND(); @@ -91,16 +92,19 @@ public class NativeView extends java.awt.Canvas * (e.g. JSplitPane) we must provide some information about our * preferred/minimum and maximum size. */ + @Override public Dimension getPreferredSize() { return new Dimension(500,300); } + @Override public Dimension getMaximumSize() { return new Dimension(1024,768); } + @Override public Dimension getMinimumSize() { return new Dimension(100,100); @@ -116,6 +120,7 @@ public class NativeView extends java.awt.Canvas * May the remote window is already plugged. In such case we * shouldn't paint it over. */ + @Override public void paint(Graphics aGraphic) { if(maHandle==null) diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java index b21905505c89..af70c10cadc1 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java @@ -122,6 +122,7 @@ class OnewayExecutor extends Thread * give him all necessary parameters. * After that we die by ourselves ... */ + @Override public void run() { if (m_rLink==null) diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java index e91eeefb9cde..d03496dbb8b3 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java @@ -190,6 +190,7 @@ public class ViewContainer extends Thread * on shutdown. We inform all current registered listener and * views. They should deinitialize her internal things then. */ + @Override public void run() { synchronized(this) diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper_Hyph.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper_Hyph.java index a8a3e2375e80..a0e22a5e6516 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper_Hyph.java +++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper_Hyph.java @@ -49,6 +49,7 @@ public class PropChgHelper_Hyph extends PropChgHelper // XPropertyChangeListener + @Override public void propertyChange( PropertyChangeEvent aEvt ) throws com.sun.star.uno.RuntimeException { diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper_Spell.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper_Spell.java index e87df4ad26f1..16d93269ad97 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper_Spell.java +++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper_Spell.java @@ -49,6 +49,7 @@ public class PropChgHelper_Spell extends PropChgHelper // XPropertyChangeListener + @Override public void propertyChange( PropertyChangeEvent aEvt ) throws com.sun.star.uno.RuntimeException { diff --git a/odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/ConnectionAwareClient.java b/odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/ConnectionAwareClient.java index e50e1fde75b6..4cf807828b5c 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/ConnectionAwareClient.java +++ b/odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/ConnectionAwareClient.java @@ -80,6 +80,7 @@ public class ConnectionAwareClient extends java.awt.Frame addWindowListener( new WindowAdapter() { + @Override public void windowClosing(WindowEvent event) { System.exit(0); diff --git a/odk/examples/DevelopersGuide/ProfUNO/Lifetime/MyUnoObject.java b/odk/examples/DevelopersGuide/ProfUNO/Lifetime/MyUnoObject.java index d5e828cf46e8..62949299b37f 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/Lifetime/MyUnoObject.java +++ b/odk/examples/DevelopersGuide/ProfUNO/Lifetime/MyUnoObject.java @@ -36,6 +36,7 @@ class MyUnoObject implements com.sun.star.uno.XInterface { public MyUnoObject() {} + @Override protected void finalize() throws Throwable { super.finalize(); System.out.println( "finalizer called" ); diff --git a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java index b6e118301a37..b6f58d9a4c79 100644 --- a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java +++ b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java @@ -227,6 +227,7 @@ class ScriptSelectorPanel extends JPanel { DefaultMutableTreeNode top = new DefaultMutableTreeNode(myrootnode) { + @Override public String toString() { return ((XBrowseNode)getUserObject()).getName(); } @@ -283,6 +284,7 @@ class ScriptSelectorPanel extends JPanel { public void addNode(DefaultMutableTreeNode parent, XBrowseNode xbn) { DefaultMutableTreeNode newNode = new DefaultMutableTreeNode(xbn) { + @Override public String toString() { return ((XBrowseNode)getUserObject()).getName(); } @@ -309,6 +311,7 @@ class ScriptSelectorPanel extends JPanel { } DefaultMutableTreeNode newNode = new DefaultMutableTreeNode(children[i]) { + @Override public String toString() { return ((XBrowseNode)getUserObject()).getName(); } @@ -336,6 +339,7 @@ class ScriptTreeRenderer extends DefaultTreeCellRenderer { containerIcon = new ImageIcon(getClass().getResource("container.gif")); } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, diff --git a/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java b/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java index c764fc94ccea..cd0c7c767960 100644 --- a/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java +++ b/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java @@ -86,6 +86,7 @@ class ExampleAddInThread extends Thread aCounters = aResults; } + @Override public void run() { while ( true ) diff --git a/odk/examples/java/ConverterServlet/ConverterServlet.java b/odk/examples/java/ConverterServlet/ConverterServlet.java index 2a3688c4ead9..607fc140ab5a 100644 --- a/odk/examples/java/ConverterServlet/ConverterServlet.java +++ b/odk/examples/java/ConverterServlet/ConverterServlet.java @@ -87,6 +87,7 @@ public class ConverterServlet extends HttpServlet { * @throws ServletException If the request for the POST could not be handled. * @throws IOException If an input or output error is detected when the servlet handles the request. */ + @Override protected void doPost( HttpServletRequest request, HttpServletResponse response) throws ServletException, java.io.IOException { try { diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java b/odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java index 4c9dc1b23d62..d30175f2b1bc 100644 --- a/odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java +++ b/odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java @@ -32,6 +32,7 @@ public class EditorFrame extends JFrame WindowListener m_aCloser = new WindowAdapter() { + @Override public void windowClosing( WindowEvent e ) { m_aBufImage = new BufferedImage( m_aTextArea.getWidth(), m_aTextArea.getHeight(), BufferedImage.TYPE_INT_RGB ); diff --git a/odk/examples/java/Inspector/MethodParametersDialog.java b/odk/examples/java/Inspector/MethodParametersDialog.java index 6a43c697ad0d..27ac872eb1d7 100644 --- a/odk/examples/java/Inspector/MethodParametersDialog.java +++ b/odk/examples/java/Inspector/MethodParametersDialog.java @@ -266,6 +266,7 @@ public class MethodParametersDialog extends JDialog{ private class UpdateUIAdapter extends KeyAdapter{ + @Override public void keyReleased(KeyEvent e){ boolean bIsCompleted = isCompleted(); jOKButton.setEnabled(bIsCompleted); diff --git a/odk/examples/java/Inspector/SourceCodeGenerator.java b/odk/examples/java/Inspector/SourceCodeGenerator.java index 7e158afd04ad..1df755d3d91b 100644 --- a/odk/examples/java/Inspector/SourceCodeGenerator.java +++ b/odk/examples/java/Inspector/SourceCodeGenerator.java @@ -373,7 +373,8 @@ public class SourceCodeGenerator { } - public boolean add(String _oElement){ + @Override + public boolean add(String _oElement){ if (!contains(_oElement)){ super.add(_oElement); return true; diff --git a/odk/examples/java/Inspector/SwingDialogProvider.java b/odk/examples/java/Inspector/SwingDialogProvider.java index 29774f93a6ca..f683cd40305f 100644 --- a/odk/examples/java/Inspector/SwingDialogProvider.java +++ b/odk/examples/java/Inspector/SwingDialogProvider.java @@ -154,12 +154,14 @@ public class SwingDialogProvider implements XDialogProvider{ private class InspectorComponentAdapter extends ComponentAdapter{ + @Override public void componentHidden(ComponentEvent e){ m_jInspectorDialog.pack(); m_jInspectorDialog.invalidate(); } + @Override public void componentShown(ComponentEvent e){ m_jInspectorDialog.pack(); m_jInspectorDialog.invalidate(); @@ -167,11 +169,13 @@ public class SwingDialogProvider implements XDialogProvider{ } private class InspectorWindowAdapter extends WindowAdapter{ + @Override public void windowClosed(WindowEvent e){ removeTabPanes(); m_oInspector.disposeHiddenDocuments(); } + @Override public void windowClosing(WindowEvent e){ removeTabPanes(); m_oInspector.disposeHiddenDocuments(); diff --git a/odk/examples/java/Inspector/SwingTreeControlProvider.java b/odk/examples/java/Inspector/SwingTreeControlProvider.java index f4eb91945cc3..819202fa64af 100644 --- a/odk/examples/java/Inspector/SwingTreeControlProvider.java +++ b/odk/examples/java/Inspector/SwingTreeControlProvider.java @@ -168,6 +168,7 @@ public class SwingTreeControlProvider implements XTreeControlProvider{ private class InspectorKeyFilterAdapter extends KeyAdapter{ + @Override public void keyReleased(KeyEvent e){ String sFilter = jtxtFilter.getText(); SwingTreePathProvider oSwingTreePathProvider = new SwingTreePathProvider(jTree.getSelectionPath()); @@ -234,6 +235,7 @@ public class SwingTreeControlProvider implements XTreeControlProvider{ ); // Add KeyListener for help jTree.addKeyListener( new java.awt.event.KeyAdapter() { + @Override public void keyReleased(java.awt.event.KeyEvent event) { if ( event.getKeyCode() == KeyEvent.VK_F1 ) { // function key F1 pressed @@ -244,6 +246,7 @@ public class SwingTreeControlProvider implements XTreeControlProvider{ } }); jTree.addMouseListener(new MouseAdapter() { + @Override public void mousePressed (MouseEvent e) { if (e.isPopupTrigger()){ m_oInspectorPane.showPopUpMenu(e.getComponent(), e.getX(), e.getY()); diff --git a/odk/examples/java/Inspector/SwingUnoFacetteNode.java b/odk/examples/java/Inspector/SwingUnoFacetteNode.java index 2b51902bc963..dc726beaa62d 100644 --- a/odk/examples/java/Inspector/SwingUnoFacetteNode.java +++ b/odk/examples/java/Inspector/SwingUnoFacetteNode.java @@ -52,6 +52,7 @@ public class SwingUnoFacetteNode extends SwingUnoNode implements XUnoFacetteNode m_sFilter = _sFilter; } + @Override public String getName(){ return toString(); } diff --git a/odk/examples/java/Inspector/SwingUnoMethodNode.java b/odk/examples/java/Inspector/SwingUnoMethodNode.java index 92bebe505e1c..5b4833fa4f4a 100644 --- a/odk/examples/java/Inspector/SwingUnoMethodNode.java +++ b/odk/examples/java/Inspector/SwingUnoMethodNode.java @@ -59,10 +59,12 @@ public class SwingUnoMethodNode extends SwingUnoNode implements ActionListener, return m_oUnoMethodNode.isFoldable(); } + @Override public String getName(){ return m_oUnoMethodNode.getName(); } + @Override public String getClassName(){ String sClassName = ""; sClassName = getXIdlMethod().getDeclaringClass().getName(); @@ -72,6 +74,7 @@ public class SwingUnoMethodNode extends SwingUnoNode implements ActionListener, return sClassName; } + @Override public String getAnchor(){ return m_oUnoMethodNode.getAnchor(); } diff --git a/odk/examples/java/Inspector/SwingUnoNode.java b/odk/examples/java/Inspector/SwingUnoNode.java index 19295cc4b4d0..dbe79e6887c0 100644 --- a/odk/examples/java/Inspector/SwingUnoNode.java +++ b/odk/examples/java/Inspector/SwingUnoNode.java @@ -127,6 +127,7 @@ public class SwingUnoNode extends HideableMutableTreeNode implements XUnoNode{ } + @Override public int getChildCount(){ return super.getChildCount(); } diff --git a/odk/examples/java/Inspector/SwingUnoPropertyNode.java b/odk/examples/java/Inspector/SwingUnoPropertyNode.java index f72229db6f10..7de646bb5b15 100644 --- a/odk/examples/java/Inspector/SwingUnoPropertyNode.java +++ b/odk/examples/java/Inspector/SwingUnoPropertyNode.java @@ -58,6 +58,7 @@ public class SwingUnoPropertyNode extends SwingUnoNode implements XUnoPropertyNo m_oUnoPropertyNode = new UnoPropertyNode(_aPropertyValue, _oUnoObject, _oUnoReturnObject); } + @Override public String getName(){ return m_oUnoPropertyNode.getName(); } @@ -68,6 +69,7 @@ public class SwingUnoPropertyNode extends SwingUnoNode implements XUnoPropertyNo } + @Override public String getClassName(){ String sClassName = m_oUnoPropertyNode.getClassName(); if (sClassName.equals("")){ @@ -76,6 +78,7 @@ public class SwingUnoPropertyNode extends SwingUnoNode implements XUnoPropertyNo return sClassName; } + @Override public String getAnchor(){ return m_oUnoPropertyNode.getAnchor(); } diff --git a/odk/examples/java/Inspector/UnoMethodNode.java b/odk/examples/java/Inspector/UnoMethodNode.java index 69bb58e4d2d9..1ef0e81fe9d5 100644 --- a/odk/examples/java/Inspector/UnoMethodNode.java +++ b/odk/examples/java/Inspector/UnoMethodNode.java @@ -75,6 +75,7 @@ public class UnoMethodNode extends UnoNode{ } + @Override public String getAnchor(){ return getXIdlMethod().getName(); } diff --git a/odk/examples/java/Inspector/UnoPropertyNode.java b/odk/examples/java/Inspector/UnoPropertyNode.java index 920300e15546..b0db9b396120 100644 --- a/odk/examples/java/Inspector/UnoPropertyNode.java +++ b/odk/examples/java/Inspector/UnoPropertyNode.java @@ -94,6 +94,7 @@ public class UnoPropertyNode extends UnoNode{ } + @Override public String getClassName(){ String sClassName = ""; if (m_oUnoObject != null){ @@ -115,6 +116,7 @@ public class UnoPropertyNode extends UnoNode{ } + @Override public String getAnchor(){ return m_sPropertyName; } diff --git a/odk/examples/java/Inspector/UnoTreeRenderer.java b/odk/examples/java/Inspector/UnoTreeRenderer.java index fb3295ca3899..61b481e4ba40 100644 --- a/odk/examples/java/Inspector/UnoTreeRenderer.java +++ b/odk/examples/java/Inspector/UnoTreeRenderer.java @@ -73,6 +73,7 @@ public class UnoTreeRenderer extends DefaultTreeCellRenderer{ } + @Override public synchronized Component getTreeCellRendererComponent(JTree tree,Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus){ try{ bSelected = sel; @@ -104,6 +105,7 @@ public class UnoTreeRenderer extends DefaultTreeCellRenderer{ + @Override public void paintComponent(Graphics g) { FontMetrics fm = getFontMetrics(getFont()); int x, y; diff --git a/odk/source/com/sun/star/lib/loader/InstallationFinder.java b/odk/source/com/sun/star/lib/loader/InstallationFinder.java index bf035752bea7..dcf80302105a 100644 --- a/odk/source/com/sun/star/lib/loader/InstallationFinder.java +++ b/odk/source/com/sun/star/lib/loader/InstallationFinder.java @@ -556,6 +556,7 @@ final class InstallationFinder { m_istream = istream; } + @Override public void run() { try { BufferedReader br = new BufferedReader( diff --git a/odk/source/com/sun/star/lib/loader/Loader.java b/odk/source/com/sun/star/lib/loader/Loader.java index d6b67b7ee6db..0c55d19a84cd 100644 --- a/odk/source/com/sun/star/lib/loader/Loader.java +++ b/odk/source/com/sun/star/lib/loader/Loader.java @@ -277,6 +277,7 @@ public final class Loader { this.stream = stream; } + @Override public void run() { try { while (stream.read() != -1) {} @@ -296,6 +297,7 @@ public final class Loader { super( urls ); } + @Override protected Class findClass( String name ) throws ClassNotFoundException { // This is only called via this.loadClass -> super.loadClass -> // this.findClass, after this.loadClass has already called @@ -303,6 +305,7 @@ public final class Loader { throw new ClassNotFoundException( name ); } + @Override protected Class loadClass( String name, boolean resolve ) throws ClassNotFoundException { diff --git a/qadevOOo/runner/complexlib/MethodThread.java b/qadevOOo/runner/complexlib/MethodThread.java index 70d5ce993f02..b6f1b81affba 100644 --- a/qadevOOo/runner/complexlib/MethodThread.java +++ b/qadevOOo/runner/complexlib/MethodThread.java @@ -64,6 +64,7 @@ public class MethodThread extends Thread /** * Invoke the method. */ + @Override public void run() { try @@ -115,6 +116,7 @@ public class MethodThread extends Thread * Stop the running method. * @deprecated */ + @Override public void destroy() { stop(); diff --git a/qadevOOo/runner/convwatch/ConvWatchStarter.java b/qadevOOo/runner/convwatch/ConvWatchStarter.java index b8a0691629e2..1cd17991d1f9 100644 --- a/qadevOOo/runner/convwatch/ConvWatchStarter.java +++ b/qadevOOo/runner/convwatch/ConvWatchStarter.java @@ -56,6 +56,7 @@ public class ConvWatchStarter extends EnhancedComplexTestCase * Return all test methods. * @return The test methods. */ + @Override public String[] getTestMethodNames() { return new String[]{"compareGraphicalDiffs"}; } @@ -139,6 +140,7 @@ public class ConvWatchStarter extends EnhancedComplexTestCase * * @return a List of software which must accessible as an external executable */ + @Override protected String[] mustInstalledSoftware() { ArrayList<String> aList = new ArrayList<String>(); diff --git a/qadevOOo/runner/convwatch/CrashLoopTest.java b/qadevOOo/runner/convwatch/CrashLoopTest.java index fea1490dfae5..015314980d14 100644 --- a/qadevOOo/runner/convwatch/CrashLoopTest.java +++ b/qadevOOo/runner/convwatch/CrashLoopTest.java @@ -26,6 +26,7 @@ public class CrashLoopTest extends ReferenceBuilder * In this case it is the actual name of the service. * @return The tested service. */ + @Override public String getTestObjectName() { return "CrashLoopTest runner"; } @@ -36,6 +37,7 @@ public class CrashLoopTest extends ReferenceBuilder * Return all test methods. * @return The test methods. */ + @Override public String[] getTestMethodNames() { return new String[]{"testcrashandloops"}; } diff --git a/qadevOOo/runner/convwatch/DBHelper.java b/qadevOOo/runner/convwatch/DBHelper.java index 420e9d03a9ad..844e3359045d 100644 --- a/qadevOOo/runner/convwatch/DBHelper.java +++ b/qadevOOo/runner/convwatch/DBHelper.java @@ -61,6 +61,7 @@ class ShareConnection m_sSQL = _sSQL; } + @Override public void run() { Statement oStmt = null; diff --git a/qadevOOo/runner/convwatch/DocumentConverter.java b/qadevOOo/runner/convwatch/DocumentConverter.java index 758037012cdb..b088d9177f72 100644 --- a/qadevOOo/runner/convwatch/DocumentConverter.java +++ b/qadevOOo/runner/convwatch/DocumentConverter.java @@ -50,6 +50,7 @@ public class DocumentConverter extends EnhancedComplexTestCase * In this case it is the actual name of the service. * @return The tested service. */ + @Override public String getTestObjectName() { return "DocumentConverter runner"; } @@ -60,6 +61,7 @@ public class DocumentConverter extends EnhancedComplexTestCase * Return all test methods. * @return The test methods. */ + @Override public String[] getTestMethodNames() { return new String[]{"convert"}; } @@ -124,6 +126,7 @@ public class DocumentConverter extends EnhancedComplexTestCase /** * Function returns a List of software which must accessible as an external executable */ + @Override protected String[] mustInstalledSoftware() { ArrayList<String> aList = new ArrayList<String>(); diff --git a/qadevOOo/runner/convwatch/FilenameHelper.java b/qadevOOo/runner/convwatch/FilenameHelper.java index 85b02993c132..1822232fc205 100644 --- a/qadevOOo/runner/convwatch/FilenameHelper.java +++ b/qadevOOo/runner/convwatch/FilenameHelper.java @@ -267,6 +267,7 @@ abstract class FilenameHelper_impl implements Filenamer */ class OriginalFilename extends FilenameHelper_impl { + @Override public String buildName() { return getName(); @@ -281,10 +282,12 @@ class OriginalFilename extends FilenameHelper_impl */ class OriginalReferenceFilename extends FilenameHelper_impl { + @Override public String getSuffix() { return "prn"; } + @Override public String buildName() { return getName(); @@ -298,10 +301,12 @@ class OriginalReferenceFilename extends FilenameHelper_impl */ class OriginalReferencePictureFilename extends FilenameHelper_impl { + @Override public String getSuffix() { return "jpg"; } + @Override public String buildName() { return getName() + "-" + getNumber() + "-ref"; @@ -320,10 +325,12 @@ class OriginalReferencePictureFilename extends FilenameHelper_impl */ class CurrentReferenceFilename extends FilenameHelper_impl { + @Override public String getSuffix() { return "ps"; } + @Override public String buildName() { return getName(); @@ -338,10 +345,12 @@ class CurrentReferenceFilename extends FilenameHelper_impl */ class CurrentReferencePictureFilename extends FilenameHelper_impl { + @Override public String getSuffix() { return "jpg"; } + @Override public String buildName() { return getName() + "-" + getNumber() + "-new-ref"; diff --git a/qadevOOo/runner/convwatch/GfxCompare.java b/qadevOOo/runner/convwatch/GfxCompare.java index 69af898846ba..921191ba46a2 100644 --- a/qadevOOo/runner/convwatch/GfxCompare.java +++ b/qadevOOo/runner/convwatch/GfxCompare.java @@ -37,6 +37,7 @@ public class GfxCompare extends EnhancedComplexTestCase * @return The test methods. */ + @Override public String[] getTestMethodNames() { return new String[]{"gfxcompare"}; } @@ -45,6 +46,7 @@ public class GfxCompare extends EnhancedComplexTestCase * * @return a List of software which must accessible as an external executable */ + @Override protected String[] mustInstalledSoftware() { ArrayList<String> aList = new ArrayList<String>(); diff --git a/qadevOOo/runner/convwatch/PixelCounter.java b/qadevOOo/runner/convwatch/PixelCounter.java index 36109cc93650..63523f60047e 100644 --- a/qadevOOo/runner/convwatch/PixelCounter.java +++ b/qadevOOo/runner/convwatch/PixelCounter.java @@ -35,6 +35,7 @@ class CountNotWhite extends CountPixel { } + @Override public void count(int pixel) { int red = (pixel >> 16) & 0xff; @@ -56,6 +57,7 @@ class CountNotBlack extends CountPixel { } + @Override public void count(int pixel) { int red = (pixel >> 16) & 0xff; diff --git a/qadevOOo/runner/convwatch/ReferenceBuilder.java b/qadevOOo/runner/convwatch/ReferenceBuilder.java index 41a496eab9f0..c9fbc9a8dda6 100644 --- a/qadevOOo/runner/convwatch/ReferenceBuilder.java +++ b/qadevOOo/runner/convwatch/ReferenceBuilder.java @@ -49,6 +49,7 @@ public class ReferenceBuilder extends EnhancedComplexTestCase * In this case it is the actual name of the service. * @return The tested service. */ + @Override public String getTestObjectName() { return "ReferenceBuilder runner"; } @@ -59,6 +60,7 @@ public class ReferenceBuilder extends EnhancedComplexTestCase * Return all test methods. * @return The test methods. */ + @Override public String[] getTestMethodNames() { return new String[]{"buildreference"}; } @@ -123,6 +125,7 @@ public class ReferenceBuilder extends EnhancedComplexTestCase /** * Function returns a List of software which must accessible as an external executable */ + @Override protected String[] mustInstalledSoftware() { return new String[] { "perl -version" }; diff --git a/qadevOOo/runner/convwatch/ReportDesignerTest.java b/qadevOOo/runner/convwatch/ReportDesignerTest.java index 8a4be7382ba5..0aad73c78985 100644 --- a/qadevOOo/runner/convwatch/ReportDesignerTest.java +++ b/qadevOOo/runner/convwatch/ReportDesignerTest.java @@ -125,6 +125,7 @@ public class ReportDesignerTest extends ComplexTestCase { * This method returns a list of Strings, each string must be a function name in this class. * @return */ + @Override public String[] getTestMethodNames() { return new String[] {"ReportDesignTest"}; // MAIN diff --git a/qadevOOo/runner/convwatch/TriState.java b/qadevOOo/runner/convwatch/TriState.java index 4e10cfe34825..80a568329f92 100644 --- a/qadevOOo/runner/convwatch/TriState.java +++ b/qadevOOo/runner/convwatch/TriState.java @@ -55,6 +55,7 @@ public class TriState <code>false</code> otherwise. */ + @Override public boolean equals(Object obj) { if ((obj != null) && diff --git a/qadevOOo/runner/graphical/GraphicalComparator.java b/qadevOOo/runner/graphical/GraphicalComparator.java index 72e193b7756a..53a2d9aabcb2 100644 --- a/qadevOOo/runner/graphical/GraphicalComparator.java +++ b/qadevOOo/runner/graphical/GraphicalComparator.java @@ -21,6 +21,7 @@ package graphical; public class GraphicalComparator extends EnhancedComplexTestCase { + @Override public String[] getTestMethodNames() { return new String[]{"check"}; } diff --git a/qadevOOo/runner/graphical/JPEGComparator.java b/qadevOOo/runner/graphical/JPEGComparator.java index a3a886975298..2ea6841b3e82 100644 --- a/qadevOOo/runner/graphical/JPEGComparator.java +++ b/qadevOOo/runner/graphical/JPEGComparator.java @@ -120,6 +120,7 @@ class CountNotWhitePixelsFromImage extends CountNotXXXPixelsFromImage super(_sFilename); } + @Override public void run() { try @@ -142,6 +143,7 @@ class CountNotBlackPixelsFromImage extends CountNotXXXPixelsFromImage super(_sFilename); } + @Override public void run() { try @@ -159,6 +161,7 @@ class CountNotBlackPixelsFromImage extends CountNotXXXPixelsFromImage public class JPEGComparator extends EnhancedComplexTestCase { + @Override public String[] getTestMethodNames() { return new String[]{"CompareJPEGvsJPEG"}; diff --git a/qadevOOo/runner/graphical/JPEGCreator.java b/qadevOOo/runner/graphical/JPEGCreator.java index 6a53bca2d16b..c95aad79e5bb 100644 --- a/qadevOOo/runner/graphical/JPEGCreator.java +++ b/qadevOOo/runner/graphical/JPEGCreator.java @@ -25,6 +25,7 @@ import java.io.File; public class JPEGCreator extends EnhancedComplexTestCase { + @Override public String[] getTestMethodNames() { return new String[]{"PostscriptOrPDFToJPEG"}; diff --git a/qadevOOo/runner/graphical/JPEGEvaluator.java b/qadevOOo/runner/graphical/JPEGEvaluator.java index 5ee8db786b9e..cddbde844e91 100644 --- a/qadevOOo/runner/graphical/JPEGEvaluator.java +++ b/qadevOOo/runner/graphical/JPEGEvaluator.java @@ -20,6 +20,7 @@ package graphical; public class JPEGEvaluator extends EnhancedComplexTestCase { + @Override public String[] getTestMethodNames() { return new String[]{"EvaluateResult"}; diff --git a/qadevOOo/runner/graphical/PixelCounter.java b/qadevOOo/runner/graphical/PixelCounter.java index 0c0fd711d724..887424772d65 100644 --- a/qadevOOo/runner/graphical/PixelCounter.java +++ b/qadevOOo/runner/graphical/PixelCounter.java @@ -47,6 +47,7 @@ class CountNotWhite extends CountPixel } ++m_nCount; } + @Override public void count(final int pixel) { // final int alpha = (pixel >> 24) & 0xff; @@ -91,6 +92,7 @@ class CountNotBlack extends CountPixel } ++m_nCount; } + @Override public void count(final int pixel) { // final int alpha = (pixel >> 24) & 0xff; diff --git a/qadevOOo/runner/graphical/PostscriptCreator.java b/qadevOOo/runner/graphical/PostscriptCreator.java index 27c6e4847f33..6a27dea78eec 100644 --- a/qadevOOo/runner/graphical/PostscriptCreator.java +++ b/qadevOOo/runner/graphical/PostscriptCreator.java @@ -21,6 +21,7 @@ package graphical; public class PostscriptCreator extends EnhancedComplexTestCase { + @Override public String[] getTestMethodNames() { return new String[]{"DocumentToPostscript"}; diff --git a/qadevOOo/runner/helper/APIDescGetter.java b/qadevOOo/runner/helper/APIDescGetter.java index 085f8f2e80cf..86a501b05cfc 100644 --- a/qadevOOo/runner/helper/APIDescGetter.java +++ b/qadevOOo/runner/helper/APIDescGetter.java @@ -66,6 +66,7 @@ public class APIDescGetter extends DescGetter * @param entry contains the entry name, e.g. sw.SwXBodyText * @param debug if true some debug information is displayed on standard out */ + @Override public DescEntry[] getDescriptionFor(String job, String descPath, boolean debug) { @@ -184,6 +185,7 @@ public class APIDescGetter extends DescGetter } } + @Override protected DescEntry getDescriptionForSingleJob(String job, String descPath, boolean debug) { @@ -716,6 +718,7 @@ public class APIDescGetter extends DescGetter return aEntry; } + @Override protected ArrayList<String> getSubInterfaces(String job) { ArrayList<String> namesList = new ArrayList<String>(); @@ -747,6 +750,7 @@ public class APIDescGetter extends DescGetter return namesList; } + @Override protected String[] createScenario(String descPath, String job, boolean debug) { diff --git a/qadevOOo/runner/helper/ComplexDescGetter.java b/qadevOOo/runner/helper/ComplexDescGetter.java index 6e517d712d36..d0ec77879926 100644 --- a/qadevOOo/runner/helper/ComplexDescGetter.java +++ b/qadevOOo/runner/helper/ComplexDescGetter.java @@ -41,6 +41,7 @@ public class ComplexDescGetter extends DescGetter testClass = null; } + @Override public DescEntry[] getDescriptionFor(String entry, String DescPath, boolean debug) { @@ -67,6 +68,7 @@ public class ComplexDescGetter extends DescGetter return null; } + @Override protected DescEntry getDescriptionForSingleJob(String className, String descPath, boolean debug) { DynamicClassLoader dcl = new DynamicClassLoader(); @@ -175,6 +177,7 @@ public class ComplexDescGetter extends DescGetter return dEntry; } + @Override protected String[] createScenario(String descPath, String job, boolean debug) { return new String[] {}; diff --git a/qadevOOo/runner/helper/LoggingThread.java b/qadevOOo/runner/helper/LoggingThread.java index 70249fe793c5..6eb2e1861640 100644 --- a/qadevOOo/runner/helper/LoggingThread.java +++ b/qadevOOo/runner/helper/LoggingThread.java @@ -52,6 +52,7 @@ public class LoggingThread extends Thread { this.debug = tParam.getBool(PropertyName.DEBUG_IS_ACTIVE); } + @Override public void run() { final int timeOut = param.getInt(PropertyName.TIME_OUT) / 2; int count = 0; diff --git a/qadevOOo/runner/helper/OfficeWatcher.java b/qadevOOo/runner/helper/OfficeWatcher.java index a45b4343b18e..b01d81609b89 100644 --- a/qadevOOo/runner/helper/OfficeWatcher.java +++ b/qadevOOo/runner/helper/OfficeWatcher.java @@ -56,6 +56,7 @@ public class OfficeWatcher extends Thread implements share.Watcher { return StoredPing; } + @Override public void run() { dbg("started"); boolean isDone = false; diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java index 5c477447381f..0bcabe4e8b68 100644 --- a/qadevOOo/runner/helper/ProcessHandler.java +++ b/qadevOOo/runner/helper/ProcessHandler.java @@ -69,6 +69,7 @@ class Pump extends Thread start(); } + @Override public void run() { try @@ -885,6 +886,7 @@ public class ProcessHandler interrupt(); } + @Override public void run() { while (m_nTimeoutInSec > 0) diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java index a0c93f34896c..10d2a67fb103 100644 --- a/qadevOOo/runner/lib/MultiPropertyTest.java +++ b/qadevOOo/runner/lib/MultiPropertyTest.java @@ -72,6 +72,7 @@ public class MultiPropertyTest extends MultiMethodTest /** * Overrides super.before() to check the service is supported by the object. */ + @Override protected void before() { XServiceInfo xInfo = UnoRuntime.queryInterface( @@ -102,6 +103,7 @@ public class MultiPropertyTest extends MultiMethodTest * * @see MultiMethodTest#invokeTestMethod */ + @Override protected void invokeTestMethod(Method meth, String methName) { if (meth != null) @@ -513,6 +515,7 @@ public class MultiPropertyTest extends MultiMethodTest * @return The second value if old value is equal to the first * one, the first value otherwise. */ + @Override protected Object getNewValue(String propName, Object old) { if (ValueComparer.equalValue(val1, old)) diff --git a/qadevOOo/runner/lib/Status.java b/qadevOOo/runner/lib/Status.java index e19f8bb39169..680e499cf8da 100644 --- a/qadevOOo/runner/lib/Status.java +++ b/qadevOOo/runner/lib/Status.java @@ -110,6 +110,7 @@ public class Status extends SimpleStatus { * description and appends to it it the reason, for example: * "FAILED.The getLabel works wrong", "PASSED.OK". */ + @Override public String toString() { String str = getRunStateString() + "." + getStateString(); diff --git a/qadevOOo/runner/lib/TestParameters.java b/qadevOOo/runner/lib/TestParameters.java index 17d5cdd95dd0..b560430dca41 100644 --- a/qadevOOo/runner/lib/TestParameters.java +++ b/qadevOOo/runner/lib/TestParameters.java @@ -170,6 +170,7 @@ public class TestParameters extends HashMap<String,Object> { * @return The value of this key. * @see java.util.HashMap */ + @Override public Object get(Object key) { Object val = super.get(key); if (val == null && DebugIsActive) { @@ -237,6 +238,7 @@ public class TestParameters extends HashMap<String,Object> { * @return The value of this key. * @see java.util.HashMap */ + @Override public Object put(String key, Object val) { return super.put(key,val); } diff --git a/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java b/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java index 1ba18f6e0c13..120e72e10362 100644 --- a/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java +++ b/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java @@ -83,6 +83,7 @@ public class ComplexDataBaseOutProducer extends DataBaseOutProducer { * @parameter log A log writer * @return True, if everything worked. */ + @Override protected boolean prepareDataBase(LogWriter log) { executeSQLCommand("SELECT id AS \"test_run.id\", api_version_id, description, date FROM test_run" + " WHERE date = \"$date\" AND description = \"$test_run_description\";", true); @@ -112,6 +113,7 @@ public class ComplexDataBaseOutProducer extends DataBaseOutProducer { * @parameter log A log writer * @return True, if everything worked. */ + @Override protected boolean insertEntry(LogWriter log) { if ( m_bDebug ) { diff --git a/qadevOOo/runner/stats/FatDataBaseOutProducer.java b/qadevOOo/runner/stats/FatDataBaseOutProducer.java index 48fe2062af11..1843577b40d4 100644 --- a/qadevOOo/runner/stats/FatDataBaseOutProducer.java +++ b/qadevOOo/runner/stats/FatDataBaseOutProducer.java @@ -63,6 +63,7 @@ public class FatDataBaseOutProducer extends DataBaseOutProducer { mSqlInput.put("api_version_name", apiVersion); } + @Override protected boolean prepareDataBase(LogWriter log) { executeSQLCommand("SHOW TABLES"); @@ -90,6 +91,7 @@ public class FatDataBaseOutProducer extends DataBaseOutProducer { return true; } + @Override protected boolean insertEntry(LogWriter log) { executeSQLCommand("SELECT id AS \"entry.id\", name AS \"entry.name\" FROM entry WHERE name = \"$EntryLongName\";", true); diff --git a/qadevOOo/runner/stats/FileLogWriter.java b/qadevOOo/runner/stats/FileLogWriter.java index 953814f16687..22d538df988b 100644 --- a/qadevOOo/runner/stats/FileLogWriter.java +++ b/qadevOOo/runner/stats/FileLogWriter.java @@ -75,6 +75,7 @@ public class FileLogWriter extends PrintWriter implements LogWriter { } + @Override public void println(String msg) { this.ow = (share.Watcher) entry.UserDefinedParams.get("Watcher"); diff --git a/qadevOOo/runner/stats/InternalLogWriter.java b/qadevOOo/runner/stats/InternalLogWriter.java index 052baf5b9487..7c4f988b281a 100644 --- a/qadevOOo/runner/stats/InternalLogWriter.java +++ b/qadevOOo/runner/stats/InternalLogWriter.java @@ -54,6 +54,7 @@ public class InternalLogWriter extends PrintWriter * Method to print a line that is added to the StringBuffer. * @param msg The message that is printed. */ + @Override public void println(String msg) { if (active) super.println(msg); @@ -63,6 +64,7 @@ public class InternalLogWriter extends PrintWriter * Method to print to the StringBuffer. * @param msg The message that is printed. */ + @Override public void print(String msg) { if (active) super.print(msg); diff --git a/qadevOOo/runner/stats/SimpleLogWriter.java b/qadevOOo/runner/stats/SimpleLogWriter.java index 2610d9b0a366..b3a236fa798e 100644 --- a/qadevOOo/runner/stats/SimpleLogWriter.java +++ b/qadevOOo/runner/stats/SimpleLogWriter.java @@ -51,6 +51,7 @@ public class SimpleLogWriter extends PrintWriter implements LogWriter { return true; } + @Override public void println(String msg) { if ((ow == null) && (entry != null)) { diff --git a/qadevOOo/runner/util/BookmarkDsc.java b/qadevOOo/runner/util/BookmarkDsc.java index f650324be0b1..5eb821318380 100644 --- a/qadevOOo/runner/util/BookmarkDsc.java +++ b/qadevOOo/runner/util/BookmarkDsc.java @@ -41,14 +41,17 @@ public class BookmarkDsc extends InstDescr { initBookmark(); } + @Override public String getName() { return name; } + @Override public String getIfcName() { return ifcName; } + @Override public String getService() { return service; } @@ -60,6 +63,7 @@ public class BookmarkDsc extends InstDescr { catch( ClassNotFoundException cnfE ) { } } + @Override public XInterface createInstance( XMultiServiceFactory docMSF ) { Object ServiceObj = null; diff --git a/qadevOOo/runner/util/ControlDsc.java b/qadevOOo/runner/util/ControlDsc.java index 36fbd1874791..8a99b70645b8 100644 --- a/qadevOOo/runner/util/ControlDsc.java +++ b/qadevOOo/runner/util/ControlDsc.java @@ -36,13 +36,16 @@ public class ControlDsc extends InstDescr { service="com.sun.star.form.component."+kind; initControl(); } + @Override public String getName() { return name; } + @Override public String getIfcName() { return ifcName; } + @Override public String getService() { return service; } @@ -54,6 +57,7 @@ public class ControlDsc extends InstDescr { catch( ClassNotFoundException cnfE ) { } } + @Override public XInterface createInstance( XMultiServiceFactory docMSF ) { Object SrvObj = null; diff --git a/qadevOOo/runner/util/DefaultDsc.java b/qadevOOo/runner/util/DefaultDsc.java index 254d43df244f..9aedebb11008 100644 --- a/qadevOOo/runner/util/DefaultDsc.java +++ b/qadevOOo/runner/util/DefaultDsc.java @@ -37,13 +37,16 @@ public class DefaultDsc extends InstDescr { ifcName = Interface; initDefault(); } + @Override public String getName() { return name; } + @Override public String getIfcName() { return ifcName; } + @Override public String getService() { return service; } @@ -55,6 +58,7 @@ public class DefaultDsc extends InstDescr { catch( ClassNotFoundException cnfE ) { } } + @Override public XInterface createInstance( XMultiServiceFactory docMSF ) { Object SrvObj = null; diff --git a/qadevOOo/runner/util/FootnoteDsc.java b/qadevOOo/runner/util/FootnoteDsc.java index dfb9ad519269..3e9fb89f2867 100644 --- a/qadevOOo/runner/util/FootnoteDsc.java +++ b/qadevOOo/runner/util/FootnoteDsc.java @@ -41,14 +41,17 @@ public class FootnoteDsc extends InstDescr { initFootnote(); } + @Override public String getName() { return name; } + @Override public String getIfcName() { return ifcName; } + @Override public String getService() { return service; } @@ -60,6 +63,7 @@ public class FootnoteDsc extends InstDescr { catch( ClassNotFoundException cnfE ) { } } + @Override public XInterface createInstance( XMultiServiceFactory docMSF ) { Object ServiceObj = null; diff --git a/qadevOOo/runner/util/FrameDsc.java b/qadevOOo/runner/util/FrameDsc.java index 8f69fe710eae..0af97f9eedf6 100644 --- a/qadevOOo/runner/util/FrameDsc.java +++ b/qadevOOo/runner/util/FrameDsc.java @@ -53,12 +53,15 @@ public class FrameDsc extends InstDescr { width = nWidth; initFrame(); } + @Override public String getName() { return name; } + @Override public String getIfcName() { return ifcName; } + @Override public String getService() { return service; } @@ -70,6 +73,7 @@ public class FrameDsc extends InstDescr { catch( ClassNotFoundException cnfE ) { } } + @Override public XInterface createInstance( XMultiServiceFactory docMSF ) { Object SrvObj = null; diff --git a/qadevOOo/runner/util/ParagraphDsc.java b/qadevOOo/runner/util/ParagraphDsc.java index cdf706759684..65ec021b2d52 100644 --- a/qadevOOo/runner/util/ParagraphDsc.java +++ b/qadevOOo/runner/util/ParagraphDsc.java @@ -42,14 +42,17 @@ public class ParagraphDsc extends InstDescr { initParagraph(); } + @Override public String getName() { return name; } + @Override public String getIfcName() { return ifcName; } + @Override public String getService() { return service; } @@ -61,6 +64,7 @@ public class ParagraphDsc extends InstDescr { catch( ClassNotFoundException cnfE ) { } } + @Override public XInterface createInstance( XMultiServiceFactory docMSF ) { Object ServiceObj = null; diff --git a/qadevOOo/runner/util/ReferenceMarkDsc.java b/qadevOOo/runner/util/ReferenceMarkDsc.java index 64231e2f1a40..0441a89d0e1e 100644 --- a/qadevOOo/runner/util/ReferenceMarkDsc.java +++ b/qadevOOo/runner/util/ReferenceMarkDsc.java @@ -41,14 +41,17 @@ public class ReferenceMarkDsc extends InstDescr { initReferenceMark(); } + @Override public String getName() { return name; } + @Override public String getIfcName() { return ifcName; } + @Override public String getService() { return service; } @@ -60,6 +63,7 @@ public class ReferenceMarkDsc extends InstDescr { catch( ClassNotFoundException cnfE ) { } } + @Override public XInterface createInstance( XMultiServiceFactory docMSF ) { Object ServiceObj = null; diff --git a/qadevOOo/runner/util/ShapeDsc.java b/qadevOOo/runner/util/ShapeDsc.java index 9b5814463ee8..faea91984842 100644 --- a/qadevOOo/runner/util/ShapeDsc.java +++ b/qadevOOo/runner/util/ShapeDsc.java @@ -44,13 +44,16 @@ public class ShapeDsc extends InstDescr { service="com.sun.star.drawing."+kind+"Shape"; initShape(); } + @Override public String getName() { return name; } + @Override public String getIfcName() { return ifcName; } + @Override public String getService() { return service; } @@ -62,6 +65,7 @@ public class ShapeDsc extends InstDescr { catch( ClassNotFoundException cnfE ) { } } + @Override public XInterface createInstance( XMultiServiceFactory docMSF ) { diff --git a/qadevOOo/runner/util/StyleFamilyDsc.java b/qadevOOo/runner/util/StyleFamilyDsc.java index 6d180e3dcb96..2a165b0a3d69 100644 --- a/qadevOOo/runner/util/StyleFamilyDsc.java +++ b/qadevOOo/runner/util/StyleFamilyDsc.java @@ -35,13 +35,16 @@ public class StyleFamilyDsc extends InstDescr { service = "com.sun.star.style." + kind; initStyleFamily(); } + @Override public String getName() { return name; } + @Override public String getIfcName() { return ifcName; } + @Override public String getService() { return service; } @@ -53,6 +56,7 @@ public class StyleFamilyDsc extends InstDescr { catch( ClassNotFoundException cnfE ) { } } + @Override public XInterface createInstance( XMultiServiceFactory docMSF ) { diff --git a/qadevOOo/runner/util/TableDsc.java b/qadevOOo/runner/util/TableDsc.java index 3de8d6bccc29..bfeabf615492 100644 --- a/qadevOOo/runner/util/TableDsc.java +++ b/qadevOOo/runner/util/TableDsc.java @@ -49,12 +49,15 @@ public class TableDsc extends InstDescr { columns = nColumns; initTable(); } + @Override public String getName() { return name; } + @Override public String getIfcName() { return ifcName; } + @Override public String getService() { return service; } @@ -66,6 +69,7 @@ public class TableDsc extends InstDescr { catch( ClassNotFoundException cnfE ) { } } + @Override public XInterface createInstance( XMultiServiceFactory docMSF ) { Object SrvObj = null; try { diff --git a/qadevOOo/runner/util/TextSectionDsc.java b/qadevOOo/runner/util/TextSectionDsc.java index 41d08502c523..bb1a1b13cad7 100644 --- a/qadevOOo/runner/util/TextSectionDsc.java +++ b/qadevOOo/runner/util/TextSectionDsc.java @@ -41,14 +41,17 @@ public class TextSectionDsc extends InstDescr { initTextSection(); } + @Override public String getName() { return name; } + @Override public String getIfcName() { return ifcName; } + @Override public String getService() { return service; } @@ -60,6 +63,7 @@ public class TextSectionDsc extends InstDescr { catch( ClassNotFoundException cnfE ) { } } + @Override public XInterface createInstance( XMultiServiceFactory docMSF ) { Object ServiceObj = null; diff --git a/qadevOOo/runner/util/WaitUnreachable.java b/qadevOOo/runner/util/WaitUnreachable.java index ab9c4bb7151e..605bf752b305 100644 --- a/qadevOOo/runner/util/WaitUnreachable.java +++ b/qadevOOo/runner/util/WaitUnreachable.java @@ -102,6 +102,7 @@ public final class WaitUnreachable { unreachable = new WaitUnreachable(obj); } + @Override public void run() { unreachable.waitUnreachable(); } diff --git a/qadevOOo/runner/util/XMLTools.java b/qadevOOo/runner/util/XMLTools.java index 81ff5291d0c3..2ee99cbe4843 100644 --- a/qadevOOo/runner/util/XMLTools.java +++ b/qadevOOo/runner/util/XMLTools.java @@ -284,6 +284,7 @@ public class XMLTools { printXMLData = false ; } + @Override public void startDocument() { super.startDocument(); @@ -294,6 +295,7 @@ public class XMLTools { docStarted = true ; } + @Override public void endDocument() { super.endDocument(); if (!docStarted) { @@ -302,6 +304,7 @@ public class XMLTools { } docEnded = true ; } + @Override public void startElement(String name, XAttributeList attr) { super.startElement(name, attr); if (attr == null) { @@ -311,6 +314,7 @@ public class XMLTools { } tagStack.add(0, name) ; } + @Override public void endElement(String name) { super.endElement(name); if (wellFormed) { @@ -402,6 +406,7 @@ public class XMLTools { chars.put(ch, outerTag) ; } + @Override public void startElement(String name, XAttributeList attrs) { super.startElement(name, attrs) ; if (tags.containsKey(name)) { @@ -424,6 +429,7 @@ public class XMLTools { } } + @Override public void characters(String ch) { super.characters(ch) ; @@ -564,6 +570,7 @@ public class XMLTools { /** * Gets tag String description. */ + @Override public String toString() { String ret = "<" + name ; for (int i = 0; i < attrList.length; i++) { @@ -648,6 +655,7 @@ public class XMLTools { chars.add(new Object[] {ch.trim(), outerTag}) ; } + @Override public void startElement(String name, XAttributeList attr) { try { super.startElement(name, attr); @@ -683,6 +691,7 @@ public class XMLTools { } } + @Override public void characters(String ch) { super.characters(ch) ; for (int i = 0; i < chars.size(); i++) { @@ -708,6 +717,7 @@ public class XMLTools { } } + @Override public void endElement(String name) { try { super.endElement(name); diff --git a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java index 091be8f0f739..0e1c1b55fce3 100644 --- a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java +++ b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java @@ -557,6 +557,7 @@ public class CheckModuleAPI extends ComplexTestCase } } + @Override public String[] getTestMethodNames() { return new String[] diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java index 30dfb2f818aa..bc0de990ced7 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java @@ -151,6 +151,7 @@ public class _XAccessibleAction extends lib.MultiMethodTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java index 66237639a555..54dc72284519 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java @@ -608,6 +608,7 @@ public class _XAccessibleComponent extends MultiMethodTest { /** * Restores initial component text. */ + @Override protected void after() { if (tEnv.getObjRelation("Destroy") != null) { disposeEnvironment(); diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java index bfcee4da18f1..927658b69bbb 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java @@ -53,6 +53,7 @@ public class _XAccessibleContext extends MultiMethodTest { private XAccessible parent = null; // temporary while accessibility package is in com.sun.star + @Override protected String getTestedClassName() { return className; } diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java index 654cb7af295a..8e8d4e9ba2c6 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java @@ -72,7 +72,8 @@ public class _XAccessibleEditableText extends MultiMethodTest { * Retrieves object relation. Stores initial component text * for restoding it in <code>after</code>. */ - protected void before() { + @Override + protected void before() { Boolean b = (Boolean) tEnv.getObjRelation("XAccessibleEditableText.hasAttr"); if (b != null) { @@ -527,6 +528,7 @@ public class _XAccessibleEditableText extends MultiMethodTest { /** * Restores initial component text. */ + @Override protected void after() { oObj.setText(initialText); } diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java index 1c345dd51542..62e2aac1f3e6 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java @@ -87,6 +87,7 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest { * Retrieves relation. * @throws StatusException If the relation is not found. */ + @Override public void before() { prod = (EventProducer) tEnv.getObjRelation("EventProducer") ; if (prod == null) { @@ -193,6 +194,7 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest { /** * Forces environment recreation. */ + @Override protected void after() { if (destroy) disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java index a79282d895ea..de8787871b8f 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java @@ -61,6 +61,7 @@ public class _XAccessibleSelection extends MultiMethodTest { protected boolean OneAlwaysSelected = false; // temporary while accessibility package is in com.sun.star + @Override protected String getTestedClassName() { return className; } @@ -71,6 +72,7 @@ public class _XAccessibleSelection extends MultiMethodTest { * @see com.sun.star.accessibility.XAccessibleContext * @see ifc.accessibility._XAccessibleContext */ + @Override protected void before() { xAC = UnoRuntime.queryInterface( XAccessibleContext.class, oObj); diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java index f237d60cbc28..ee2400f44813 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java @@ -58,6 +58,7 @@ public class _XAccessibleTable extends MultiMethodTest { XAccessibleSelection xASel = null; XAccessibleContext xACont = null; + @Override protected void before() { xASel = UnoRuntime.queryInterface(XAccessibleSelection.class, oObj); if (xASel == null) { diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java index da2ddc37f8ab..da9e379b32b0 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java @@ -79,6 +79,7 @@ public class _XAccessibleText extends MultiMethodTest { * Retrieves a string representation of the component's text. * The length of retrieved string must be greater than zero. */ + @Override protected void before() { Object xat = tEnv.getObjRelation("XAccessibleText"); diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java index 9116fb3fc030..783ba99252a4 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java @@ -53,6 +53,7 @@ public class _XAccessibleValue extends MultiMethodTest { private Object val = null; XAccessibleValue anotherFromGroup = null; + @Override protected void before() { anotherFromGroup = (XAccessibleValue)tEnv.getObjRelation( "XAccessibleValue.anotherFromGroup"); @@ -336,6 +337,7 @@ public class _XAccessibleValue extends MultiMethodTest { /** * Disposes test environment. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java index 8415b12957d1..4951d40382e1 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java @@ -42,6 +42,7 @@ public class _UnoControlButtonModel extends MultiPropertyTest { * Redefined method returns value, that differs from property value. */ protected PropertyTester ColorTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (util.ValueComparer.equalValue(oldValue, new Integer(17))) return new Integer(25); @@ -54,6 +55,7 @@ public class _UnoControlButtonModel extends MultiPropertyTest { * Redefined method returns value, that differs from property value. */ protected PropertyTester BoolTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (util.ValueComparer.equalValue(oldValue, new Boolean(true))) return new Boolean(false); diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlCheckBoxModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlCheckBoxModel.java index 152350dde606..b9c2d926e6eb 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlCheckBoxModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlCheckBoxModel.java @@ -43,6 +43,7 @@ public class _UnoControlCheckBoxModel extends MultiPropertyTest { * Redefined method returns value, that differs from property value. */ protected PropertyTester ColorTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (util.ValueComparer.equalValue(oldValue, new Integer(17))) return new Integer(25); @@ -57,6 +58,7 @@ public class _UnoControlCheckBoxModel extends MultiPropertyTest { */ public void _BackgroundColor() { testProperty("BackgroundColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -69,6 +71,7 @@ public class _UnoControlCheckBoxModel extends MultiPropertyTest { */ public void _Tabstop() { testProperty("Tabstop", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { if (utils.isVoid(old)) return new Boolean(true) ; else return null ; @@ -82,6 +85,7 @@ public class _UnoControlCheckBoxModel extends MultiPropertyTest { */ public void _TextColor() { testProperty("TextColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { if (utils.isVoid(old)) return new Integer(12345) ; else return null ; diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java index 1b707165ddfc..13674faea5f7 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java @@ -51,6 +51,7 @@ public class _UnoControlComboBoxModel extends MultiPropertyTest { */ public void _BackgroundColor() { testProperty("BackgroundColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -63,6 +64,7 @@ public class _UnoControlComboBoxModel extends MultiPropertyTest { */ public void _BorderColor() { testProperty("BorderColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -75,6 +77,7 @@ public class _UnoControlComboBoxModel extends MultiPropertyTest { */ public void _TextColor() { testProperty("TextColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : null ; } @@ -87,6 +90,7 @@ public class _UnoControlComboBoxModel extends MultiPropertyTest { */ public void _Tabstop() { testProperty("Tabstop", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Boolean(true) : null ; } @@ -108,6 +112,7 @@ public class _UnoControlComboBoxModel extends MultiPropertyTest { * Redefined method returns value, that differs from property value. */ protected PropertyTester ColorTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (util.ValueComparer.equalValue(oldValue, new Integer(17))) return new Integer(25); diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlContainerModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlContainerModel.java index dfb2f275de2a..92d820caf1f0 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlContainerModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlContainerModel.java @@ -42,6 +42,7 @@ public class _UnoControlContainerModel extends MultiPropertyTest { * Redefined method returns value, that differs from property value. */ protected PropertyTester ColorTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (util.ValueComparer.equalValue(oldValue, new Integer(17))) return new Integer(25); diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java index a776520ca430..17bc0a67b987 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java @@ -54,6 +54,7 @@ public class _UnoControlCurrencyFieldModel extends MultiPropertyTest { */ public void _BackgroundColor() { testProperty("BackgroundColor", new PropertyTester() { + @Override protected Object getNewValue(String prop, Object old) { return utils.isVoid(old) ? new Integer(6543) : null ; } @@ -66,6 +67,7 @@ public class _UnoControlCurrencyFieldModel extends MultiPropertyTest { */ public void _Tabstop() { testProperty("Tabstop", new PropertyTester() { + @Override protected Object getNewValue(String prop, Object old) { return utils.isVoid(old) ? new Boolean(true) : null ; } @@ -78,6 +80,7 @@ public class _UnoControlCurrencyFieldModel extends MultiPropertyTest { */ public void _BorderColor() { testProperty("BorderColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -90,6 +93,7 @@ public class _UnoControlCurrencyFieldModel extends MultiPropertyTest { */ public void _TextColor() { testProperty("TextColor", new PropertyTester() { + @Override protected Object getNewValue(String prop, Object old) { return utils.isVoid(old) ? new Integer(123) : null ; } @@ -102,6 +106,7 @@ public class _UnoControlCurrencyFieldModel extends MultiPropertyTest { */ public void _TextLineColor() { testProperty("TextLineColor", new PropertyTester() { + @Override protected Object getNewValue(String prop, Object old) { return utils.isVoid(old) ? new Integer(123) : null ; } @@ -114,6 +119,7 @@ public class _UnoControlCurrencyFieldModel extends MultiPropertyTest { */ public void _Value() { testProperty("Value", new PropertyTester() { + @Override protected Object getNewValue(String prop, Object old) { return utils.isVoid(old) ? new Double(777) : super.getNewValue(prop, old) ; diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlDateFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlDateFieldModel.java index 4134afe1bd31..a9f8626754b0 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlDateFieldModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlDateFieldModel.java @@ -53,6 +53,7 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest { */ public void _BackgroundColor() { testProperty("BackgroundColor", new PropertyTester() { + @Override protected Object getNewValue(String prop, Object old) { return utils.isVoid(old) ? new Integer(6543) : null ; } @@ -65,6 +66,7 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest { */ public void _BorderColor() { testProperty("BorderColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -78,6 +80,7 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest { */ public void _Date() { testProperty("Date", new PropertyTester() { + @Override protected Object getNewValue(String prop, Object old) { return utils.isVoid(old) ? new Integer(6543) : super.getNewValue(prop, old) ; @@ -91,6 +94,7 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest { */ public void _Tabstop() { testProperty("Tabstop", new PropertyTester() { + @Override protected Object getNewValue(String prop, Object old) { return utils.isVoid(old) ? new Boolean(true) : null ; } @@ -103,6 +107,7 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest { */ public void _TextColor() { testProperty("TextColor", new PropertyTester() { + @Override protected Object getNewValue(String prop, Object old) { return utils.isVoid(old) ? new Integer(123) : null ; } @@ -113,6 +118,7 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest { * Redefined method returns value, that differs from property value. */ protected PropertyTester ColorTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (util.ValueComparer.equalValue(oldValue, new Integer(17))) return new Integer(25); diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlDialogModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlDialogModel.java index 1dc8e5e5b1c0..7d4216d39cd3 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlDialogModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlDialogModel.java @@ -45,6 +45,7 @@ public class _UnoControlDialogModel extends MultiPropertyTest { */ public void _BackgroundColor() { testProperty("BackgroundColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : null ; } @@ -57,6 +58,7 @@ public class _UnoControlDialogModel extends MultiPropertyTest { */ public void _TextColor() { testProperty("TextColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : null ; } @@ -69,6 +71,7 @@ public class _UnoControlDialogModel extends MultiPropertyTest { */ public void _TextLineColor() { testProperty("TextLineColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : null ; } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlEditModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlEditModel.java index f09d727855b0..4820a9163cad 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlEditModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlEditModel.java @@ -55,6 +55,7 @@ public class _UnoControlEditModel extends MultiPropertyTest { */ public void _BackgroundColor() { testProperty("BackgroundColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -67,6 +68,7 @@ public class _UnoControlEditModel extends MultiPropertyTest { */ public void _BorderColor() { testProperty("BorderColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -79,6 +81,7 @@ public class _UnoControlEditModel extends MultiPropertyTest { */ public void _TextColor() { testProperty("TextColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : null ; } @@ -91,6 +94,7 @@ public class _UnoControlEditModel extends MultiPropertyTest { */ public void _Tabstop() { testProperty("Tabstop", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Boolean(true) : null ; } @@ -101,6 +105,7 @@ public class _UnoControlEditModel extends MultiPropertyTest { * Redefined method returns value, that differs from property value. */ protected PropertyTester ColorTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (util.ValueComparer.equalValue(oldValue, new Integer(17))) return new Integer(25); diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java index d55e56e4ab48..97354b886738 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java @@ -51,6 +51,7 @@ public class _UnoControlFileControlModel extends MultiPropertyTest { */ public void _BackgroundColor() { testProperty("BackgroundColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -63,6 +64,7 @@ public class _UnoControlFileControlModel extends MultiPropertyTest { */ public void _BorderColor() { testProperty("BorderColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -75,6 +77,7 @@ public class _UnoControlFileControlModel extends MultiPropertyTest { */ public void _TextColor() { testProperty("TextColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : null ; } @@ -87,6 +90,7 @@ public class _UnoControlFileControlModel extends MultiPropertyTest { */ public void _TextLineColor() { testProperty("TextLineColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : null ; } @@ -99,6 +103,7 @@ public class _UnoControlFileControlModel extends MultiPropertyTest { */ public void _Tabstop() { testProperty("Tabstop", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Boolean(true) : null ; } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFixedLineModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlFixedLineModel.java index 6167caf4d086..52bf9fd262c8 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlFixedLineModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFixedLineModel.java @@ -46,6 +46,7 @@ public class _UnoControlFixedLineModel extends MultiPropertyTest { */ public void _TextColor() { testProperty("TextColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : null ; } @@ -58,6 +59,7 @@ public class _UnoControlFixedLineModel extends MultiPropertyTest { */ public void _TextLineColor() { testProperty("TextLineColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : null ; } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFixedTextModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlFixedTextModel.java index 889d8aaa86f1..dd4ee692761a 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlFixedTextModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFixedTextModel.java @@ -48,6 +48,7 @@ public class _UnoControlFixedTextModel extends MultiPropertyTest { */ public void _BackgroundColor() { testProperty("BackgroundColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -60,6 +61,7 @@ public class _UnoControlFixedTextModel extends MultiPropertyTest { */ public void _BorderColor() { testProperty("BorderColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -72,6 +74,7 @@ public class _UnoControlFixedTextModel extends MultiPropertyTest { */ public void _TextColor() { testProperty("TextColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : null ; } @@ -82,6 +85,7 @@ public class _UnoControlFixedTextModel extends MultiPropertyTest { * Redefined method returns value, that differs from property value. */ protected PropertyTester ColorTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (util.ValueComparer.equalValue(oldValue, new Integer(17))) return new Integer(25); diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java index 61471d9c7bc0..ae22942e0138 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java @@ -59,6 +59,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { * */ protected PropertyTester ControlTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (util.ValueComparer.equalValue(oldValue, "com.sun.star.form.control.FormattedField")) @@ -82,6 +83,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { */ public void _BorderColor() { testProperty("BorderColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -94,6 +96,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { */ public void _TextColor() { testProperty("TextColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object v) { return utils.isVoid(v) ? new Integer(123) : super.getNewValue(p,v) ; @@ -107,6 +110,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { */ public void _TextLineColor() { testProperty("TextLineColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object v) { return utils.isVoid(v) ? new Integer(123) : super.getNewValue(p,v) ; @@ -120,6 +124,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { */ public void _BackgroundColor() { testProperty("BackgroundColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object v) { return utils.isVoid(v) ? new Integer(123) : super.getNewValue(p,v) ; @@ -149,6 +154,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { */ public void _EffectiveMax() { testProperty("EffectiveMax", new PropertyTester() { + @Override protected Object getNewValue(String p, Object v) { return utils.isVoid(v) ? new Double(123.8) : super.getNewValue(p,v) ; @@ -162,6 +168,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { */ public void _FormatsSupplier() { testProperty("FormatsSupplier", new PropertyTester() { + @Override protected Object getNewValue(String p, Object v) { Object newValue = null; try { @@ -179,6 +186,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { */ public void _EffectiveMin() { testProperty("EffectiveMin", new PropertyTester() { + @Override protected Object getNewValue(String p, Object v) { return utils.isVoid(v) ? new Double(0.1) : super.getNewValue(p,v) ; @@ -192,6 +200,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { */ public void _FormatKey() { testProperty("FormatKey", new PropertyTester() { + @Override protected Object getNewValue(String p, Object v) { return utils.isVoid(v) ? new Integer(0) : super.getNewValue(p,v) ; @@ -205,6 +214,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { */ public void _StrictFromat() { testProperty("StrictFromat", new PropertyTester() { + @Override protected Object getNewValue(String p, Object v) { return utils.isVoid(v) ? new Boolean(true) : super.getNewValue(p,v) ; @@ -218,6 +228,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { */ public void _Tabstop() { testProperty("Tabstop", new PropertyTester() { + @Override protected Object getNewValue(String p, Object v) { return utils.isVoid(v) ? new Boolean(true) : null ; @@ -231,6 +242,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { */ public void _Text() { testProperty("Text", new PropertyTester() { + @Override protected Object getNewValue(String p, Object v) { return utils.isVoid(v) ? "UnoControlFormattedFieldModel" : super.getNewValue(p,v) ; diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlGroupBoxModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlGroupBoxModel.java index e330485bd669..965b96aa2eb5 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlGroupBoxModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlGroupBoxModel.java @@ -44,6 +44,7 @@ public class _UnoControlGroupBoxModel extends MultiPropertyTest { */ public void _TextColor() { testProperty("TextColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : super.getNewValue(p, old) ; @@ -55,6 +56,7 @@ public class _UnoControlGroupBoxModel extends MultiPropertyTest { * Redefined method returns value, that differs from property value. */ protected PropertyTester ColorTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (util.ValueComparer.equalValue(oldValue, new Integer(17))) return new Integer(25); diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlImageControlModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlImageControlModel.java index d2cdbb4cabb8..518644321931 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlImageControlModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlImageControlModel.java @@ -42,6 +42,7 @@ public class _UnoControlImageControlModel extends MultiPropertyTest { * Custom <code>PropertyTester</code> used in <code>ImageURL</code> test. */ protected PropertyTester URLTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (oldValue.equals(util.utils.getFullTestURL("space-metal.jpg"))) @@ -64,6 +65,7 @@ public class _UnoControlImageControlModel extends MultiPropertyTest { */ public void _BackgroundColor() { testProperty("BackgroundColor", new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { return utils.isVoid(oldValue) ? new Integer(8945) : super.getNewValue(propName, oldValue) ; @@ -77,6 +79,7 @@ public class _UnoControlImageControlModel extends MultiPropertyTest { */ public void _BorderColor() { testProperty("BorderColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -89,6 +92,7 @@ public class _UnoControlImageControlModel extends MultiPropertyTest { */ public void _Tabstop() { testProperty("Tabstop", new PropertyTester() { + @Override protected Object getNewValue(String p, Object v) { return utils.isVoid(v) ? new Boolean(true) : null ; diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlListBoxModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlListBoxModel.java index 4f97111aaa2c..49c1377e4012 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlListBoxModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlListBoxModel.java @@ -51,6 +51,7 @@ public class _UnoControlListBoxModel extends MultiPropertyTest { */ public void _BackgroundColor() { testProperty("BackgroundColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -63,6 +64,7 @@ public class _UnoControlListBoxModel extends MultiPropertyTest { */ public void _BorderColor() { testProperty("BorderColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -75,6 +77,7 @@ public class _UnoControlListBoxModel extends MultiPropertyTest { */ public void _TextColor() { testProperty("TextColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : null ; } @@ -87,6 +90,7 @@ public class _UnoControlListBoxModel extends MultiPropertyTest { */ public void _Tabstop() { testProperty("Tabstop", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Boolean(true) : null ; } @@ -97,6 +101,7 @@ public class _UnoControlListBoxModel extends MultiPropertyTest { * Redefined method returns value, that differs from property value. */ protected PropertyTester ColorTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (util.ValueComparer.equalValue(oldValue, new Integer(17))) return new Integer(25); diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java index d2860168f206..724ac84e975d 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java @@ -54,6 +54,7 @@ public class _UnoControlNumericFieldModel extends MultiPropertyTest { */ public void _BackgroundColor() { testProperty("BackgroundColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -66,6 +67,7 @@ public class _UnoControlNumericFieldModel extends MultiPropertyTest { */ public void _BorderColor() { testProperty("BorderColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -78,6 +80,7 @@ public class _UnoControlNumericFieldModel extends MultiPropertyTest { */ public void _TextColor() { testProperty("TextColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : null ; } @@ -90,6 +93,7 @@ public class _UnoControlNumericFieldModel extends MultiPropertyTest { */ public void _TextLineColor() { testProperty("TextLineColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : null ; } @@ -102,6 +106,7 @@ public class _UnoControlNumericFieldModel extends MultiPropertyTest { */ public void _Tabstop() { testProperty("Tabstop", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Boolean(true) : null ; } @@ -114,6 +119,7 @@ public class _UnoControlNumericFieldModel extends MultiPropertyTest { */ public void _Value() { testProperty("Value", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Double(234.89) : super.getNewValue(p, old) ; diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlPatternFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlPatternFieldModel.java index ca6f8a93b9a3..0cbd17cd9d40 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlPatternFieldModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlPatternFieldModel.java @@ -50,6 +50,7 @@ public class _UnoControlPatternFieldModel extends MultiPropertyTest { */ public void _BackgroundColor() { testProperty("BackgroundColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -62,6 +63,7 @@ public class _UnoControlPatternFieldModel extends MultiPropertyTest { */ public void _BorderColor() { testProperty("BorderColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -74,6 +76,7 @@ public class _UnoControlPatternFieldModel extends MultiPropertyTest { */ public void _TextColor() { testProperty("TextColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : null ; } @@ -86,6 +89,7 @@ public class _UnoControlPatternFieldModel extends MultiPropertyTest { */ public void _TextLineColor() { testProperty("TextLineColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : null ; } @@ -98,6 +102,7 @@ public class _UnoControlPatternFieldModel extends MultiPropertyTest { */ public void _Tabstop() { testProperty("Tabstop", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Boolean(true) : null ; } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlProgressBarModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlProgressBarModel.java index a60a40192862..cc1bca447949 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlProgressBarModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlProgressBarModel.java @@ -48,6 +48,7 @@ public class _UnoControlProgressBarModel extends MultiPropertyTest { */ public void _BackgroundColor() { testProperty("BackgroundColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -60,6 +61,7 @@ public class _UnoControlProgressBarModel extends MultiPropertyTest { */ public void _FillColor() { testProperty("FillColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : null ; } @@ -72,6 +74,7 @@ public class _UnoControlProgressBarModel extends MultiPropertyTest { */ public void _ProgressValue() { testProperty("ProgressValue", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(10) : null ; } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlRadioButtonModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlRadioButtonModel.java index 5d8faa2158b5..84302c1484a4 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlRadioButtonModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlRadioButtonModel.java @@ -45,6 +45,7 @@ public class _UnoControlRadioButtonModel extends MultiPropertyTest { */ public void _TextColor() { testProperty("TextColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : null ; } @@ -57,6 +58,7 @@ public class _UnoControlRadioButtonModel extends MultiPropertyTest { */ public void _Tabstop() { testProperty("Tabstop", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Boolean(true) : null ; } @@ -67,6 +69,7 @@ public class _UnoControlRadioButtonModel extends MultiPropertyTest { * Redefined method returns value, that differs from property value. */ protected PropertyTester ColorTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (util.ValueComparer.equalValue(oldValue, new Integer(17))) return new Integer(25); @@ -90,6 +93,7 @@ public class _UnoControlRadioButtonModel extends MultiPropertyTest { */ public void _BackgroundColor() { testProperty("BackgroundColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlScrollBarModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlScrollBarModel.java index c503adc3c379..77d75160716e 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlScrollBarModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlScrollBarModel.java @@ -49,6 +49,7 @@ public class _UnoControlScrollBarModel extends MultiPropertyTest { */ public void _BackgroundColor() { testProperty("BackgroundColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(32768) : null ; } @@ -61,6 +62,7 @@ public class _UnoControlScrollBarModel extends MultiPropertyTest { */ public void _BorderColor() { testProperty("BorderColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -73,6 +75,7 @@ public class _UnoControlScrollBarModel extends MultiPropertyTest { */ public void _SymbolColor() { testProperty("SymbolColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(65324) : null ; } @@ -85,6 +88,7 @@ public class _UnoControlScrollBarModel extends MultiPropertyTest { */ public void _ScrollValue() { testProperty("ScrollValue", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(10) : new Integer(15) ; } @@ -97,6 +101,7 @@ public class _UnoControlScrollBarModel extends MultiPropertyTest { */ public void _VisibleSize() { testProperty("VisibleSize", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(10) : null ; } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlSpinButtonModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlSpinButtonModel.java index d48ff910cbbb..7c4fd15a288f 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlSpinButtonModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlSpinButtonModel.java @@ -29,6 +29,7 @@ public class _UnoControlSpinButtonModel extends MultiPropertyTest { */ public void _BackgroundColor() { testProperty("BackgroundColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(32768) : null ; } @@ -41,6 +42,7 @@ public class _UnoControlSpinButtonModel extends MultiPropertyTest { */ public void _BorderColor() { testProperty("BorderColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -53,6 +55,7 @@ public class _UnoControlSpinButtonModel extends MultiPropertyTest { */ public void _SymbolColor() { testProperty("SymbolColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(65324) : null ; } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlTimeFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlTimeFieldModel.java index 013ec9c5262c..13824c0da596 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlTimeFieldModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlTimeFieldModel.java @@ -58,6 +58,7 @@ public class _UnoControlTimeFieldModel extends MultiPropertyTest { */ public void _BackgroundColor() { testProperty("BackgroundColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -70,6 +71,7 @@ public class _UnoControlTimeFieldModel extends MultiPropertyTest { */ public void _BorderColor() { testProperty("BorderColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(1234) : null ; } @@ -82,6 +84,7 @@ public class _UnoControlTimeFieldModel extends MultiPropertyTest { */ public void _TextColor() { testProperty("TextColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : null ; } @@ -94,6 +97,7 @@ public class _UnoControlTimeFieldModel extends MultiPropertyTest { */ public void _TextLineColor() { testProperty("TextLineColor", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : null ; } @@ -106,6 +110,7 @@ public class _UnoControlTimeFieldModel extends MultiPropertyTest { */ public void _Time() { testProperty("Time", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : super.getNewValue(p, old) ; @@ -119,6 +124,7 @@ public class _UnoControlTimeFieldModel extends MultiPropertyTest { */ public void _Tabstop() { testProperty("Tabstop", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Boolean(true) : null ; } diff --git a/qadevOOo/tests/java/ifc/awt/_XDataTransferProviderAccess.java b/qadevOOo/tests/java/ifc/awt/_XDataTransferProviderAccess.java index 6e40508f556f..54c273a708e5 100644 --- a/qadevOOo/tests/java/ifc/awt/_XDataTransferProviderAccess.java +++ b/qadevOOo/tests/java/ifc/awt/_XDataTransferProviderAccess.java @@ -57,6 +57,7 @@ public class _XDataTransferProviderAccess extends MultiMethodTest { * Retrieves object relations. * @throws StatusException If one of relations not found. */ + @Override public void before() { win = (XWindow) tEnv.getObjRelation ("XDataTransferProviderAccess.XWindow") ; diff --git a/qadevOOo/tests/java/ifc/awt/_XDialog.java b/qadevOOo/tests/java/ifc/awt/_XDialog.java index 8f5eeefd0f06..8b9f6aa527b7 100644 --- a/qadevOOo/tests/java/ifc/awt/_XDialog.java +++ b/qadevOOo/tests/java/ifc/awt/_XDialog.java @@ -141,6 +141,7 @@ public class _XDialog extends MultiMethodTest { /** * Disposes object environment. */ + @Override public void after() { disposeEnvironment() ; } diff --git a/qadevOOo/tests/java/ifc/awt/_XImageProducer.java b/qadevOOo/tests/java/ifc/awt/_XImageProducer.java index 681a46a831c7..70b4d9322e04 100644 --- a/qadevOOo/tests/java/ifc/awt/_XImageProducer.java +++ b/qadevOOo/tests/java/ifc/awt/_XImageProducer.java @@ -95,6 +95,7 @@ public class _XImageProducer extends MultiMethodTest { /** * Creates a new XImageConsumer implementation. */ + @Override public void before() { consumer = new TestImageConsumer(log) ; } diff --git a/qadevOOo/tests/java/ifc/awt/_XItemListener.java b/qadevOOo/tests/java/ifc/awt/_XItemListener.java index f8def1598a50..8bd31ed04ba8 100644 --- a/qadevOOo/tests/java/ifc/awt/_XItemListener.java +++ b/qadevOOo/tests/java/ifc/awt/_XItemListener.java @@ -70,6 +70,7 @@ public class _XItemListener extends MultiMethodTest { * Retrieves object relation. * @throws StatusException If the relation not found. */ + @Override public void before() { itemListener = (TestItemListener) tEnv.getObjRelation("TestItemListener") ; if (itemListener == null) diff --git a/qadevOOo/tests/java/ifc/awt/_XListBox.java b/qadevOOo/tests/java/ifc/awt/_XListBox.java index e8c128025678..7d49ee226a50 100644 --- a/qadevOOo/tests/java/ifc/awt/_XListBox.java +++ b/qadevOOo/tests/java/ifc/awt/_XListBox.java @@ -103,6 +103,7 @@ public class _XListBox extends MultiMethodTest { * Retrieves object relations. * @throws StatusException If one of relations not found. */ + @Override public void before() { itemCount = oObj.getItemCount(); } diff --git a/qadevOOo/tests/java/ifc/awt/_XTextComponent.java b/qadevOOo/tests/java/ifc/awt/_XTextComponent.java index cce6b8cdecf0..ae8de12c7efa 100644 --- a/qadevOOo/tests/java/ifc/awt/_XTextComponent.java +++ b/qadevOOo/tests/java/ifc/awt/_XTextComponent.java @@ -75,6 +75,7 @@ public class _XTextComponent extends MultiMethodTest { * Retrieves object relation, then sets flag 'num' to 'true' * if relation is not null. */ + @Override public void before() { if (tEnv.getObjRelation("XTextComponent.onlyNumbers") != null) num = true; diff --git a/qadevOOo/tests/java/ifc/awt/_XTextListener.java b/qadevOOo/tests/java/ifc/awt/_XTextListener.java index 632422e9bf8f..ded65478433d 100644 --- a/qadevOOo/tests/java/ifc/awt/_XTextListener.java +++ b/qadevOOo/tests/java/ifc/awt/_XTextListener.java @@ -72,6 +72,7 @@ public class _XTextListener extends MultiMethodTest { * Retrieves object relation. * @throws StatusException If the relation not found. */ + @Override public void before() { textListener = (TestTextListener) tEnv.getObjRelation("TestTextListener"); @@ -110,6 +111,7 @@ public class _XTextListener extends MultiMethodTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/awt/_XTopWindow.java b/qadevOOo/tests/java/ifc/awt/_XTopWindow.java index 3c9cf9e5ba2b..290f4de21670 100644 --- a/qadevOOo/tests/java/ifc/awt/_XTopWindow.java +++ b/qadevOOo/tests/java/ifc/awt/_XTopWindow.java @@ -95,6 +95,7 @@ public class _XTopWindow extends MultiMethodTest { XTextDocument aTextDoc = null; + @Override protected void before() { aTextDoc = util.WriterTools.createTextDoc(tParam.getMSF()); } @@ -181,6 +182,7 @@ public class _XTopWindow extends MultiMethodTest { /** * Disposes the document created in <code>before</code> method. */ + @Override protected void after() { aTextDoc.dispose(); } diff --git a/qadevOOo/tests/java/ifc/awt/_XUnoControlContainer.java b/qadevOOo/tests/java/ifc/awt/_XUnoControlContainer.java index 451c1d7852c3..daf791ede429 100644 --- a/qadevOOo/tests/java/ifc/awt/_XUnoControlContainer.java +++ b/qadevOOo/tests/java/ifc/awt/_XUnoControlContainer.java @@ -51,6 +51,7 @@ public class _XUnoControlContainer extends MultiMethodTest { * This method gets the object relations. * */ + @Override protected void before() { tabControl1 = (XTabController) tEnv.getObjRelation("TABCONTROL1"); diff --git a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java index 9b3a2b54a709..7440670bf68e 100644 --- a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java +++ b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java @@ -93,6 +93,7 @@ public class _XUserInputInterception extends MultiMethodTest { /** get the object rlation XUserInputInterception.XModel from the * test environment */ + @Override protected void before() { log.print("try to get object relation 'XUserInputInterception.XModel': "); m_XModel = (XModel)tEnv.getObjRelation("XUserInputInterception.XModel"); @@ -235,6 +236,7 @@ public class _XUserInputInterception extends MultiMethodTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } @@ -432,6 +434,7 @@ public class _XUserInputInterception extends MultiMethodTest { * </LI> * </UL> */ + @Override public void run(){ switch (this.eventType){ diff --git a/qadevOOo/tests/java/ifc/awt/_XView.java b/qadevOOo/tests/java/ifc/awt/_XView.java index 36fda94fd470..a7858d037dc5 100644 --- a/qadevOOo/tests/java/ifc/awt/_XView.java +++ b/qadevOOo/tests/java/ifc/awt/_XView.java @@ -126,6 +126,7 @@ public class _XView extends MultiMethodTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java b/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java index 75060dc1b36b..1c8cd3c1be29 100644 --- a/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java +++ b/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java @@ -51,6 +51,7 @@ public class _XMutableTreeNode extends MultiMethodTest { public XMutableTreeNode createNode(String name); } + @Override public void before(){ nodeCreator = (XMutableTreeNodeCreator) tEnv.getObjRelation("XMutableTreeNodeCreator"); if (nodeCreator == null){ diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java b/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java index 0a939d78287b..ff19b9cac4f2 100644 --- a/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java +++ b/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java @@ -203,6 +203,7 @@ public class _XTreeControl extends MultiMethodTest { mTreeNodeEdit2 = false; } + @Override public void before(){ mXNode = (XMutableTreeNode) tEnv.getObjRelation("XTreeControl_Node"); if (mXNode == null) { diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java b/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java index dc81150b8907..92e1d56714fc 100644 --- a/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java +++ b/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java @@ -102,6 +102,7 @@ public class _XTreeDataModel extends MultiMethodTest { } + @Override public void before(){ mListenerEvent = (XTreeDataModelListenerEvent) tEnv.getObjRelation("XTreeDataModelListenerEvent"); if (mListenerEvent == null) { diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java b/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java index a425cf590f43..498a9ecb7019 100644 --- a/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java +++ b/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java @@ -53,6 +53,7 @@ public class _XTreeNode extends MultiMethodTest { String msNodeGraphicURL = null; + @Override public void before(){ msDisplayValue = (String) tEnv.getObjRelation("XTreeNode_DisplayValue"); if (msDisplayValue == null){ diff --git a/qadevOOo/tests/java/ifc/beans/_XExactName.java b/qadevOOo/tests/java/ifc/beans/_XExactName.java index e33435e530ad..ab8f6f96572d 100644 --- a/qadevOOo/tests/java/ifc/beans/_XExactName.java +++ b/qadevOOo/tests/java/ifc/beans/_XExactName.java @@ -74,6 +74,7 @@ public class _XExactName extends MultiMethodTest { * Checking if the Object relation expectedName is given * throw a StatusException if not. */ + @Override protected void before() { expectedName = (String) tEnv.getObjRelation("expectedName"); diff --git a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java index 6ee8c0c611c9..c30fc2bcfbc0 100644 --- a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java @@ -62,7 +62,8 @@ public class _XFastPropertySet extends MultiMethodTest { /** * Retrieves relation. */ - protected void before() { + @Override + protected void before() { exclude = (Set<String>) tEnv.getObjRelation("XFastPropertySet.ExcludeProps") ; if (exclude == null) { exclude = new java.util.HashSet<String>() ; diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java index 9fe62d5442f5..7b000c059a2e 100644 --- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java @@ -76,6 +76,7 @@ public class _XMultiPropertySet extends MultiMethodTest { /** * Initializes some fields. */ + @Override public void before() { exclProps = (Set<String>) tEnv.getObjRelation("XMultiPropertySet.ExcludeProps"); if (exclProps == null) exclProps = new HashSet<String>(0); @@ -354,6 +355,7 @@ public class _XMultiPropertySet extends MultiMethodTest { /* * Does nothing. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java b/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java index bbe5fa1916ba..81836c2c9b26 100644 --- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java +++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java @@ -49,6 +49,7 @@ public class _XMultiPropertyStates extends MultiMethodTest { private PropertyState[] states = null; private String[] names = null; + @Override public void before() { names = (String[]) tEnv.getObjRelation("PropertyNames"); if (names == null) { diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java b/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java index 0a7d55aa2cad..0b05dbea4fe4 100644 --- a/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java +++ b/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java @@ -55,6 +55,7 @@ public class _XPropertyAccess extends MultiMethodTest { * checks if the object relation <CODE>XPropertyAccess.propertyToChange</CODE> * is available */ + @Override public void before() { propertyToChange = (PropertyValue) tEnv.getObjRelation("XPropertyAccess.propertyToChange"); if (propertyToChange == null) { diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java b/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java index 5befa68df01b..53274d15cffc 100644 --- a/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java +++ b/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java @@ -55,6 +55,7 @@ public class _XPropertyContainer extends MultiMethodTest { * checks if the object relation <CODE>XPropertyAccess.propertyNotRemovable</CODE> * is available */ + @Override public void before() { propertyNotRemovable = (String) tEnv.getObjRelation("XPropertyContainer.propertyNotRemovable"); if (propertyNotRemovable == null) { diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java index a31542c19330..17ab69014769 100644 --- a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java @@ -657,6 +657,7 @@ public class _XPropertySet extends MultiMethodTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyState.java b/qadevOOo/tests/java/ifc/beans/_XPropertyState.java index babc1c463fa1..046e1ef30220 100644 --- a/qadevOOo/tests/java/ifc/beans/_XPropertyState.java +++ b/qadevOOo/tests/java/ifc/beans/_XPropertyState.java @@ -69,6 +69,7 @@ public class _XPropertyState extends MultiMethodTest { * @throws StatusException If <code>XPropertySet</code> is not * implemented by object. */ + @Override public void before() throws StatusException { oPS = UnoRuntime.queryInterface( XPropertySet.class, oObj ); if (oPS == null) @@ -256,6 +257,7 @@ public class _XPropertyState extends MultiMethodTest { tRes.tested("setPropertyToDefault()", result); } + @Override public void after() { disposeEnvironment() ; } diff --git a/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java index 5d38019a41d6..8b5bb5c0b4c8 100644 --- a/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java @@ -56,6 +56,7 @@ public class _XTolerantMultiPropertySet extends MultiMethodTest { * to get the direct properties<br> * Throws a lib StatusException if the Component doesn't support XPropertySet or XPropertyState */ + @Override public void before() { PS = UnoRuntime.queryInterface(XPropertySet.class, tEnv.getTestObject()); diff --git a/qadevOOo/tests/java/ifc/bridge/_XBridge.java b/qadevOOo/tests/java/ifc/bridge/_XBridge.java index cbae96813c40..4e1833284461 100644 --- a/qadevOOo/tests/java/ifc/bridge/_XBridge.java +++ b/qadevOOo/tests/java/ifc/bridge/_XBridge.java @@ -60,6 +60,7 @@ public class _XBridge extends MultiMethodTest { * Retrieves object relations. * @throws StatusException If one of relations not found. */ + @Override public void before() { args = (Object[])tEnv.getObjRelation("XInitialization.args"); @@ -131,6 +132,7 @@ public class _XBridge extends MultiMethodTest { /** * Disposes object environment. */ + @Override public void after() { disposeEnvironment() ; } diff --git a/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java b/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java index 4f983612c216..f61eb5457f21 100644 --- a/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java +++ b/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java @@ -50,6 +50,7 @@ public class _XBridgeFactory extends MultiMethodTest { /** * Interrupts the acceptor after test is finished */ + @Override protected void after() { acceptorThread.acc.stopAccepting(); if (acceptorThread.isAlive()) { @@ -86,6 +87,7 @@ public class _XBridgeFactory extends MultiMethodTest { /** * Call <code>accept()</code> method. */ + @Override public void run() { try { acceptedCall = acc.accept(connectString); diff --git a/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java b/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java index 22e191fe01a5..15acdcd47b44 100644 --- a/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java +++ b/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java @@ -107,6 +107,7 @@ public class _XUnoUrlResolver extends MultiMethodTest { this.connectString = connectString; } + @Override public void run() { try { // create a connection diff --git a/qadevOOo/tests/java/ifc/chart/_BarDiagram.java b/qadevOOo/tests/java/ifc/chart/_BarDiagram.java index 601b6e0e570a..5b546774bf9b 100644 --- a/qadevOOo/tests/java/ifc/chart/_BarDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_BarDiagram.java @@ -60,6 +60,7 @@ public class _BarDiagram extends MultiPropertyTest { * Retrieves object relations and prepares a chart document. * @throws StatusException if one of relations not found. */ + @Override protected void before() { log.println("Setting Diagram type to BarDiagram"); doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC"); @@ -98,11 +99,13 @@ public class _BarDiagram extends MultiPropertyTest { /** * Sets the old diagram for a chart document. */ + @Override protected void after() { doc.setDiagram(oldDiagram); } protected PropertyTester LineTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { int a = 0; diff --git a/qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java b/qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java index 99bb00065ddb..a255ae217414 100644 --- a/qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java +++ b/qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java @@ -50,6 +50,7 @@ public class _Chart3DBarProperties extends MultiPropertyTest { * Retrieves object relations and prepares a chart document. * @throws StatusException if one of relations not found. */ + @Override protected void before() { log.println("Setting Diagram type to BarDiagram"); XChartDocument doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC"); @@ -87,6 +88,7 @@ public class _Chart3DBarProperties extends MultiPropertyTest { /** * Sets the diagram back to 2D as 2D rendering is much faster for the following tests. */ + @Override protected void after() { log.println("Setting Diagram back to 2D"); XChartDocument doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC"); diff --git a/qadevOOo/tests/java/ifc/chart/_ChartAxis.java b/qadevOOo/tests/java/ifc/chart/_ChartAxis.java index dfd9bacc1288..e4932e7e021b 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartAxis.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartAxis.java @@ -145,6 +145,7 @@ public class _ChartAxis extends MultiPropertyTest { } protected PropertyTester StepMainTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { Double ValueToSet = (Double) ValueChanger.changePValue(oldValue); diff --git a/qadevOOo/tests/java/ifc/chart/_ChartAxisYSupplier.java b/qadevOOo/tests/java/ifc/chart/_ChartAxisYSupplier.java index 0253e8c34cfe..62eb9748fbba 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartAxisYSupplier.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartAxisYSupplier.java @@ -49,6 +49,7 @@ public class _ChartAxisYSupplier extends MultiPropertyTest { * Retrieves object relations and prepares a chart document. * @throws StatusException if one of relations not found. */ + @Override protected void before() { XChartDocument doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC"); if (doc == null) throw new StatusException(Status.failed diff --git a/qadevOOo/tests/java/ifc/chart/_ChartAxisZSupplier.java b/qadevOOo/tests/java/ifc/chart/_ChartAxisZSupplier.java index 42ba8b17af78..33e2e8afec10 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartAxisZSupplier.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartAxisZSupplier.java @@ -52,6 +52,7 @@ public class _ChartAxisZSupplier extends MultiPropertyTest { * Retrieves object relations and prepares a chart document. * @throws StatusException if one of relations not found. */ + @Override protected void before() { log.println("Setting Diagram type to BarDiagram"); XChartDocument doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC"); @@ -186,6 +187,7 @@ public class _ChartAxisZSupplier extends MultiPropertyTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java b/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java index 7f7c878ab934..acf8e50b19bc 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java @@ -54,6 +54,7 @@ public class _ChartDataPointProperties extends MultiPropertyTest { * Retrieves object relations and prepares a chart document. * @throws StatusException if one of relations not found. */ + @Override protected void before() { log.println("Setting Diagram type to LineDiagram"); XChartDocument doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC"); @@ -68,6 +69,7 @@ public class _ChartDataPointProperties extends MultiPropertyTest { } protected PropertyTester URLTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { return utils.getFullTestURL("space-metal.jpg"); diff --git a/qadevOOo/tests/java/ifc/chart/_ChartStatistics.java b/qadevOOo/tests/java/ifc/chart/_ChartStatistics.java index d7f3be6cf9e4..3abbcc03cb14 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartStatistics.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartStatistics.java @@ -52,6 +52,7 @@ public class _ChartStatistics extends MultiPropertyTest { * Retrieves object relations and prepares a chart document. * @throws StatusException if one of relations not found. */ + @Override protected void before() { log.println("Setting Diagram type to LineDiagram"); XChartDocument doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC"); diff --git a/qadevOOo/tests/java/ifc/chart/_ChartTableAddressSupplier.java b/qadevOOo/tests/java/ifc/chart/_ChartTableAddressSupplier.java index 4165d5bdef3d..f3cf71a2500c 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartTableAddressSupplier.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartTableAddressSupplier.java @@ -40,6 +40,7 @@ public class _ChartTableAddressSupplier extends MultiPropertyTest { */ public void _SeriesAddresses() { testProperty("SeriesAddresses", new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { ChartSeriesAddress[] addr = (ChartSeriesAddress[]) oldValue ; ChartSeriesAddress[] newAddr = null ; diff --git a/qadevOOo/tests/java/ifc/chart/_ChartTitle.java b/qadevOOo/tests/java/ifc/chart/_ChartTitle.java index cb32e34bf974..29078ec3fb6d 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartTitle.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartTitle.java @@ -37,6 +37,7 @@ public class _ChartTitle extends MultiPropertyTest { */ public void _TextRotation() { testProperty("TextRotation", new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { Object ValueToSet = ValueChanger.changePValue(oldValue); int ro = ((Integer) ValueToSet).intValue() * 100; diff --git a/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisXSupplier.java b/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisXSupplier.java index 10b1345a6248..9cbcd9ed0d0e 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisXSupplier.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisXSupplier.java @@ -52,6 +52,7 @@ public class _ChartTwoAxisXSupplier extends MultiPropertyTest { * Retrieves object relations and prepares a chart document. * @throws StatusException if one of relations not found. */ + @Override protected void before() { log.println("Setting Diagram type to BarDiagram"); doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC"); @@ -91,6 +92,7 @@ public class _ChartTwoAxisXSupplier extends MultiPropertyTest { /** * Sets the old diagram for a chart document. */ + @Override protected void after() { doc.setDiagram(oldDiagram); } diff --git a/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisYSupplier.java b/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisYSupplier.java index 1333c6011b89..588242ad6a3d 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisYSupplier.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisYSupplier.java @@ -52,6 +52,7 @@ public class _ChartTwoAxisYSupplier extends MultiPropertyTest { * Retrieves object relations and prepares a chart document. * @throws StatusException if one of relations not found. */ + @Override protected void before() { log.println("Setting Diagram type to BarDiagram"); doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC"); @@ -91,6 +92,7 @@ public class _ChartTwoAxisYSupplier extends MultiPropertyTest { /** * Sets the old diagram for a chart document. */ + @Override protected void after() { doc.setDiagram(oldDiagram); } diff --git a/qadevOOo/tests/java/ifc/chart/_Diagram.java b/qadevOOo/tests/java/ifc/chart/_Diagram.java index 3ab90b84784c..ea4fe01ca420 100644 --- a/qadevOOo/tests/java/ifc/chart/_Diagram.java +++ b/qadevOOo/tests/java/ifc/chart/_Diagram.java @@ -46,6 +46,7 @@ public class _Diagram extends MultiPropertyTest { * Retrieves object relations and prepares a chart document. * @throws StatusException if one of relations not found. */ + @Override protected void before() { log.println("Setting Diagram type to LineDiagram"); XChartDocument doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC"); diff --git a/qadevOOo/tests/java/ifc/chart/_Dim3DDiagram.java b/qadevOOo/tests/java/ifc/chart/_Dim3DDiagram.java index 0288aeb6cbf5..512bb0016c59 100644 --- a/qadevOOo/tests/java/ifc/chart/_Dim3DDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_Dim3DDiagram.java @@ -45,6 +45,7 @@ public class _Dim3DDiagram extends MultiPropertyTest { * Retrieves object relations and prepares a chart document. * @throws StatusException if one of relations not found. */ + @Override protected void before() { log.println("Setting Diagram type to LineDiagram"); XChartDocument doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC"); diff --git a/qadevOOo/tests/java/ifc/chart/_LineDiagram.java b/qadevOOo/tests/java/ifc/chart/_LineDiagram.java index 4632bc8f9e66..20c99b952c09 100644 --- a/qadevOOo/tests/java/ifc/chart/_LineDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_LineDiagram.java @@ -62,6 +62,7 @@ public class _LineDiagram extends MultiPropertyTest { * Retrieves object relations. * @throws StatusException If one of relations not found. */ + @Override protected void before() { log.println("Setting Diagram type to LineDiagram"); doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC"); @@ -80,11 +81,13 @@ public class _LineDiagram extends MultiPropertyTest { /** * Sets the old diagram for a chart document. */ + @Override protected void after() { doc.setDiagram(oldDiagram); } protected PropertyTester URLTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (oldValue.equals(util.utils.getFullTestURL("space-metal.jpg"))) @@ -94,6 +97,7 @@ public class _LineDiagram extends MultiPropertyTest { } ; protected PropertyTester SymbolTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { @@ -106,6 +110,7 @@ public class _LineDiagram extends MultiPropertyTest { } ; protected PropertyTester SplineTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { diff --git a/qadevOOo/tests/java/ifc/chart/_StackableDiagram.java b/qadevOOo/tests/java/ifc/chart/_StackableDiagram.java index bb7a36080197..9fbb2bed273e 100644 --- a/qadevOOo/tests/java/ifc/chart/_StackableDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_StackableDiagram.java @@ -52,6 +52,7 @@ public class _StackableDiagram extends MultiPropertyTest { * Retrieves object relations and prepares a chart document. * @throws StatusException if one of relations not found. */ + @Override protected void before() { log.println("Setting Diagram type to LineDiagram"); doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC"); @@ -71,6 +72,7 @@ public class _StackableDiagram extends MultiPropertyTest { /** * Sets the old diagram for a chart document. */ + @Override protected void after() { doc.setDiagram(oldDiagram); } diff --git a/qadevOOo/tests/java/ifc/chart/_StockDiagram.java b/qadevOOo/tests/java/ifc/chart/_StockDiagram.java index d54a0e7aab44..32c0200241d0 100644 --- a/qadevOOo/tests/java/ifc/chart/_StockDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_StockDiagram.java @@ -52,6 +52,7 @@ public class _StockDiagram extends MultiPropertyTest { * Retrieves object relations and prepares a chart document. * @throws StatusException if one of relations not found. */ + @Override protected void before() { log.println("Setting Diagram type to StockDiagram"); doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC"); @@ -70,6 +71,7 @@ public class _StockDiagram extends MultiPropertyTest { /** * Sets the old diagram for a chart document. */ + @Override protected void after() { doc.setDiagram(oldDiagram); } diff --git a/qadevOOo/tests/java/ifc/chart/_XChartData.java b/qadevOOo/tests/java/ifc/chart/_XChartData.java index e928453e0b30..c0a4bc3c7be5 100644 --- a/qadevOOo/tests/java/ifc/chart/_XChartData.java +++ b/qadevOOo/tests/java/ifc/chart/_XChartData.java @@ -149,6 +149,7 @@ public class _XChartData extends MultiMethodTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java b/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java index 5233db64848d..14e811efd67a 100644 --- a/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java +++ b/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java @@ -49,6 +49,7 @@ public class _XChartDataArray extends MultiMethodTest { private boolean mbExcludeSetRowAndSetColumn = false; private String msExcludeMessage; + @Override protected void before() { Object o = tEnv.getObjRelation("CRDESC"); if (o != null) { @@ -216,6 +217,7 @@ public class _XChartDataArray extends MultiMethodTest { tRes.tested("getData()", bResult); } + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/chart/_XDiagram.java b/qadevOOo/tests/java/ifc/chart/_XDiagram.java index b1fbbf83ab97..3d02e7399924 100644 --- a/qadevOOo/tests/java/ifc/chart/_XDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_XDiagram.java @@ -53,6 +53,7 @@ public class _XDiagram extends MultiMethodTest { * Retrieves object relations. * @throws StatusException If one of relations not found. */ + @Override public void before() { rowamount = (Integer)tEnv.getObjRelation("ROWAMOUNT"); if (rowamount == null) throw new StatusException(Status.failed diff --git a/qadevOOo/tests/java/ifc/chart/_XTwoAxisYSupplier.java b/qadevOOo/tests/java/ifc/chart/_XTwoAxisYSupplier.java index 909c4d853646..bc88bdc72945 100644 --- a/qadevOOo/tests/java/ifc/chart/_XTwoAxisYSupplier.java +++ b/qadevOOo/tests/java/ifc/chart/_XTwoAxisYSupplier.java @@ -53,6 +53,7 @@ public class _XTwoAxisYSupplier extends MultiMethodTest { /** * Forces object environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XBackendEntities.java b/qadevOOo/tests/java/ifc/configuration/backend/_XBackendEntities.java index e23a515ebf73..5ed64c292105 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XBackendEntities.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XBackendEntities.java @@ -28,6 +28,7 @@ public class _XBackendEntities extends MultiMethodTest { String adm = ""; public XBackendEntities oObj; + @Override public void before() { adm = (String) tEnv.getObjRelation("NoAdmin"); } diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java b/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java index 2ebea13d2c74..597d245efbd1 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java @@ -33,6 +33,7 @@ public class _XSchema extends MultiMethodTest { XSchemaHandlerImpl xSchemaHandlerImpl = new XSchemaHandlerImpl(); String filename = null; + @Override protected void before() { filename = (String)tEnv.getObjRelation("ParsedFileName"); } diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java b/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java index 8f1daf4b5a39..6e86d034c3e6 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java @@ -30,6 +30,7 @@ public class _XUpdateHandler extends MultiMethodTest { public XUpdateHandler oObj; protected XLayerHandlerImpl xLayerHandler = null; + @Override public void before() { xLayerHandler = (XLayerHandlerImpl) tEnv.getObjRelation("LayerHandler"); diff --git a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java index b98337070245..09ff4c65a421 100644 --- a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java +++ b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java @@ -73,6 +73,7 @@ public class _XAcceptor extends MultiMethodTest { /** * Call <code>accept()</code> method. */ + @Override public void run() { try { acceptedCall = acc.accept(connectString) ; @@ -92,6 +93,7 @@ public class _XAcceptor extends MultiMethodTest { /** * Retrieves object relation. */ + @Override public void before() throws StatusException { connectString = (String) tEnv.getObjRelation("XAcceptor.connectStr") ; diff --git a/qadevOOo/tests/java/ifc/connection/_XConnector.java b/qadevOOo/tests/java/ifc/connection/_XConnector.java index fa1d9b074d92..d9ac5b10c529 100644 --- a/qadevOOo/tests/java/ifc/connection/_XConnector.java +++ b/qadevOOo/tests/java/ifc/connection/_XConnector.java @@ -71,6 +71,7 @@ public class _XConnector extends MultiMethodTest { /** * Call <code>accept()</code> method. */ + @Override public void run() { try { acceptedCall = acc.accept(connectString) ; @@ -90,6 +91,7 @@ public class _XConnector extends MultiMethodTest { /** * Retrieves object relation. */ + @Override public void before() throws StatusException { connectString = (String) tEnv.getObjRelation("XConnector.connectStr") ; diff --git a/qadevOOo/tests/java/ifc/container/_XContainer.java b/qadevOOo/tests/java/ifc/container/_XContainer.java index d63ba7d22eb9..b7c987d4e1d3 100644 --- a/qadevOOo/tests/java/ifc/container/_XContainer.java +++ b/qadevOOo/tests/java/ifc/container/_XContainer.java @@ -80,6 +80,7 @@ public class _XContainer extends MultiMethodTest { * @throws StatusException If one of relations not found or * object doesn't implement <code>XNameContainer</code> interface. */ + @Override public void before() throws StatusException { // do this test with a different object Object altObj = tEnv.getObjRelation("XContainer.AlternateObject"); diff --git a/qadevOOo/tests/java/ifc/container/_XContainerQuery.java b/qadevOOo/tests/java/ifc/container/_XContainerQuery.java index c1034d34b407..5e8748ba11ac 100644 --- a/qadevOOo/tests/java/ifc/container/_XContainerQuery.java +++ b/qadevOOo/tests/java/ifc/container/_XContainerQuery.java @@ -61,6 +61,7 @@ public class _XContainerQuery extends MultiMethodTest { * Retrieves object relations * @throws StatusException If one of relations not found. */ + @Override public void before() throws StatusException { m_querySequenze = (NamedValue[]) tEnv.getObjRelation( diff --git a/qadevOOo/tests/java/ifc/container/_XNameReplace.java b/qadevOOo/tests/java/ifc/container/_XNameReplace.java index 1c2d96dfdc23..92e7c220f0a2 100644 --- a/qadevOOo/tests/java/ifc/container/_XNameReplace.java +++ b/qadevOOo/tests/java/ifc/container/_XNameReplace.java @@ -165,6 +165,7 @@ public class _XNameReplace extends MultiMethodTest { /** * Forces object environment recreation. */ + @Override public void after() { disposeEnvironment() ; } diff --git a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java index f7edef2c0525..d486472f76e1 100644 --- a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java +++ b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java @@ -82,6 +82,7 @@ public class _XClipboard extends MultiMethodTest { /** * Initially sets the content of the clipboard. */ + @Override public void before() { oObj.setContents(myTransferable1 = new MyTransferable(), myOwner = new MyOwner()); diff --git a/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java b/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java index ccfb7af52b87..2b208e4537a7 100644 --- a/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java +++ b/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java @@ -99,6 +99,7 @@ public class _XDocumentInsertable extends MultiMethodTest { * @throws StatusException If neither relation found nor * <code>XTextRange</code> interface is queried. */ + @Override public void before() { checker = (InsertChecker) tEnv.getObjRelation("XDocumentInsertable.Checker") ; @@ -181,6 +182,7 @@ public class _XDocumentInsertable extends MultiMethodTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/document/_XExporter.java b/qadevOOo/tests/java/ifc/document/_XExporter.java index cb5f1d9a0b84..067f8b5d5f89 100644 --- a/qadevOOo/tests/java/ifc/document/_XExporter.java +++ b/qadevOOo/tests/java/ifc/document/_XExporter.java @@ -49,6 +49,7 @@ public class _XExporter extends MultiMethodTest { * Retrieves object relations. * @throws StatusException If one of relations not found. */ + @Override public void before() { source = (XComponent) tEnv.getObjRelation("SourceDocument") ; diff --git a/qadevOOo/tests/java/ifc/document/_XFilter.java b/qadevOOo/tests/java/ifc/document/_XFilter.java index 9fbc130cdc56..9908c452cda3 100644 --- a/qadevOOo/tests/java/ifc/document/_XFilter.java +++ b/qadevOOo/tests/java/ifc/document/_XFilter.java @@ -71,6 +71,7 @@ public class _XFilter extends MultiMethodTest { * therefore the methods of this interface will be skipped * in this case */ + @Override public void before() { String name = tEnv.getTestCase().getObjectName(); if (name.indexOf("Importer")>0) { @@ -93,6 +94,7 @@ public class _XFilter extends MultiMethodTest { catch (com.sun.star.lang.IllegalArgumentException e) {} } + @Override public void after() { if (dummy) { throw new StatusException(Status.skipped(true)); @@ -163,6 +165,7 @@ public class _XFilter extends MultiMethodTest { this.Filter = Filter ; } + @Override public void run() { filterRes = Filter.filter(mdesc); } diff --git a/qadevOOo/tests/java/ifc/document/_XTypeDetection.java b/qadevOOo/tests/java/ifc/document/_XTypeDetection.java index 0a7ac45e652e..9550e3b076d2 100644 --- a/qadevOOo/tests/java/ifc/document/_XTypeDetection.java +++ b/qadevOOo/tests/java/ifc/document/_XTypeDetection.java @@ -49,6 +49,7 @@ public class _XTypeDetection extends MultiMethodTest { /** * Get the document URL. */ + @Override public void before() { docURL = utils.getFullTestURL("XTypeDetection.sxw"); bookmarkURL = (String) tEnv.getObjRelation("XTypeDetection.bookmarkDoc"); diff --git a/qadevOOo/tests/java/ifc/drawing/_AreaShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_AreaShapeDescriptor.java index ca8b166c5bbe..1bee620985f3 100644 --- a/qadevOOo/tests/java/ifc/drawing/_AreaShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_AreaShapeDescriptor.java @@ -22,6 +22,7 @@ import lib.MultiPropertyTest; public class _AreaShapeDescriptor extends MultiPropertyTest { + @Override protected boolean compare(Object ob1, Object ob2) { return super.compare(ob1, ob2); @@ -29,6 +30,7 @@ public class _AreaShapeDescriptor extends MultiPropertyTest { } protected PropertyTester URLTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (oldValue.equals(util.utils.getFullTestURL("space-metal.jpg"))) @@ -38,6 +40,7 @@ public class _AreaShapeDescriptor extends MultiPropertyTest { } ; protected PropertyTester StringTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (oldValue.equals(str1)) diff --git a/qadevOOo/tests/java/ifc/drawing/_ConnectorShape.java b/qadevOOo/tests/java/ifc/drawing/_ConnectorShape.java index 750c307e09b3..d338126d7f79 100644 --- a/qadevOOo/tests/java/ifc/drawing/_ConnectorShape.java +++ b/qadevOOo/tests/java/ifc/drawing/_ConnectorShape.java @@ -35,6 +35,7 @@ import com.sun.star.drawing.XShape; public class _ConnectorShape extends MultiPropertyTest { public XShape[] conShapes = null; + @Override protected void before() { conShapes = (XShape[]) tEnv.getObjRelation("XConnectorShape.Shapes"); } diff --git a/qadevOOo/tests/java/ifc/drawing/_ConnectorShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_ConnectorShapeDescriptor.java index bbb0f69949a9..99f974b494a6 100644 --- a/qadevOOo/tests/java/ifc/drawing/_ConnectorShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_ConnectorShapeDescriptor.java @@ -22,6 +22,7 @@ import lib.MultiPropertyTest; public class _ConnectorShapeDescriptor extends MultiPropertyTest { + @Override protected boolean compare(Object ob1, Object ob2) { return super.compare(ob1, ob2); diff --git a/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java b/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java index 86d546cdcf0e..d9f7f3c31361 100644 --- a/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java +++ b/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java @@ -45,6 +45,7 @@ public class _DrawingDocumentDrawView extends MultiPropertyTest { XDrawPage drawPage = null; static String test_name = "For DrawingDocumentDrawView"; + @Override protected void before() { drawPage = (XDrawPage)tEnv.getObjRelation("DrawPage"); XNamed xNamed = UnoRuntime.queryInterface(XNamed.class, drawPage); @@ -56,10 +57,12 @@ public class _DrawingDocumentDrawView extends MultiPropertyTest { * and compares draw pages. */ protected PropertyTester CurPageTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { return drawPage; } + @Override protected boolean compare(Object obj1, Object obj2) { XNamed named1 = UnoRuntime.queryInterface(XNamed.class, obj1); XNamed named2 = UnoRuntime.queryInterface(XNamed.class, obj2); @@ -76,6 +79,7 @@ public class _DrawingDocumentDrawView extends MultiPropertyTest { return res; } + @Override protected String toString(Object obj) { XNamed named = UnoRuntime.queryInterface(XNamed.class, obj); String res = (named == null) ? "null" : named.getName(); diff --git a/qadevOOo/tests/java/ifc/drawing/_FillProperties.java b/qadevOOo/tests/java/ifc/drawing/_FillProperties.java index 93d2e9bf5e88..50f7a76406f5 100644 --- a/qadevOOo/tests/java/ifc/drawing/_FillProperties.java +++ b/qadevOOo/tests/java/ifc/drawing/_FillProperties.java @@ -63,6 +63,7 @@ public class _FillProperties extends MultiPropertyTest { */ protected PropertyTester URLTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (oldValue.equals(util.utils.getFullTestURL("space-metal.jpg"))) { @@ -77,6 +78,7 @@ public class _FillProperties extends MultiPropertyTest { */ protected PropertyTester StringTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (oldValue.equals(str1)) { @@ -91,6 +93,7 @@ public class _FillProperties extends MultiPropertyTest { */ protected PropertyTester BitmapTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (util.ValueComparer.equalValue(oldValue, the_bitmap)) { diff --git a/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShape.java b/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShape.java index 124a534fa172..3d49bcb05f11 100644 --- a/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShape.java +++ b/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShape.java @@ -59,6 +59,7 @@ public class _GraphicObjectShape extends MultiPropertyTest { * Property tester which changes URL. */ protected PropertyTester URLTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (oldValue.equals(util.utils.getFullTestURL("space-metal.jpg"))) return util.utils.getFullTestURL("crazy-blue.jpg"); else @@ -71,6 +72,7 @@ public class _GraphicObjectShape extends MultiPropertyTest { * It also uses two object relations with bitmaps. */ protected PropertyTester BitmapTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue){ XBitmap aBitmap1=(XBitmap) tEnv.getObjRelation("Bitmap1"); XBitmap aBitmap2=(XBitmap) tEnv.getObjRelation("Bitmap2"); @@ -85,6 +87,7 @@ public class _GraphicObjectShape extends MultiPropertyTest { * Property tester which returns new <code>XIndexAccess</code> object. */ protected PropertyTester ImapTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { return set; } diff --git a/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShapeDescriptor.java index f604a801ef6a..830a065d4eec 100644 --- a/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShapeDescriptor.java @@ -24,6 +24,7 @@ import com.sun.star.awt.XBitmap; public class _GraphicObjectShapeDescriptor extends MultiPropertyTest { + @Override protected boolean compare(Object ob1, Object ob2) { return super.compare(ob1, ob2); @@ -31,6 +32,7 @@ public class _GraphicObjectShapeDescriptor extends MultiPropertyTest { } protected PropertyTester URLTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (oldValue.equals(util.utils.getFullTestURL("space-metal.jpg"))) @@ -40,6 +42,7 @@ public class _GraphicObjectShapeDescriptor extends MultiPropertyTest { } ; protected PropertyTester BitmapTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { XBitmap aBitmap1=(XBitmap) tEnv.getObjRelation("Bitmap1"); diff --git a/qadevOOo/tests/java/ifc/drawing/_LineProperties.java b/qadevOOo/tests/java/ifc/drawing/_LineProperties.java index 6944b103b0d5..d37d6506ddcd 100644 --- a/qadevOOo/tests/java/ifc/drawing/_LineProperties.java +++ b/qadevOOo/tests/java/ifc/drawing/_LineProperties.java @@ -49,6 +49,7 @@ public class _LineProperties extends MultiPropertyTest { * only predefined String values. */ protected PropertyTester LineTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (oldValue.equals("Arrow")) diff --git a/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java index 791b0b4670fd..863f4246ae20 100644 --- a/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java @@ -37,6 +37,7 @@ public class _RotationDescriptor extends MultiPropertyTest { * Custom tester which increases value by 200 */ protected PropertyTester drawMeasureTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { int val = ((Integer)oldValue).intValue() ; return new Integer(val + 200) ; diff --git a/qadevOOo/tests/java/ifc/drawing/_ShadowDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_ShadowDescriptor.java index c973977a42ab..ec95fea71632 100644 --- a/qadevOOo/tests/java/ifc/drawing/_ShadowDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_ShadowDescriptor.java @@ -22,6 +22,7 @@ import lib.MultiPropertyTest; public class _ShadowDescriptor extends MultiPropertyTest { + @Override protected boolean compare(Object ob1, Object ob2) { return super.compare(ob1, ob2); diff --git a/qadevOOo/tests/java/ifc/drawing/_Shape.java b/qadevOOo/tests/java/ifc/drawing/_Shape.java index ca8380976028..8150098386aa 100644 --- a/qadevOOo/tests/java/ifc/drawing/_Shape.java +++ b/qadevOOo/tests/java/ifc/drawing/_Shape.java @@ -54,6 +54,7 @@ public class _Shape extends MultiPropertyTest { * Custom tester which switches between two styles. */ protected PropertyTester StyleTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (util.ValueComparer.equalValue(oldValue,style1)) @@ -67,6 +68,7 @@ public class _Shape extends MultiPropertyTest { * Strings ('layout' and 'controls'). */ protected PropertyTester StringTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (util.ValueComparer.equalValue(oldValue,"layout")) diff --git a/qadevOOo/tests/java/ifc/drawing/_Text.java b/qadevOOo/tests/java/ifc/drawing/_Text.java index 104643619e72..9ffffab6ee3f 100644 --- a/qadevOOo/tests/java/ifc/drawing/_Text.java +++ b/qadevOOo/tests/java/ifc/drawing/_Text.java @@ -22,6 +22,7 @@ import lib.MultiPropertyTest; public class _Text extends MultiPropertyTest { + @Override protected boolean compare(Object ob1, Object ob2) { return super.compare(ob1, ob2); diff --git a/qadevOOo/tests/java/ifc/drawing/_XConnectorShape.java b/qadevOOo/tests/java/ifc/drawing/_XConnectorShape.java index 814a3be49f71..ef9395f33c89 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XConnectorShape.java +++ b/qadevOOo/tests/java/ifc/drawing/_XConnectorShape.java @@ -60,6 +60,7 @@ public class _XConnectorShape extends MultiMethodTest { * @throw StatusException If the relation is not found or shapes don't * support <code>XConnectableShape</code> interface. */ + @Override public void before() { log.println("No shapes implementing XConnectableShape still found."); XShape[] shapes = (XShape[]) diff --git a/qadevOOo/tests/java/ifc/form/_DataAwareControlModel.java b/qadevOOo/tests/java/ifc/form/_DataAwareControlModel.java index 8fda3b0ae4b5..190e736d984d 100644 --- a/qadevOOo/tests/java/ifc/form/_DataAwareControlModel.java +++ b/qadevOOo/tests/java/ifc/form/_DataAwareControlModel.java @@ -105,9 +105,11 @@ public class _DataAwareControlModel extends MultiPropertyTest { ("DataAwareControlModel.NewFieldName") ; final String newVal = relVal == null ? "Address" : relVal ; testProperty("DataField", new PropertyTester() { + @Override protected Object getNewValue(String p, Object oldVal) { return newVal ; } + @Override protected void checkResult(String propName, Object oldValue, Object newValue, Object resValue, Exception exception) throws java.lang.Exception{ @@ -142,6 +144,7 @@ public class _DataAwareControlModel extends MultiPropertyTest { final XInterface xTextLabel = (XInterface)tEnv.getObjRelation("LC"); testProperty("LabelControl", new PropertyTester() { + @Override protected Object getNewValue(String p, Object oldVal) { if (utils.isVoid(oldVal)) return xTextLabel ; else return super.getNewValue("LabelControl",oldVal); @@ -152,6 +155,7 @@ public class _DataAwareControlModel extends MultiPropertyTest { /** * Forces environment recreateation. */ + @Override public void after() { disposeEnvironment() ; } diff --git a/qadevOOo/tests/java/ifc/form/_XApproveActionBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XApproveActionBroadcaster.java index b27997b8e027..a0c9185f3071 100644 --- a/qadevOOo/tests/java/ifc/form/_XApproveActionBroadcaster.java +++ b/qadevOOo/tests/java/ifc/form/_XApproveActionBroadcaster.java @@ -90,6 +90,7 @@ public class _XApproveActionBroadcaster extends MultiMethodTest { /** * Just log output */ + @Override protected void after() { log.println("Skipping all XApproveActionBroadcaster methods, since they" + " need user interaction"); diff --git a/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java index 54bf166cb843..4bce8dcab931 100644 --- a/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java +++ b/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java @@ -100,6 +100,7 @@ public class _XChangeBroadcaster extends MultiMethodTest { * @throw StatusException If neither relation is found nor interface * is queried. */ + @Override public void before() { xText = UnoRuntime.queryInterface(XTextComponent.class,oObj); changer = (Changer) tEnv.getObjRelation("XChangeBroadcaster.Changer") ; diff --git a/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java index 4868f75f29e5..4a9a8524b2ad 100644 --- a/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java +++ b/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java @@ -52,6 +52,7 @@ public class _XDatabaseParameterBroadcaster extends MultiMethodTest { * Get the object relation 'ParameterListenerChecker' and * set the log inside of the implementation. */ + @Override protected void before() { listenerChecker = (CheckParameterListener) tEnv.getObjRelation("ParameterListenerChecker"); @@ -85,6 +86,7 @@ public class _XDatabaseParameterBroadcaster extends MultiMethodTest { tRes.tested("removeParameterListener()", listenerChecker.checkListener()); } + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/form/_XLoadable.java b/qadevOOo/tests/java/ifc/form/_XLoadable.java index 9106a3ecd609..ed7bf18270d9 100644 --- a/qadevOOo/tests/java/ifc/form/_XLoadable.java +++ b/qadevOOo/tests/java/ifc/form/_XLoadable.java @@ -93,6 +93,7 @@ public class _XLoadable extends MultiMethodTest { /** * Creates new listener. */ + @Override public void before() { loadListener = new TestLoadListener(log) ; } @@ -231,6 +232,7 @@ public class _XLoadable extends MultiMethodTest { tRes.tested("removeLoadListener()", result) ; } + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/form/_XSubmit.java b/qadevOOo/tests/java/ifc/form/_XSubmit.java index 611376f633ba..7cec878a2c03 100644 --- a/qadevOOo/tests/java/ifc/form/_XSubmit.java +++ b/qadevOOo/tests/java/ifc/form/_XSubmit.java @@ -174,6 +174,7 @@ public class _XSubmit extends MultiMethodTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java index 40a92e50588c..badab75a22f3 100644 --- a/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java +++ b/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java @@ -72,6 +72,7 @@ public class _XUpdateBroadcaster extends MultiMethodTest { * Retrieves object relations. * @throws StatusException If one of relations not found. */ + @Override public void before() { checker = (UpdateChecker) tEnv.getObjRelation("XUpdateBroadcaster.Checker") ; @@ -230,6 +231,7 @@ public class _XUpdateBroadcaster extends MultiMethodTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/form/component/_CurrencyField.java b/qadevOOo/tests/java/ifc/form/component/_CurrencyField.java index acb03df2aa32..ae1d7de26fd4 100644 --- a/qadevOOo/tests/java/ifc/form/component/_CurrencyField.java +++ b/qadevOOo/tests/java/ifc/form/component/_CurrencyField.java @@ -38,6 +38,7 @@ public class _CurrencyField extends MultiPropertyTest { */ public void _DefaultValue() { testProperty("DefaultValue", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return util.utils.isVoid(old) ? new Double(17.5) : super.getNewValue(p, old) ; diff --git a/qadevOOo/tests/java/ifc/form/component/_DataForm.java b/qadevOOo/tests/java/ifc/form/component/_DataForm.java index 3b3b4035af3f..4ea3e11ce079 100644 --- a/qadevOOo/tests/java/ifc/form/component/_DataForm.java +++ b/qadevOOo/tests/java/ifc/form/component/_DataForm.java @@ -46,6 +46,7 @@ public class _DataForm extends MultiPropertyTest { */ public void _NavigationBarMode() { testProperty("NavigationBarMode", new PropertyTester() { + @Override public String toString(Object obj) { if (util.utils.isVoid(obj)) { return "null"; @@ -63,9 +64,11 @@ public class _DataForm extends MultiPropertyTest { */ public void _Cycle() { testProperty("Cycle", new PropertyTester() { + @Override public Object getNewValue(String propName, Object oldValue) { return TabulatorCycle.CURRENT; } + @Override public String toString(Object obj) { if (util.utils.isVoid(obj)) return "null"; diff --git a/qadevOOo/tests/java/ifc/form/component/_DatabaseForm.java b/qadevOOo/tests/java/ifc/form/component/_DatabaseForm.java index af3114577e28..17121cb990e8 100644 --- a/qadevOOo/tests/java/ifc/form/component/_DatabaseForm.java +++ b/qadevOOo/tests/java/ifc/form/component/_DatabaseForm.java @@ -48,6 +48,7 @@ public class _DatabaseForm extends MultiPropertyTest { public void _NavigationBarMode() { dbg.printPropertyInfo(oObj, "NavigationBarMode"); testProperty("NavigationBarMode", new PropertyTester() { + @Override public String toString(Object obj) { if (obj == null) { return "null"; @@ -66,10 +67,12 @@ public class _DatabaseForm extends MultiPropertyTest { public void _Cycle() { dbg.printPropertyInfo(oObj, "Cycle"); testProperty("Cycle", new PropertyTester() { + @Override public Object getNewValue(String propName, Object oldValue) { return TabulatorCycle.CURRENT; } + @Override public String toString(Object obj) { if (obj == null) { return "null"; diff --git a/qadevOOo/tests/java/ifc/form/component/_DateField.java b/qadevOOo/tests/java/ifc/form/component/_DateField.java index 2b357edde6df..b88490bd15e5 100644 --- a/qadevOOo/tests/java/ifc/form/component/_DateField.java +++ b/qadevOOo/tests/java/ifc/form/component/_DateField.java @@ -36,6 +36,7 @@ public class _DateField extends MultiPropertyTest { */ public void _DefaultDate() { testProperty("DefaultDate", new PropertyTester() { + @Override protected Object getNewValue(String prop, Object old) { return util.utils.isVoid(old) ? new Integer(20010507) : super.getNewValue(prop, old) ; diff --git a/qadevOOo/tests/java/ifc/form/component/_GridControl.java b/qadevOOo/tests/java/ifc/form/component/_GridControl.java index 7a423d62f770..aa146e043e55 100644 --- a/qadevOOo/tests/java/ifc/form/component/_GridControl.java +++ b/qadevOOo/tests/java/ifc/form/component/_GridControl.java @@ -42,6 +42,7 @@ public class _GridControl extends MultiPropertyTest { */ public void _RowHeight() { testProperty("RowHeight", new PropertyTester() { + @Override protected Object getNewValue(String prop, Object old) { return util.utils.isVoid(old) ? new Integer(11) : super.getNewValue(prop, old) ; @@ -55,6 +56,7 @@ public class _GridControl extends MultiPropertyTest { */ public void _Tabstop() { testProperty("Tabstop", new PropertyTester() { + @Override protected Object getNewValue(String prop, Object old) { return util.utils.isVoid(old) ? new Boolean(true) : super.getNewValue(prop, old) ; @@ -68,6 +70,7 @@ public class _GridControl extends MultiPropertyTest { */ public void _TextColor() { testProperty("TextColor", new PropertyTester() { + @Override protected Object getNewValue(String prop, Object old) { return util.utils.isVoid(old) ? new Integer(342) : super.getNewValue(prop, old) ; @@ -81,6 +84,7 @@ public class _GridControl extends MultiPropertyTest { */ public void _BorderColor() { testProperty("BorderColor", new PropertyTester() { + @Override protected Object getNewValue(String prop, Object old) { return util.utils.isVoid(old) ? new Integer(342) : super.getNewValue(prop, old) ; diff --git a/qadevOOo/tests/java/ifc/form/component/_NavigationToolBar.java b/qadevOOo/tests/java/ifc/form/component/_NavigationToolBar.java index 3a764df22993..6f75545afc52 100644 --- a/qadevOOo/tests/java/ifc/form/component/_NavigationToolBar.java +++ b/qadevOOo/tests/java/ifc/form/component/_NavigationToolBar.java @@ -24,6 +24,7 @@ public class _NavigationToolBar extends MultiPropertyTest { public void _TextColor() { testProperty("TextColor", new PropertyTester() { + @Override protected Object getNewValue(String prop, Object old) { return util.utils.isVoid(old) ? new Integer(20010507) : super.getNewValue(prop, old) ; @@ -33,6 +34,7 @@ public class _NavigationToolBar extends MultiPropertyTest { public void _TextLineColor() { testProperty("TextLineColor", new PropertyTester() { + @Override protected Object getNewValue(String prop, Object old) { return util.utils.isVoid(old) ? new Integer(20050507) : super.getNewValue(prop, old) ; diff --git a/qadevOOo/tests/java/ifc/form/component/_NumericField.java b/qadevOOo/tests/java/ifc/form/component/_NumericField.java index ba6f08be8371..463e780c908f 100644 --- a/qadevOOo/tests/java/ifc/form/component/_NumericField.java +++ b/qadevOOo/tests/java/ifc/form/component/_NumericField.java @@ -38,6 +38,7 @@ public class _NumericField extends MultiPropertyTest { */ public void _DefaultValue() { testProperty("DefaultValue", new PropertyTester() { + @Override protected Object getNewValue(String prop, Object old) { return util.utils.isVoid(old) ? new Double(111.11) : super.getNewValue(prop, old) ; diff --git a/qadevOOo/tests/java/ifc/form/component/_TimeField.java b/qadevOOo/tests/java/ifc/form/component/_TimeField.java index d924f3ea6d0e..06a924fa08c9 100644 --- a/qadevOOo/tests/java/ifc/form/component/_TimeField.java +++ b/qadevOOo/tests/java/ifc/form/component/_TimeField.java @@ -38,6 +38,7 @@ public class _TimeField extends MultiPropertyTest { */ public void _DefaultTime() { testProperty("DefaultTime", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return utils.isVoid(old) ? new Integer(4321) : super.getNewValue(p, old) ; diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatch.java b/qadevOOo/tests/java/ifc/frame/_XDispatch.java index 7265a4ce2aa1..d1f50fc24171 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatch.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatch.java @@ -147,6 +147,7 @@ public class _XDispatch extends MultiMethodTest { * Retrieves object relations and creates new listeners. * @throws StatusException If one of relations not found. */ + @Override public void before() { listener = new TestStatusListener(log) ; url = (URL) tEnv.getObjRelation("XDispatch.URL") ; diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java b/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java index 275b67774b65..aebc5e4c3c86 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java @@ -51,6 +51,7 @@ public class _XDispatchProvider extends MultiMethodTest { /** * Retrieves object relation. */ + @Override public void before() { dispatchUrl = (String) tEnv.getObjRelation("XDispatchProvider.URL") ; if (dispatchUrl == null) { diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java b/qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java index 29ce2a580638..4b72518f8788 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java @@ -89,6 +89,7 @@ public class _XDispatchProviderInterception extends MultiMethodTest { /** * Cereates new interceptor implementation. */ + @Override public void before() { interceptor = new TestInterceptor(log) ; } diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java index 56553fdc0bca..03225e4170e2 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java @@ -51,6 +51,7 @@ public class _XDispatchRecorder extends MultiMethodTest { URL dispURL = null; PropertyValue[] dispArgs = new PropertyValue[0]; + @Override protected void before() { xFrame = (XFrame) tEnv.getObjRelation("XDispatchRecorder.Frame"); diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java index 81bf327b21f3..f92f366e0683 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java @@ -72,6 +72,7 @@ public class _XDispatchRecorderSupplier extends MultiMethodTest { * Also a <code>com.sun.star.frame.Desktop</code> * service created for obtaining document's frame. */ + @Override protected void before() { SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF()); @@ -227,6 +228,7 @@ public class _XDispatchRecorderSupplier extends MultiMethodTest { /** * Disposes the document created in <code>before()</code> */ + @Override protected void after() { xTextDoc.dispose(); } diff --git a/qadevOOo/tests/java/ifc/frame/_XFrame.java b/qadevOOo/tests/java/ifc/frame/_XFrame.java index f4c79061cfa2..b3cb999fa3d9 100644 --- a/qadevOOo/tests/java/ifc/frame/_XFrame.java +++ b/qadevOOo/tests/java/ifc/frame/_XFrame.java @@ -567,6 +567,7 @@ public class _XFrame extends MultiMethodTest { /** * Forces environment recreation. */ + @Override public void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java index b5c0416e7fc5..f4e4a1c366f0 100644 --- a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java +++ b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java @@ -88,6 +88,7 @@ public class _XFrameLoader extends MultiMethodTest { * creates their default values. <p> * @throws StatusException If one of required relations not found. */ + @Override public void before() { url = (String) tEnv.getObjRelation("FrameLoader.URL") ; frame = (XFrame) tEnv.getObjRelation("FrameLoader.Frame") ; @@ -182,6 +183,7 @@ public class _XFrameLoader extends MultiMethodTest { tRes.tested("cancel()", result) ; } + @Override public void after() { if (frameSup != null) frameSup.dispose() ; frame.dispose(); diff --git a/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java b/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java index dbe43e261675..2510cfe8fe0a 100644 --- a/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java +++ b/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java @@ -34,6 +34,7 @@ public class _XLayoutManager extends MultiMethodTest { private XFrame xFrame = null; private String sElementName = "private:resource/menubar/myMenu"; + @Override public void before() { xFrame = (XFrame)tEnv.getObjRelation("XLayoutManager.Frame"); } diff --git a/qadevOOo/tests/java/ifc/frame/_XModuleManager.java b/qadevOOo/tests/java/ifc/frame/_XModuleManager.java index 692215de1297..b5d895d4fa34 100644 --- a/qadevOOo/tests/java/ifc/frame/_XModuleManager.java +++ b/qadevOOo/tests/java/ifc/frame/_XModuleManager.java @@ -79,6 +79,7 @@ public class _XModuleManager extends MultiMethodTest { private PropertyValue[] xModelSeq = null; /** Retrieves object relations. */ + @Override public void before() { xFrameSeq = (PropertyValue[]) tEnv.getObjRelation("XModuleManager.XFrame") ; diff --git a/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java b/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java index 7cf64918c89a..650b2dba35c2 100644 --- a/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java +++ b/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java @@ -83,6 +83,7 @@ public class _XNotifyingDispatch extends MultiMethodTest { * Retrieves object relations and creates new listeners. * @throws StatusException If one of relations not found. */ + @Override public void before() { notificationListener = new TestNotificationListener(log) ; url = (URL) tEnv.getObjRelation("XDispatch.URL") ; diff --git a/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java b/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java index b4cec85dc79e..be8c32da4cf0 100644 --- a/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java +++ b/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java @@ -27,6 +27,7 @@ import lib.MultiMethodTest; public class _XPopupMenuController extends MultiMethodTest { public XPopupMenuController oObj = null; + @Override public void before() { } diff --git a/qadevOOo/tests/java/ifc/frame/_XStatusListener.java b/qadevOOo/tests/java/ifc/frame/_XStatusListener.java index 067cd5a89a10..393c0a205bdd 100644 --- a/qadevOOo/tests/java/ifc/frame/_XStatusListener.java +++ b/qadevOOo/tests/java/ifc/frame/_XStatusListener.java @@ -26,6 +26,7 @@ public class _XStatusListener extends MultiMethodTest { public XStatusListener oObj = null; + @Override public void before() { } diff --git a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java index 83040fa01f64..2151d77957ba 100644 --- a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java +++ b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java @@ -70,6 +70,7 @@ public class _XSynchronousFrameLoader extends MultiMethodTest { * * @throws StatusException If one of required relations not found. */ + @Override public void before() { url = (String) tEnv.getObjRelation("FrameLoader.URL") ; frame = (XFrame) tEnv.getObjRelation("FrameLoader.Frame") ; @@ -143,6 +144,7 @@ public class _XSynchronousFrameLoader extends MultiMethodTest { final boolean[] result = new boolean[1] ; (new Thread() { + @Override public void run() { result[0] = oObj.load(descr, frame); } @@ -161,6 +163,7 @@ public class _XSynchronousFrameLoader extends MultiMethodTest { /** * Disposes document if it was created for frame supplying. */ + @Override protected void after() { if (frameSup != null) { frameSup.dispose(); diff --git a/qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java b/qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java index 4455460e3cc5..21a627d7191c 100644 --- a/qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java +++ b/qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java @@ -26,6 +26,7 @@ public class _XUIControllerRegistration extends MultiMethodTest { private String aRegisteredController = null; private String aController = ".uno:MySecondController"; + @Override public void before() { aRegisteredController = (String)tEnv.getObjRelation("XUIControllerRegistration.RegisteredController"); } diff --git a/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java b/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java index eb0b72c77794..7c6194d80e2e 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java +++ b/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java @@ -84,6 +84,7 @@ public class _XBreakIterator extends MultiMethodTest { * Retrieves object relations. * @throws StatusException If one of relations not found. */ + @Override protected void before() { locale = (Locale)tEnv.getObjRelation("Locale"); if (locale == null) { diff --git a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java index 59c983b8aaa5..43f46d128be0 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java +++ b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java @@ -68,6 +68,7 @@ public class _XCalendar extends MultiMethodTest { double aOriginalDTime = 0; Locale[] installed_locales; + @Override public void before() { XLocaleData locData = null; try { @@ -91,6 +92,7 @@ public class _XCalendar extends MultiMethodTest { * Restore the changed time during the test to the original value of the * machine: has to be correct for the following interface tests. */ + @Override public void after() { oObj.loadDefaultCalendar(installed_locales[0]); oObj.setDateTime(aOriginalDTime); diff --git a/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java b/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java index 97acd4013a10..99d26e7b9a0b 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java +++ b/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java @@ -38,6 +38,7 @@ public class _XExtendedCalendar extends MultiMethodTest { /** * Load a calendar */ + @Override public void before() { Locale[] installed_locales = null; XLocaleData locData = null; diff --git a/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java b/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java index 29e9edb22186..c96c8e42f72b 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java +++ b/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java @@ -29,6 +29,7 @@ public class _XExtendedTransliteration extends MultiMethodTest { public XExtendedTransliteration oObj = null; private Locale loc = new Locale("en", "US", "") ; + @Override public void before() { oObj.loadModule(TransliterationModules.LOWERCASE_UPPERCASE, loc); } diff --git a/qadevOOo/tests/java/ifc/inspection/_XObjectInspector.java b/qadevOOo/tests/java/ifc/inspection/_XObjectInspector.java index 49d88d9a867d..faf0036f3c60 100644 --- a/qadevOOo/tests/java/ifc/inspection/_XObjectInspector.java +++ b/qadevOOo/tests/java/ifc/inspection/_XObjectInspector.java @@ -69,6 +69,7 @@ public class _XObjectInspector extends MultiMethodTest { * <li>XObjectInspector.toInspect</li> * </ul> */ + @Override public void before() { oInspect = (Object[]) tEnv.getObjRelation("XObjectInspector.toInspect"); diff --git a/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java b/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java index a13145edf334..33a2bd09b78e 100644 --- a/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java +++ b/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java @@ -232,6 +232,7 @@ public class _XActiveDataControl extends MultiMethodTest { /** * Disposes the test environment, since it is used. */ + @Override public void after() { this.disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/io/_XActiveDataSink.java b/qadevOOo/tests/java/ifc/io/_XActiveDataSink.java index 00d9cf64e37d..ec1dad459570 100644 --- a/qadevOOo/tests/java/ifc/io/_XActiveDataSink.java +++ b/qadevOOo/tests/java/ifc/io/_XActiveDataSink.java @@ -53,6 +53,7 @@ public class _XActiveDataSink extends MultiMethodTest { /** * Take the XInputStream from the environment for setting and getting */ + @Override public void before() { XInterface x = (XInterface)tEnv.getObjRelation("InputStream"); iStream = UnoRuntime.queryInterface @@ -94,6 +95,7 @@ public class _XActiveDataSink extends MultiMethodTest { tRes.tested("getInputStream()", getStream != oldStream) ; } + @Override public void after() { this.disposeEnvironment() ; } diff --git a/qadevOOo/tests/java/ifc/io/_XActiveDataSource.java b/qadevOOo/tests/java/ifc/io/_XActiveDataSource.java index a7092aa91ce2..5cd2dd3efa3d 100644 --- a/qadevOOo/tests/java/ifc/io/_XActiveDataSource.java +++ b/qadevOOo/tests/java/ifc/io/_XActiveDataSource.java @@ -53,6 +53,7 @@ public class _XActiveDataSource extends MultiMethodTest { /** * Take the XOutputStream from the environment for setting and getting. */ + @Override public void before() { XInterface x = (XInterface)tEnv.getObjRelation("OutputStream"); oStream = UnoRuntime.queryInterface @@ -88,6 +89,7 @@ public class _XActiveDataSource extends MultiMethodTest { /** * Forces object environment recreation. */ + @Override public void after() { this.disposeEnvironment() ; } diff --git a/qadevOOo/tests/java/ifc/io/_XConnectable.java b/qadevOOo/tests/java/ifc/io/_XConnectable.java index 8c8d061b9c7c..35742e8d4dee 100644 --- a/qadevOOo/tests/java/ifc/io/_XConnectable.java +++ b/qadevOOo/tests/java/ifc/io/_XConnectable.java @@ -51,6 +51,7 @@ public class _XConnectable extends MultiMethodTest { /** * Get another connectable object from object relations. */ + @Override public void before() { XInterface x = (XInterface)tEnv.getObjRelation("Connectable"); xConnect = UnoRuntime.queryInterface( @@ -116,6 +117,7 @@ public class _XConnectable extends MultiMethodTest { /** * Forces object environment recreation. */ + @Override public void after() { this.disposeEnvironment() ; } diff --git a/qadevOOo/tests/java/ifc/io/_XDataInputStream.java b/qadevOOo/tests/java/ifc/io/_XDataInputStream.java index 2671b4baf620..5a3321f541c7 100644 --- a/qadevOOo/tests/java/ifc/io/_XDataInputStream.java +++ b/qadevOOo/tests/java/ifc/io/_XDataInputStream.java @@ -76,6 +76,7 @@ public class _XDataInputStream extends MultiMethodTest { * data of different types and fills the appropriate variables. * @throws StatusException If one of relations not found. */ + @Override public void before(){ XInterface x = (XInterface)tEnv.getObjRelation("StreamWriter") ; @@ -396,6 +397,7 @@ public class _XDataInputStream extends MultiMethodTest { /** * Forces object environment recreation. */ + @Override public void after() { try { oStream.flush(); diff --git a/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java b/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java index 90d049cbd05f..51dcff41c2f0 100644 --- a/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java +++ b/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java @@ -56,6 +56,7 @@ public class _XDataOutputStream extends MultiMethodTest { * If relation or data of some type in stream not found then * tests of corresponding methods are skipped. */ + @Override public void before() throws RuntimeException { List<Object> data = (List<Object>) tEnv.getObjRelation("StreamData") ; @@ -253,6 +254,7 @@ public class _XDataOutputStream extends MultiMethodTest { /** * Forces object environment recreation. */ + @Override public void after() { this.disposeEnvironment() ; } diff --git a/qadevOOo/tests/java/ifc/io/_XInputStream.java b/qadevOOo/tests/java/ifc/io/_XInputStream.java index f60a3c5f43a1..9bfe93b337be 100644 --- a/qadevOOo/tests/java/ifc/io/_XInputStream.java +++ b/qadevOOo/tests/java/ifc/io/_XInputStream.java @@ -60,6 +60,7 @@ public class _XInputStream extends MultiMethodTest { * Before the test, the stream writer and the data are ecxtracted from * the object relations and the data is written to the stream. */ + @Override public void before() { XInterface x = (XInterface)tEnv.getObjRelation("StreamWriter"); oStream = UnoRuntime.queryInterface( @@ -77,6 +78,7 @@ public class _XInputStream extends MultiMethodTest { * After the test, the stream writer is closed and the * environment is disposed. */ + @Override public void after() { try { oStream.flush(); diff --git a/qadevOOo/tests/java/ifc/io/_XObjectInputStream.java b/qadevOOo/tests/java/ifc/io/_XObjectInputStream.java index 01235e3d39d8..197a97086629 100644 --- a/qadevOOo/tests/java/ifc/io/_XObjectInputStream.java +++ b/qadevOOo/tests/java/ifc/io/_XObjectInputStream.java @@ -158,6 +158,7 @@ public class _XObjectInputStream extends MultiMethodTest { /** * Forces object environment recreation. */ + @Override public void after() { this.disposeEnvironment() ; } diff --git a/qadevOOo/tests/java/ifc/io/_XOutputStream.java b/qadevOOo/tests/java/ifc/io/_XOutputStream.java index 8e53c67def0b..5a3b90e7726b 100644 --- a/qadevOOo/tests/java/ifc/io/_XOutputStream.java +++ b/qadevOOo/tests/java/ifc/io/_XOutputStream.java @@ -56,6 +56,7 @@ public class _XOutputStream extends MultiMethodTest { public void resetStreams(); } + @Override protected void before() { checker = (StreamChecker) tEnv.getObjRelation("XOutputStream.StreamChecker"); @@ -157,6 +158,7 @@ public class _XOutputStream extends MultiMethodTest { /** * Forces object environment recreation. */ + @Override public void after() { this.disposeEnvironment() ; } diff --git a/qadevOOo/tests/java/ifc/java/_XJavaThreadRegister_11.java b/qadevOOo/tests/java/ifc/java/_XJavaThreadRegister_11.java index 2939ac9b690d..0a704fa342a7 100644 --- a/qadevOOo/tests/java/ifc/java/_XJavaThreadRegister_11.java +++ b/qadevOOo/tests/java/ifc/java/_XJavaThreadRegister_11.java @@ -38,6 +38,7 @@ import com.sun.star.java.XJavaThreadRegister_11; public class _XJavaThreadRegister_11 extends MultiMethodTest { public XJavaThreadRegister_11 oObj; + @Override protected void after() { log.println("Skipping all XJavaThreadRegister_11 methods, since they" + " can't be tested in the context"); diff --git a/qadevOOo/tests/java/ifc/java/_XJavaVM.java b/qadevOOo/tests/java/ifc/java/_XJavaVM.java index 040dfbd04fdf..0c8fe92a336f 100644 --- a/qadevOOo/tests/java/ifc/java/_XJavaVM.java +++ b/qadevOOo/tests/java/ifc/java/_XJavaVM.java @@ -38,6 +38,7 @@ import com.sun.star.java.XJavaVM; public class _XJavaVM extends MultiMethodTest { public XJavaVM oObj; + @Override protected void after() { log.println("Skipping all XJavaVM methods, since they" + " can't be tested in the context"); diff --git a/qadevOOo/tests/java/ifc/lang/_XComponent.java b/qadevOOo/tests/java/ifc/lang/_XComponent.java index 66fe850e5ab0..657f80086501 100644 --- a/qadevOOo/tests/java/ifc/lang/_XComponent.java +++ b/qadevOOo/tests/java/ifc/lang/_XComponent.java @@ -75,6 +75,7 @@ public class _XComponent extends MultiMethodTest { * element. TODO: Is this needed for anything else, too, or should it be * removed? */ + @Override protected void before() { // do not dispose this component, but parent instead altDispose = (XComponent)tEnv.getObjRelation("XComponent.DisposeThis"); @@ -161,6 +162,7 @@ public class _XComponent extends MultiMethodTest { /** * Forces object recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/lang/_XInitialization.java b/qadevOOo/tests/java/ifc/lang/_XInitialization.java index c699bd022907..87a80ef26494 100644 --- a/qadevOOo/tests/java/ifc/lang/_XInitialization.java +++ b/qadevOOo/tests/java/ifc/lang/_XInitialization.java @@ -92,6 +92,7 @@ public class _XInitialization extends MultiMethodTest { /** * Disposes object environment. */ + @Override public void after() { disposeEnvironment() ; } diff --git a/qadevOOo/tests/java/ifc/lang/_XMultiComponentFactory.java b/qadevOOo/tests/java/ifc/lang/_XMultiComponentFactory.java index 6c627c81a7d4..0b8fdb561fad 100644 --- a/qadevOOo/tests/java/ifc/lang/_XMultiComponentFactory.java +++ b/qadevOOo/tests/java/ifc/lang/_XMultiComponentFactory.java @@ -41,6 +41,7 @@ public class _XMultiComponentFactory extends MultiMethodTest { public XComponentContext xContext = null; private String[] availableServiceNames = null; + @Override public void before(){ xContext = (XComponentContext)tEnv.getObjRelation("DC"); availableServiceNames = (String[])tEnv.getObjRelation("XMultiComponentFactory.ServiceNames"); diff --git a/qadevOOo/tests/java/ifc/lang/_XSingleServiceFactory.java b/qadevOOo/tests/java/ifc/lang/_XSingleServiceFactory.java index 61cdf787cd45..4264e68747d8 100644 --- a/qadevOOo/tests/java/ifc/lang/_XSingleServiceFactory.java +++ b/qadevOOo/tests/java/ifc/lang/_XSingleServiceFactory.java @@ -57,6 +57,7 @@ public class _XSingleServiceFactory extends MultiMethodTest { public XSingleServiceFactory oObj = null; private Class<?>[] mustSupport = null ; + @Override public void before() { mustSupport = (Class[]) tEnv.getObjRelation ("XSingleServiceFactory.MustSupport") ; diff --git a/qadevOOo/tests/java/ifc/linguistic2/_XSpellChecker.java b/qadevOOo/tests/java/ifc/linguistic2/_XSpellChecker.java index 3893aec2bb9f..1645b28bc34d 100644 --- a/qadevOOo/tests/java/ifc/linguistic2/_XSpellChecker.java +++ b/qadevOOo/tests/java/ifc/linguistic2/_XSpellChecker.java @@ -41,6 +41,7 @@ public class _XSpellChecker extends MultiMethodTest { public XSpellChecker oObj = null; XSpellChecker alternative = null; + @Override public void before() { alternative = (XSpellChecker) tEnv.getObjRelation("AlternativeChecker"); if (alternative == null) throw new StatusException(Status.failed diff --git a/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java b/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java index 36c228b448f9..8aa334a8bb1d 100644 --- a/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java +++ b/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java @@ -60,6 +60,7 @@ public class _XImplementationLoader extends MultiMethodTest { * Retrieves object relations. * @throws StatusException If one of relations not found. */ + @Override public void before() { implLoader = (String) tEnv.getObjRelation("ImplementationLoader") ; implUrl = (String) tEnv.getObjRelation("ImplementationUrl") ; @@ -171,6 +172,7 @@ public class _XImplementationLoader extends MultiMethodTest { /** * Forces object recreation. */ + @Override public void after() { this.disposeEnvironment() ; } diff --git a/qadevOOo/tests/java/ifc/presentation/_Presentation.java b/qadevOOo/tests/java/ifc/presentation/_Presentation.java index 3ac26dc41561..28f8a5aaba3b 100644 --- a/qadevOOo/tests/java/ifc/presentation/_Presentation.java +++ b/qadevOOo/tests/java/ifc/presentation/_Presentation.java @@ -64,6 +64,7 @@ public class _Presentation extends MultiPropertyTest { } protected PropertyTester CustomShowTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if ( ((String)oldValue).equals("SecondPresentation") ) { diff --git a/qadevOOo/tests/java/ifc/presentation/_PresentationView.java b/qadevOOo/tests/java/ifc/presentation/_PresentationView.java index 3927f81e191b..0846877b1b58 100644 --- a/qadevOOo/tests/java/ifc/presentation/_PresentationView.java +++ b/qadevOOo/tests/java/ifc/presentation/_PresentationView.java @@ -26,6 +26,7 @@ public class _PresentationView extends MultiPropertyTest { * Property tester which changes DrawPage. */ protected PropertyTester PageTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (oldValue.equals(tEnv.getObjRelation("FirstPage"))) diff --git a/qadevOOo/tests/java/ifc/qadevooo/_SelfTest.java b/qadevOOo/tests/java/ifc/qadevooo/_SelfTest.java index 42b70fd89b86..c67dde39b07e 100644 --- a/qadevOOo/tests/java/ifc/qadevooo/_SelfTest.java +++ b/qadevOOo/tests/java/ifc/qadevooo/_SelfTest.java @@ -33,6 +33,7 @@ public class _SelfTest extends MultiMethodTest /** */ + @Override public void before() { log.println("_SelfTest.before()"); @@ -62,6 +63,7 @@ public class _SelfTest extends MultiMethodTest /** * Forces object environment recreation. */ + @Override public void after() { log.println("_SelfTest.after()"); diff --git a/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java b/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java index d2ab01f456cb..7603f8a00594 100644 --- a/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java +++ b/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java @@ -175,6 +175,7 @@ public class _XImplementationRegistration extends MultiMethodTest { tRes.tested("revokeImplementation()", true) ; } + @Override public void after() { this.disposeEnvironment() ; } diff --git a/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java b/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java index 1b73af54f9b6..1848429a850d 100644 --- a/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java +++ b/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java @@ -71,6 +71,7 @@ public class _XSimpleRegistry extends MultiMethodTest { * Retrieves object relations. * @throws StatusException If one of required relations not found. */ + @Override protected void before() { if (tEnv.getObjRelation("configuration") != null) { configuration = true; diff --git a/qadevOOo/tests/java/ifc/sdb/_DataSource.java b/qadevOOo/tests/java/ifc/sdb/_DataSource.java index 24c1cb3c1ae2..c190babb6e50 100644 --- a/qadevOOo/tests/java/ifc/sdb/_DataSource.java +++ b/qadevOOo/tests/java/ifc/sdb/_DataSource.java @@ -63,6 +63,7 @@ public class _DataSource extends MultiPropertyTest { Object oldInfo = oObj.getPropertyValue("Info") ; testProperty("Info", new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { PropertyValue propUsr = new PropertyValue(), @@ -140,6 +141,7 @@ public class _DataSource extends MultiPropertyTest { */ public void _NumberFormatsSupplier() { testProperty("NumberFormatsSupplier", new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { return null ; } @@ -149,6 +151,7 @@ public class _DataSource extends MultiPropertyTest { /** * If object test allows to recreate environment it is better to do it. */ + @Override public void after() { try { oObj.setPropertyValue("IsPasswordRequired",new Boolean(false)); diff --git a/qadevOOo/tests/java/ifc/sdb/_RowSet.java b/qadevOOo/tests/java/ifc/sdb/_RowSet.java index 9a50fbd1f524..d4b9efbf884a 100644 --- a/qadevOOo/tests/java/ifc/sdb/_RowSet.java +++ b/qadevOOo/tests/java/ifc/sdb/_RowSet.java @@ -65,12 +65,14 @@ public class _RowSet extends MultiPropertyTest { protected class SafeTester extends PropertyTester { Object oldValue = null ; + @Override protected Object getNewValue(String prop, Object old) { log.println("Testing with SafeTester ...") ; oldValue = old ; return super.getNewValue(prop, old) ; } + @Override protected void checkResult(String propName, Object oldValue, Object newValue, Object resValue, Exception exception) throws Exception { @@ -102,6 +104,7 @@ public class _RowSet extends MultiPropertyTest { * * @see SafeTester */ + @Override protected void testProperty(String propName) { testProperty(propName, new SafeTester()) ; } @@ -132,6 +135,7 @@ public class _RowSet extends MultiPropertyTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java b/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java index 28c03caf8618..4ff9f65fb211 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java +++ b/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java @@ -47,6 +47,7 @@ public class _XCompletedExecution extends MultiMethodTest { public boolean checkInteractionHandler(); } + @Override protected void before() { checkHandler = (CheckInteractionHandler) tEnv.getObjRelation("InteractionHandlerChecker"); @@ -69,6 +70,7 @@ public class _XCompletedExecution extends MultiMethodTest { tRes.tested("executeWithCompletion()", checkHandler.checkInteractionHandler()); } + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java b/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java index 702ed7259af1..8f525182a413 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java +++ b/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java @@ -117,6 +117,7 @@ public class _XRowSetApproveBroadcaster extends MultiMethodTest { /** * Tries to retrieve object relation. */ + @Override public void before() { checker = (RowSetApproveChecker) tEnv.getObjRelation ("XRowSetApproveBroadcaster.ApproveChecker") ; @@ -196,6 +197,7 @@ public class _XRowSetApproveBroadcaster extends MultiMethodTest { /** * Disposes object environment. */ + @Override public void after() { disposeEnvironment() ; } diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java index f0ff54731561..c822438d9be0 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java +++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java @@ -61,6 +61,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { * </ul> <p> * @see com.sun.star.sdb.XSingleSelectQueryComposer */ + @Override protected void before() { xComposer = UnoRuntime.queryInterface(XSingleSelectQueryComposer.class, diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java index b8022140c51b..b79c2f509efa 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java +++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java @@ -72,6 +72,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { * @see com.sun.star.sdb.XSingleSelectQueryAnalyzer * @see com.sun.star.beans.XPropertySet */ + @Override protected void before() /* throws Exception*/ { xQueryAna = UnoRuntime.queryInterface(XSingleSelectQueryAnalyzer.class, diff --git a/qadevOOo/tests/java/ifc/sdbc/_XCloseable.java b/qadevOOo/tests/java/ifc/sdbc/_XCloseable.java index 56d149fa74f9..45aa0fa0e676 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XCloseable.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XCloseable.java @@ -76,6 +76,7 @@ public class _XCloseable extends MultiMethodTest { /** * Forces environment recreation. */ + @Override public void after() { disposeEnvironment() ; } diff --git a/qadevOOo/tests/java/ifc/sdbc/_XDriver.java b/qadevOOo/tests/java/ifc/sdbc/_XDriver.java index 7f14518a2dbf..4b0eb147f2ff 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XDriver.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XDriver.java @@ -61,6 +61,7 @@ public class _XDriver extends MultiMethodTest { * Retrieves relations. * @throw StatusException If any relation not found. */ + @Override protected void before() { nbu = (String) tEnv.getObjRelation("NoBadURL"); url = (String)tEnv.getObjRelation("XDriver.URL"); diff --git a/qadevOOo/tests/java/ifc/sdbc/_XDriverManager.java b/qadevOOo/tests/java/ifc/sdbc/_XDriverManager.java index 0b531c03afbf..57477b4a7189 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XDriverManager.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XDriverManager.java @@ -60,6 +60,7 @@ public class _XDriverManager extends MultiMethodTest { /** * Retrieves the required object relations. */ + @Override protected void before() { sdbcURL = (String)tEnv.getObjRelation("SDBC.URL"); if (sdbcURL == null) { diff --git a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java index bead09fd6b8e..5701729ecac3 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java @@ -99,6 +99,7 @@ public class _XParameters extends MultiMethodTest { /** * Gets object relation */ + @Override public void before() { data = (List<Object>) tEnv.getObjRelation("XParameters.ParamValues") ; if (data == null) { diff --git a/qadevOOo/tests/java/ifc/sdbc/_XResultSet.java b/qadevOOo/tests/java/ifc/sdbc/_XResultSet.java index c6256a755679..a2114d7d0a6e 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XResultSet.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XResultSet.java @@ -71,6 +71,7 @@ public class _XResultSet extends MultiMethodTest { * Positions the cursor to the first row. * Forces method tests to be executed in definite order. */ + @Override public void before() { try { oObj.last() ; @@ -481,6 +482,7 @@ public class _XResultSet extends MultiMethodTest { * Moves the cursor to the first row to avoid affection to * the following interfaces tests */ + @Override public void after() { log.println("Finally moving cursor to the first row ..."); try { diff --git a/qadevOOo/tests/java/ifc/sdbc/_XResultSetUpdate.java b/qadevOOo/tests/java/ifc/sdbc/_XResultSetUpdate.java index 8420adcb72d5..b32e93dbdf8c 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XResultSetUpdate.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XResultSetUpdate.java @@ -87,6 +87,7 @@ public class _XResultSetUpdate extends MultiMethodTest { * Retrieves relation. * @throw StatusException If relation not found. */ + @Override public void before() throws StatusException { tester = (UpdateTester)tEnv.getObjRelation ("XResultSetUpdate.UpdateTester") ; @@ -245,6 +246,7 @@ public class _XResultSetUpdate extends MultiMethodTest { /** * Forces environment to be recreated. */ + @Override public void after() { //disposeEnvironment() ; } diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRow.java b/qadevOOo/tests/java/ifc/sdbc/_XRow.java index b7d680ef1cca..d681384b9bac 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XRow.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XRow.java @@ -100,6 +100,7 @@ public class _XRow extends MultiMethodTest { /** * Retrieves object relation first. */ + @Override public void before() { data = (List<Object>) tEnv.getObjRelation("CurrentRowData") ; } diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java b/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java index 1c77be883789..4d5e4529a39e 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java @@ -81,6 +81,7 @@ public class _XRowSet extends MultiMethodTest { * Retrieves relation. * @throw StatusException If relation not found. */ + @Override public void before() throws StatusException { checker = (_XRowSetApproveBroadcaster.RowSetApproveChecker) tEnv.getObjRelation("XRowSetApproveBroadcaster.ApproveChecker") ; @@ -182,6 +183,7 @@ public class _XRowSet extends MultiMethodTest { /** * Disposes test environment. */ + @Override public void after() { disposeEnvironment() ; } diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java index 9e27da7462f9..9b55ded68714 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java @@ -98,6 +98,7 @@ public class _XRowUpdate extends MultiMethodTest { /** * Gets relations. */ + @Override public void before() { rowData = (List<Object>) tEnv.getObjRelation("CurrentRowData") ; if (rowData == null) { @@ -671,6 +672,7 @@ public class _XRowUpdate extends MultiMethodTest { /** * Disposes environment. */ + @Override public void after() { disposeEnvironment() ; } diff --git a/qadevOOo/tests/java/ifc/sdbcx/_XDataDefinitionSupplier.java b/qadevOOo/tests/java/ifc/sdbcx/_XDataDefinitionSupplier.java index e6aad78638a6..a7c21573956e 100644 --- a/qadevOOo/tests/java/ifc/sdbcx/_XDataDefinitionSupplier.java +++ b/qadevOOo/tests/java/ifc/sdbcx/_XDataDefinitionSupplier.java @@ -60,6 +60,7 @@ public class _XDataDefinitionSupplier extends MultiMethodTest { * Retrieves relations. * @throw StatusException If any relation not found. */ + @Override protected void before() { url = (String)tEnv.getObjRelation("XDriver.URL"); if (url == null) { diff --git a/qadevOOo/tests/java/ifc/sdbcx/_XDeleteRows.java b/qadevOOo/tests/java/ifc/sdbcx/_XDeleteRows.java index 64287c973139..1e412f27f5c4 100644 --- a/qadevOOo/tests/java/ifc/sdbcx/_XDeleteRows.java +++ b/qadevOOo/tests/java/ifc/sdbcx/_XDeleteRows.java @@ -76,6 +76,7 @@ public class _XDeleteRows extends MultiMethodTest { tRes.tested("deleteRows()", rowsBefore - 1 == rowsAfter); } + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/sheet/_DataPilotField.java b/qadevOOo/tests/java/ifc/sheet/_DataPilotField.java index f16b968082f6..13debc4a32cd 100644 --- a/qadevOOo/tests/java/ifc/sheet/_DataPilotField.java +++ b/qadevOOo/tests/java/ifc/sheet/_DataPilotField.java @@ -40,6 +40,7 @@ public class _DataPilotField extends MultiPropertyTest { *This class is destined to custom test of property <code>SortInfo</code>. */ protected PropertyTester SortInfoTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { DataPilotFieldSortInfo sortInfo = new DataPilotFieldSortInfo(); sortInfo.Mode = com.sun.star.sheet.DataPilotFieldSortMode.MANUAL; @@ -66,6 +67,7 @@ public class _DataPilotField extends MultiPropertyTest { *This class is destined to custom test of property <code>LayoutInfo</code>. */ protected PropertyTester LayoutInfoTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { DataPilotFieldLayoutInfo layoutInfo = new DataPilotFieldLayoutInfo(); layoutInfo.LayoutMode = com.sun.star.sheet.DataPilotFieldLayoutMode.OUTLINE_SUBTOTALS_BOTTOM; @@ -91,6 +93,7 @@ public class _DataPilotField extends MultiPropertyTest { *This class is destined to custom test of property <code>AutoShowInfo</code>. */ protected PropertyTester AutoShowInfoTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { DataPilotFieldAutoShowInfo AutoShowInfo = new DataPilotFieldAutoShowInfo(); AutoShowInfo.DataField = "Col1"; @@ -116,6 +119,7 @@ public class _DataPilotField extends MultiPropertyTest { *This class is destined to custom test of property <code>Reference</code>. */ protected PropertyTester ReferenceTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { DataPilotFieldReference Reference = new DataPilotFieldReference(); Reference.ReferenceField="Col1"; diff --git a/qadevOOo/tests/java/ifc/sheet/_Scenario.java b/qadevOOo/tests/java/ifc/sheet/_Scenario.java index ce01ebf4d91d..48efe7a84bb6 100644 --- a/qadevOOo/tests/java/ifc/sheet/_Scenario.java +++ b/qadevOOo/tests/java/ifc/sheet/_Scenario.java @@ -24,6 +24,7 @@ import lib.MultiPropertyTest; public class _Scenario extends MultiPropertyTest { + @Override public void before() { oObj = UnoRuntime.queryInterface(XPropertySet.class, tEnv.getObjRelation( diff --git a/qadevOOo/tests/java/ifc/sheet/_SheetLink.java b/qadevOOo/tests/java/ifc/sheet/_SheetLink.java index 8ab6e186e0b0..503d13a72864 100644 --- a/qadevOOo/tests/java/ifc/sheet/_SheetLink.java +++ b/qadevOOo/tests/java/ifc/sheet/_SheetLink.java @@ -38,6 +38,7 @@ public class _SheetLink extends MultiPropertyTest { *This class is destined to custom test of property <code>Url</code>. */ protected PropertyTester UrlTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { String newValue = (String) ValueChanger.changePValue(oldValue); if ( !newValue.startsWith("file://") ) { @@ -59,6 +60,7 @@ public class _SheetLink extends MultiPropertyTest { *This class is destined to custom test of property <code>Filter</code>. */ protected PropertyTester FilterTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { return "StarCalc 4.0"; } diff --git a/qadevOOo/tests/java/ifc/sheet/_Spreadsheet.java b/qadevOOo/tests/java/ifc/sheet/_Spreadsheet.java index ef8810d4a9e1..369c592a1bcd 100644 --- a/qadevOOo/tests/java/ifc/sheet/_Spreadsheet.java +++ b/qadevOOo/tests/java/ifc/sheet/_Spreadsheet.java @@ -36,6 +36,7 @@ public class _Spreadsheet extends MultiPropertyTest { *This class is destined to custom test of property <code>PageStyle</code>. */ protected PropertyTester styleTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { String str = "Default"; String str2= "Report"; diff --git a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java index b2a73a0b4533..e3b388b8dcbd 100644 --- a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java +++ b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java @@ -53,6 +53,7 @@ public class _SpreadsheetDocumentSettings extends MultiPropertyTest { *This class is destined to custom test of property <code>NullDate</code>. */ protected PropertyTester DateTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { Date date = (Date) oldValue; Date newDate = new Date((short) (date.Day - 1), date.Month, @@ -66,10 +67,12 @@ public class _SpreadsheetDocumentSettings extends MultiPropertyTest { *This class is destined to custom test of property <code>ForbiddenCharacters</code>. */ protected PropertyTester ChrTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { return new ForbiddenChrTest(); } + @Override protected boolean compare(Object obj1, Object obj2) { Locale loc = new Locale("ru", "RU", ""); XForbiddenCharacters fc1 = UnoRuntime.queryInterface( diff --git a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings.java b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings.java index 5d3532a69617..5aa4994daf98 100644 --- a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings.java +++ b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings.java @@ -59,6 +59,7 @@ public class _SpreadsheetViewSettings extends MultiPropertyTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField.java b/qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField.java index 871c3d116e9a..fc21d22263c5 100644 --- a/qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField.java +++ b/qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField.java @@ -82,6 +82,7 @@ public class _TableAutoFormatField extends MultiPropertyTest { */ public void _CharFontName() { testProperty("CharFontName", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return "Courier".equals(old) ? "Times New Roman" : "Courier" ; } @@ -95,6 +96,7 @@ public class _TableAutoFormatField extends MultiPropertyTest { */ public void _CharLocale() { testProperty("CharLocale", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return old == null || ((Locale)old).Language == "de" ? new Locale("es", "ES", "") : new Locale("de", "DE", "") ; @@ -108,6 +110,7 @@ public class _TableAutoFormatField extends MultiPropertyTest { */ public void _ShadowFormat() { testProperty("ShadowFormat", new PropertyTester() { + @Override protected Object getNewValue(String p, Object old) { return old == null ? new com.sun.star.table.ShadowFormat() : super.getNewValue(p, old) ; diff --git a/qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster.java b/qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster.java index d12789cefae8..5d2d15dc6628 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster.java +++ b/qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster.java @@ -72,6 +72,7 @@ public class _XActivationBroadcaster extends MultiMethodTest { tRes.tested("removeActivationEventListener()", !listenerCalled); } + @Override public void before() { xSpreadsheetView = UnoRuntime.queryInterface( XSpreadsheetView.class, diff --git a/qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange.java b/qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange.java index fde204d3ce6a..7fa5a7feccbd 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange.java +++ b/qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange.java @@ -165,6 +165,7 @@ public class _XArrayFormulaRange extends MultiMethodTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/sheet/_XCalculatable.java b/qadevOOo/tests/java/ifc/sheet/_XCalculatable.java index 7176d388d640..260b452b131c 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XCalculatable.java +++ b/qadevOOo/tests/java/ifc/sheet/_XCalculatable.java @@ -35,6 +35,7 @@ public class _XCalculatable extends MultiMethodTest { * Get object relation: four cells with values and formulas. * @see mod._sc.ScModelObj */ + @Override public void before() { xCells = (XCell[])tEnv.getObjRelation("XCalculatable.Cells"); if (xCells == null || xCells.length != 3) @@ -45,6 +46,7 @@ public class _XCalculatable extends MultiMethodTest { /** * Restore begin setting */ + @Override public void after() { // reset to begin value oObj.enableAutomaticCalculation(bIsAutomaticCalculationEnabled); diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery.java b/qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery.java index d0554788bd42..29705c6e84a9 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery.java +++ b/qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery.java @@ -65,6 +65,7 @@ public class _XCellRangesQuery extends MultiMethodTest { public static final int QUERYROWDIFFERENCES = 5; public static final int QUERYVISIBLECELLS = 6; + @Override protected void before() { oSheet = (XSpreadsheet) tEnv.getObjRelation("SHEET"); @@ -290,6 +291,7 @@ public class _XCellRangesQuery extends MultiMethodTest { /** * Forces environment recreation. */ + @Override protected void after() { if(bMakeEntriesAndDispose) { disposeEnvironment(); diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellSeries.java b/qadevOOo/tests/java/ifc/sheet/_XCellSeries.java index 6152d2c243ee..72e078e9c0cb 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XCellSeries.java +++ b/qadevOOo/tests/java/ifc/sheet/_XCellSeries.java @@ -36,6 +36,7 @@ public class _XCellSeries extends MultiMethodTest { protected boolean forceFillAuto = false; + @Override protected void before() { oSheet = (XSpreadsheet) tEnv.getObjRelation("SHEET"); @@ -229,6 +230,7 @@ public class _XCellSeries extends MultiMethodTest { /** * Forces environment recreation. */ + @Override public void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java index 99d4856903cf..9fa571f48af6 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java @@ -67,6 +67,7 @@ public class _XDataPilotDescriptor extends MultiMethodTest { * Retrieves object relations. * @throws StatusException If one of relations not found. */ + @Override protected void before() { Integer amount = (Integer)tEnv.getObjRelation("FIELDSAMOUNT"); if (amount == null) throw new StatusException(Status.failed @@ -411,6 +412,7 @@ public class _XDataPilotDescriptor extends MultiMethodTest { /** * Recreates object(to back old orientations of the fields). */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable.java index 959d752f5956..d6db10c87172 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable.java @@ -53,6 +53,7 @@ public class _XDataPilotTable extends MultiMethodTest { XCell xCellForCheck = null; CellAddress OutputRange = null; + @Override protected void before() { xCellForChange = (XCell)tEnv.getObjRelation("CELLFORCHANGE"); xCellForCheck = (XCell)tEnv.getObjRelation("CELLFORCHECK"); diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java index ff8296aeefd3..9192a1ef38c8 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java @@ -70,6 +70,7 @@ public class _XDataPilotTable2 extends MultiMethodTest */ private class ResultCellFailure extends com.sun.star.uno.Exception {} + @Override protected void before() { Object o = tEnv.getObjRelation("DATAPILOTTABLE2"); diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTables.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTables.java index fa0ea9ad6584..820bd4413340 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTables.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTables.java @@ -54,6 +54,7 @@ public class _XDataPilotTables extends MultiMethodTest { * Retrieves object relations. * @throws StatusException If one of relations not found. */ + @Override protected void before() { oSheet = (XSpreadsheet)tEnv.getObjRelation("SHEET"); if (oSheet == null) throw new StatusException(Status.failed diff --git a/qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java b/qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java index 9f1cea195609..f7ea1453c80e 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java @@ -64,6 +64,7 @@ public class _XDatabaseRange extends MultiMethodTest { * Retrieves object relations. * @throws StatusException If one of relations not found. */ + @Override protected void before() { oldCRA = (CellRangeAddress)tEnv.getObjRelation("DATAAREA"); if (oldCRA == null) { @@ -227,6 +228,7 @@ public class _XDatabaseRange extends MultiMethodTest { tRes.tested("setDataArea()", true); } + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java b/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java index 0996351fc09c..bba15dd95b95 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java @@ -50,6 +50,7 @@ public class _XDocumentAuditing extends MultiMethodTest { String sheetName = null; Point pos = null; + @Override public void before() { Exception ex = null; // get two sheets @@ -126,6 +127,7 @@ public class _XDocumentAuditing extends MultiMethodTest { } } + @Override public void after() { // switch the automatic refresh back on PropertyValue[] props = new PropertyValue[1]; diff --git a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java index 9c5bb63e46df..484edfdd521c 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java +++ b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java @@ -43,6 +43,7 @@ public class _XEnhancedMouseClickBroadcaster extends MultiMethodTest { protected XEnhancedMouseClickHandler listener = new MyListener(); private XModel docModel = null; + @Override public void before() { docModel = UnoRuntime.queryInterface( XModel.class,tEnv.getObjRelation("FirstModel")); diff --git a/qadevOOo/tests/java/ifc/sheet/_XFormulaQuery.java b/qadevOOo/tests/java/ifc/sheet/_XFormulaQuery.java index 01d53899a034..7a41fc0603c0 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XFormulaQuery.java +++ b/qadevOOo/tests/java/ifc/sheet/_XFormulaQuery.java @@ -40,6 +40,7 @@ public class _XFormulaQuery extends MultiMethodTest { private int[] miExpectedDependentValues; private int[] miExpectedPrecedentValues; + @Override protected void before() { oSheet = (XSpreadsheet)tEnv.getObjRelation("SHEET"); @@ -181,6 +182,7 @@ public class _XFormulaQuery extends MultiMethodTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java b/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java index d19a94cb85e5..c8c31ac79229 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java +++ b/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java @@ -37,6 +37,7 @@ public class _XGoalSeek extends MultiMethodTest { CellAddress aFormula = null; CellAddress aValue = null; + @Override public void before() { Exception ex = null; // get two sheets diff --git a/qadevOOo/tests/java/ifc/sheet/_XMultipleOperation.java b/qadevOOo/tests/java/ifc/sheet/_XMultipleOperation.java index 8aaede910f0b..4f51db581af4 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XMultipleOperation.java +++ b/qadevOOo/tests/java/ifc/sheet/_XMultipleOperation.java @@ -37,6 +37,7 @@ public class _XMultipleOperation extends MultiMethodTest { protected XSpreadsheet oSheet = null; boolean both = true; + @Override protected void before() { oSheet = (XSpreadsheet) tEnv.getObjRelation("SHEET"); @@ -167,6 +168,7 @@ public class _XMultipleOperation extends MultiMethodTest { /** * Restores initial component text. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/sheet/_XNamedRange.java b/qadevOOo/tests/java/ifc/sheet/_XNamedRange.java index 63bf5515da8b..110a0b03f6bd 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XNamedRange.java +++ b/qadevOOo/tests/java/ifc/sheet/_XNamedRange.java @@ -191,6 +191,7 @@ public class _XNamedRange extends MultiMethodTest { /** * Forces object environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/sheet/_XNamedRanges.java b/qadevOOo/tests/java/ifc/sheet/_XNamedRanges.java index a1505b5138b2..78c867d69d04 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XNamedRanges.java +++ b/qadevOOo/tests/java/ifc/sheet/_XNamedRanges.java @@ -66,6 +66,7 @@ public class _XNamedRanges extends MultiMethodTest { * Retrieves object relations. * @throws StatusException If one of relations not found. */ + @Override protected void before() { oSheet = (XSpreadsheet)tEnv.getObjRelation("SHEET"); if (oSheet == null) throw new StatusException(Status.failed diff --git a/qadevOOo/tests/java/ifc/sheet/_XPrintAreas.java b/qadevOOo/tests/java/ifc/sheet/_XPrintAreas.java index 720b120afbda..476479edaecf 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XPrintAreas.java +++ b/qadevOOo/tests/java/ifc/sheet/_XPrintAreas.java @@ -34,6 +34,7 @@ public class _XPrintAreas extends MultiMethodTest { CellRangeAddress titleColumns; CellRangeAddress titleRows; + @Override public void before() { address = (CellRangeAddress)tEnv.getObjRelation("CellRangeAddress"); subaddress = (CellRangeAddress)tEnv.getObjRelation("CellRangeSubAddress"); diff --git a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java index 5fb682a45365..7a6b8e8d61a9 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java +++ b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java @@ -52,6 +52,7 @@ public class _XRangeSelection extends MultiMethodTest { public XRangeSelection oObj = null; MyRangeSelectionListener aListener = null; + @Override public void before() { aListener = new _XRangeSelection.MyRangeSelectionListener(log); // workaround for i34499 diff --git a/qadevOOo/tests/java/ifc/sheet/_XScenario.java b/qadevOOo/tests/java/ifc/sheet/_XScenario.java index 0c45d187f362..4860a7a2dba4 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XScenario.java +++ b/qadevOOo/tests/java/ifc/sheet/_XScenario.java @@ -31,6 +31,7 @@ public class _XScenario extends MultiMethodTest { String comment = null; boolean skipTest = false; + @Override public void before() { // testing a scenario containing the whole sheet does not make sense. // test is skipped until this interface is implemented somewhere else diff --git a/qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced.java b/qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced.java index 2a17173ab1f6..162121cf76e6 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced.java +++ b/qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced.java @@ -26,6 +26,7 @@ import lib.MultiMethodTest; public class _XScenarioEnhanced extends MultiMethodTest { public XScenarioEnhanced oObj = null; + @Override public void before() { oObj = UnoRuntime.queryInterface( XScenarioEnhanced.class, diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java b/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java index a2084b65de9f..5be2edee32ce 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java @@ -46,6 +46,7 @@ public class _XSheetAuditing extends MultiMethodTest { XDrawPage xDrawPage = null; int elementCount = 0; + @Override public void before() { address = (CellAddress)tEnv.getObjRelation("XSheetAuditing.CellAddress"); precedentAddress = (CellAddress)tEnv.getObjRelation("XSheetAuditing.PrecedentCellAddress"); diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer.java b/qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer.java index bf9c813eae40..a852daf67fbd 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer.java @@ -44,6 +44,7 @@ public class _XSheetCellRangeContainer extends MultiMethodTest { * After method called, the new array of structures 'CellRangeAddress' * is created. Then container is cleared. */ + @Override public void before() { for ( short i=0; i<=2; i++ ) { rAddr[i] = new CellRangeAddress(); @@ -189,6 +190,7 @@ public class _XSheetCellRangeContainer extends MultiMethodTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntries.java b/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntries.java index 7c93e77ec7f4..fc631d909579 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntries.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntries.java @@ -120,6 +120,7 @@ public class _XSheetConditionalEntries extends MultiMethodTest { /** * Forces object environment recreation. */ + @Override protected void after() { this.disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetFilterable.java b/qadevOOo/tests/java/ifc/sheet/_XSheetFilterable.java index d35703041884..793635b0cf22 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetFilterable.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetFilterable.java @@ -36,6 +36,7 @@ public class _XSheetFilterable extends MultiMethodTest { protected XSpreadsheet oSheet; protected XSheetFilterDescriptor desc; + @Override protected void before() { oSheet = (XSpreadsheet) tEnv.getObjRelation("SHEET"); diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetLinkable.java b/qadevOOo/tests/java/ifc/sheet/_XSheetLinkable.java index 347ea628291c..8494525b40d5 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetLinkable.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetLinkable.java @@ -32,6 +32,7 @@ public class _XSheetLinkable extends MultiMethodTest { String linkUrl = null; String linkUrl2 = null; + @Override public void before() { // get a document for linking. linkUrl = (String)tEnv.getObjRelation("XSheetLinkable.LinkSheet"); diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetOutline.java b/qadevOOo/tests/java/ifc/sheet/_XSheetOutline.java index 2b73249a12ef..7471ea4a6df4 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetOutline.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetOutline.java @@ -36,6 +36,7 @@ public class _XSheetOutline extends MultiMethodTest { CellRangeAddress address = null; CellRangeAddress subaddress = null; + @Override public void before() { address = (CellRangeAddress)tEnv.getObjRelation("CellRangeAddress"); subaddress = (CellRangeAddress)tEnv.getObjRelation("CellRangeSubAddress"); diff --git a/qadevOOo/tests/java/ifc/sheet/_XSpreadsheets.java b/qadevOOo/tests/java/ifc/sheet/_XSpreadsheets.java index fd048dc9a984..fe7188b4fe38 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSpreadsheets.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSpreadsheets.java @@ -41,6 +41,7 @@ public class _XSpreadsheets extends MultiMethodTest { /** * Sets the unique number for the current test. */ + @Override protected synchronized void before() { uniqNumber = uniqCount++; } diff --git a/qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable.java b/qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable.java index d34f89f4403f..b84798e995a6 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable.java @@ -33,6 +33,7 @@ public class _XSubTotalCalculatable extends MultiMethodTest { protected XSubTotalDescriptor desc; protected XSpreadsheet oSheet; + @Override protected void before() { oSheet = (XSpreadsheet) tEnv.getObjRelation("SHEET"); diff --git a/qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor.java index 9c1975856499..923beaa2103c 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor.java @@ -62,6 +62,7 @@ public class _XSubTotalDescriptor extends MultiMethodTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor.java b/qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor.java index 7c8922b97f1d..3ff16306a7a2 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor.java +++ b/qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor.java @@ -120,6 +120,7 @@ public class _XUsedAreaCursor extends MultiMethodTest { /** * Forces object environment recreation. */ + @Override protected void after() { this.disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java index b5f9234657d5..5a6114888f15 100644 --- a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java +++ b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java @@ -106,6 +106,7 @@ public class _CharacterProperties extends MultiPropertyTest { public void _CharHeight() { testProperty("CharHeight", new PropertyTester() { + @Override protected Object getNewValue(String propName, Object old) { if (utils.isVoid(old)) { return new Float(10) ; @@ -121,6 +122,7 @@ public class _CharacterProperties extends MultiPropertyTest { * Switches between two JPG images' URLs. */ protected PropertyTester URLTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (oldValue.equals("http://www.sun.com")) return "http://www.openoffice.org"; else @@ -156,6 +158,7 @@ public class _CharacterProperties extends MultiPropertyTest { * between 'Citation' and 'Emphasis' names. */ protected PropertyTester StyleTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { String oStyleName1 = (String) tEnv.getObjRelation("STYLENAME1"); String oStyleName2 = (String) tEnv.getObjRelation("STYLENAME2"); @@ -178,6 +181,7 @@ public class _CharacterProperties extends MultiPropertyTest { * 'Citation' and 'Emphasis' names. */ protected PropertyTester StylesTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (utils.isVoid(oldValue) || (oldValue.equals("Standard"))) return new String[] {"Citation"}; else @@ -259,6 +263,7 @@ public class _CharacterProperties extends MultiPropertyTest { * Custom tester for the ruby text property. */ protected PropertyTester RubyTextTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (utils.isVoid(oldValue)) { diff --git a/qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex.java b/qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex.java index 61339be56c1a..2582ff8c5bec 100644 --- a/qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex.java +++ b/qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex.java @@ -52,6 +52,7 @@ public class _CharacterPropertiesComplex extends MultiPropertyTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/style/_PageProperties.java b/qadevOOo/tests/java/ifc/style/_PageProperties.java index 929c9ca2b893..9a7f7312ba90 100644 --- a/qadevOOo/tests/java/ifc/style/_PageProperties.java +++ b/qadevOOo/tests/java/ifc/style/_PageProperties.java @@ -38,6 +38,7 @@ public class _PageProperties extends MultiPropertyTest { * Switch on Header and Footer properties * so all props can be tested. */ + @Override protected void before() { try { oObj.setPropertyValue("HeaderIsOn", Boolean.TRUE); diff --git a/qadevOOo/tests/java/ifc/style/_PageStyle.java b/qadevOOo/tests/java/ifc/style/_PageStyle.java index 08fae5901b7c..64503469d1ff 100644 --- a/qadevOOo/tests/java/ifc/style/_PageStyle.java +++ b/qadevOOo/tests/java/ifc/style/_PageStyle.java @@ -32,6 +32,7 @@ public class _PageStyle extends _PageProperties { * Test is used from _PageProperties * @see ifc.style._PageProperties */ + @Override public void _PrinterPaperTray() { super._PrinterPaperTray(); } @@ -41,6 +42,7 @@ public class _PageStyle extends _PageProperties { * Test is used from _PageProperties * @see ifc.style._PageProperties */ + @Override public void _UserDefinedAttributes() { super._UserDefinedAttributes(); } diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java index 9f4ba6ad8806..335d8968e6bf 100644 --- a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java +++ b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java @@ -105,6 +105,7 @@ public class _ParagraphProperties extends MultiPropertyTest { * 'Numbering 1' and 'Numbering 2' styles. */ protected PropertyTester NumberingStyleTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if ((oldValue != null) && (oldValue.equals("Numbering 1"))) { @@ -120,6 +121,7 @@ public class _ParagraphProperties extends MultiPropertyTest { * 'Salutation' and 'Heading' styles. */ protected PropertyTester charStyleTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (!utils.isVoid(oldValue) && (oldValue.equals("Example"))) { return "Emphasis"; @@ -134,6 +136,7 @@ public class _ParagraphProperties extends MultiPropertyTest { * 'Salutation' and 'Heading' styles. */ protected PropertyTester ParaStyleTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (!utils.isVoid(oldValue) && (oldValue.equals("Heading"))) { return "Salutation"; @@ -148,6 +151,7 @@ public class _ParagraphProperties extends MultiPropertyTest { * 'HTML' and 'Standard' descriptor names. */ protected PropertyTester PageDescTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (!util.utils.isVoid(oldValue) && (oldValue.equals("Default"))) { @@ -164,6 +168,7 @@ public class _ParagraphProperties extends MultiPropertyTest { * be specified. Switches between two different values. */ protected PropertyTester ShortTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if ((oldValue != null) && (oldValue.equals(new Short((short) 0)))) { @@ -180,6 +185,7 @@ public class _ParagraphProperties extends MultiPropertyTest { * be specified. Switches between true and false. */ protected PropertyTester BooleanTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if ((oldValue != null) && (oldValue.equals(new Boolean(false)))) { @@ -195,6 +201,7 @@ public class _ParagraphProperties extends MultiPropertyTest { * Switches between two JPG images' URLs. */ protected PropertyTester URLTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (oldValue.equals(util.utils.getFullTestURL("space-metal.jpg"))) { return util.utils.getFullTestURL("crazy-blue.jpg"); @@ -209,11 +216,13 @@ public class _ParagraphProperties extends MultiPropertyTest { /** * Creates tester for 'NumberingRules' depending on relation. */ + @Override public void before() { final Object nRules = tEnv.getObjRelation("NRULES"); if (nRules != null) { rules = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { return nRules; } diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesAsian.java b/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesAsian.java index c82b8e0f0d32..b63fa9c2fd63 100644 --- a/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesAsian.java +++ b/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesAsian.java @@ -38,6 +38,7 @@ public class _ParagraphPropertiesAsian extends MultiPropertyTest { * be specified. Switches between true and false. */ protected PropertyTester BooleanTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if ((oldValue != null) && (oldValue.equals(new Boolean(false)))) { diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesComplex.java b/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesComplex.java index cb250eadac09..a05b4d2946cb 100644 --- a/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesComplex.java +++ b/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesComplex.java @@ -30,6 +30,7 @@ public class _ParagraphPropertiesComplex extends MultiPropertyTest { protected PropertyTester WritingModeTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if ((oldValue != null) && (oldValue.equals(new Short(com.sun.star.text.WritingMode2.LR_TB)))) return new Short(com.sun.star.text.WritingMode2.PAGE); else diff --git a/qadevOOo/tests/java/ifc/style/_XStyle.java b/qadevOOo/tests/java/ifc/style/_XStyle.java index 3de792261ce1..ce031f9f9e5a 100644 --- a/qadevOOo/tests/java/ifc/style/_XStyle.java +++ b/qadevOOo/tests/java/ifc/style/_XStyle.java @@ -50,6 +50,7 @@ public class _XStyle extends MultiMethodTest { * Retrieves object relations. * @throws StatusException If one of relations not found. */ + @Override public void before() { oMyStyle = (XStyle) tEnv.getObjRelation("PoolStyle"); if (oMyStyle == null) throw new StatusException diff --git a/qadevOOo/tests/java/ifc/table/_CellProperties.java b/qadevOOo/tests/java/ifc/table/_CellProperties.java index ce45507cb27d..e3fac6674aac 100644 --- a/qadevOOo/tests/java/ifc/table/_CellProperties.java +++ b/qadevOOo/tests/java/ifc/table/_CellProperties.java @@ -55,6 +55,7 @@ public class _CellProperties extends MultiPropertyTest { */ public void _CellStyle() { testProperty("CellStyle", new PropertyTester() { + @Override protected Object getNewValue(String name, Object old) { return "Default".equals(old) ? "Result" : "Default" ; } diff --git a/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java b/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java index 65b518b066f1..6473f17b7380 100644 --- a/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java +++ b/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java @@ -119,6 +119,7 @@ public class _XAutoFormattable extends MultiMethodTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/table/_XCellCursor.java b/qadevOOo/tests/java/ifc/table/_XCellCursor.java index 2c9942cff446..ff7971ad57fc 100644 --- a/qadevOOo/tests/java/ifc/table/_XCellCursor.java +++ b/qadevOOo/tests/java/ifc/table/_XCellCursor.java @@ -201,6 +201,7 @@ public class _XCellCursor extends MultiMethodTest { /** * Forces object environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/table/_XCellRange.java b/qadevOOo/tests/java/ifc/table/_XCellRange.java index e15ae3b8e824..0aab83d76432 100644 --- a/qadevOOo/tests/java/ifc/table/_XCellRange.java +++ b/qadevOOo/tests/java/ifc/table/_XCellRange.java @@ -134,6 +134,7 @@ public class _XCellRange extends MultiMethodTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/table/_XTableColumns.java b/qadevOOo/tests/java/ifc/table/_XTableColumns.java index 49616bbe6cf1..dbe675356d71 100644 --- a/qadevOOo/tests/java/ifc/table/_XTableColumns.java +++ b/qadevOOo/tests/java/ifc/table/_XTableColumns.java @@ -52,6 +52,7 @@ public class _XTableColumns extends MultiMethodTest { private XCellRange xCellRange = null; private int lastColumn = 0; + @Override public void before() { xCellRange = (XCellRange) tEnv.getObjRelation("XTableColumns.XCellRange") ; diff --git a/qadevOOo/tests/java/ifc/table/_XTableRows.java b/qadevOOo/tests/java/ifc/table/_XTableRows.java index 8acb33a5a8f4..2f997860c609 100644 --- a/qadevOOo/tests/java/ifc/table/_XTableRows.java +++ b/qadevOOo/tests/java/ifc/table/_XTableRows.java @@ -38,6 +38,7 @@ public class _XTableRows extends MultiMethodTest { public XTableRows oObj = null; public XCellRange range = null; + @Override public void before() { range = (XCellRange) tEnv.getObjRelation("XTableRows.XCellRange"); if (range==null) { diff --git a/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java b/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java index e72bc2256982..bd9748574dec 100644 --- a/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java +++ b/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java @@ -61,6 +61,7 @@ public class _XInteractionHandler extends MultiMethodTest { * Retrieves an object relation. <p> * @throws StatusException If the relation is not found. */ + @Override public void before() { request = (XInteractionRequest) tEnv.getObjRelation("XInteractionHandler.Request") ; diff --git a/qadevOOo/tests/java/ifc/task/_XJob.java b/qadevOOo/tests/java/ifc/task/_XJob.java index efa5d5c4ef1c..58800f37ebbc 100644 --- a/qadevOOo/tests/java/ifc/task/_XJob.java +++ b/qadevOOo/tests/java/ifc/task/_XJob.java @@ -52,6 +52,7 @@ public class _XJob extends MultiMethodTest { * <code>executeArgs</code> [<code>NamedValue[]</code>] * @throw StatusException If relations are not found */ + @Override public void before() { Object[] XJobArgs = (Object[]) tEnv.getObjRelation("XJobArgs") ; if (XJobArgs == null) diff --git a/qadevOOo/tests/java/ifc/text/_BaseFrame.java b/qadevOOo/tests/java/ifc/text/_BaseFrame.java index 84287802b07a..0852668b2340 100644 --- a/qadevOOo/tests/java/ifc/text/_BaseFrame.java +++ b/qadevOOo/tests/java/ifc/text/_BaseFrame.java @@ -86,6 +86,7 @@ public class _BaseFrame extends MultiPropertyTest { * Redefined method returns value, that differs from property value. */ protected PropertyTester StringTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (str1.equals(oldValue)) return str2; diff --git a/qadevOOo/tests/java/ifc/text/_BaseFrameProperties.java b/qadevOOo/tests/java/ifc/text/_BaseFrameProperties.java index b409a502fc73..9b0cf03c8855 100644 --- a/qadevOOo/tests/java/ifc/text/_BaseFrameProperties.java +++ b/qadevOOo/tests/java/ifc/text/_BaseFrameProperties.java @@ -22,6 +22,7 @@ import lib.MultiPropertyTest; public class _BaseFrameProperties extends MultiPropertyTest { protected PropertyTester FrameTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { Object frame = tEnv.getObjRelation("TextFrame"); diff --git a/qadevOOo/tests/java/ifc/text/_BaseIndex.java b/qadevOOo/tests/java/ifc/text/_BaseIndex.java index c0a3863a7383..37fc8e7863cb 100644 --- a/qadevOOo/tests/java/ifc/text/_BaseIndex.java +++ b/qadevOOo/tests/java/ifc/text/_BaseIndex.java @@ -60,6 +60,7 @@ public class _BaseIndex extends MultiPropertyTest { * Redefined method returns object, that contains changed property value. */ protected PropertyTester CustomTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { XTextColumns TC = UnoRuntime.queryInterface( XTextColumns.class, oldValue); @@ -102,6 +103,7 @@ public class _BaseIndex extends MultiPropertyTest { PropertyValue[][] newVal = null; PropertyValue[][] oldVal = null; + @Override protected Object getNewValue(String propName, Object oldValue) { XIndexReplace indProp = UnoRuntime.queryInterface( XIndexReplace.class, oldValue); @@ -138,6 +140,7 @@ public class _BaseIndex extends MultiPropertyTest { return indProp; } + @Override protected void checkResult(String propName, Object oldValue, Object newValue, Object resValue, Exception exception) diff --git a/qadevOOo/tests/java/ifc/text/_CellProperties.java b/qadevOOo/tests/java/ifc/text/_CellProperties.java index 95247a02be42..6cefdad8ac12 100644 --- a/qadevOOo/tests/java/ifc/text/_CellProperties.java +++ b/qadevOOo/tests/java/ifc/text/_CellProperties.java @@ -72,6 +72,7 @@ public class _CellProperties extends MultiPropertyTest { public void _TextSection() { log.println("Testing with custom Property tester") ; testProperty("TextSection", new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { return tEnv.getObjRelation("CellProperties.TextSection"); } @@ -87,6 +88,7 @@ public class _CellProperties extends MultiPropertyTest { final Short val2 = new Short( (short) 6 ); log.println("Testing with custom Property tester") ; testProperty("BackColor", new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if ( oldValue.equals(val1) ) return val2; @@ -103,6 +105,7 @@ public class _CellProperties extends MultiPropertyTest { public void _BackGraphicURL() { log.println("Testing with custom Property tester") ; testProperty("BackGraphicURL", new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (oldValue.equals(util.utils.getFullTestURL ("space-metal.jpg"))) @@ -120,6 +123,7 @@ public class _CellProperties extends MultiPropertyTest { public void _UserDefinedAttributes() { log.println("Testing with custom property tester"); testProperty("UserDefinedAttributes", new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { XNameContainer NC = null; try { diff --git a/qadevOOo/tests/java/ifc/text/_CellRange.java b/qadevOOo/tests/java/ifc/text/_CellRange.java index 19b2b86b2a4b..e98b2f791b72 100644 --- a/qadevOOo/tests/java/ifc/text/_CellRange.java +++ b/qadevOOo/tests/java/ifc/text/_CellRange.java @@ -55,6 +55,7 @@ public class _CellRange extends MultiPropertyTest { final Short val2 = new Short( (short) 6 ); log.println("Testing with custom Property tester") ; testProperty("BackColor", new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if ( oldValue.equals(val1) ) return val2; @@ -79,6 +80,7 @@ public class _CellRange extends MultiPropertyTest { public void _BackGraphicURL() { log.println("Testing with custom Property tester") ; testProperty("BackGraphicURL", new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (oldValue.equals(util.utils.getFullTestURL ("space-metal.jpg"))) diff --git a/qadevOOo/tests/java/ifc/text/_MailMerge.java b/qadevOOo/tests/java/ifc/text/_MailMerge.java index 9f03a9a1f96f..b3c0e1fe4367 100644 --- a/qadevOOo/tests/java/ifc/text/_MailMerge.java +++ b/qadevOOo/tests/java/ifc/text/_MailMerge.java @@ -31,6 +31,7 @@ public class _MailMerge extends MultiPropertyTest { * Switches between two valid folders */ protected PropertyTester URLTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (oldValue.equals(util.utils.getOfficeTemp(tParam.getMSF()))) return util.utils.getFullTestURL(""); else @@ -43,6 +44,7 @@ public class _MailMerge extends MultiPropertyTest { * Switches between two document URLs. */ protected PropertyTester DocumentURLTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { if (oldValue.equals(util.utils.getFullTestURL("MailMerge.sxw"))) return util.utils.getFullTestURL("sForm.sxw"); else @@ -155,6 +157,7 @@ public class _MailMerge extends MultiPropertyTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/text/_TextColumns.java b/qadevOOo/tests/java/ifc/text/_TextColumns.java index a1cafda4f456..b6c9868529e9 100644 --- a/qadevOOo/tests/java/ifc/text/_TextColumns.java +++ b/qadevOOo/tests/java/ifc/text/_TextColumns.java @@ -48,6 +48,7 @@ public class _TextColumns extends MultiPropertyTest { public void _AutomaticDistance() { log.println("Testing with custom Property tester") ; testProperty("AutomaticDistance", new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { XTextColumns xTC = UnoRuntime.queryInterface (XTextColumns.class,tEnv.getTestObject()); diff --git a/qadevOOo/tests/java/ifc/text/_TextFrame.java b/qadevOOo/tests/java/ifc/text/_TextFrame.java index 9220b863021f..c501654f4a40 100644 --- a/qadevOOo/tests/java/ifc/text/_TextFrame.java +++ b/qadevOOo/tests/java/ifc/text/_TextFrame.java @@ -40,6 +40,7 @@ public class _TextFrame extends MultiPropertyTest { * Property tester which switches two shorts. */ protected PropertyTester WModeTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (oldValue.equals(new Short(com.sun.star.text.WritingMode2.LR_TB))) diff --git a/qadevOOo/tests/java/ifc/text/_TextGraphicObject.java b/qadevOOo/tests/java/ifc/text/_TextGraphicObject.java index 924a64583e53..a9edbaa6a2ef 100644 --- a/qadevOOo/tests/java/ifc/text/_TextGraphicObject.java +++ b/qadevOOo/tests/java/ifc/text/_TextGraphicObject.java @@ -72,6 +72,7 @@ public class _TextGraphicObject extends MultiPropertyTest { * or create a new one if necessary. */ protected PropertyTester PointTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { if (utils.isVoid(oldValue)) { diff --git a/qadevOOo/tests/java/ifc/text/_TextSection.java b/qadevOOo/tests/java/ifc/text/_TextSection.java index c4fc53745554..b3e3a34eb265 100644 --- a/qadevOOo/tests/java/ifc/text/_TextSection.java +++ b/qadevOOo/tests/java/ifc/text/_TextSection.java @@ -92,6 +92,7 @@ public class _TextSection extends MultiPropertyTest { */ protected PropertyTester TextColumnsTester = new PropertyTester() { + @Override protected Object getNewValue(String propName, Object oldValue) { XTextColumns TC = null; short val2set = 25; @@ -108,6 +109,7 @@ public class _TextSection extends MultiPropertyTest { return TC; } + @Override protected boolean compare(Object obj1, Object obj2) { short val1 = 0; short val2 = 1; @@ -122,6 +124,7 @@ public class _TextSection extends MultiPropertyTest { return val1 == val2; } + @Override protected String toString(Object obj) { return "XTextColumns: ColumnCount = "+ ((XTextColumns) obj).getColumnCount(); diff --git a/qadevOOo/tests/java/ifc/text/_TextTable.java b/qadevOOo/tests/java/ifc/text/_TextTable.java index 15dd1b6cfdfa..fac44cdb96fc 100644 --- a/qadevOOo/tests/java/ifc/text/_TextTable.java +++ b/qadevOOo/tests/java/ifc/text/_TextTable.java @@ -101,6 +101,7 @@ public class _TextTable extends MultiPropertyTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/text/_XAutoTextGroup.java b/qadevOOo/tests/java/ifc/text/_XAutoTextGroup.java index 623132bf7d4d..b99fab13b103 100644 --- a/qadevOOo/tests/java/ifc/text/_XAutoTextGroup.java +++ b/qadevOOo/tests/java/ifc/text/_XAutoTextGroup.java @@ -74,6 +74,7 @@ public class _XAutoTextGroup extends MultiMethodTest { * * @throws StatusException if the relation is not found. */ + @Override public void before() { str = pref + uniq++ ; String[] names = oObj.getElementNames() ; diff --git a/qadevOOo/tests/java/ifc/text/_XMailMergeBroadcaster.java b/qadevOOo/tests/java/ifc/text/_XMailMergeBroadcaster.java index d0ed25833390..13bd492edacf 100644 --- a/qadevOOo/tests/java/ifc/text/_XMailMergeBroadcaster.java +++ b/qadevOOo/tests/java/ifc/text/_XMailMergeBroadcaster.java @@ -69,6 +69,7 @@ public class _XMailMergeBroadcaster extends MultiMethodTest { * [<code>XJob</code>] * @throw StatusException If relations are not found */ + @Override public void before() { NamedValue[] executeArgs = (NamedValue[]) tEnv.getObjRelation("executeArgs") ; if (executeArgs == null) diff --git a/qadevOOo/tests/java/ifc/text/_XTextCursor.java b/qadevOOo/tests/java/ifc/text/_XTextCursor.java index d5c276c06f49..06217abf179c 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextCursor.java +++ b/qadevOOo/tests/java/ifc/text/_XTextCursor.java @@ -52,6 +52,7 @@ public class _XTextCursor extends MultiMethodTest { /** * Stores component's text. */ + @Override public void before() { oObj.gotoStart(false); oObj.gotoEnd(true); @@ -223,6 +224,7 @@ public class _XTextCursor extends MultiMethodTest { * Restores the text of the component to the * state it was before this interafce test. */ + @Override public void after() { oObj.gotoStart(false); oObj.gotoEnd(true); diff --git a/qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java b/qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java index 60fe3fb4cd52..e26fefdd62d9 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java +++ b/qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java @@ -53,6 +53,7 @@ public class _XTextFieldsSupplier extends MultiMethodTest { * Insert some text fields into a cell on the sheet, so this interface test * makes sense. */ + @Override protected void before() { Object o = tEnv.getObjRelation("XTextFieldsSupplier.MAKEENTRY"); if (o != null && ((Boolean)o).booleanValue()) { @@ -168,6 +169,7 @@ public class _XTextFieldsSupplier extends MultiMethodTest { tRes.tested(method, false); } + @Override protected void after() { if (mDispose) disposeEnvironment(); diff --git a/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java b/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java index cc0924156459..8c4bceb6de14 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java +++ b/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java @@ -77,6 +77,7 @@ public class _XTextRangeCompare extends MultiMethodTest { * @throws StatusException If neither 'TEXTDOC' nore 'TEXT' * relation exists. */ + @Override public void before() { nameStr = this.getClass().getName(); diff --git a/qadevOOo/tests/java/ifc/text/_XTextTable.java b/qadevOOo/tests/java/ifc/text/_XTextTable.java index 089e2e7943b0..93ac5a9d95f7 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextTable.java +++ b/qadevOOo/tests/java/ifc/text/_XTextTable.java @@ -53,6 +53,7 @@ public class _XTextTable extends MultiMethodTest { String cellNamesList[] = null ; + @Override protected void before() { Integer num_row = (Integer)tEnv.getObjRelation("NROW"); if (num_row == null) { diff --git a/qadevOOo/tests/java/ifc/text/_XTextTableCursor.java b/qadevOOo/tests/java/ifc/text/_XTextTableCursor.java index a136d1df8355..4bbea70463db 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextTableCursor.java +++ b/qadevOOo/tests/java/ifc/text/_XTextTableCursor.java @@ -276,6 +276,7 @@ public class _XTextTableCursor extends MultiMethodTest { /** * Forces object environment recreation. */ + @Override public void after() { disposeEnvironment() ; } diff --git a/qadevOOo/tests/java/ifc/text/_XWordCursor.java b/qadevOOo/tests/java/ifc/text/_XWordCursor.java index a2506b674d5f..47474472af1e 100644 --- a/qadevOOo/tests/java/ifc/text/_XWordCursor.java +++ b/qadevOOo/tests/java/ifc/text/_XWordCursor.java @@ -43,6 +43,7 @@ public class _XWordCursor extends MultiMethodTest { /** * Moves the cursor to start of the text. */ + @Override public void before() { oObj.gotoStart(false); } diff --git a/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetFactory.java b/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetFactory.java index 9af99156fe95..b6af19b8b7aa 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetFactory.java +++ b/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetFactory.java @@ -53,6 +53,7 @@ public class _XCachedContentResultSetFactory extends MultiMethodTest { * Retrieves object relation. * @throws StatusException If relation not found. */ + @Override public void before() { resSetStub = (XResultSet) tEnv.getObjRelation("CachedContentResultSetStub") ; diff --git a/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetStubFactory.java b/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetStubFactory.java index 3b67f04fefa9..5d68f27010fd 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetStubFactory.java +++ b/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetStubFactory.java @@ -53,6 +53,7 @@ public class _XCachedContentResultSetStubFactory extends MultiMethodTest { * Retrieves object relation. * @throws StatusException If relation not found. */ + @Override public void before() { resSet = (XResultSet) tEnv.getObjRelation("ContentResultSet") ; if (resSet == null) { diff --git a/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetFactory.java b/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetFactory.java index c6a99f23773c..6a7dfe486c53 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetFactory.java +++ b/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetFactory.java @@ -54,6 +54,7 @@ public class _XCachedDynamicResultSetFactory extends MultiMethodTest { * Retrieves object relation. * @throws StatusException If relation not found. */ + @Override public void before() { resSetStub = (XDynamicResultSet) tEnv.getObjRelation("CachedDynamicResultSetStub") ; diff --git a/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java b/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java index db1715d9668a..5d12bc102acd 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java +++ b/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java @@ -58,6 +58,7 @@ public class _XCachedDynamicResultSetStubFactory extends MultiMethodTest { * Retrieves object relation. * @throws StatusException If relation not found. */ + @Override public void before() { resSet = (XDynamicResultSet) tEnv.getObjRelation("DynamicResultSet") ; if (resSet == null) { diff --git a/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java b/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java index b4001e4cbb0a..0ba9a03e9acf 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java +++ b/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java @@ -195,6 +195,7 @@ public class _XCommandProcessor extends MultiMethodTest { } Thread aborter = new Thread() { + @Override public void run() { for (int i = 0; i < 10; i++) { log.println("try to abort command"); diff --git a/qadevOOo/tests/java/ifc/ucb/_XContentProvider.java b/qadevOOo/tests/java/ifc/ucb/_XContentProvider.java index 78172ebc0696..7f56233fb9b9 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XContentProvider.java +++ b/qadevOOo/tests/java/ifc/ucb/_XContentProvider.java @@ -60,6 +60,7 @@ public class _XContentProvider extends MultiMethodTest { * Retrieves object relations. * @throws StatusException If one of relations not found. */ + @Override public void before() { CIF = (XContentIdentifierFactory) tEnv.getObjRelation("FACTORY"); String tmp = (String) tEnv.getObjRelation("CONTENT1") ; diff --git a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java index 52d94530f462..fd9cf81b7b36 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java +++ b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java @@ -92,6 +92,7 @@ public class _XContentProviderManager extends MultiMethodTest { * @see #firstContentProvider * @see #contentProvider */ + @Override public void before() { XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java index e9b41cb1819c..8399a9d25f09 100644 --- a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java +++ b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java @@ -53,6 +53,7 @@ public class _XContextMenuInterception extends MultiMethodTest { private XMultiServiceFactory xMSF = null; private Point point = null; + @Override public void before() { docModel = UnoRuntime.queryInterface( XModel.class,tEnv.getObjRelation("FirstModel")); @@ -70,6 +71,7 @@ public class _XContextMenuInterception extends MultiMethodTest { utils.shortWait(3000); } + @Override public void after() { if (xCI != null) { oObj.releaseContextMenuInterceptor(xCI); diff --git a/qadevOOo/tests/java/ifc/ui/_XModuleUIConfigurationManager.java b/qadevOOo/tests/java/ifc/ui/_XModuleUIConfigurationManager.java index aedb4571b7bc..ec3a14d6b219 100644 --- a/qadevOOo/tests/java/ifc/ui/_XModuleUIConfigurationManager.java +++ b/qadevOOo/tests/java/ifc/ui/_XModuleUIConfigurationManager.java @@ -27,6 +27,7 @@ public class _XModuleUIConfigurationManager extends MultiMethodTest { public XModuleUIConfigurationManager oObj = null; private String resourceUrl = null; + @Override public void before() { resourceUrl = (String)tEnv.getObjRelation("XModuleUIConfigurationManager.ResourceURL"); } diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java b/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java index e4afe2dc8b0f..44682acf33ca 100644 --- a/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java +++ b/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java @@ -56,6 +56,7 @@ public class _XUIConfiguration extends MultiMethodTest { * try to get a listener out of the object relation * <CODE>XUIConfiguration.XUIConfigurationListenerImpl</CODE> */ + @Override public void before() { xListener = (XUIConfigurationListenerImpl)tEnv.getObjRelation( "XUIConfiguration.XUIConfigurationListenerImpl"); @@ -86,6 +87,7 @@ public class _XUIConfiguration extends MultiMethodTest { /** * Dispose because the UIConfigurationManager has to be recreated */ + @Override public void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java index dc20472b0a61..f57ccc97374e 100644 --- a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java +++ b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java @@ -47,6 +47,7 @@ public class _XUIConfigurationManager extends MultiMethodTest { * Some stuff before the tests: * extract the multi service factory. */ + @Override protected void before() { mxMSF = tParam.getMSF(); sShortCutManagerServiceName = (String)tEnv.getObjRelation("XConfigurationManager.ShortCutManager"); diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationPersistence.java b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationPersistence.java index fc905e79beba..a7a7b5c43699 100644 --- a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationPersistence.java +++ b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationPersistence.java @@ -27,6 +27,7 @@ public class _XUIConfigurationPersistence extends MultiMethodTest { public XUIConfigurationPersistence oObj; private XStorage xStore = null; + @Override public void before() { xStore = (XStorage)tEnv.getObjRelation("XUIConfigurationStorage.Storage"); } diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationStorage.java b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationStorage.java index 35d4e803c8fc..1e40a0577e95 100644 --- a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationStorage.java +++ b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationStorage.java @@ -37,6 +37,7 @@ public class _XUIConfigurationStorage extends MultiMethodTest { public XUIConfigurationStorage oObj; private XStorage xStore = null; + @Override public void before() { xStore = (XStorage)tEnv.getObjRelation("XUIConfigurationStorage.Storage"); } diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XControlAccess.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XControlAccess.java index 63ef27bab1ca..7d6bf621d2aa 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XControlAccess.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XControlAccess.java @@ -56,6 +56,7 @@ public class _XControlAccess extends MultiMethodTest { * @throw StatusException if interface is not supported or * properties couldn't be get. */ + @Override protected void before() { xCI = UnoRuntime.queryInterface (XControlInformation.class, oObj); diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java index 8729566d63a8..f4e573174f0f 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java @@ -104,6 +104,7 @@ public class _XExecutableDialog extends MultiMethodTest { this.Diag = Diag ; } + @Override public void run() { try { execRes = Diag.execute(); @@ -126,6 +127,7 @@ public class _XExecutableDialog extends MultiMethodTest { } } + @Override public void after() { if (eThread.isAlive()) { log.println("Thread didn't die ... cleaning up"); diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerControlAccess.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerControlAccess.java index 29d1589c546f..69776dedf646 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerControlAccess.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerControlAccess.java @@ -61,6 +61,7 @@ public class _XFilePickerControlAccess extends MultiMethodTest { * Retrieves object relations. * @throws StatusException If one of relations not found. */ + @Override public void before() { Short ID = (Short) tEnv.getObjRelation ("XFilePickerControlAccess.ControlID") ; diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java index 4b4c822a54a1..503baf630a4b 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java @@ -93,6 +93,7 @@ public class _XFilePickerNotifier extends MultiMethodTest { * @throw StatusException If object doesn't support <code>XFilePicker</code> * interface. */ + @Override public void before() { fps = UnoRuntime.queryInterface (XFilePicker.class, oObj) ; @@ -188,6 +189,7 @@ public class _XFilePickerNotifier extends MultiMethodTest { this.Diag = Diag ; } + @Override public void run() { try { execRes = Diag.execute(); diff --git a/qadevOOo/tests/java/ifc/uno/_XNamingService.java b/qadevOOo/tests/java/ifc/uno/_XNamingService.java index 2e6df574ab9a..e2469d138985 100644 --- a/qadevOOo/tests/java/ifc/uno/_XNamingService.java +++ b/qadevOOo/tests/java/ifc/uno/_XNamingService.java @@ -46,6 +46,7 @@ public class _XNamingService extends MultiMethodTest { * Retrieves object relation. * @throws StatusException If the relation not found. */ + @Override public void before() { regObject = (XInterface) tEnv.getObjRelation("XNamingService.RegisterObject") ; diff --git a/qadevOOo/tests/java/ifc/util/_PathSettings.java b/qadevOOo/tests/java/ifc/util/_PathSettings.java index ebf55ed0013c..75bbedd5ceb0 100644 --- a/qadevOOo/tests/java/ifc/util/_PathSettings.java +++ b/qadevOOo/tests/java/ifc/util/_PathSettings.java @@ -63,6 +63,7 @@ public class _PathSettings extends MultiPropertyTest { */ public void _UIConfig() { testProperty("UIConfig", new PropertyTester() { + @Override public Object getNewValue(String propName, Object oldVal) { String path = (String) oldVal; if (path == null) path = ""; diff --git a/qadevOOo/tests/java/ifc/util/_XCancellable.java b/qadevOOo/tests/java/ifc/util/_XCancellable.java index 3c21188d820a..85ab779df5b2 100644 --- a/qadevOOo/tests/java/ifc/util/_XCancellable.java +++ b/qadevOOo/tests/java/ifc/util/_XCancellable.java @@ -48,6 +48,7 @@ public class _XCancellable extends MultiMethodTest { /** * Forces object recreation. */ + @Override public void after() { disposeEnvironment() ; } diff --git a/qadevOOo/tests/java/ifc/util/_XChangesBatch.java b/qadevOOo/tests/java/ifc/util/_XChangesBatch.java index e46cc034ca1f..c0e87f3ada97 100644 --- a/qadevOOo/tests/java/ifc/util/_XChangesBatch.java +++ b/qadevOOo/tests/java/ifc/util/_XChangesBatch.java @@ -39,6 +39,7 @@ public class _XChangesBatch extends MultiMethodTest { /** * add a change that can be committed */ + @Override protected void before() { changeElement = tEnv.getObjRelation("XChangesBatch.ChangeElement"); originalElement = tEnv.getObjRelation("XChangesBatch.OriginalElement"); diff --git a/qadevOOo/tests/java/ifc/util/_XChangesNotifier.java b/qadevOOo/tests/java/ifc/util/_XChangesNotifier.java index 263cc2e2c2eb..73592df4e248 100644 --- a/qadevOOo/tests/java/ifc/util/_XChangesNotifier.java +++ b/qadevOOo/tests/java/ifc/util/_XChangesNotifier.java @@ -85,6 +85,7 @@ public class _XChangesNotifier extends MultiMethodTest { * Before the test: get the 'XChangesNotifier.ChangesBatch' object relation * and create the listener. */ + @Override protected void before() { xBatch = (XChangesBatch)tEnv.getObjRelation("XChangesNotifier.ChangesBatch"); changeElement = tEnv.getObjRelation("XChangesNotifier.ChangeElement"); diff --git a/qadevOOo/tests/java/ifc/util/_XImportable.java b/qadevOOo/tests/java/ifc/util/_XImportable.java index 5224cee08a1d..f913375d7e57 100644 --- a/qadevOOo/tests/java/ifc/util/_XImportable.java +++ b/qadevOOo/tests/java/ifc/util/_XImportable.java @@ -186,6 +186,7 @@ public class _XImportable extends MultiMethodTest { /** * Dispose environment. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/util/_XIndent.java b/qadevOOo/tests/java/ifc/util/_XIndent.java index 9d08387c887b..769b21eb9ac9 100644 --- a/qadevOOo/tests/java/ifc/util/_XIndent.java +++ b/qadevOOo/tests/java/ifc/util/_XIndent.java @@ -44,6 +44,7 @@ public class _XIndent extends MultiMethodTest { /** * Ensures that the ObjRelation PropSet is given. */ + @Override public void before() { PropSet = (XPropertySet) tEnv.getObjRelation("PropSet"); if (PropSet == null) { diff --git a/qadevOOo/tests/java/ifc/util/_XReplaceable.java b/qadevOOo/tests/java/ifc/util/_XReplaceable.java index 1515d7a53f39..ca3cca6ee7c0 100644 --- a/qadevOOo/tests/java/ifc/util/_XReplaceable.java +++ b/qadevOOo/tests/java/ifc/util/_XReplaceable.java @@ -54,6 +54,7 @@ public class _XReplaceable extends MultiMethodTest { * the inserted object may influence following tests. * */ + @Override protected void before() { Object o = tEnv.getObjRelation("SEARCHSTRING"); if (o != null) { @@ -129,6 +130,7 @@ public class _XReplaceable extends MultiMethodTest { * In case the interface itself made the entry to search for, the environment * must be disposed */ + @Override protected void after() { if(mDispose) { disposeEnvironment(); diff --git a/qadevOOo/tests/java/ifc/util/_XSearchable.java b/qadevOOo/tests/java/ifc/util/_XSearchable.java index 6669b322de68..932a47455a88 100644 --- a/qadevOOo/tests/java/ifc/util/_XSearchable.java +++ b/qadevOOo/tests/java/ifc/util/_XSearchable.java @@ -57,6 +57,7 @@ public class _XSearchable extends MultiMethodTest { * the inserted object may influence following tests. * */ + @Override protected void before() { Object o = tEnv.getObjRelation("SEARCHSTRING"); if (o != null) { @@ -166,6 +167,7 @@ public class _XSearchable extends MultiMethodTest { * In case the interface itself made the entry to search for, the environment * must be disposed */ + @Override protected void after() { if(mDispose) { disposeEnvironment(); diff --git a/qadevOOo/tests/java/ifc/util/_XSortable.java b/qadevOOo/tests/java/ifc/util/_XSortable.java index 389bd56a8422..dd987cdeff41 100644 --- a/qadevOOo/tests/java/ifc/util/_XSortable.java +++ b/qadevOOo/tests/java/ifc/util/_XSortable.java @@ -50,6 +50,7 @@ public class _XSortable extends MultiMethodTest { XSortChecker checker = null; PropertyValue[] oPV = null; + @Override protected void before() { checker = (XSortChecker) tEnv.getObjRelation("SORTCHECKER"); @@ -222,6 +223,7 @@ public class _XSortable extends MultiMethodTest { /** * Forces environment recreation. */ + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/view/_XFormLayerAccess.java b/qadevOOo/tests/java/ifc/view/_XFormLayerAccess.java index 12efb5beb220..01228465caea 100644 --- a/qadevOOo/tests/java/ifc/view/_XFormLayerAccess.java +++ b/qadevOOo/tests/java/ifc/view/_XFormLayerAccess.java @@ -51,6 +51,7 @@ public class _XFormLayerAccess extends MultiMethodTest { * checks if the object relation <CODE>XFormLayerAccess.XForm</CODE> * is available */ + @Override public void before() { xForm = (XForm) tEnv.getObjRelation("XFormLayerAccess.XForm"); if (xForm == null) { diff --git a/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java b/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java index 69ed794b2005..f7c334b30c3c 100644 --- a/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java +++ b/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java @@ -55,6 +55,7 @@ public class _XMultiSelectionSupplier extends MultiMethodTest { Object[] selections = null; Comparator<Object> ObjCompare = null; + @Override protected void before() { selections = (Object[])tEnv.getObjRelation("Selections"); if (selections == null) { @@ -65,6 +66,7 @@ public class _XMultiSelectionSupplier extends MultiMethodTest { ObjCompare = (Comparator<Object>)tEnv.getObjRelation("Comparer"); } + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/view/_XPrintJobBroadcaster.java b/qadevOOo/tests/java/ifc/view/_XPrintJobBroadcaster.java index e183545e63f3..813cafca06ae 100644 --- a/qadevOOo/tests/java/ifc/view/_XPrintJobBroadcaster.java +++ b/qadevOOo/tests/java/ifc/view/_XPrintJobBroadcaster.java @@ -39,6 +39,7 @@ public class _XPrintJobBroadcaster extends MultiMethodTest { * Get an object implementation of the _XPrintJobListener interface from the * test environment. */ + @Override public void before() { listenerImpl = (MyPrintJobListener)tEnv.getObjRelation("XPrintJobBroadcaster.XPrintJobListener"); if (listenerImpl == null) { diff --git a/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java b/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java index 28a0288b270b..407130e7f994 100644 --- a/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java +++ b/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java @@ -53,6 +53,7 @@ public class _XSelectionSupplier extends MultiMethodTest { Object[] selections = null; Comparator<Object> ObjCompare = null; + @Override protected void before() { selections = (Object[])tEnv.getObjRelation("Selections"); if (selections == null) { @@ -63,6 +64,7 @@ public class _XSelectionSupplier extends MultiMethodTest { ObjCompare = (Comparator<Object>)tEnv.getObjRelation("Comparer"); } + @Override protected void after() { disposeEnvironment(); } diff --git a/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java b/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java index 0e81e5699e89..fa1030a47f5c 100644 --- a/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java +++ b/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java @@ -131,6 +131,7 @@ public class _XDocumentHandler extends MultiMethodTest { * Retrieves object relations. * @throws StatusException If one of relations not found. */ + @Override public void before() { locator = new DocumentLocator(log) ; if (tEnv.getTestCase().getObjectName().equals("XMLSettingsImporter")) { diff --git a/qadevOOo/tests/java/mod/_acceptor/Acceptor.java b/qadevOOo/tests/java/mod/_acceptor/Acceptor.java index de0575e60480..c1699b091551 100644 --- a/qadevOOo/tests/java/mod/_acceptor/Acceptor.java +++ b/qadevOOo/tests/java/mod/_acceptor/Acceptor.java @@ -51,6 +51,7 @@ public class Acceptor extends TestCase { * Retrieves host name where StarOffice is started from test * parameter <code>'CNCSTR'</code>. */ + @Override public void initialize( TestParameters tParam, PrintWriter log ) { String cncstr = (String) tParam.get("CNCSTR") ; int idx = cncstr.indexOf("host=") + 5 ; @@ -73,6 +74,7 @@ public class Acceptor extends TestCase { * when disposing environment, to free this port number. </li> * <ul> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { @@ -107,6 +109,7 @@ public class Acceptor extends TestCase { /** * Just clears flag which indicates that port is free now. */ + @Override public synchronized void disposeTestEnvironment( TestEnvironment tEnv, TestParameters tParam) { diff --git a/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java b/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java index 5610aab265a1..f5b90ac05bf6 100644 --- a/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java +++ b/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java @@ -47,6 +47,7 @@ public class Acceptor extends TestCase { * Retrieves host name where StarOffice is started from test * parameter <code>'CNCSTR'</code>. */ + @Override public void initialize( TestParameters tParam, PrintWriter log ) { String cncstr = (String) tParam.get("CNCSTR") ; int idx = cncstr.indexOf("host=") + 5 ; @@ -69,6 +70,7 @@ public class Acceptor extends TestCase { * when disposing environment, to free this port number. </li> * <ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -102,6 +104,7 @@ public class Acceptor extends TestCase { /** * Just clears flag which indicates that port is free now. */ + @Override public synchronized void disposeTestEnvironment( TestEnvironment tEnv, TestParameters tParam) { diff --git a/qadevOOo/tests/java/mod/_adabas/ODriver.java b/qadevOOo/tests/java/mod/_adabas/ODriver.java index d416e8b39700..d97206a53a1e 100644 --- a/qadevOOo/tests/java/mod/_adabas/ODriver.java +++ b/qadevOOo/tests/java/mod/_adabas/ODriver.java @@ -58,6 +58,7 @@ public class ODriver extends TestCase { * <code>adabas.user</code> and <code>adabas.password</code>.</li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_ado/ODriver.java b/qadevOOo/tests/java/mod/_ado/ODriver.java index ad88033b111f..83c9a87b579a 100644 --- a/qadevOOo/tests/java/mod/_ado/ODriver.java +++ b/qadevOOo/tests/java/mod/_ado/ODriver.java @@ -57,6 +57,7 @@ public class ODriver extends TestCase { * </li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java b/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java index 65a578f9fcae..df8978875df9 100644 --- a/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java +++ b/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java @@ -49,6 +49,7 @@ public class AccessibleShape extends TestCase { XTextDocument xTextDoc = null; XInterface oObj = null; + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println("Cleaning up"); DesktopTools.closeDoc(xTextDoc); @@ -62,6 +63,7 @@ public class AccessibleShape extends TestCase { } } + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); log.println( "creating a test environment" ); diff --git a/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java b/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java index 9e7f903703bb..4bd3f68ca44a 100644 --- a/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java +++ b/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java @@ -42,12 +42,14 @@ public class BridgeFactory extends TestCase { * Retrieves host name where StarOffice is started from test * parameter <code>'CNCSTR'</code>. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { String cncstr = (String) tParam.get("CNCSTR") ; int idx = cncstr.indexOf("host=") + 5 ; sOfficeHost = cncstr.substring(idx, cncstr.indexOf(",", idx)) ; } + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { } @@ -64,6 +66,7 @@ public class BridgeFactory extends TestCase { * Just creates <code>com.sun.star.bridge.BridgeFactory</code> * service as object to be tested. */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { @@ -99,6 +102,7 @@ public class BridgeFactory extends TestCase { /** * Just clears flag which indicates that port is free now. */ + @Override public synchronized void disposeTestEnvironment( TestEnvironment tEnv, TestParameters tParam) { curPort = ((Integer)tEnv.getObjRelation("Connector.Port")).intValue() ; diff --git a/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java b/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java index 43e8124fff3d..e2be0e95d638 100644 --- a/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java +++ b/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java @@ -40,12 +40,14 @@ public class BridgeFactory extends TestCase { * Retrieves host name where StarOffice is started from test * parameter <code>'CNCSTR'</code>. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { String cncstr = (String) tParam.get("CNCSTR") ; int idx = cncstr.indexOf("host=") + 5 ; sOfficeHost = cncstr.substring(idx, cncstr.indexOf(",", idx)) ; } + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { } @@ -62,6 +64,7 @@ public class BridgeFactory extends TestCase { * Just creates <code>com.sun.star.bridge.BridgeFactory</code> * service as object to be tested. */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null ; @@ -97,6 +100,7 @@ public class BridgeFactory extends TestCase { /** * Just clears flag which indicates that port is free now. */ + @Override public synchronized void disposeTestEnvironment( TestEnvironment tEnv, TestParameters tParam) { curPort = ((Integer)tEnv.getObjRelation("Connector.Port")).intValue() ; diff --git a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java index 0eb692be8040..dcad404e8a09 100644 --- a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java +++ b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java @@ -76,6 +76,7 @@ public class CachedContentResultSetFactory extends TestCase { * </li> * </ul> */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java index 4491a1df369f..91e08fbdc78b 100644 --- a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java +++ b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java @@ -74,6 +74,7 @@ public class CachedContentResultSetStubFactory extends TestCase { * </li> * </ul> */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java index 03367f0ba086..2bf301ab89f4 100644 --- a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java +++ b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java @@ -74,6 +74,7 @@ public class CachedDynamicResultSetFactory extends TestCase { * </li> * </ul> */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java index baecaa3e8673..56dc3fcfe161 100644 --- a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java +++ b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java @@ -71,6 +71,7 @@ public class CachedDynamicResultSetStubFactory extends TestCase { * </li> * </ul> */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_cmdmail/SimpleCommandMail.java b/qadevOOo/tests/java/mod/_cmdmail/SimpleCommandMail.java index f957153ebe13..5988517fefa0 100644 --- a/qadevOOo/tests/java/mod/_cmdmail/SimpleCommandMail.java +++ b/qadevOOo/tests/java/mod/_cmdmail/SimpleCommandMail.java @@ -30,6 +30,7 @@ import com.sun.star.uno.XInterface; public class SimpleCommandMail extends TestCase { + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_cnt/ChaosContentProvider.java b/qadevOOo/tests/java/mod/_cnt/ChaosContentProvider.java index e7a3875e49de..89a5d7e34315 100644 --- a/qadevOOo/tests/java/mod/_cnt/ChaosContentProvider.java +++ b/qadevOOo/tests/java/mod/_cnt/ChaosContentProvider.java @@ -63,6 +63,7 @@ public class ChaosContentProvider extends TestCase { * content URL for this provider </li> * </ul> */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_cnt/CntUnoDataContainer.java b/qadevOOo/tests/java/mod/_cnt/CntUnoDataContainer.java index 6ab9c64f643d..0fbdb236672f 100644 --- a/qadevOOo/tests/java/mod/_cnt/CntUnoDataContainer.java +++ b/qadevOOo/tests/java/mod/_cnt/CntUnoDataContainer.java @@ -77,6 +77,7 @@ public class CntUnoDataContainer extends TestCase { * </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_cnt/PropertyMatcherFactory.java b/qadevOOo/tests/java/mod/_cnt/PropertyMatcherFactory.java index a5d3d1c1fa50..1fd01dc26d03 100644 --- a/qadevOOo/tests/java/mod/_cnt/PropertyMatcherFactory.java +++ b/qadevOOo/tests/java/mod/_cnt/PropertyMatcherFactory.java @@ -48,6 +48,7 @@ public class PropertyMatcherFactory extends TestCase { * Creates an instance of the service * <code>com.sun.star.cnt.PropertyMatcherFactory</code>. <p> */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_configmgr/ConfigurationProvider.java b/qadevOOo/tests/java/mod/_configmgr/ConfigurationProvider.java index abc412c7f986..c59edbfb8d0b 100644 --- a/qadevOOo/tests/java/mod/_configmgr/ConfigurationProvider.java +++ b/qadevOOo/tests/java/mod/_configmgr/ConfigurationProvider.java @@ -28,6 +28,7 @@ import java.io.PrintWriter; public final class ConfigurationProvider extends TestCase { public ConfigurationProvider() {} + @Override protected TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_configmgr/DefaultProvider.java b/qadevOOo/tests/java/mod/_configmgr/DefaultProvider.java index cdefbd0eb395..44ae0f92bfb5 100644 --- a/qadevOOo/tests/java/mod/_configmgr/DefaultProvider.java +++ b/qadevOOo/tests/java/mod/_configmgr/DefaultProvider.java @@ -29,6 +29,7 @@ import java.io.PrintWriter; public final class DefaultProvider extends TestCase { public DefaultProvider() {} + @Override protected TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_connector/uno/Connector.java b/qadevOOo/tests/java/mod/_connector/uno/Connector.java index cac29dbdc267..e670901d8349 100644 --- a/qadevOOo/tests/java/mod/_connector/uno/Connector.java +++ b/qadevOOo/tests/java/mod/_connector/uno/Connector.java @@ -51,6 +51,7 @@ public class Connector extends TestCase { * Retrieves host name where StarOffice is started from test * parameter <code>'CNCSTR'</code>. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { String cncstr = (String) tParam.get("CNCSTR") ; int idx = cncstr.indexOf("host=") + 5 ; @@ -60,6 +61,7 @@ public class Connector extends TestCase { /** * Does nothing. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { } @@ -68,6 +70,7 @@ public class Connector extends TestCase { * Creating a Testenvironment for the interfaces to be tested. * Just creates service <code>com.sun.star.connection.Connector</code> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null ; @@ -102,6 +105,7 @@ public class Connector extends TestCase { /** * Just clears flag which indicates that port is free now. */ + @Override public synchronized void disposeTestEnvironment( TestEnvironment tEnv, TestParameters tParam) { diff --git a/qadevOOo/tests/java/mod/_connectr/Connector.java b/qadevOOo/tests/java/mod/_connectr/Connector.java index 7ba4617d8ced..8cdd6f52591f 100644 --- a/qadevOOo/tests/java/mod/_connectr/Connector.java +++ b/qadevOOo/tests/java/mod/_connectr/Connector.java @@ -53,6 +53,7 @@ public class Connector extends TestCase { * Retrieves host name where StarOffice is started from test * parameter <code>'CNCSTR'</code>. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { String cncstr = (String) tParam.get("CNCSTR") ; int idx = cncstr.indexOf("host=") + 5 ; @@ -62,6 +63,7 @@ public class Connector extends TestCase { /** * Does nothing. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { } @@ -70,6 +72,7 @@ public class Connector extends TestCase { * Creating a Testenvironment for the interfaces to be tested. * Just creates service <code>com.sun.star.connection.Connector</code> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) throws StatusException { @@ -105,6 +108,7 @@ public class Connector extends TestCase { /** * Just clears flag which indicates that port is free now. */ + @Override public synchronized void disposeTestEnvironment( TestEnvironment tEnv, TestParameters tParam) { diff --git a/qadevOOo/tests/java/mod/_corefl/CoreReflection.java b/qadevOOo/tests/java/mod/_corefl/CoreReflection.java index 7f43234c31fa..e64502314365 100644 --- a/qadevOOo/tests/java/mod/_corefl/CoreReflection.java +++ b/qadevOOo/tests/java/mod/_corefl/CoreReflection.java @@ -43,6 +43,7 @@ public class CoreReflection extends TestCase { /** * Does nothing. */ + @Override protected void initialize ( TestParameters Param, PrintWriter log) { } @@ -51,6 +52,7 @@ public class CoreReflection extends TestCase { * Creating a Testenvironment for the interfaces to be tested. * Creates <code>com.sun.star.reflection.CoreReflection</code> service. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_corereflection/uno/CoreReflection.java b/qadevOOo/tests/java/mod/_corereflection/uno/CoreReflection.java index bda037ee5ae6..63a2005347d8 100644 --- a/qadevOOo/tests/java/mod/_corereflection/uno/CoreReflection.java +++ b/qadevOOo/tests/java/mod/_corereflection/uno/CoreReflection.java @@ -40,6 +40,7 @@ public class CoreReflection extends TestCase { /** * Does nothing. */ + @Override protected void initialize ( TestParameters Param, PrintWriter log) { } @@ -48,6 +49,7 @@ public class CoreReflection extends TestCase { * Creating a Testenvironment for the interfaces to be tested. * Creates <code>com.sun.star.reflection.CoreReflection</code> service. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object oInterface = null; diff --git a/qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java b/qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java index 23fa7fe34e6a..9f5202a3fd75 100644 --- a/qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java +++ b/qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java @@ -47,6 +47,7 @@ public class DLLComponentLoader extends TestCase { /** * Does nothing. */ + @Override protected void initialize ( TestParameters Param, PrintWriter log) { } @@ -63,6 +64,7 @@ public class DLLComponentLoader extends TestCase { * <li> <code>'ImplementationName'</code> : Name of the implementation.</li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java index 7279f910b1ce..6988bc70e9e7 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java @@ -92,6 +92,7 @@ public class ConnectionLineAccessibility extends TestCase * @throws StatusException * @see TestEnvironment */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { @@ -370,6 +371,7 @@ public class ConnectionLineAccessibility extends TestCase /** * Closes the DatasourceAdministration dialog and Query Dialog. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { try diff --git a/qadevOOo/tests/java/mod/_dbaccess/DBContentLoader.java b/qadevOOo/tests/java/mod/_dbaccess/DBContentLoader.java index d4fc7f1412f6..253f7bbefbf2 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/DBContentLoader.java +++ b/qadevOOo/tests/java/mod/_dbaccess/DBContentLoader.java @@ -61,6 +61,7 @@ public class DBContentLoader extends TestCase { * {@link ifc.frame._XFrameLoader} </li> * </ul> */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java index c904d8d88df7..2dbcd0bc672b 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java +++ b/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java @@ -91,6 +91,7 @@ public class JoinViewAccessibility extends TestCase { * @throws StatusException * @see TestEnvironment */ + @Override protected TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { @@ -347,6 +348,7 @@ public class JoinViewAccessibility extends TestCase { /** * Closes the DatasourceAdministration dialog and Query Dialog. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { try { diff --git a/qadevOOo/tests/java/mod/_dbaccess/OCommandDefinition.java b/qadevOOo/tests/java/mod/_dbaccess/OCommandDefinition.java index aeaf5253d170..265217b95761 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OCommandDefinition.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OCommandDefinition.java @@ -50,6 +50,7 @@ public class OCommandDefinition extends TestCase { * Creating a Testenvironment for the interfaces to be tested. * Creates service <code>com.sun.star.sdb.QueryDefinition</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseContext.java b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseContext.java index 232010c6753d..2a1e4939a250 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseContext.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseContext.java @@ -63,6 +63,7 @@ public class ODatabaseContext extends TestCase { /** * Does nothing. */ + @Override protected void initialize ( TestParameters Param, PrintWriter log) { } @@ -78,6 +79,7 @@ public class ODatabaseContext extends TestCase { * service. </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object oInterface = null; diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java index 03c0f6145def..d27ad7b96001 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java @@ -86,10 +86,12 @@ public class ODatabaseSource extends TestCase { * Assigns database's name unique suffix for this object depending * on static field. For names differs in different object threads. */ + @Override protected void initialize ( TestParameters Param, PrintWriter log) { uniqueSuffix = uniqueSuffixStat++ ; } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing not longer needed docs... "); DesktopTools.closeDoc(xDBDoc); @@ -115,6 +117,7 @@ public class ODatabaseSource extends TestCase { * @see com.sun.star.sdb.DatabaseContext * @see com.sun.star.sdb.DataSource */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object oInterface = null; diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java index 683f555af1a4..2f9cd51e843b 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java @@ -59,6 +59,7 @@ public class ODatasourceAdministrationDialog extends TestCase { * Creates an instance of the service * <code>com.sun.star.sdb.DatasourceAdministrationDialog</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java index d553fa8e1328..238386071c6e 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java @@ -95,6 +95,7 @@ public class ODatasourceBrowser extends TestCase { /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( @@ -106,6 +107,7 @@ public class ODatasourceBrowser extends TestCase { * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println("disposing xTextDoc"); System.setProperty("hideMe", "true"); @@ -171,6 +173,7 @@ public class ODatasourceBrowser extends TestCase { * @see com.sun.star.frame.XController * @see com.sun.star.frame.XDispatchProvider */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { log.println("creating a test environment"); diff --git a/qadevOOo/tests/java/mod/_dbaccess/OInteractionHandler.java b/qadevOOo/tests/java/mod/_dbaccess/OInteractionHandler.java index 6ed99c5c7eef..0d2fbb06c329 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OInteractionHandler.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OInteractionHandler.java @@ -72,6 +72,7 @@ public class OInteractionHandler extends TestCase { * <code>SQLException</code> object. </li> * </ul> */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java index 8fc1c5fae440..17e90db4c1e7 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java @@ -60,11 +60,13 @@ public class OQueryDesign extends TestCase { /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { xDesk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop(Param.getMSF()) ); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { log.println( "creating a test environment" ); diff --git a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java index b63b2491fd52..41df33c42605 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java @@ -156,6 +156,7 @@ public class ORowSet extends TestCase { * @throws StatusException if DataSource can not be created or * registered. */ + @Override protected void initialize ( TestParameters Param, PrintWriter _log) throws StatusException { @@ -240,6 +241,7 @@ public class ORowSet extends TestCase { * @see com.sun.star.sdb.DatabaseContext * @see com.sun.star.sdb.DataSource */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { @@ -497,6 +499,7 @@ public class ORowSet extends TestCase { /** * Closes connection of <code>RowSet</code> instance created. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { String doing = null; diff --git a/qadevOOo/tests/java/mod/_dbaccess/OSQLMessageDialog.java b/qadevOOo/tests/java/mod/_dbaccess/OSQLMessageDialog.java index 257f87534a83..82099a6c660e 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OSQLMessageDialog.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OSQLMessageDialog.java @@ -64,6 +64,7 @@ public class OSQLMessageDialog extends TestCase { * {@link ifc.sdb._ErrorMessageDialog} </li> * </ul> */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java index 297b80e8c0f1..e8287d43a289 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java @@ -140,6 +140,7 @@ public class OSingleSelectQueryComposer extends TestCase { public XConnection conn = null; + @Override protected void initialize ( TestParameters Param, PrintWriter log) throws StatusException { @@ -164,6 +165,7 @@ public class OSingleSelectQueryComposer extends TestCase { * </ul> * */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { @@ -261,6 +263,7 @@ public class OSingleSelectQueryComposer extends TestCase { /** * Closes connection of <code>RowSet</code> instance created. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { } } diff --git a/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java b/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java index 9ca266aaeae4..b0c1e31b5598 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java +++ b/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java @@ -124,6 +124,7 @@ public class SbaXGridControl extends TestCase { /** * Creates Writer document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); @@ -140,6 +141,7 @@ public class SbaXGridControl extends TestCase { /** * Disposes Writer document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { //closing the appearing dialog before disposing the document XInterface toolkit = null; @@ -224,6 +226,7 @@ public class SbaXGridControl extends TestCase { * inserted into collection. Is a column instance.</li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java index 9f187d49f630..3a7b8b528d70 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java +++ b/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java @@ -93,6 +93,7 @@ public class TableWindowAccessibility extends TestCase { * @throws StatusException * @see TestEnvironment */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -334,6 +335,7 @@ public class TableWindowAccessibility extends TestCase { /** * Closes all open documents. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { try { diff --git a/qadevOOo/tests/java/mod/_dbpool/OConnectionPool.java b/qadevOOo/tests/java/mod/_dbpool/OConnectionPool.java index 191b5b573d70..4eac4ab86735 100644 --- a/qadevOOo/tests/java/mod/_dbpool/OConnectionPool.java +++ b/qadevOOo/tests/java/mod/_dbpool/OConnectionPool.java @@ -42,6 +42,7 @@ import com.sun.star.uno.XInterface; * @see ifc.sdbc._XDriverManager */ public class OConnectionPool extends TestCase { + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XMultiServiceFactory xMSF = Param.getMSF(); diff --git a/qadevOOo/tests/java/mod/_defreg/NestedRegistry.java b/qadevOOo/tests/java/mod/_defreg/NestedRegistry.java index a8563b10d470..2aa02482f779 100644 --- a/qadevOOo/tests/java/mod/_defreg/NestedRegistry.java +++ b/qadevOOo/tests/java/mod/_defreg/NestedRegistry.java @@ -65,6 +65,7 @@ public class NestedRegistry extends TestCase { XSimpleRegistry reg1; XSimpleRegistry reg2; + @Override public synchronized void disposeTestEnvironment( TestEnvironment tEnv, TestParameters tParam ) { try { @@ -127,6 +128,7 @@ public class NestedRegistry extends TestCase { * </li> * </ul> */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { @@ -184,6 +186,7 @@ public class NestedRegistry extends TestCase { return tEnv; } // finish method getTestEnvironment + @Override protected void cleanup( TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_dtrans/generic.java b/qadevOOo/tests/java/mod/_dtrans/generic.java index 893c0f70479c..dc3c4d43a0cd 100644 --- a/qadevOOo/tests/java/mod/_dtrans/generic.java +++ b/qadevOOo/tests/java/mod/_dtrans/generic.java @@ -39,6 +39,7 @@ public class generic extends TestCase { * Creates an instance of the service * <code>com.sun.star.comp.datatransfer.generic</code>. */ + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java b/qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java index fd3f98cf1131..1e02a2c8b2ae 100644 --- a/qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java +++ b/qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java @@ -51,6 +51,7 @@ public class Dynamic extends TestCase { * Creates service * <code>com.sun.star.loader.Dynamic</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_file/calc/ODriver.java b/qadevOOo/tests/java/mod/_file/calc/ODriver.java index e9ffcd22458f..4e17d9a448e8 100644 --- a/qadevOOo/tests/java/mod/_file/calc/ODriver.java +++ b/qadevOOo/tests/java/mod/_file/calc/ODriver.java @@ -60,6 +60,7 @@ public class ODriver extends TestCase { * </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_file/dbase/ODriver.java b/qadevOOo/tests/java/mod/_file/dbase/ODriver.java index 5b0f0fab0f13..70ffcd27094f 100644 --- a/qadevOOo/tests/java/mod/_file/dbase/ODriver.java +++ b/qadevOOo/tests/java/mod/_file/dbase/ODriver.java @@ -60,6 +60,7 @@ public class ODriver extends TestCase { * </li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_file/flat/ODriver.java b/qadevOOo/tests/java/mod/_file/flat/ODriver.java index 9d8801af3bd6..849de8497ea0 100644 --- a/qadevOOo/tests/java/mod/_file/flat/ODriver.java +++ b/qadevOOo/tests/java/mod/_file/flat/ODriver.java @@ -58,6 +58,7 @@ public class ODriver extends TestCase { * </li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_fileacc/SimpleFileAccess.java b/qadevOOo/tests/java/mod/_fileacc/SimpleFileAccess.java index 56b611f1b0c4..e6e435e8ac94 100644 --- a/qadevOOo/tests/java/mod/_fileacc/SimpleFileAccess.java +++ b/qadevOOo/tests/java/mod/_fileacc/SimpleFileAccess.java @@ -47,6 +47,7 @@ public class SimpleFileAccess extends TestCase { * Creating a Testenvironment for the interfaces to be tested. * Creates service <code>com.sun.star.ucb.SimpleFileAccess</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_fop/FolderPicker.java b/qadevOOo/tests/java/mod/_fop/FolderPicker.java index b3f04bc08585..a5466c4993ae 100644 --- a/qadevOOo/tests/java/mod/_fop/FolderPicker.java +++ b/qadevOOo/tests/java/mod/_fop/FolderPicker.java @@ -63,6 +63,7 @@ public class FolderPicker extends TestCase { * Creates an instance of the service * <code>com.sun.star.fop.FolderPicker</code>. <p> */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java index 5ace649a9690..6a0e2ad5a948 100644 --- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java +++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java @@ -214,6 +214,7 @@ public class GenericModelTest extends TestCase { * @param tParam the test paremter * @param log the log writer */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); m_xTextDoc = WriterTools.createTextDoc((tParam.getMSF())); @@ -230,6 +231,7 @@ public class GenericModelTest extends TestCase { * @param tParam the test parameter * @param log the log writer */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println("closing connection..."); @@ -366,6 +368,7 @@ public class GenericModelTest extends TestCase { * @param log the log writer * @return a test environment */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_forms/OButtonControl.java b/qadevOOo/tests/java/mod/_forms/OButtonControl.java index a994a0fb86b2..61dd1006dc41 100644 --- a/qadevOOo/tests/java/mod/_forms/OButtonControl.java +++ b/qadevOOo/tests/java/mod/_forms/OButtonControl.java @@ -82,6 +82,7 @@ public class OButtonControl extends TestCase { /** * Creates a text document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); @@ -98,6 +99,7 @@ public class OButtonControl extends TestCase { /** * Disposes the text document created before */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -141,6 +143,7 @@ public class OButtonControl extends TestCase { * component. </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_forms/OButtonModel.java b/qadevOOo/tests/java/mod/_forms/OButtonModel.java index 600a98bb79b2..ece822505a63 100644 --- a/qadevOOo/tests/java/mod/_forms/OButtonModel.java +++ b/qadevOOo/tests/java/mod/_forms/OButtonModel.java @@ -90,6 +90,7 @@ public class OButtonModel extends GenericModelTest { * @param log the log writer */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { super.initialize(tParam, log); @@ -106,6 +107,7 @@ public class OButtonModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } @@ -117,6 +119,7 @@ public class OButtonModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); diff --git a/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java b/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java index 7f1b44f59244..379a6b9d379f 100644 --- a/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java @@ -90,6 +90,7 @@ public class OCheckBoxControl extends TestCase { /** * Creates a new text document. */ + @Override protected void initialize ( TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( (Param.getMSF()) ); @@ -106,6 +107,7 @@ public class OCheckBoxControl extends TestCase { /** * Disposes the text document created before */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -152,6 +154,7 @@ public class OCheckBoxControl extends TestCase { * registered here and passed as relation. </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XWindowPeer the_win = null; diff --git a/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java b/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java index e8910bd9ae66..c247b86bb6d6 100644 --- a/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java +++ b/qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java @@ -105,6 +105,7 @@ public class OCheckBoxModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { super.initialize(tParam, log); @@ -121,6 +122,7 @@ public class OCheckBoxModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } @@ -132,6 +134,7 @@ public class OCheckBoxModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); diff --git a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java index b02279b4c17f..c4e269231cd2 100644 --- a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java @@ -94,6 +94,7 @@ public class OComboBoxControl extends TestCase { /** * Creates a new text document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); @@ -110,6 +111,7 @@ public class OComboBoxControl extends TestCase { /** * Disposes the text document created before */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -153,6 +155,7 @@ public class OComboBoxControl extends TestCase { * component. </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java b/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java index 44bae5f5216b..5b8dbc892dc2 100644 --- a/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java +++ b/qadevOOo/tests/java/mod/_forms/OComboBoxModel.java @@ -113,6 +113,7 @@ public class OComboBoxModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { super.initialize(tParam, log); @@ -136,6 +137,7 @@ public class OComboBoxModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } @@ -147,6 +149,7 @@ public class OComboBoxModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); diff --git a/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java b/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java index bbb592b061ab..903721f9a9f3 100644 --- a/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java +++ b/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java @@ -94,6 +94,7 @@ public class OCurrencyControl extends TestCase { /** * Creates a new text document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); @@ -110,6 +111,7 @@ public class OCurrencyControl extends TestCase { /** * Disposes the text document created before */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -156,6 +158,7 @@ public class OCurrencyControl extends TestCase { * can have only numeric values the relation must be specified. </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java b/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java index f66cd0015a41..5ecb0aab79b8 100644 --- a/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java +++ b/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java @@ -108,6 +108,7 @@ public class OCurrencyModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { super.initialize(tParam, log); @@ -132,6 +133,7 @@ public class OCurrencyModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } @@ -143,6 +145,7 @@ public class OCurrencyModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java index 26be61c77b0c..adca7192509b 100644 --- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java +++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java @@ -228,6 +228,7 @@ public class ODatabaseForm extends TestCase { protected XConnection conn = null; private Object dbSrc = null; + @Override protected void initialize(TestParameters tParam, PrintWriter log) { tmpDir = utils.getOfficeTemp((tParam.getMSF())); @@ -304,6 +305,7 @@ public class ODatabaseForm extends TestCase { /** * * creating a Testenvironment for the interfaces to be tested */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { if (xTextDoc != null) { @@ -731,6 +733,7 @@ public class ODatabaseForm extends TestCase { /** * Closes connection of <code>RowSet</code> instance created. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println("closing connection..."); try { diff --git a/qadevOOo/tests/java/mod/_forms/ODateControl.java b/qadevOOo/tests/java/mod/_forms/ODateControl.java index deb479afd45f..8875d8123dd8 100644 --- a/qadevOOo/tests/java/mod/_forms/ODateControl.java +++ b/qadevOOo/tests/java/mod/_forms/ODateControl.java @@ -93,6 +93,7 @@ public class ODateControl extends TestCase { /** * Creates a new text document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); @@ -109,6 +110,7 @@ public class ODateControl extends TestCase { /** * Disposes the text document created before */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -152,6 +154,7 @@ public class ODateControl extends TestCase { * component. </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_forms/ODateModel.java b/qadevOOo/tests/java/mod/_forms/ODateModel.java index 79d24c14cba2..90ccccdc7c3f 100644 --- a/qadevOOo/tests/java/mod/_forms/ODateModel.java +++ b/qadevOOo/tests/java/mod/_forms/ODateModel.java @@ -123,6 +123,7 @@ public class ODateModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { super.initialize(tParam, log); @@ -151,6 +152,7 @@ public class ODateModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } @@ -162,6 +164,7 @@ public class ODateModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); diff --git a/qadevOOo/tests/java/mod/_forms/OEditControl.java b/qadevOOo/tests/java/mod/_forms/OEditControl.java index a4739753107b..18ab08bcf517 100644 --- a/qadevOOo/tests/java/mod/_forms/OEditControl.java +++ b/qadevOOo/tests/java/mod/_forms/OEditControl.java @@ -94,6 +94,7 @@ public class OEditControl extends TestCase { /** * Creates a new text document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); @@ -110,6 +111,7 @@ public class OEditControl extends TestCase { /** * Disposes the text document created before */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -162,6 +164,7 @@ public class OEditControl extends TestCase { * of another component. </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_forms/OEditModel.java b/qadevOOo/tests/java/mod/_forms/OEditModel.java index 58c464f81142..dddbf97c532d 100644 --- a/qadevOOo/tests/java/mod/_forms/OEditModel.java +++ b/qadevOOo/tests/java/mod/_forms/OEditModel.java @@ -121,6 +121,7 @@ public class OEditModel extends GenericModelTest { * @param log the log writer */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { super.initialize(tParam, log); @@ -143,6 +144,7 @@ public class OEditModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } @@ -154,6 +156,7 @@ public class OEditModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); diff --git a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java b/qadevOOo/tests/java/mod/_forms/OFileControlModel.java index 5ced66e56103..d0644dbbc7cc 100644 --- a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java +++ b/qadevOOo/tests/java/mod/_forms/OFileControlModel.java @@ -94,6 +94,7 @@ public class OFileControlModel extends TestCase { /** * Creates Draw document where controls are placed. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory((tParam.getMSF())); @@ -110,6 +111,7 @@ public class OFileControlModel extends TestCase { /** * Disposes Draw document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xDrawDoc "); @@ -134,6 +136,7 @@ public class OFileControlModel extends TestCase { * represented by this object. </li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java b/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java index d3c815dc6e4c..8b6549407eaa 100644 --- a/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java +++ b/qadevOOo/tests/java/mod/_forms/OFixedTextModel.java @@ -84,6 +84,7 @@ public class OFixedTextModel extends GenericModelTest { * @param log the log writer */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { super.initialize(tParam, log); @@ -100,6 +101,7 @@ public class OFixedTextModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } @@ -111,6 +113,7 @@ public class OFixedTextModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); diff --git a/qadevOOo/tests/java/mod/_forms/OFormattedControl.java b/qadevOOo/tests/java/mod/_forms/OFormattedControl.java index 7077272fc1e5..9489c629e7d6 100644 --- a/qadevOOo/tests/java/mod/_forms/OFormattedControl.java +++ b/qadevOOo/tests/java/mod/_forms/OFormattedControl.java @@ -90,6 +90,7 @@ public class OFormattedControl extends TestCase { /** * Creates a new text document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); @@ -106,6 +107,7 @@ public class OFormattedControl extends TestCase { /** * Disposes the text document created before */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -149,6 +151,7 @@ public class OFormattedControl extends TestCase { * component. </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java b/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java index f5fb46ba5233..67552dde82a4 100644 --- a/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java +++ b/qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java @@ -113,6 +113,7 @@ public class OFormattedFieldWrapper extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { super.initialize(tParam, log); @@ -135,6 +136,7 @@ public class OFormattedFieldWrapper extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } @@ -146,6 +148,7 @@ public class OFormattedFieldWrapper extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); diff --git a/qadevOOo/tests/java/mod/_forms/OFormsCollection.java b/qadevOOo/tests/java/mod/_forms/OFormsCollection.java index 188583e277a0..14f7d6c531e3 100644 --- a/qadevOOo/tests/java/mod/_forms/OFormsCollection.java +++ b/qadevOOo/tests/java/mod/_forms/OFormsCollection.java @@ -74,6 +74,7 @@ public class OFormsCollection extends TestCase { /** * Creates Drawing document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a draw document"); xDrawDoc = DrawTools.createDrawDoc((tParam.getMSF())); @@ -82,6 +83,7 @@ public class OFormsCollection extends TestCase { /** * Disposes drawing document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xDrawDoc "); @@ -113,6 +115,7 @@ public class OFormsCollection extends TestCase { * names. In case of forms' collection forms can have equal names.</li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java index 6581a54c91ad..d5d474f0f261 100644 --- a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java +++ b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java @@ -139,6 +139,7 @@ public class OGridControlModel extends GenericModelTest { * @param log the log writer */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { super.initialize(tParam, log); @@ -155,6 +156,7 @@ public class OGridControlModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } @@ -166,6 +168,7 @@ public class OGridControlModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { TestEnvironment tEnv = super.createTestEnvironment(Param, log); @@ -260,6 +263,7 @@ class OGridControlModelold extends TestCase { /** * Creates Drawing document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory((tParam.getMSF())); @@ -275,6 +279,7 @@ class OGridControlModelold extends TestCase { /** * Disposes drawing document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xDrawDoc "); @@ -310,6 +315,7 @@ class OGridControlModelold extends TestCase { * {@link ifc.container._XContainer} : a column instance. </li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java b/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java index 0a2fabb872bf..d76af3480fa1 100644 --- a/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java @@ -72,6 +72,7 @@ public class OGroupBoxControl extends TestCase { /** * Creates a new text document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); @@ -88,6 +89,7 @@ public class OGroupBoxControl extends TestCase { /** * Disposes the text document created before */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -131,6 +133,7 @@ public class OGroupBoxControl extends TestCase { * component. </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java b/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java index d6a2e83a2497..539ee3831200 100644 --- a/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java +++ b/qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java @@ -83,6 +83,7 @@ public class OGroupBoxModel extends GenericModelTest { * @param log the log writer */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { super.initialize(tParam, log); @@ -100,6 +101,7 @@ public class OGroupBoxModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } @@ -111,6 +113,7 @@ public class OGroupBoxModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); diff --git a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java index 5e8831b1b340..44d2eef436da 100644 --- a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java +++ b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java @@ -90,6 +90,7 @@ public class OHiddenModel extends TestCase { /** * Creates Drawing document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory((tParam.getMSF())); @@ -106,6 +107,7 @@ public class OHiddenModel extends TestCase { /** * Disposes drawing document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xDrawDoc "); @@ -130,6 +132,7 @@ public class OHiddenModel extends TestCase { * represented by this object. </li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java b/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java index 2c7b047ac64f..e2d56cc22ba3 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java +++ b/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java @@ -77,6 +77,7 @@ public class OImageButtonControl extends TestCase { /** * Creates a new text document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); @@ -93,6 +94,7 @@ public class OImageButtonControl extends TestCase { /** * Disposes the text document created before */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -136,6 +138,7 @@ public class OImageButtonControl extends TestCase { * component. </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java b/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java index 2512cd9d548d..8dc72ead5ef0 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java +++ b/qadevOOo/tests/java/mod/_forms/OImageButtonModel.java @@ -88,6 +88,7 @@ public class OImageButtonModel extends GenericModelTest { * @param log the log writer */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { super.initialize(tParam, log); @@ -104,6 +105,7 @@ public class OImageButtonModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } @@ -115,6 +117,7 @@ public class OImageButtonModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); diff --git a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java b/qadevOOo/tests/java/mod/_forms/OImageControlControl.java index 918443a8a614..fca215c97e76 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java +++ b/qadevOOo/tests/java/mod/_forms/OImageControlControl.java @@ -78,6 +78,7 @@ public class OImageControlControl extends TestCase { /** * Creates a new text document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); @@ -94,6 +95,7 @@ public class OImageControlControl extends TestCase { /** * Disposes the text document created before */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -137,6 +139,7 @@ public class OImageControlControl extends TestCase { * component. </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_forms/OImageControlModel.java b/qadevOOo/tests/java/mod/_forms/OImageControlModel.java index 572686a9c67a..946d58f7ee5d 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageControlModel.java +++ b/qadevOOo/tests/java/mod/_forms/OImageControlModel.java @@ -114,6 +114,7 @@ public class OImageControlModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { super.initialize(tParam, log); @@ -134,6 +135,7 @@ public class OImageControlModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } @@ -145,6 +147,7 @@ public class OImageControlModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java b/qadevOOo/tests/java/mod/_forms/OListBoxControl.java index ee35d9872b3b..c0862484ba58 100644 --- a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OListBoxControl.java @@ -46,6 +46,7 @@ public class OListBoxControl extends TestCase { XTextDocument xTextDoc; + @Override protected void initialize ( TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( (Param.getMSF()) ); @@ -59,6 +60,7 @@ public class OListBoxControl extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -73,6 +75,7 @@ public class OListBoxControl extends TestCase { } } + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object anotherCtrl = null ; diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java index 38f92a2cdb7c..c5d61c79f4ad 100644 --- a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java +++ b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java @@ -128,6 +128,7 @@ public class OListBoxModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { super.initialize(tParam, log); @@ -157,6 +158,7 @@ public class OListBoxModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } @@ -171,6 +173,7 @@ public class OListBoxModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { TestEnvironment tEnv = super.createTestEnvironment(Param, log); diff --git a/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java b/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java index 8401806e4689..837fb706caef 100644 --- a/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java +++ b/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java @@ -47,6 +47,7 @@ public class ONavigationBarControl extends TestCase { /** * Creates a text document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); @@ -63,6 +64,7 @@ public class ONavigationBarControl extends TestCase { /** * Disposes the text document created before */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -98,6 +100,7 @@ public class ONavigationBarControl extends TestCase { * component. </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_forms/ONavigationBarModel.java b/qadevOOo/tests/java/mod/_forms/ONavigationBarModel.java index 927697cbd734..3a15f252e49f 100644 --- a/qadevOOo/tests/java/mod/_forms/ONavigationBarModel.java +++ b/qadevOOo/tests/java/mod/_forms/ONavigationBarModel.java @@ -36,6 +36,7 @@ public class ONavigationBarModel extends GenericModelTest { * @param log the log writer */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { super.initialize(tParam, log); @@ -52,6 +53,7 @@ public class ONavigationBarModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } @@ -63,6 +65,7 @@ public class ONavigationBarModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); diff --git a/qadevOOo/tests/java/mod/_forms/ONumericControl.java b/qadevOOo/tests/java/mod/_forms/ONumericControl.java index 1b8f460a000d..b9027df9f091 100644 --- a/qadevOOo/tests/java/mod/_forms/ONumericControl.java +++ b/qadevOOo/tests/java/mod/_forms/ONumericControl.java @@ -93,6 +93,7 @@ public class ONumericControl extends TestCase { /** * Creates a new text document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); @@ -109,6 +110,7 @@ public class ONumericControl extends TestCase { /** * Disposes the text document created before */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -152,6 +154,7 @@ public class ONumericControl extends TestCase { * component. </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_forms/ONumericModel.java b/qadevOOo/tests/java/mod/_forms/ONumericModel.java index 6234b896313f..ad6557660780 100644 --- a/qadevOOo/tests/java/mod/_forms/ONumericModel.java +++ b/qadevOOo/tests/java/mod/_forms/ONumericModel.java @@ -111,6 +111,7 @@ public class ONumericModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { super.initialize(tParam, log); @@ -133,6 +134,7 @@ public class ONumericModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } @@ -144,6 +146,7 @@ public class ONumericModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); diff --git a/qadevOOo/tests/java/mod/_forms/OPatternControl.java b/qadevOOo/tests/java/mod/_forms/OPatternControl.java index 320352923486..49837f2501bd 100644 --- a/qadevOOo/tests/java/mod/_forms/OPatternControl.java +++ b/qadevOOo/tests/java/mod/_forms/OPatternControl.java @@ -93,6 +93,7 @@ public class OPatternControl extends TestCase { /** * Creates a new text document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); @@ -109,6 +110,7 @@ public class OPatternControl extends TestCase { /** * Disposes the text document created before */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -152,6 +154,7 @@ public class OPatternControl extends TestCase { * component. </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_forms/OPatternModel.java b/qadevOOo/tests/java/mod/_forms/OPatternModel.java index d96c2800f3f0..7b3c2fe54a9a 100644 --- a/qadevOOo/tests/java/mod/_forms/OPatternModel.java +++ b/qadevOOo/tests/java/mod/_forms/OPatternModel.java @@ -116,6 +116,7 @@ public class OPatternModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { super.initialize(tParam, log); @@ -138,6 +139,7 @@ public class OPatternModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } @@ -149,6 +151,7 @@ public class OPatternModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { return super.createTestEnvironment(Param, log); diff --git a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java index 22328d69ae5d..1cdda7745d53 100644 --- a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java +++ b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java @@ -81,6 +81,7 @@ public class ORadioButtonControl extends TestCase { /** * Creates a new text document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); @@ -97,6 +98,7 @@ public class ORadioButtonControl extends TestCase { /** * Disposes the text document created before */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -140,6 +142,7 @@ public class ORadioButtonControl extends TestCase { * component. </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java b/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java index 6abbdfe255a7..2023f7849bf6 100644 --- a/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java +++ b/qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java @@ -114,6 +114,7 @@ public class ORadioButtonModel extends GenericModelTest { * @param log the log writer */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { super.initialize(tParam, log); @@ -136,6 +137,7 @@ public class ORadioButtonModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } @@ -147,6 +149,7 @@ public class ORadioButtonModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { TestEnvironment tEnv = super.createTestEnvironment(Param, log); diff --git a/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java b/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java index 37e20a9e08c0..70b4907706a3 100644 --- a/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java +++ b/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java @@ -38,6 +38,7 @@ public class OScrollBarModel extends TestCase { /** * Creates Writer document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { log.println( "creating a textdocument" ); @@ -47,6 +48,7 @@ public class OScrollBarModel extends TestCase { /** * Disposes the Writer document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -61,6 +63,7 @@ public class OScrollBarModel extends TestCase { } } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java b/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java index ecca4c16cc85..bb16b604fe85 100644 --- a/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java +++ b/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java @@ -38,6 +38,7 @@ public class OSpinButtonModel extends TestCase { /** * Creates a Writer document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { log.println( "creating a textdocument" ); @@ -47,6 +48,7 @@ public class OSpinButtonModel extends TestCase { /** * Disposes the Writer document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -66,6 +68,7 @@ public class OSpinButtonModel extends TestCase { * Creating a Testenvironment for the interfaces to be tested. * Adds spin button into text and retrieves it's control model. */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_forms/OTimeControl.java b/qadevOOo/tests/java/mod/_forms/OTimeControl.java index 7659fba213ce..67703e5a7439 100644 --- a/qadevOOo/tests/java/mod/_forms/OTimeControl.java +++ b/qadevOOo/tests/java/mod/_forms/OTimeControl.java @@ -94,6 +94,7 @@ public class OTimeControl extends TestCase { /** * Creates a new text document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); @@ -110,6 +111,7 @@ public class OTimeControl extends TestCase { /** * Disposes the text document created before */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -153,6 +155,7 @@ public class OTimeControl extends TestCase { * component. </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_forms/OTimeModel.java b/qadevOOo/tests/java/mod/_forms/OTimeModel.java index dff1c7292568..ff9d4190fb82 100644 --- a/qadevOOo/tests/java/mod/_forms/OTimeModel.java +++ b/qadevOOo/tests/java/mod/_forms/OTimeModel.java @@ -125,6 +125,7 @@ public class OTimeModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { super.initialize(tParam, log); @@ -147,6 +148,7 @@ public class OTimeModel extends GenericModelTest { * @param tParam the test parameter * @param log the log writer */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { super.cleanup(tParam, log); } @@ -160,6 +162,7 @@ public class OTimeModel extends GenericModelTest { * @param log the log writer * @return lib.TestEnvironment */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { TestEnvironment tEnv = super.createTestEnvironment(Param, log); diff --git a/qadevOOo/tests/java/mod/_fps/FilePicker.java b/qadevOOo/tests/java/mod/_fps/FilePicker.java index 0a93157f876e..82c34e67c44c 100644 --- a/qadevOOo/tests/java/mod/_fps/FilePicker.java +++ b/qadevOOo/tests/java/mod/_fps/FilePicker.java @@ -85,6 +85,7 @@ public class FilePicker extends TestCase { * of the control is empty) .</li> * </ul> */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_ftransl/DataFormatTranslator.java b/qadevOOo/tests/java/mod/_ftransl/DataFormatTranslator.java index c56060f83026..6ae6d84925c4 100644 --- a/qadevOOo/tests/java/mod/_ftransl/DataFormatTranslator.java +++ b/qadevOOo/tests/java/mod/_ftransl/DataFormatTranslator.java @@ -56,6 +56,7 @@ public class DataFormatTranslator extends TestCase { * Creates an instance of the service * <code>com.sun.star.datatransfer.DataFormatTranslator</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java b/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java index 7390925211e8..8bcf58dd2a07 100644 --- a/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java @@ -58,6 +58,7 @@ public class ControlMenuController extends TestCase { /** * Create test environment. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_fwk/Desktop.java b/qadevOOo/tests/java/mod/_fwk/Desktop.java index 1158f5b74a1c..f97d440b1588 100644 --- a/qadevOOo/tests/java/mod/_fwk/Desktop.java +++ b/qadevOOo/tests/java/mod/_fwk/Desktop.java @@ -74,6 +74,7 @@ public class Desktop extends TestCase { * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing xTextDoc"); @@ -89,6 +90,7 @@ public class Desktop extends TestCase { * Creating a Testenvironment for the interfaces to be tested. * Creates service <code>com.sun.star.frame.Desktop</code>. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { // get a soffice factory object diff --git a/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java b/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java index 20091ea64167..0149effc9bde 100644 --- a/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java +++ b/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java @@ -65,6 +65,7 @@ public class DispatchRecorder extends TestCase { * Creating a Testenvironment for the interfaces to be tested. * Creates service <code>com.sun.star.frame.Desktop</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { @@ -156,6 +157,7 @@ public class DispatchRecorder extends TestCase { return tEnv; } // finish method getTestEnvironment + @Override protected void cleanup( TestParameters Param, PrintWriter log) { util.DesktopTools.closeDoc(oDoc); } diff --git a/qadevOOo/tests/java/mod/_fwk/DispatchRecorderSupplier.java b/qadevOOo/tests/java/mod/_fwk/DispatchRecorderSupplier.java index 31d47378141e..07df37d050cb 100644 --- a/qadevOOo/tests/java/mod/_fwk/DispatchRecorderSupplier.java +++ b/qadevOOo/tests/java/mod/_fwk/DispatchRecorderSupplier.java @@ -43,6 +43,7 @@ public class DispatchRecorderSupplier extends TestCase { * Creates instance of * <code>com.sun.star.comp.framework.DispatchRecorderSupplier</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_fwk/FontMenuController.java b/qadevOOo/tests/java/mod/_fwk/FontMenuController.java index fbfc5d6b279a..755ada50e0aa 100644 --- a/qadevOOo/tests/java/mod/_fwk/FontMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/FontMenuController.java @@ -32,6 +32,7 @@ import util.utils; public class FontMenuController extends TestCase { XInterface oObj = null; + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_fwk/FontSizeMenuController.java b/qadevOOo/tests/java/mod/_fwk/FontSizeMenuController.java index d117a24dedf8..934f50b15236 100644 --- a/qadevOOo/tests/java/mod/_fwk/FontSizeMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/FontSizeMenuController.java @@ -32,6 +32,7 @@ import util.utils; public class FontSizeMenuController extends TestCase { XInterface oObj = null; + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_fwk/FooterMenuController.java b/qadevOOo/tests/java/mod/_fwk/FooterMenuController.java index 4e84afe2fc60..5db0ce8273a7 100644 --- a/qadevOOo/tests/java/mod/_fwk/FooterMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/FooterMenuController.java @@ -32,6 +32,7 @@ import util.utils; public class FooterMenuController extends TestCase { XInterface oObj = null; + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_fwk/FormatMenuController.java b/qadevOOo/tests/java/mod/_fwk/FormatMenuController.java index 3e704fc1ddd4..4b8e49b6b567 100644 --- a/qadevOOo/tests/java/mod/_fwk/FormatMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/FormatMenuController.java @@ -32,6 +32,7 @@ import util.utils; public class FormatMenuController extends TestCase { XInterface oObj = null; + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_fwk/Frame.java b/qadevOOo/tests/java/mod/_fwk/Frame.java index 2d199e4f74e2..9ce802c7264b 100644 --- a/qadevOOo/tests/java/mod/_fwk/Frame.java +++ b/qadevOOo/tests/java/mod/_fwk/Frame.java @@ -61,6 +61,7 @@ public class Frame extends TestCase { /** * Creates a text document and obtains a frame of current controller. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { @@ -99,6 +100,7 @@ public class Frame extends TestCase { * the frame containing the document (for case when the frame * contains no model after some interafce manipulations). */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { try { XCloseable xTextClose = UnoRuntime.queryInterface(XCloseable.class, xTextDoc); diff --git a/qadevOOo/tests/java/mod/_fwk/HeaderMenuController.java b/qadevOOo/tests/java/mod/_fwk/HeaderMenuController.java index fc63456a4a9b..fe9c1c69bb2a 100644 --- a/qadevOOo/tests/java/mod/_fwk/HeaderMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/HeaderMenuController.java @@ -32,6 +32,7 @@ import util.utils; public class HeaderMenuController extends TestCase { XInterface oObj = null; + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_fwk/JobExecutor.java b/qadevOOo/tests/java/mod/_fwk/JobExecutor.java index 48bee5e75beb..f33c31fffa9b 100644 --- a/qadevOOo/tests/java/mod/_fwk/JobExecutor.java +++ b/qadevOOo/tests/java/mod/_fwk/JobExecutor.java @@ -99,6 +99,7 @@ public class JobExecutor extends TestCase { * Note: SOffice is started again while the next * <code>(XMultiServiceFactory)SOLink.getMSF()</code> call. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { boolean serviceRegistered = false; boolean configured = false; @@ -197,6 +198,7 @@ public class JobExecutor extends TestCase { * Service <code>com.sun.star.comp.framework.JobExecutor</code> * is created. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -222,6 +224,7 @@ public class JobExecutor extends TestCase { return tEnv; } // finish method getTestEnvironment + @Override protected void cleanup( TestParameters Param, PrintWriter log) { } } diff --git a/qadevOOo/tests/java/mod/_fwk/JobHandler.java b/qadevOOo/tests/java/mod/_fwk/JobHandler.java index 7b00c7be56a8..d17958fd4877 100644 --- a/qadevOOo/tests/java/mod/_fwk/JobHandler.java +++ b/qadevOOo/tests/java/mod/_fwk/JobHandler.java @@ -44,6 +44,7 @@ public class JobHandler extends TestCase { /** * Creating a Testenvironment for the interfaces to be tested. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { boolean serviceRegistered = false; diff --git a/qadevOOo/tests/java/mod/_fwk/LayoutManager.java b/qadevOOo/tests/java/mod/_fwk/LayoutManager.java index feec68b53952..6628add8332e 100644 --- a/qadevOOo/tests/java/mod/_fwk/LayoutManager.java +++ b/qadevOOo/tests/java/mod/_fwk/LayoutManager.java @@ -45,6 +45,7 @@ public class LayoutManager extends TestCase { * @param tParam The test parameters. * @param log The log writer. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -70,6 +71,7 @@ public class LayoutManager extends TestCase { * @param log The log writer. * @return The test environment. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_fwk/MacrosMenuController.java b/qadevOOo/tests/java/mod/_fwk/MacrosMenuController.java index 4347bd371ba0..af13bb9e5e32 100644 --- a/qadevOOo/tests/java/mod/_fwk/MacrosMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/MacrosMenuController.java @@ -32,6 +32,7 @@ import util.utils; public class MacrosMenuController extends TestCase{ XInterface oObj = null; + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_fwk/MailToDispatcher.java b/qadevOOo/tests/java/mod/_fwk/MailToDispatcher.java index 00ae84916d46..9b5546406e99 100644 --- a/qadevOOo/tests/java/mod/_fwk/MailToDispatcher.java +++ b/qadevOOo/tests/java/mod/_fwk/MailToDispatcher.java @@ -45,6 +45,7 @@ public class MailToDispatcher extends TestCase { * Creating a Testenvironment for the interfaces to be tested. * Creates service <code>com.sun.star.framework.MailToDispatcher</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_fwk/MenuBarFactory.java b/qadevOOo/tests/java/mod/_fwk/MenuBarFactory.java index 6f4e0060c9f4..053e82320196 100644 --- a/qadevOOo/tests/java/mod/_fwk/MenuBarFactory.java +++ b/qadevOOo/tests/java/mod/_fwk/MenuBarFactory.java @@ -31,6 +31,7 @@ import lib.TestParameters; public class MenuBarFactory extends TestCase { XInterface oObj = null; + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; try { diff --git a/qadevOOo/tests/java/mod/_fwk/ModuleManager.java b/qadevOOo/tests/java/mod/_fwk/ModuleManager.java index ea5326ace30a..c88e549d3a17 100644 --- a/qadevOOo/tests/java/mod/_fwk/ModuleManager.java +++ b/qadevOOo/tests/java/mod/_fwk/ModuleManager.java @@ -64,6 +64,7 @@ public class ModuleManager extends TestCase { * @throws StatusException was thrwon on error * @return the test environement */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { @@ -258,6 +259,7 @@ public class ModuleManager extends TestCase { * @param tParam test parameters * @param log simple logger */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " closing all documents " ); DesktopTools.closeDoc(xTextDoc); diff --git a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java index 4e1653fd5c08..3496c783a97a 100644 --- a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java +++ b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java @@ -53,6 +53,7 @@ public class ModuleUIConfigurationManager extends TestCase { * @param tParam The test parameters. * @param log The log writer. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); if (xTextDoc != null) { @@ -72,6 +73,7 @@ public class ModuleUIConfigurationManager extends TestCase { /** * Create environment. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; diff --git a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManagerSupplier.java b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManagerSupplier.java index 0cf94ae38842..4f90a3ace534 100644 --- a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManagerSupplier.java +++ b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManagerSupplier.java @@ -32,6 +32,7 @@ import lib.TestParameters; public class ModuleUIConfigurationManagerSupplier extends TestCase{ XInterface oObj = null; + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; try { diff --git a/qadevOOo/tests/java/mod/_fwk/ObjectMenuController.java b/qadevOOo/tests/java/mod/_fwk/ObjectMenuController.java index c55afc396ffe..86e8e1428028 100644 --- a/qadevOOo/tests/java/mod/_fwk/ObjectMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/ObjectMenuController.java @@ -41,6 +41,7 @@ public class ObjectMenuController extends TestCase { * @param tParam The test parameters. * @param log The log writer. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -67,6 +68,7 @@ public class ObjectMenuController extends TestCase { * @param log The log writer. * @return The test environment. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_fwk/PopupMenuControllerFactory.java b/qadevOOo/tests/java/mod/_fwk/PopupMenuControllerFactory.java index 7b9b70087ad3..2e8ef4995377 100644 --- a/qadevOOo/tests/java/mod/_fwk/PopupMenuControllerFactory.java +++ b/qadevOOo/tests/java/mod/_fwk/PopupMenuControllerFactory.java @@ -43,6 +43,7 @@ public class PopupMenuControllerFactory extends TestCase { * @param tParam The test parameters. * @param log The log writer. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -64,6 +65,7 @@ public class PopupMenuControllerFactory extends TestCase { * @param log The log writer. * @return The test environment. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_fwk/ServiceHandler.java b/qadevOOo/tests/java/mod/_fwk/ServiceHandler.java index f6191c190d94..0bf0512562e3 100644 --- a/qadevOOo/tests/java/mod/_fwk/ServiceHandler.java +++ b/qadevOOo/tests/java/mod/_fwk/ServiceHandler.java @@ -45,6 +45,7 @@ public class ServiceHandler extends TestCase { * Creating a Testenvironment for the interfaces to be tested. * Creates service <code>com.sun.star.framework.ServiceHandler</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_fwk/SoundHandler.java b/qadevOOo/tests/java/mod/_fwk/SoundHandler.java index 42b8ab02dd2e..d0c550ad6929 100644 --- a/qadevOOo/tests/java/mod/_fwk/SoundHandler.java +++ b/qadevOOo/tests/java/mod/_fwk/SoundHandler.java @@ -45,6 +45,7 @@ public class SoundHandler extends TestCase { /** * Creating a Testenvironment for the interfaces to be tested. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_fwk/StatusBarControllerFactory.java b/qadevOOo/tests/java/mod/_fwk/StatusBarControllerFactory.java index e8499e3c0c70..4707c79cae76 100644 --- a/qadevOOo/tests/java/mod/_fwk/StatusBarControllerFactory.java +++ b/qadevOOo/tests/java/mod/_fwk/StatusBarControllerFactory.java @@ -33,6 +33,7 @@ import lib.TestParameters; public class StatusBarControllerFactory extends TestCase { XInterface oObj = null; + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_fwk/ToolBarsMenuController.java b/qadevOOo/tests/java/mod/_fwk/ToolBarsMenuController.java index 59f540a0f3cf..79e12e149b34 100644 --- a/qadevOOo/tests/java/mod/_fwk/ToolBarsMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/ToolBarsMenuController.java @@ -32,6 +32,7 @@ import util.utils; public class ToolBarsMenuController extends TestCase { XInterface oObj = null; + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_fwk/UICategoryDescription.java b/qadevOOo/tests/java/mod/_fwk/UICategoryDescription.java index 5799b79c1c3c..419adfc9a4ed 100644 --- a/qadevOOo/tests/java/mod/_fwk/UICategoryDescription.java +++ b/qadevOOo/tests/java/mod/_fwk/UICategoryDescription.java @@ -32,6 +32,7 @@ import util.utils; public class UICategoryDescription extends TestCase { XInterface oObj = null; + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_fwk/UICommandDescription.java b/qadevOOo/tests/java/mod/_fwk/UICommandDescription.java index 2ec3390c2564..4b673a218bf9 100644 --- a/qadevOOo/tests/java/mod/_fwk/UICommandDescription.java +++ b/qadevOOo/tests/java/mod/_fwk/UICommandDescription.java @@ -29,6 +29,7 @@ import util.utils; public class UICommandDescription extends TestCase { XInterface oObj = null; + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java b/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java index 6a1992f586dd..5465a9859b4c 100644 --- a/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java +++ b/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java @@ -57,6 +57,7 @@ public class UIConfigurationManager extends TestCase { * @param log The log writer. * @return The test environment. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_fwk/UIElementFactoryManager.java b/qadevOOo/tests/java/mod/_fwk/UIElementFactoryManager.java index f6511cb4a862..7255a376cd1e 100644 --- a/qadevOOo/tests/java/mod/_fwk/UIElementFactoryManager.java +++ b/qadevOOo/tests/java/mod/_fwk/UIElementFactoryManager.java @@ -41,6 +41,7 @@ public class UIElementFactoryManager extends TestCase { * @param tParam The test parameters. * @param log The log writer. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -67,6 +68,7 @@ public class UIElementFactoryManager extends TestCase { * @param log The log writer. * @return The test environment. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_fwk/URLTransformer.java b/qadevOOo/tests/java/mod/_fwk/URLTransformer.java index cdd842e86300..6a304687699a 100644 --- a/qadevOOo/tests/java/mod/_fwk/URLTransformer.java +++ b/qadevOOo/tests/java/mod/_fwk/URLTransformer.java @@ -41,6 +41,7 @@ public class URLTransformer extends TestCase { /** * Creating a Testenvironment for the interfaces to be tested. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java b/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java index a579c7908232..bee81c41d927 100644 --- a/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java +++ b/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java @@ -57,6 +57,7 @@ public class ContentHandlerFactory extends TestCase { * Creates an instance of the service * <code>com.sun.star.frame.ContentHandlerFactory</code>. <p> */ + @Override protected TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_fwl/FilterFactory.java b/qadevOOo/tests/java/mod/_fwl/FilterFactory.java index cf848d827b76..9fc1bd8275b5 100644 --- a/qadevOOo/tests/java/mod/_fwl/FilterFactory.java +++ b/qadevOOo/tests/java/mod/_fwl/FilterFactory.java @@ -64,6 +64,7 @@ public class FilterFactory extends TestCase { * in some reasons (?). For instantiation used filter type as service * name and its name as a parameter. <p> */ + @Override protected TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_fwl/FrameLoaderFactory.java b/qadevOOo/tests/java/mod/_fwl/FrameLoaderFactory.java index 7fff156923a6..1cbf48d3f628 100644 --- a/qadevOOo/tests/java/mod/_fwl/FrameLoaderFactory.java +++ b/qadevOOo/tests/java/mod/_fwl/FrameLoaderFactory.java @@ -57,6 +57,7 @@ public class FrameLoaderFactory extends TestCase { * Creates an instance of the service * <code>com.sun.star.frame.FrameLoaderFactory</code>. <p> */ + @Override protected TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_fwl/PathSettings.java b/qadevOOo/tests/java/mod/_fwl/PathSettings.java index 6642001c494b..ee12c94e4ba2 100644 --- a/qadevOOo/tests/java/mod/_fwl/PathSettings.java +++ b/qadevOOo/tests/java/mod/_fwl/PathSettings.java @@ -70,6 +70,7 @@ public class PathSettings extends TestCase { * @param tParam the test parameter * @param log the log writer */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println("restore old values of path settings..."); @@ -90,6 +91,7 @@ public class PathSettings extends TestCase { * Creates an instance of the service * <code>com.sun.star.comp.framework.PathSettings</code>. */ + @Override protected TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_fwl/SubstituteVariables.java b/qadevOOo/tests/java/mod/_fwl/SubstituteVariables.java index dea7dcb982c5..b2ebe36b2b01 100644 --- a/qadevOOo/tests/java/mod/_fwl/SubstituteVariables.java +++ b/qadevOOo/tests/java/mod/_fwl/SubstituteVariables.java @@ -50,6 +50,7 @@ public class SubstituteVariables extends TestCase { * Creates an instance of the service * <code>com.sun.star.util.PathSubstitution</code>. <p> */ + @Override protected TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_fwl/TypeDetection.java b/qadevOOo/tests/java/mod/_fwl/TypeDetection.java index 3c1e7ad07dcb..dfa8f98175fc 100644 --- a/qadevOOo/tests/java/mod/_fwl/TypeDetection.java +++ b/qadevOOo/tests/java/mod/_fwl/TypeDetection.java @@ -72,6 +72,7 @@ public class TypeDetection extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -84,6 +85,7 @@ public class TypeDetection extends TestCase { * Creates an instance of the service * <code>com.sun.star.document.TypeDetection</code>. <p> */ + @Override protected TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_i18n/BreakIterator.java b/qadevOOo/tests/java/mod/_i18n/BreakIterator.java index 14189caec3c2..2b182b89c8d1 100644 --- a/qadevOOo/tests/java/mod/_i18n/BreakIterator.java +++ b/qadevOOo/tests/java/mod/_i18n/BreakIterator.java @@ -54,6 +54,7 @@ public class BreakIterator extends TestCase { * Loads a Text document with name 'Iterator.sxw' from test * documents directory */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -73,6 +74,7 @@ public class BreakIterator extends TestCase { * Creates an instance of the service * <code>com.sun.star.i18n.BreakIterator</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { @@ -105,6 +107,7 @@ public class BreakIterator extends TestCase { /** * Disposes the Text document loaded before. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); xTextDoc.dispose(); diff --git a/qadevOOo/tests/java/mod/_i18n/CalendarImpl.java b/qadevOOo/tests/java/mod/_i18n/CalendarImpl.java index 78299b030a92..0bccfaf91a0b 100644 --- a/qadevOOo/tests/java/mod/_i18n/CalendarImpl.java +++ b/qadevOOo/tests/java/mod/_i18n/CalendarImpl.java @@ -44,6 +44,7 @@ public class CalendarImpl extends TestCase { * Creates an instance of the service * <code>com.sun.star.i18n.Calendar</code>. */ + @Override protected TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_i18n/ChapterCollator.java b/qadevOOo/tests/java/mod/_i18n/ChapterCollator.java index b2d75a72edaa..dd37745431a6 100644 --- a/qadevOOo/tests/java/mod/_i18n/ChapterCollator.java +++ b/qadevOOo/tests/java/mod/_i18n/ChapterCollator.java @@ -48,6 +48,7 @@ public class ChapterCollator extends TestCase { * Creates an instance of the service * <code>com.sun.star.i18n.ChapterCollator</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_i18n/CharacterClassification.java b/qadevOOo/tests/java/mod/_i18n/CharacterClassification.java index 780c6a73acd1..9fc7de498a63 100644 --- a/qadevOOo/tests/java/mod/_i18n/CharacterClassification.java +++ b/qadevOOo/tests/java/mod/_i18n/CharacterClassification.java @@ -50,6 +50,7 @@ public class CharacterClassification extends TestCase { * Creates an instance of the service * <code>com.sun.star.i18n.CharacterClassification</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_i18n/Collator.java b/qadevOOo/tests/java/mod/_i18n/Collator.java index 6d3248d8ac37..5c83af1b1581 100644 --- a/qadevOOo/tests/java/mod/_i18n/Collator.java +++ b/qadevOOo/tests/java/mod/_i18n/Collator.java @@ -46,6 +46,7 @@ public class Collator extends TestCase { * Creates an instance of the service * <code>com.sun.star.i18n.Collator</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_i18n/IndexEntrySupplier.java b/qadevOOo/tests/java/mod/_i18n/IndexEntrySupplier.java index 3b6344cd3fb6..71d059bb9254 100644 --- a/qadevOOo/tests/java/mod/_i18n/IndexEntrySupplier.java +++ b/qadevOOo/tests/java/mod/_i18n/IndexEntrySupplier.java @@ -50,6 +50,7 @@ public class IndexEntrySupplier extends TestCase { * Creates an instance of the service * <code>com.sun.star.i18n.IndexEntrySupplier</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_i18n/LocaleData.java b/qadevOOo/tests/java/mod/_i18n/LocaleData.java index b85cf19111a0..2cefa277ec7a 100644 --- a/qadevOOo/tests/java/mod/_i18n/LocaleData.java +++ b/qadevOOo/tests/java/mod/_i18n/LocaleData.java @@ -50,6 +50,7 @@ public class LocaleData extends TestCase { * Creates an instance of the service * <code>com.sun.star.i18n.LocaleData</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_i18n/NumberFormatCodeMapper.java b/qadevOOo/tests/java/mod/_i18n/NumberFormatCodeMapper.java index 8fdc8a8d2f6b..7759eee4197d 100644 --- a/qadevOOo/tests/java/mod/_i18n/NumberFormatCodeMapper.java +++ b/qadevOOo/tests/java/mod/_i18n/NumberFormatCodeMapper.java @@ -53,6 +53,7 @@ public class NumberFormatCodeMapper extends TestCase { * Creates an instance of the service * <code>com.sun.star.i18n.NumberFormatCodeMapper</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_i18n/Transliteration.java b/qadevOOo/tests/java/mod/_i18n/Transliteration.java index 8e9de0d76414..121e0488f75e 100644 --- a/qadevOOo/tests/java/mod/_i18n/Transliteration.java +++ b/qadevOOo/tests/java/mod/_i18n/Transliteration.java @@ -46,6 +46,7 @@ public class Transliteration extends TestCase { * Creates an instance of the service * <code>com.sun.star.i18n.Transliteration</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_implreg/uno/ImplementationRegistration.java b/qadevOOo/tests/java/mod/_implreg/uno/ImplementationRegistration.java index eb2886438291..dfa178a708b4 100644 --- a/qadevOOo/tests/java/mod/_implreg/uno/ImplementationRegistration.java +++ b/qadevOOo/tests/java/mod/_implreg/uno/ImplementationRegistration.java @@ -45,6 +45,7 @@ public class ImplementationRegistration extends TestCase { * Creates service * <code>com.sun.star.registry.ImplementationRegistration</code>. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object oInterface = null; diff --git a/qadevOOo/tests/java/mod/_impreg/ImplementationRegistration.java b/qadevOOo/tests/java/mod/_impreg/ImplementationRegistration.java index 5b9ceaf5bd64..8e2344a906ab 100644 --- a/qadevOOo/tests/java/mod/_impreg/ImplementationRegistration.java +++ b/qadevOOo/tests/java/mod/_impreg/ImplementationRegistration.java @@ -48,6 +48,7 @@ public class ImplementationRegistration extends TestCase { * Creates service * <code>com.sun.star.registry.ImplementationRegistration</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_insp/Introspection.java b/qadevOOo/tests/java/mod/_insp/Introspection.java index 26774dd23dbe..9d5b4c58a86d 100644 --- a/qadevOOo/tests/java/mod/_insp/Introspection.java +++ b/qadevOOo/tests/java/mod/_insp/Introspection.java @@ -47,6 +47,7 @@ public class Introspection extends TestCase { * Creating a Testenvironment for the interfaces to be tested. * Creates service <code>com.sun.star.comp.stoc.Introspection</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_introspection/uno/Introspection.java b/qadevOOo/tests/java/mod/_introspection/uno/Introspection.java index 71c8f6c5c311..e55137b190eb 100644 --- a/qadevOOo/tests/java/mod/_introspection/uno/Introspection.java +++ b/qadevOOo/tests/java/mod/_introspection/uno/Introspection.java @@ -44,6 +44,7 @@ public class Introspection extends TestCase { * Creating a Testenvironment for the interfaces to be tested. * Creates service <code>com.sun.star.comp.stoc.Introspection</code>. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object oInterface = null; diff --git a/qadevOOo/tests/java/mod/_inv/Invocation.java b/qadevOOo/tests/java/mod/_inv/Invocation.java index 19214ba7d17b..87cf3875c0fe 100644 --- a/qadevOOo/tests/java/mod/_inv/Invocation.java +++ b/qadevOOo/tests/java/mod/_inv/Invocation.java @@ -64,6 +64,7 @@ public class Invocation extends TestCase { * <code>com.sun.star.script.XInvocation</code> interface. * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_invadp/InvocationAdapterFactory.java b/qadevOOo/tests/java/mod/_invadp/InvocationAdapterFactory.java index 71b3d4dd72b7..f60bb2936c6c 100644 --- a/qadevOOo/tests/java/mod/_invadp/InvocationAdapterFactory.java +++ b/qadevOOo/tests/java/mod/_invadp/InvocationAdapterFactory.java @@ -48,6 +48,7 @@ public class InvocationAdapterFactory extends TestCase { * Creates an instance of the service * <code>com.sun.star.script.InvocationAdapterFactory</code>. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_invocadapt/uno/InvocationAdapterFactory.java b/qadevOOo/tests/java/mod/_invocadapt/uno/InvocationAdapterFactory.java index 1681aedb9b76..b863261e9d6e 100644 --- a/qadevOOo/tests/java/mod/_invocadapt/uno/InvocationAdapterFactory.java +++ b/qadevOOo/tests/java/mod/_invocadapt/uno/InvocationAdapterFactory.java @@ -46,6 +46,7 @@ public class InvocationAdapterFactory extends TestCase { * Creates an instance of the service * <code>com.sun.star.script.InvocationAdapterFactory</code>. */ + @Override protected TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_invocation/uno/Invocation.java b/qadevOOo/tests/java/mod/_invocation/uno/Invocation.java index 140ad5cbacad..22ae9b59fd38 100644 --- a/qadevOOo/tests/java/mod/_invocation/uno/Invocation.java +++ b/qadevOOo/tests/java/mod/_invocation/uno/Invocation.java @@ -62,6 +62,7 @@ public class Invocation extends TestCase { * <code>com.sun.star.script.XInvocation</code> interface. * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_javaloader/JavaComponentLoader.java b/qadevOOo/tests/java/mod/_javaloader/JavaComponentLoader.java index 3f39a429b07e..9e0bdfa93d73 100644 --- a/qadevOOo/tests/java/mod/_javaloader/JavaComponentLoader.java +++ b/qadevOOo/tests/java/mod/_javaloader/JavaComponentLoader.java @@ -56,6 +56,7 @@ public class JavaComponentLoader extends TestCase { * <li> <code>'ImplementationName'</code> : Name of the implementation.</li> * </ul> */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_javaloader/uno/JavaComponentLoader.java b/qadevOOo/tests/java/mod/_javaloader/uno/JavaComponentLoader.java index fca32ef203ea..b0b03ab00ab7 100644 --- a/qadevOOo/tests/java/mod/_javaloader/uno/JavaComponentLoader.java +++ b/qadevOOo/tests/java/mod/_javaloader/uno/JavaComponentLoader.java @@ -53,6 +53,7 @@ public class JavaComponentLoader extends TestCase { * <li> <code>'ImplementationName'</code> : Name of the implementation.</li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object oInterface = null; diff --git a/qadevOOo/tests/java/mod/_javavm/uno/JavaVirtualMachine.java b/qadevOOo/tests/java/mod/_javavm/uno/JavaVirtualMachine.java index d0e5bbaa92ac..96dbc5e9312f 100644 --- a/qadevOOo/tests/java/mod/_javavm/uno/JavaVirtualMachine.java +++ b/qadevOOo/tests/java/mod/_javavm/uno/JavaVirtualMachine.java @@ -49,6 +49,7 @@ public class JavaVirtualMachine extends TestCase { * Creates an instance of the service * <code>com.sun.star.java.JavaVirtualMachine</code>. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_jdbc/JDBCDriver.java b/qadevOOo/tests/java/mod/_jdbc/JDBCDriver.java index b8af38251fdd..1bf0fed2e6e6 100644 --- a/qadevOOo/tests/java/mod/_jdbc/JDBCDriver.java +++ b/qadevOOo/tests/java/mod/_jdbc/JDBCDriver.java @@ -56,6 +56,7 @@ public class JDBCDriver extends TestCase { * <code>jdbc.user</code> and <code>jdbc.password</code>.</li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_jen/JavaVirtualMachine.java b/qadevOOo/tests/java/mod/_jen/JavaVirtualMachine.java index 683d60bf2888..7c0bb019a150 100644 --- a/qadevOOo/tests/java/mod/_jen/JavaVirtualMachine.java +++ b/qadevOOo/tests/java/mod/_jen/JavaVirtualMachine.java @@ -51,6 +51,7 @@ public class JavaVirtualMachine extends TestCase { * Creates an instance of the service * <code>com.sun.star.java.JavaVirtualMachine</code>. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_lng/DicList.java b/qadevOOo/tests/java/mod/_lng/DicList.java index 8453d66b603f..9069039b8020 100644 --- a/qadevOOo/tests/java/mod/_lng/DicList.java +++ b/qadevOOo/tests/java/mod/_lng/DicList.java @@ -65,6 +65,7 @@ public class DicList extends TestCase { * entry is added to each of dictionaries and they both are activated. * The distionary list is retruned as a component for testing. */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_lng/LinguProps.java b/qadevOOo/tests/java/mod/_lng/LinguProps.java index 262027a02c4a..b30b6db92d73 100644 --- a/qadevOOo/tests/java/mod/_lng/LinguProps.java +++ b/qadevOOo/tests/java/mod/_lng/LinguProps.java @@ -62,6 +62,7 @@ public class LinguProps extends TestCase { * Creates an instance of the service * <code>com.sun.star.linguistic2.LinguProperties</code>. */ + @Override public synchronized TestEnvironment createTestEnvironment ( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_lng/LngSvcMgr.java b/qadevOOo/tests/java/mod/_lng/LngSvcMgr.java index b2e75881a44d..f8e55c904195 100644 --- a/qadevOOo/tests/java/mod/_lng/LngSvcMgr.java +++ b/qadevOOo/tests/java/mod/_lng/LngSvcMgr.java @@ -56,6 +56,7 @@ public class LngSvcMgr extends TestCase { * Creates an instance of the service * <code>com.sun.star.linguistic2.LinguServiceManager</code>. */ + @Override public synchronized TestEnvironment createTestEnvironment ( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_lnn/Hyphenator.java b/qadevOOo/tests/java/mod/_lnn/Hyphenator.java index 2c447c0d18b6..d64911825e85 100644 --- a/qadevOOo/tests/java/mod/_lnn/Hyphenator.java +++ b/qadevOOo/tests/java/mod/_lnn/Hyphenator.java @@ -71,6 +71,7 @@ public class Hyphenator extends TestCase { * Then a property for using new German rules for hyphenation * is set. */ + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_lnn/SpellChecker.java b/qadevOOo/tests/java/mod/_lnn/SpellChecker.java index 09af542ecec4..0f5d4c06d86b 100644 --- a/qadevOOo/tests/java/mod/_lnn/SpellChecker.java +++ b/qadevOOo/tests/java/mod/_lnn/SpellChecker.java @@ -70,6 +70,7 @@ public class SpellChecker extends TestCase { * Creates an instance of the service * <code>com.sun.star.linguistic2.SpellChecker</code>. */ + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_lnn/Thesaurus.java b/qadevOOo/tests/java/mod/_lnn/Thesaurus.java index 0bf6febc644a..3078548aeb01 100644 --- a/qadevOOo/tests/java/mod/_lnn/Thesaurus.java +++ b/qadevOOo/tests/java/mod/_lnn/Thesaurus.java @@ -65,6 +65,7 @@ public class Thesaurus extends TestCase { * Creates an instance of the service * <code>com.sun.star.linguistic2.Thesaurus</code>. */ + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_mcnttype/MimeContentTypeFactory.java b/qadevOOo/tests/java/mod/_mcnttype/MimeContentTypeFactory.java index 1d67600ed64b..b2ab181a1c5d 100644 --- a/qadevOOo/tests/java/mod/_mcnttype/MimeContentTypeFactory.java +++ b/qadevOOo/tests/java/mod/_mcnttype/MimeContentTypeFactory.java @@ -54,6 +54,7 @@ public class MimeContentTypeFactory extends TestCase { * Creates an instance of the service * <code>com.sun.star.datatransfer.MimeContentTypeFactory</code>. <p> */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_mozab/MozabDriver.java b/qadevOOo/tests/java/mod/_mozab/MozabDriver.java index 8c78dd2d2f02..f52895372116 100644 --- a/qadevOOo/tests/java/mod/_mozab/MozabDriver.java +++ b/qadevOOo/tests/java/mod/_mozab/MozabDriver.java @@ -57,6 +57,7 @@ public class MozabDriver extends TestCase { * </li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_namingservice/NamingService.java b/qadevOOo/tests/java/mod/_namingservice/NamingService.java index 3000a4ec7c4b..3effe06c0cb7 100644 --- a/qadevOOo/tests/java/mod/_namingservice/NamingService.java +++ b/qadevOOo/tests/java/mod/_namingservice/NamingService.java @@ -56,6 +56,7 @@ public class NamingService extends TestCase { * service.</li> * </ul> */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_namingservice/uno/NamingService.java b/qadevOOo/tests/java/mod/_namingservice/uno/NamingService.java index 4147ea9464d0..c8dc5f1de05e 100644 --- a/qadevOOo/tests/java/mod/_namingservice/uno/NamingService.java +++ b/qadevOOo/tests/java/mod/_namingservice/uno/NamingService.java @@ -54,6 +54,7 @@ public class NamingService extends TestCase { * service.</li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object oInterface = null; diff --git a/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java b/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java index 3eed73afe2ee..10e72c09cc73 100644 --- a/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java +++ b/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java @@ -63,6 +63,7 @@ public class NestedRegistry extends TestCase { XSimpleRegistry reg1; XSimpleRegistry reg2; + @Override public synchronized void disposeTestEnvironment( TestEnvironment tEnv, TestParameters tParam ) { try { @@ -124,6 +125,7 @@ public class NestedRegistry extends TestCase { * </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object oInterface = null; @@ -180,6 +182,7 @@ public class NestedRegistry extends TestCase { return tEnv; } // finish method getTestEnvironment + @Override protected void cleanup( TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_odbc/ODBCDriver.java b/qadevOOo/tests/java/mod/_odbc/ODBCDriver.java index 2e87a31ac6d4..5ba1eaa97a69 100644 --- a/qadevOOo/tests/java/mod/_odbc/ODBCDriver.java +++ b/qadevOOo/tests/java/mod/_odbc/ODBCDriver.java @@ -53,6 +53,7 @@ public class ODBCDriver extends TestCase { * </li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_pcr/ObjectInspector.java b/qadevOOo/tests/java/mod/_pcr/ObjectInspector.java index 5f0c49ebdc11..25780676e865 100644 --- a/qadevOOo/tests/java/mod/_pcr/ObjectInspector.java +++ b/qadevOOo/tests/java/mod/_pcr/ObjectInspector.java @@ -73,6 +73,7 @@ public class ObjectInspector extends TestCase { * @see share.LogWriter * @see com.sun.star.frame.Desktop */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { log.println("create a desktop..."); StarDesktop = DesktopTools.createDesktop(Param.getMSF()); @@ -95,6 +96,7 @@ public class ObjectInspector extends TestCase { * @see util.DesktopTools * @see helper.PropertyHandlerImpl */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { this.cleanup(tParam, log); @@ -182,6 +184,7 @@ public class ObjectInspector extends TestCase { * @param Param the test parameter * @param log the logger */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println(" Closing dialog if one exists ... "); diff --git a/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java b/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java index 26dec23177f1..4d0bf26fafc2 100644 --- a/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java +++ b/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java @@ -65,6 +65,7 @@ public class ObjectInspectorModel extends TestCase { * @see share.LogWriter * @see com.sun.star.frame.Desktop */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { log.println("create a desktop..."); StarDesktop = DesktopTools.createDesktop(Param.getMSF()); @@ -85,6 +86,7 @@ public class ObjectInspectorModel extends TestCase { * @see util.DesktopTools * @see helper.PropertyHandlerImpl */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { this.cleanup(tParam, log); @@ -143,6 +145,7 @@ public class ObjectInspectorModel extends TestCase { * @param Param the test parameter * @param log the logger */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println(" Closing dialog if one exists ... "); diff --git a/qadevOOo/tests/java/mod/_proxyfac/ProxyFactory.java b/qadevOOo/tests/java/mod/_proxyfac/ProxyFactory.java index 5f4878f57149..93d914daf3d9 100644 --- a/qadevOOo/tests/java/mod/_proxyfac/ProxyFactory.java +++ b/qadevOOo/tests/java/mod/_proxyfac/ProxyFactory.java @@ -49,6 +49,7 @@ public class ProxyFactory extends TestCase { * Creates an instance of the service * <code>com.sun.star.reflection.ProxyFactory</code>. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_proxyfac/uno/ProxyFactory.java b/qadevOOo/tests/java/mod/_proxyfac/uno/ProxyFactory.java index d5e00292893b..fee2e5a08c8f 100644 --- a/qadevOOo/tests/java/mod/_proxyfac/uno/ProxyFactory.java +++ b/qadevOOo/tests/java/mod/_proxyfac/uno/ProxyFactory.java @@ -47,6 +47,7 @@ public class ProxyFactory extends TestCase { * Creates an instance of the service * <code>com.sun.star.reflection.ProxyFactory</code>. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_qadevOOo/SelfTest.java b/qadevOOo/tests/java/mod/_qadevOOo/SelfTest.java index 42133dabcfcd..bc7b0d9fa01b 100644 --- a/qadevOOo/tests/java/mod/_qadevOOo/SelfTest.java +++ b/qadevOOo/tests/java/mod/_qadevOOo/SelfTest.java @@ -36,6 +36,7 @@ public class SelfTest extends TestCase { private XTextDocument xTextDoc = null; + @Override protected void initialize(TestParameters tParam, PrintWriter log) { // get a soffice factory object @@ -57,12 +58,14 @@ public class SelfTest extends TestCase /** * Disposes text document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" cleanup selftest"); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java b/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java index 20c768f57bb3..3ad6575386df 100644 --- a/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java +++ b/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java @@ -54,6 +54,7 @@ import com.sun.star.uno.XInterface; */ public class RegistryTypeDescriptionProvider extends TestCase { + @Override protected void initialize ( TestParameters Param, PrintWriter log) { } @@ -70,6 +71,7 @@ public class RegistryTypeDescriptionProvider extends TestCase { * <code>com.sun.star.uno.XInterface</code> interface.</li> * </ul> */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider.java b/qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider.java index a248041b30c8..7a035cd25e2a 100644 --- a/qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider.java +++ b/qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider.java @@ -51,6 +51,7 @@ import lib.TestParameters; */ public class RegistryTypeDescriptionProvider extends TestCase { + @Override protected void initialize ( TestParameters Param, PrintWriter log) { } @@ -67,6 +68,7 @@ public class RegistryTypeDescriptionProvider extends TestCase { * <code>com.sun.star.uno.XInterface</code> interface.</li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object oInterface = null; diff --git a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java index ae2f76d04169..a4c760bd6b13 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java @@ -147,6 +147,7 @@ public class various extends TestCase { * Call <code>accept()</code> method and establish a bridge with an * instance provider */ + @Override public void run() { try { acceptedCall = acc.accept(connectString) ; @@ -176,6 +177,7 @@ public class various extends TestCase { * for <code>initialize()</code> method test.</li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); @@ -259,6 +261,7 @@ public class various extends TestCase { /** * Stop the acceptor thread and dispose the bridge */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { System.out.println("++++++++ cleanup"); diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java b/qadevOOo/tests/java/mod/_remotebridge/various.java index b01d3239d91d..ac9f9b3c33a5 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/various.java @@ -143,6 +143,7 @@ public class various extends TestCase { * Call <code>accept()</code> method and establish a bridge with an * instance provider */ + @Override public void run() { try { acceptedCall = acc.accept(connectString) ; @@ -168,6 +169,7 @@ public class various extends TestCase { * for <code>initialize()</code> method test.</li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); @@ -251,6 +253,7 @@ public class various extends TestCase { /** * Stop the acceptor thread and dispose the bridge */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { System.out.println("++++++++ cleanup"); diff --git a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java index 81892bd64fe8..97efd9ed1a2c 100644 --- a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java +++ b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java @@ -51,6 +51,7 @@ public class AccessibleEditableTextPara_HeaderFooter extends TestCase { protected static XMultiServiceFactory msf = null; protected static XAccessibleAction action = null; + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XAccessibleContext oObj = null; @@ -130,6 +131,7 @@ public class AccessibleEditableTextPara_HeaderFooter extends TestCase { * Closes the dialog using accessible button 'OK' found in * <code>createTestEnvironment()</code>. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println(" disposing xCalcDoc "); @@ -147,6 +149,7 @@ public class AccessibleEditableTextPara_HeaderFooter extends TestCase { /** * Opens new writer document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { msf = Param.getMSF(); @@ -173,6 +176,7 @@ public class AccessibleEditableTextPara_HeaderFooter extends TestCase { this.msf = msf; } + @Override public void run() { XModel aModel = UnoRuntime.queryInterface(XModel.class, xCalcDoc); diff --git a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java index 1c70b16ae621..e0f9a2e8581b 100644 --- a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java +++ b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java @@ -56,6 +56,7 @@ public class AccessibleEditableTextPara_PreviewCell extends TestCase { /** * Creates a spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -71,6 +72,7 @@ public class AccessibleEditableTextPara_PreviewCell extends TestCase { /** * Disposes a spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface @@ -83,6 +85,7 @@ public class AccessibleEditableTextPara_PreviewCell extends TestCase { * Creating a Testenvironment for the interfaces to be tested. * Obtains the accessible object for a one of cell in preview mode. */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XCell xCell = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java index 6e60de59a3c8..a79cb07dbbef 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java @@ -85,6 +85,7 @@ public class ScAccessibleCell extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -176,6 +177,7 @@ public class ScAccessibleCell extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc) ; diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java index f515be96d355..8c477ebbe3cd 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java @@ -56,6 +56,7 @@ public class ScAccessibleCsvCell extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; @@ -116,6 +117,7 @@ public class ScAccessibleCsvCell extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println( " closing Dialog " ); try { @@ -135,6 +137,7 @@ public class ScAccessibleCsvCell extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -178,6 +181,7 @@ public class ScAccessibleCsvCell extends TestCase { this.args = Args; } + @Override public void run() { try { String url= utils.getFullTestURL("10test.csv"); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java index d6fdbecf097c..6ceae7c89b03 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java @@ -55,6 +55,7 @@ public class ScAccessibleCsvGrid extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -111,6 +112,7 @@ public class ScAccessibleCsvGrid extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println( " closing Dialog " ); try { @@ -130,6 +132,7 @@ public class ScAccessibleCsvGrid extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -174,6 +177,7 @@ public class ScAccessibleCsvGrid extends TestCase { this.args = Args; } + @Override public void run() { try { String url= utils.getFullTestURL("10test.csv"); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java index 0ce9ab6bed39..701067dcc145 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java @@ -58,6 +58,7 @@ public class ScAccessibleCsvRuler extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -141,6 +142,7 @@ public class ScAccessibleCsvRuler extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { /* log.println( " closing Dialog " ); try { @@ -160,6 +162,7 @@ public class ScAccessibleCsvRuler extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -204,6 +207,7 @@ public class ScAccessibleCsvRuler extends TestCase { this.args = Args; } + @Override public void run() { try { String url= utils.getFullTestURL("10test.csv"); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java index fa684178317f..0433837316c0 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java @@ -74,6 +74,7 @@ public class ScAccessibleDocument extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -114,6 +115,7 @@ public class ScAccessibleDocument extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println( " disposing xSheetDoc " ); util.DesktopTools.closeDoc(xSpreadsheetDoc); @@ -129,6 +131,7 @@ public class ScAccessibleDocument extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java index ee42b5fefe55..8e1e05ac40f7 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java @@ -82,6 +82,7 @@ public class ScAccessibleDocumentPagePreview extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -189,6 +190,7 @@ public class ScAccessibleDocumentPagePreview extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc) ; @@ -205,6 +207,7 @@ public class ScAccessibleDocumentPagePreview extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java index 059ff1cc7680..552c7c0536d7 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java @@ -87,6 +87,7 @@ public class ScAccessiblePageHeader extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -242,6 +243,7 @@ public class ScAccessiblePageHeader extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println( " disposing xSheetDoc " ); try { @@ -262,6 +264,7 @@ public class ScAccessiblePageHeader extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java index 86bee325185d..e05f4da4f220 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java @@ -83,6 +83,7 @@ public class ScAccessiblePageHeaderArea extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -180,6 +181,7 @@ public class ScAccessiblePageHeaderArea extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println( " disposing xSheetDoc " ); try { @@ -200,6 +202,7 @@ public class ScAccessiblePageHeaderArea extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java index 20863da2ac60..bb6c5e2e5450 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java @@ -80,6 +80,7 @@ public class ScAccessiblePreviewCell extends TestCase { /** * Creates a spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -95,6 +96,7 @@ public class ScAccessiblePreviewCell extends TestCase { /** * Disposes a spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface @@ -107,6 +109,7 @@ public class ScAccessiblePreviewCell extends TestCase { * Creating a Testenvironment for the interfaces to be tested. * Obtains the accessible object for a one of cell in preview mode. */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XCell xCell = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java index c70381d33f06..48599b85c1a2 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java @@ -84,12 +84,14 @@ public class ScAccessiblePreviewHeaderCell extends TestCase { /** * Creates a spreadsheet document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { } /** * Disposes a spreadsheet document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xSheetDoc "); @@ -115,6 +117,7 @@ public class ScAccessiblePreviewHeaderCell extends TestCase { * Switchs the document to preview mode and then obtains the * accessible object for the header cell. */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { if (xSheetDoc != null) { diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java index d7809c99914f..7f5ecd269f84 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java @@ -82,6 +82,7 @@ public class ScAccessiblePreviewTable extends TestCase { /** * Creates a spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -97,6 +98,7 @@ public class ScAccessiblePreviewTable extends TestCase { /** * Disposes a spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface @@ -109,6 +111,7 @@ public class ScAccessiblePreviewTable extends TestCase { * Creating a Testenvironment for the interfaces to be tested. * Obtains the accessible object for a table in preview mode. */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XCell xCell = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java index 3d6456b70c99..6ea054549505 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java @@ -71,6 +71,7 @@ public class ScAccessibleSpreadsheet extends TestCase { /** * Creates a spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -86,6 +87,7 @@ public class ScAccessibleSpreadsheet extends TestCase { /** * Disposes a spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface @@ -98,6 +100,7 @@ public class ScAccessibleSpreadsheet extends TestCase { * Creating a Testenvironment for the interfaces to be tested. * Obtains the accessible object for the spreadsheet. */ + @Override public synchronized TestEnvironment createTestEnvironment ( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java index b5d52fc89d5e..295eaf700af8 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java @@ -67,6 +67,7 @@ public class ScAnnotationObj extends TestCase { /** * Creates a spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -84,6 +85,7 @@ public class ScAnnotationObj extends TestCase { /** * Disposes a spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface @@ -106,6 +108,7 @@ public class ScAnnotationObj extends TestCase { * contains the annotation cell address.</li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment ( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java index 626110ecb41b..ea8f9c32e14c 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java @@ -73,6 +73,7 @@ public class ScAnnotationShapeObj extends TestCase { /** * Creates a spreadsheet document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory(tParam @@ -96,6 +97,7 @@ public class ScAnnotationShapeObj extends TestCase { /** * Disposes a spreadsheet document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xSheetDoc "); @@ -119,6 +121,7 @@ public class ScAnnotationShapeObj extends TestCase { * contains the annotation cell address.</li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java index fea56fe90d9d..81ff087ff5b1 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java +++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java @@ -61,6 +61,7 @@ public class ScAnnotationTextCursor extends TestCase { private XSpreadsheetDocument xSheetDoc = null; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -75,6 +76,7 @@ public class ScAnnotationTextCursor extends TestCase { } + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface @@ -86,6 +88,7 @@ public class ScAnnotationTextCursor extends TestCase { /** * creating a Testenvironment for the interfaces to be tested */ + @Override public synchronized TestEnvironment createTestEnvironment ( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java index d7c8e88702d8..cc6cc28020ee 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java @@ -68,6 +68,7 @@ public class ScAnnotationsObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -85,6 +86,7 @@ public class ScAnnotationsObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; @@ -98,6 +100,7 @@ public class ScAnnotationsObj extends TestCase { * of annotations is retrieved using spreadsheet's * <code>com.sun.star.sheet.XSheetAnnotationsSupplier</code> interface. */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java b/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java index 8fe4ee2117f6..875b60797630 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java @@ -67,6 +67,7 @@ public class ScAreaLinkObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -84,6 +85,7 @@ public class ScAreaLinkObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface @@ -99,6 +101,7 @@ public class ScAreaLinkObj extends TestCase { * collection, which has a source in the same document. This * link is passed as a tested object. */ + @Override public synchronized TestEnvironment createTestEnvironment ( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java b/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java index 3f153c9fa1ac..4917329a59f2 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java @@ -63,7 +63,8 @@ public class ScAreaLinksObj extends TestCase { /** * Creates Spreadsheet document. */ - protected void initialize( TestParameters tParam, PrintWriter log ) { + @Override +protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -80,6 +81,7 @@ public class ScAreaLinksObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface @@ -95,6 +97,7 @@ public class ScAreaLinksObj extends TestCase { * collection, which has a source in the same document. The * link collection is passed as a tested object. */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log){ diff --git a/qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj.java index c527d3f01774..a92c950508b0 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj.java @@ -62,6 +62,7 @@ public class ScAutoFormatFieldObj extends TestCase { * and then from this format one of its compound fields is * retrieved. */ + @Override public synchronized TestEnvironment createTestEnvironment ( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java b/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java index e2bb6df5392f..796d2e4a4bd7 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java @@ -70,6 +70,7 @@ public class ScAutoFormatObj extends TestCase { * is created. From this collection one Format is retrieved as * object tested. */ + @Override public TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java b/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java index 66f29bb5b22a..934c5826a7ea 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java @@ -64,6 +64,7 @@ public class ScAutoFormatsObj extends TestCase{ /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -80,6 +81,7 @@ public class ScAutoFormatsObj extends TestCase{ /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface @@ -101,6 +103,7 @@ public class ScAutoFormatsObj extends TestCase{ * object for each interface thread. </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java b/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java index 6e568bce3bba..7d66599f9922 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java @@ -102,6 +102,7 @@ public class ScCellCursorObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -119,6 +120,7 @@ public class ScCellCursorObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xSheetDoc "); @@ -143,6 +145,7 @@ public class ScCellCursorObj extends TestCase { * retieved from collection)</li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java index 903c87672782..1fe23fdea5f3 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java @@ -69,6 +69,7 @@ public class ScCellFieldObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -86,6 +87,7 @@ public class ScCellFieldObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc); @@ -110,6 +112,7 @@ public class ScCellFieldObj extends TestCase { * {@link ifc.text._XTextContent} (the text of the cell)</li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java b/qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java index d7e0cba94216..9ad004d868ec 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java @@ -64,6 +64,7 @@ public class ScCellFieldsObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -81,6 +82,7 @@ public class ScCellFieldsObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc); @@ -94,6 +96,7 @@ public class ScCellFieldsObj extends TestCase { * of the cell in the spreadsheet. Then the component is obtained * by <code>XTextFieldsSupplier</code> interface of a cell.<p> */ + @Override protected synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java index f09eae64a9b0..36e79f78120b 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java @@ -55,6 +55,7 @@ public class ScCellFormatsEnumeration extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -72,6 +73,7 @@ public class ScCellFormatsEnumeration extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc); @@ -97,6 +99,7 @@ public class ScCellFormatsEnumeration extends TestCase { * @see com.sun.star.sheet.XCellFormatRangesSupplier * @see com.sun.star.container.XEnumerationAccess */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java b/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java index 56be56816f83..57ee887767b4 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java @@ -57,6 +57,7 @@ public class ScCellFormatsObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -74,6 +75,7 @@ public class ScCellFormatsObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc); @@ -89,6 +91,7 @@ public class ScCellFormatsObj extends TestCase { * @see com.sun.star.sheet.CellFormatRanges * @see com.sun.star.sheet.XCellFormatRangesSupplier */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScCellObj.java b/qadevOOo/tests/java/mod/_sc/ScCellObj.java index 75ce4c99ac01..f877d5dd0f4a 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellObj.java @@ -85,6 +85,7 @@ public class ScCellObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -101,6 +102,7 @@ public class ScCellObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc); @@ -119,6 +121,7 @@ public class ScCellObj extends TestCase { * </ul> * @see com.sun.star.sheet.SheetCell */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java index 4f3605ce3d32..d1e84ab8dce0 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java @@ -90,6 +90,7 @@ public class ScCellRangeObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -106,6 +107,7 @@ public class ScCellRangeObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xSheetDoc "); @@ -128,6 +130,7 @@ public class ScCellRangeObj extends TestCase { * </ul> * @see com.sun.star.sheet.XSpreadsheet */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java index 6046cdfb0b50..1e0d2fc09dd7 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java @@ -87,6 +87,7 @@ public class ScCellRangesObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -105,6 +106,7 @@ public class ScCellRangesObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = @@ -130,6 +132,7 @@ public class ScCellRangesObj extends TestCase { * </ul> * @see com.sun.star.table.XCellRange */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java b/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java index 4f6b4270ab1f..0d005fd7de72 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java @@ -64,6 +64,7 @@ public class ScCellSearchObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -81,6 +82,7 @@ public class ScCellSearchObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; @@ -96,6 +98,7 @@ public class ScCellSearchObj extends TestCase { * implemented by a spreasheet. * @see com.sun.star.util.XSearchable */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java b/qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java index 66d9c5de212d..e0e99ecedbe7 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java @@ -93,6 +93,7 @@ public class ScCellTextCursor extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -110,6 +111,7 @@ public class ScCellTextCursor extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; @@ -132,6 +134,7 @@ public class ScCellTextCursor extends TestCase { * </ul> * @see com.sun.star.text.XText */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java index 7976ae2a70ed..844c4a496158 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java @@ -57,6 +57,7 @@ public class ScCellsEnumeration extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -74,6 +75,7 @@ public class ScCellsEnumeration extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; @@ -99,6 +101,7 @@ public class ScCellsEnumeration extends TestCase { * @see com.sun.star.sheet.XCellRangesQuery * @see com.sun.star.container.XEnumerationAccess */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScCellsObj.java b/qadevOOo/tests/java/mod/_sc/ScCellsObj.java index c8848a503cf1..923f10c8ecc4 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellsObj.java @@ -60,6 +60,7 @@ public class ScCellsObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -78,6 +79,7 @@ public class ScCellsObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; @@ -94,6 +96,7 @@ public class ScCellsObj extends TestCase { * <code>com.sun.star.sheet.Cells</code>. * @see com.sun.star.sheet.XCellRangesQuery */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScChartObj.java b/qadevOOo/tests/java/mod/_sc/ScChartObj.java index 5a2461ac8052..8f74e215e3c4 100644 --- a/qadevOOo/tests/java/mod/_sc/ScChartObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScChartObj.java @@ -67,6 +67,7 @@ public class ScChartObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -84,6 +85,7 @@ public class ScChartObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSheetDoc); @@ -105,6 +107,7 @@ public class ScChartObj extends TestCase { * </ul> * @see com.sun.star.container.XNamed */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XSpreadsheet oSheet=null; diff --git a/qadevOOo/tests/java/mod/_sc/ScChartsObj.java b/qadevOOo/tests/java/mod/_sc/ScChartsObj.java index ba73bf808afa..674aa6625a5b 100644 --- a/qadevOOo/tests/java/mod/_sc/ScChartsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScChartsObj.java @@ -68,6 +68,7 @@ public class ScChartsObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -85,6 +86,7 @@ public class ScChartsObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSheetDoc); @@ -113,6 +115,7 @@ public class ScChartsObj extends TestCase { * @see com.sun.star.container.XNamed * @see com.sun.star.table.XTableChartsSupplier */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XSpreadsheet oSheet=null; diff --git a/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java b/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java index 7dec01a49e95..ef522027a052 100644 --- a/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java +++ b/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java @@ -49,6 +49,7 @@ public class ScConsolidationDescriptor extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -66,6 +67,7 @@ public class ScConsolidationDescriptor extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; @@ -82,6 +84,7 @@ public class ScConsolidationDescriptor extends TestCase { * @see com.sun.star.sheet.ConsolidationDescriptor * @see com.sun.star.sheet.XConsolidatable */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java b/qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java index dc0e56f85661..561734ca4d7d 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java @@ -66,6 +66,7 @@ public class ScDDELinkObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -83,6 +84,7 @@ public class ScDDELinkObj extends TestCase { /** * Disposes Spreadsheet document and testdocument if it was loaded already. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSheetDoc) ; @@ -118,6 +120,7 @@ public class ScDDELinkObj extends TestCase { * @see com.sun.star.frame.Desktop * @see com.sun.star.sheet.DDELink */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java b/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java index 8ca54543e4c5..937634930475 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java @@ -64,6 +64,7 @@ public class ScDDELinksObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -81,6 +82,7 @@ public class ScDDELinksObj extends TestCase { /** * Disposes Spreadsheet document and testdocument. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime. @@ -102,6 +104,7 @@ public class ScDDELinksObj extends TestCase { * @see com.sun.star.frame.Desktop * @see com.sun.star.sheet.DDELinks */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java index d1ca809cbefa..44eae77ce32d 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java @@ -61,6 +61,7 @@ public class ScDataPilotFieldGroupItemObj extends TestCase /** * Creates Spreadsheet document. */ + @Override protected void initialize (TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory ( @@ -82,6 +83,7 @@ public class ScDataPilotFieldGroupItemObj extends TestCase /** * Disposes Spreadsheet document. */ + @Override protected void cleanup (TestParameters tParam, PrintWriter log) { log.println (" disposing xSheetDoc "); @@ -91,6 +93,7 @@ public class ScDataPilotFieldGroupItemObj extends TestCase util.DesktopTools.closeDoc (oComp); } + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java index b18f8832aab9..fc480b869092 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java @@ -60,6 +60,7 @@ public class ScDataPilotFieldGroupObj extends TestCase /** * Creates Spreadsheet document. */ + @Override protected void initialize (TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory ( @@ -81,6 +82,7 @@ public class ScDataPilotFieldGroupObj extends TestCase /** * Disposes Spreadsheet document. */ + @Override protected void cleanup (TestParameters tParam, PrintWriter log) { log.println (" disposing xSheetDoc "); @@ -90,6 +92,7 @@ public class ScDataPilotFieldGroupObj extends TestCase util.DesktopTools.closeDoc (oComp); } + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java index ad877c72c452..296cfe25b25c 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java @@ -60,6 +60,7 @@ public class ScDataPilotFieldGroupsObj extends TestCase /** * Creates Spreadsheet document. */ + @Override protected void initialize (TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory ( @@ -81,6 +82,7 @@ public class ScDataPilotFieldGroupsObj extends TestCase /** * Disposes Spreadsheet document. */ + @Override protected void cleanup (TestParameters tParam, PrintWriter log) { log.println (" disposing xSheetDoc "); @@ -90,6 +92,7 @@ public class ScDataPilotFieldGroupsObj extends TestCase util.DesktopTools.closeDoc (oComp); } + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java index 1ce2f651eef4..49f4be3fd369 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java @@ -74,6 +74,7 @@ public class ScDataPilotFieldObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -91,6 +92,7 @@ public class ScDataPilotFieldObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xSheetDoc "); @@ -114,6 +116,7 @@ public class ScDataPilotFieldObj extends TestCase { * @see com.sun.star.sheet.XDataPilotTablesSupplier * @see com.sun.star.sheet.XDataPilotDescriptor */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java index aba76942a51b..f5f3ab8155de 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java @@ -61,6 +61,7 @@ public class ScDataPilotFieldsObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -78,6 +79,7 @@ public class ScDataPilotFieldsObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSheetDoc) ; @@ -98,6 +100,7 @@ public class ScDataPilotFieldsObj extends TestCase { * @see com.sun.star.sheet.XDataPilotTablesSupplier * @see com.sun.star.sheet.XDataPilotDescriptor */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java index b99311416aac..b23c7dbcfe6f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java @@ -75,6 +75,7 @@ public class ScDataPilotItemObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -92,6 +93,7 @@ public class ScDataPilotItemObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xSheetDoc "); @@ -115,6 +117,7 @@ public class ScDataPilotItemObj extends TestCase { * @see com.sun.star.sheet.XDataPilotTablesSupplier * @see com.sun.star.sheet.XDataPilotDescriptor */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java index a1e9f468954b..8b45056e472e 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java @@ -75,6 +75,7 @@ public class ScDataPilotItemsObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -92,6 +93,7 @@ public class ScDataPilotItemsObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xSheetDoc "); @@ -115,6 +117,7 @@ public class ScDataPilotItemsObj extends TestCase { * @see com.sun.star.sheet.XDataPilotTablesSupplier * @see com.sun.star.sheet.XDataPilotDescriptor */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java index 9646f703f874..9008e2d82964 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java @@ -67,6 +67,7 @@ public class ScDataPilotTableObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -84,6 +85,7 @@ public class ScDataPilotTableObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSheetDoc) ; @@ -121,6 +123,7 @@ public class ScDataPilotTableObj extends TestCase { * @see com.sun.star.sheet.XDataPilotTablesSupplier * @see com.sun.star.sheet.XDataPilotDescriptor */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java index 69350766e446..4c9fa1d48c5a 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java @@ -64,6 +64,7 @@ public class ScDataPilotTablesObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -81,6 +82,7 @@ public class ScDataPilotTablesObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSheetDoc) ; @@ -105,6 +107,7 @@ public class ScDataPilotTablesObj extends TestCase { * @see com.sun.star.sheet.DataPilotTable * @see com.sun.star.sheet.XDataPilotTablesSupplier */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java index d3852ebcb5ad..dade91ebdfde 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java @@ -74,6 +74,7 @@ public class ScDatabaseRangeObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -91,6 +92,7 @@ public class ScDatabaseRangeObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xSheetDoc "); @@ -118,6 +120,7 @@ public class ScDatabaseRangeObj extends TestCase { * @see com.sun.star.sheet.DatabaseRange * @see com.sun.star.table.CellRangeAddress */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java index cc584b26facc..950eacc1052c 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java @@ -59,6 +59,7 @@ public class ScDatabaseRangesObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -76,6 +77,7 @@ public class ScDatabaseRangesObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; @@ -94,6 +96,7 @@ public class ScDatabaseRangesObj extends TestCase { * @see com.sun.star.sheet.DatabaseRanges * @see com.sun.star.container.XElementAccess */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration.java b/qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration.java index 2aa924552e41..2c43c102eca7 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration.java +++ b/qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration.java @@ -36,6 +36,7 @@ import util.SOfficeFactory; public class ScDocumentConfiguration extends TestCase { private XSpreadsheetDocument xSheetDoc = null; + @Override protected void initialize(TestParameters tParam, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -54,11 +55,13 @@ public class ScDocumentConfiguration extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xSheetDoc "); DesktopTools.closeDoc(xSheetDoc); } + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory docMSF = UnoRuntime.queryInterface( diff --git a/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java b/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java index 61d1195a1047..749453f3d7aa 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java @@ -47,6 +47,7 @@ public class ScDrawPageObj extends TestCase { /** * Creates a new Draw document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -64,6 +65,7 @@ public class ScDrawPageObj extends TestCase { /** * Disposes the Draw document created before */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent xComp = UnoRuntime.queryInterface(XComponent.class, xDoc); @@ -89,6 +91,7 @@ public class ScDrawPageObj extends TestCase { * <code>com.sun.star.drawing.Line</code> service </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java b/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java index 7668c879551d..da3c7e61530c 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java @@ -62,6 +62,7 @@ public class ScDrawPagesObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -80,6 +81,7 @@ public class ScDrawPagesObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; @@ -95,6 +97,7 @@ public class ScDrawPagesObj extends TestCase { * @see com.sun.star.drawing.XDrawPagesSupplier * @see com.sun.star.drawing.DrawPages */ + @Override public TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java index ece4432a4eb6..c454a7b203aa 100644 --- a/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java +++ b/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java @@ -60,6 +60,7 @@ public class ScFilterDescriptorBase extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -78,6 +79,7 @@ public class ScFilterDescriptorBase extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc); @@ -94,6 +96,7 @@ public class ScFilterDescriptorBase extends TestCase { * @see com.sun.star.sheet.XSheetFilterable * @see com.sun.star.sheet.SheetFilterDescriptor */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java b/qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java index 2d75835d63de..0bd8e8c71f76 100644 --- a/qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java @@ -37,6 +37,7 @@ import com.sun.star.uno.XInterface; public class ScFunctionDescriptionObj extends TestCase { private XSpreadsheetDocument xSheetDoc = null; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -51,6 +52,7 @@ public class ScFunctionDescriptionObj extends TestCase { } + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime. @@ -62,6 +64,7 @@ public class ScFunctionDescriptionObj extends TestCase { /** * creating a Testenvironment for the interfaces to be tested */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/ScFunctionListObj.java b/qadevOOo/tests/java/mod/_sc/ScFunctionListObj.java index ae2bc2023ab7..93446c9ed2e0 100644 --- a/qadevOOo/tests/java/mod/_sc/ScFunctionListObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScFunctionListObj.java @@ -58,6 +58,7 @@ public class ScFunctionListObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -75,6 +76,7 @@ public class ScFunctionListObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; @@ -87,6 +89,7 @@ public class ScFunctionListObj extends TestCase { * <code>com.sun.star.sheet.FunctionDescriptions</code>. * @see com.sun.star.sheet.FunctionDescriptions */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java index 6ff934b45696..b59411129067 100644 --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java @@ -71,6 +71,7 @@ public class ScHeaderFieldObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -88,6 +89,7 @@ public class ScHeaderFieldObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc); @@ -120,6 +122,7 @@ public class ScHeaderFieldObj extends TestCase { * @see com.sun.star.text.XText * @see com.sun.star.text.XTextContent */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java index 48ef554f10bb..1c9d547a2999 100644 --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java @@ -67,6 +67,7 @@ public class ScHeaderFieldsObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -84,6 +85,7 @@ public class ScHeaderFieldsObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc); @@ -108,6 +110,7 @@ public class ScHeaderFieldsObj extends TestCase { * @see com.sun.star.text.XText * @see com.sun.star.text.XTextContent */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java index 820bb32527a2..2fdb2b20ba56 100644 --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java @@ -56,6 +56,7 @@ public class ScHeaderFooterContentObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -73,6 +74,7 @@ public class ScHeaderFooterContentObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc); @@ -93,6 +95,7 @@ public class ScHeaderFooterContentObj extends TestCase { * @see com.sun.star.sheet.XHeaderFooterContent * @see com.sun.star.sheet.HeaderFooterContent */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java index 9dd33ffea9b5..aea5ff178791 100644 --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java +++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java @@ -95,6 +95,7 @@ public class ScHeaderFooterTextCursor extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -111,6 +112,7 @@ public class ScHeaderFooterTextCursor extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc) ; @@ -131,6 +133,7 @@ public class ScHeaderFooterTextCursor extends TestCase { * <code>com.sun.star.text.TextCursor</code>. * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java index 8220a9eadfd8..8769f18f72f1 100644 --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java @@ -84,6 +84,7 @@ public class ScHeaderFooterTextObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -101,6 +102,7 @@ public class ScHeaderFooterTextObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc); @@ -136,6 +138,7 @@ public class ScHeaderFooterTextObj extends TestCase { * </ul> * @see com.sun.star.text.Text */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java index d509425e1b36..6d94824d7374 100644 --- a/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java +++ b/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java @@ -55,6 +55,7 @@ public class ScImportDescriptorBase extends TestCase { * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -80,6 +81,7 @@ public class ScImportDescriptorBase extends TestCase { * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface @@ -100,6 +102,7 @@ public class ScImportDescriptorBase extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override public TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java index 1a010e3cca5a..402af6a7c92e 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java @@ -46,6 +46,7 @@ public class ScIndexEnumeration_CellAnnotationsEnumeration extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -63,12 +64,14 @@ public class ScIndexEnumeration_CellAnnotationsEnumeration extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc); util.DesktopTools.closeDoc(oComp); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java index 3de7073193a2..e7d96f121bae 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java @@ -43,7 +43,8 @@ public class ScIndexEnumeration_CellAreaLinksEnumeration extends TestCase { /** * Creates Spreadsheet document. */ - protected void initialize( TestParameters tParam, PrintWriter log ) { + @Override +protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -60,6 +61,7 @@ public class ScIndexEnumeration_CellAreaLinksEnumeration extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface @@ -68,6 +70,7 @@ public class ScIndexEnumeration_CellAreaLinksEnumeration extends TestCase { } + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log){ diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java index 9791996f1e26..7e7072f1026a 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java @@ -47,6 +47,7 @@ public class ScIndexEnumeration_DDELinksEnumeration extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -64,6 +65,7 @@ public class ScIndexEnumeration_DDELinksEnumeration extends TestCase { /** * Disposes Spreadsheet document and testdocument. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime. @@ -72,6 +74,7 @@ public class ScIndexEnumeration_DDELinksEnumeration extends TestCase { util.DesktopTools.closeDoc(oDoc); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java index 5663525fd5b9..bb26df369b06 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java @@ -48,6 +48,7 @@ public class ScIndexEnumeration_DataPilotFieldsEnumeration extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -65,12 +66,14 @@ public class ScIndexEnumeration_DataPilotFieldsEnumeration extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSheetDoc) ; util.DesktopTools.closeDoc(oComp); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java index f7430f0f159e..e069a1aabe01 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java @@ -77,6 +77,7 @@ public class ScIndexEnumeration_DataPilotItemsEnumeration /** * Creates Spreadsheet document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -94,6 +95,7 @@ public class ScIndexEnumeration_DataPilotItemsEnumeration /** * Disposes Spreadsheet document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xSheetDoc "); @@ -117,6 +119,7 @@ public class ScIndexEnumeration_DataPilotItemsEnumeration * @see com.sun.star.sheet.XDataPilotTablesSupplier * @see com.sun.star.sheet.XDataPilotDescriptor */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java index e204bfa45a3a..c99b1311bb65 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java @@ -48,6 +48,7 @@ public class ScIndexEnumeration_DataPilotTablesEnumeration extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -65,12 +66,14 @@ public class ScIndexEnumeration_DataPilotTablesEnumeration extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSheetDoc) ; util.DesktopTools.closeDoc(oComp); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java index 5c1362c166eb..da2d518d51d8 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java @@ -44,6 +44,7 @@ public class ScIndexEnumeration_DatabaseRangesEnumeration extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -61,12 +62,14 @@ public class ScIndexEnumeration_DatabaseRangesEnumeration extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; util.DesktopTools.closeDoc(oComp); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration.java index 29c2959b37b6..4111ef5f926b 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration.java @@ -39,6 +39,7 @@ public class ScIndexEnumeration_FunctionDescriptionEnumeration extends TestCase /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -56,12 +57,14 @@ public class ScIndexEnumeration_FunctionDescriptionEnumeration extends TestCase /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; util.DesktopTools.closeDoc(oComp); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java index afaa418eefd8..910f0d433ded 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java @@ -41,6 +41,7 @@ public class ScIndexEnumeration_LabelRangesEnumeration extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -58,12 +59,14 @@ public class ScIndexEnumeration_LabelRangesEnumeration extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; util.DesktopTools.closeDoc(oComp); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java index 49ad1bb55d07..b78a980a7771 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java @@ -42,6 +42,7 @@ public class ScIndexEnumeration_NamedRangesEnumeration extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -58,12 +59,14 @@ public class ScIndexEnumeration_NamedRangesEnumeration extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; util.DesktopTools.closeDoc(oComp); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java index b59fcafd8690..14703a65b8f7 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java @@ -47,6 +47,7 @@ public class ScIndexEnumeration_ScenariosEnumeration extends TestCase { /** * Creates Spreadsheet document. */ + @Override public void initialize( TestParameters Param, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -63,12 +64,14 @@ public class ScIndexEnumeration_ScenariosEnumeration extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc) ; util.DesktopTools.closeDoc(oComp); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { log.println("getting sheets"); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java index 84fc296f74e2..6e94cb597870 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java @@ -44,6 +44,7 @@ public class ScIndexEnumeration_SheetCellRangesEnumeration extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -62,6 +63,7 @@ public class ScIndexEnumeration_SheetCellRangesEnumeration extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = @@ -69,6 +71,7 @@ public class ScIndexEnumeration_SheetCellRangesEnumeration extends TestCase { util.DesktopTools.closeDoc(oComp); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java index 368c29ccf674..14cdd0d913d9 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java @@ -45,6 +45,7 @@ public class ScIndexEnumeration_SheetLinksEnumeration extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -61,12 +62,14 @@ public class ScIndexEnumeration_SheetLinksEnumeration extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSheetDoc) ; util.DesktopTools.closeDoc(oComp); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java index 7395f563f0ed..b6ef6302ae67 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java @@ -45,6 +45,7 @@ public class ScIndexEnumeration_SpreadsheetViewPanesEnumeration extends TestCase /** * Creates Spreadsheet document. */ + @Override public void initialize( TestParameters Param, PrintWriter log ) { // get a soffice factory object SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -61,12 +62,14 @@ public class ScIndexEnumeration_SpreadsheetViewPanesEnumeration extends TestCase /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println("disposing xSpreadsheetDocument"); XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSpreadsheetDoc); util.DesktopTools.closeDoc(oComp); } + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XModel xm = UnoRuntime.queryInterface(XModel.class, xSpreadsheetDoc); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java index df734d4a5210..3ca18f220252 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java @@ -39,6 +39,7 @@ public class ScIndexEnumeration_SpreadsheetsEnumeration extends TestCase { /** * Creates Spreadsheet document. */ + @Override public void initialize( TestParameters Param, PrintWriter log ) { // get a soffice factory object @@ -55,12 +56,14 @@ public class ScIndexEnumeration_SpreadsheetsEnumeration extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println("disposing xSpreadsheetDocument"); XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSpreadsheetDoc); util.DesktopTools.closeDoc(oComp); } + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { log.println("getting sheets"); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java index 52cd6c493d94..f0885ad2e70b 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java @@ -47,6 +47,7 @@ public class ScIndexEnumeration_SubTotalFieldsEnumeration extends TestCase { /** * Creates Spreadsheet document. */ + @Override public void initialize( TestParameters Param, PrintWriter log ) { // creation of the testobject here // first we write what we are intend to do to log file @@ -67,12 +68,14 @@ public class ScIndexEnumeration_SubTotalFieldsEnumeration extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc) ; util.DesktopTools.closeDoc(oComp); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { log.println("getting sheets"); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java index 02e758370741..19f8f15a4132 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java @@ -39,6 +39,7 @@ public class ScIndexEnumeration_TableAutoFormatEnumeration extends TestCase{ /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -55,6 +56,7 @@ public class ScIndexEnumeration_TableAutoFormatEnumeration extends TestCase{ /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface @@ -62,6 +64,7 @@ public class ScIndexEnumeration_TableAutoFormatEnumeration extends TestCase{ util.DesktopTools.closeDoc(oComp); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java index 8d740bab68c6..a46139417843 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java @@ -50,6 +50,7 @@ public class ScIndexEnumeration_TableChartsEnumeration extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -67,12 +68,14 @@ public class ScIndexEnumeration_TableChartsEnumeration extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSheetDoc); util.DesktopTools.closeDoc(oComp); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XSpreadsheet oSheet=null; diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java index 71efae8d2e19..137bd34c2026 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java @@ -45,6 +45,7 @@ public class ScIndexEnumeration_TableColumnsEnumeration extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -62,12 +63,14 @@ public class ScIndexEnumeration_TableColumnsEnumeration extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; util.DesktopTools.closeDoc(oComp); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java index 08cab52fbb57..a31fd05d5236 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java @@ -49,6 +49,7 @@ public class ScIndexEnumeration_TableConditionalEntryEnumeration extends TestCas /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -66,12 +67,14 @@ public class ScIndexEnumeration_TableConditionalEntryEnumeration extends TestCas /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc) ; util.DesktopTools.closeDoc(oComp); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java index 41c76ba825d9..f6d55da63db8 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java @@ -45,6 +45,7 @@ public class ScIndexEnumeration_TableRowsEnumeration extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -61,12 +62,14 @@ public class ScIndexEnumeration_TableRowsEnumeration extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; util.DesktopTools.closeDoc(oComp); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java index fb6f759074dd..63975f4612d3 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java @@ -59,6 +59,7 @@ public class ScIndexEnumeration_TextFieldEnumeration extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -76,6 +77,7 @@ public class ScIndexEnumeration_TextFieldEnumeration extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc); @@ -90,6 +92,7 @@ public class ScIndexEnumeration_TextFieldEnumeration extends TestCase { * by <code>XTextFieldsSupplier</code> interface of a cell * and <code>XEnumerationSupplier</code> interface .<p> */ + @Override protected synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java index 9f19534ba7ee..1dd858706337 100644 --- a/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java @@ -54,6 +54,7 @@ public class ScLabelRangeObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -71,6 +72,7 @@ public class ScLabelRangeObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; @@ -89,6 +91,7 @@ public class ScLabelRangeObj extends TestCase { * @see com.sun.star.sheet.LabelRange * @see com.sun.star.sheet.XLabelRanges */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java index 9b17ebd8aebd..4afa7c552e9a 100644 --- a/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java @@ -57,6 +57,7 @@ public class ScLabelRangesObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -74,6 +75,7 @@ public class ScLabelRangesObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; @@ -91,6 +93,7 @@ public class ScLabelRangesObj extends TestCase { * @see com.sun.star.sheet.LabelRanges * @see com.sun.star.sheet.XLabelRanges */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/ScModelObj.java b/qadevOOo/tests/java/mod/_sc/ScModelObj.java index 4dd06f283c3e..1b58a4705a0b 100644 --- a/qadevOOo/tests/java/mod/_sc/ScModelObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScModelObj.java @@ -80,6 +80,7 @@ public class ScModelObj extends TestCase { /** * Disposes Spreadsheet documents. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xSheetDoc "); @@ -113,6 +114,7 @@ public class ScModelObj extends TestCase { * spreadsheet)</li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { // creation of the testobject here diff --git a/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java index b7d70df6b7b8..d7a1f80c8f36 100644 --- a/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java @@ -60,6 +60,7 @@ public class ScNamedRangeObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -77,6 +78,7 @@ public class ScNamedRangeObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSheetDoc) ; @@ -97,6 +99,7 @@ public class ScNamedRangeObj extends TestCase { * created range) </li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java index c6ca1e143e5a..45f0454bee27 100644 --- a/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java @@ -63,6 +63,7 @@ public class ScNamedRangesObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -79,6 +80,7 @@ public class ScNamedRangesObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; @@ -100,6 +102,7 @@ public class ScNamedRangesObj extends TestCase { * </ul> * @see com.sun.star.sheet.NamedRanges */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java b/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java index 5177c8e666af..294a0d4a8902 100644 --- a/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java @@ -50,6 +50,7 @@ public class ScRecentFunctionsObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -66,6 +67,7 @@ public class ScRecentFunctionsObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSheetDoc) ; @@ -83,6 +85,7 @@ public class ScRecentFunctionsObj extends TestCase { * {@link ifc.sheet._XRecentFunctions}(the second created instance)</li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java b/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java index cceb170437c9..10bf6ee168ce 100644 --- a/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java @@ -63,6 +63,7 @@ public class ScScenariosObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override public void initialize( TestParameters Param, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -79,6 +80,7 @@ public class ScScenariosObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc) ; @@ -102,6 +104,7 @@ public class ScScenariosObj extends TestCase { * @see com.sun.star.sheet.Scenarios * @see com.sun.star.sheet.XScenariosSupplier */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { log.println("getting sheets"); diff --git a/qadevOOo/tests/java/mod/_sc/ScShapeObj.java b/qadevOOo/tests/java/mod/_sc/ScShapeObj.java index 0138ecdb7bf0..f1521246323d 100644 --- a/qadevOOo/tests/java/mod/_sc/ScShapeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScShapeObj.java @@ -36,6 +36,7 @@ public class ScShapeObj extends TestCase { static XComponent xSheetDoc; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -50,6 +51,7 @@ public class ScShapeObj extends TestCase { } } + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); util.DesktopTools.closeDoc(xSheetDoc); @@ -74,6 +76,7 @@ public class ScShapeObj extends TestCase { * service. </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java b/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java index deab0f36b670..104a72bf17e4 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java @@ -70,6 +70,7 @@ public class ScSheetLinkObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -86,6 +87,7 @@ public class ScSheetLinkObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSheetDoc); @@ -103,6 +105,7 @@ public class ScSheetLinkObj extends TestCase { * @see com.sun.star.sheet.SheetLink * @see com.sun.star.sheet.XSheetLinkable */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java b/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java index 703ca046d318..fadfe7434e02 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java @@ -58,6 +58,7 @@ public class ScSheetLinksObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -74,6 +75,7 @@ public class ScSheetLinksObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSheetDoc) ; @@ -91,6 +93,7 @@ public class ScSheetLinksObj extends TestCase { * @see com.sun.star.sheet.SheetLink * @see com.sun.star.sheet.XSheetLinkable */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java index 1cf2e4ca0374..5415366efc30 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java +++ b/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java @@ -57,6 +57,7 @@ public class ScSortDescriptorBase extends TestCase { * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -82,6 +83,7 @@ public class ScSortDescriptorBase extends TestCase { * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface @@ -102,6 +104,7 @@ public class ScSortDescriptorBase extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override public TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettings.java b/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettings.java index 49d116d45ac6..30703b26b813 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettings.java +++ b/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettings.java @@ -47,6 +47,7 @@ public class ScSpreadsheetSettings extends TestCase { * Creates an instance of the service * <code>com.sun.star.sheet.GlobalSheetSettings</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj.java b/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj.java index 9dd6d7e84330..0e9106856c6d 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj.java @@ -50,6 +50,7 @@ public class ScSpreadsheetSettingsObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -67,6 +68,7 @@ public class ScSpreadsheetSettingsObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; @@ -78,6 +80,7 @@ public class ScSpreadsheetSettingsObj extends TestCase { * The spreadsheet document is the instance of the service * <code>com.sun.star.sheet.SpreadsheetDocumentSettings</code>. */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java b/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java index 260b73b92b93..126d35e4e831 100644 --- a/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java @@ -55,6 +55,7 @@ public class ScStyleFamiliesObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -71,6 +72,7 @@ public class ScStyleFamiliesObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc) ; @@ -86,6 +88,7 @@ public class ScStyleFamiliesObj extends TestCase { * @see com.sun.star.style.StyleFamilies * @see com.sun.star.style.XStyleFamiliesSupplier */ + @Override public TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java b/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java index 647e1c82e86c..7be503cfc9f5 100644 --- a/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java @@ -66,6 +66,7 @@ public class ScStyleFamilyObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -82,6 +83,7 @@ public class ScStyleFamilyObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc) ; @@ -111,6 +113,7 @@ public class ScStyleFamilyObj extends TestCase { * </ul> * @see com.sun.star.style.CellStyle */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { // creation of testobject here diff --git a/qadevOOo/tests/java/mod/_sc/ScStyleObj.java b/qadevOOo/tests/java/mod/_sc/ScStyleObj.java index 6eaafaf7fb3c..f7099412e383 100644 --- a/qadevOOo/tests/java/mod/_sc/ScStyleObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScStyleObj.java @@ -69,6 +69,7 @@ public class ScStyleObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -85,6 +86,7 @@ public class ScStyleObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSpreadsheetDoc); @@ -113,6 +115,7 @@ public class ScStyleObj extends TestCase { * @see com.sun.star.style.Style * @see com.sun.star.style.XStyleFamiliesSupplier */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java index f3a80469b429..244b57c753e7 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java +++ b/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java @@ -63,6 +63,7 @@ public class ScSubTotalDescriptorBase extends TestCase { /** * Creates Spreadsheet document. */ + @Override public void initialize( TestParameters Param, PrintWriter log ) { // creation of the testobject here // first we write what we are intend to do to log file @@ -83,6 +84,7 @@ public class ScSubTotalDescriptorBase extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc) ; @@ -98,6 +100,7 @@ public class ScSubTotalDescriptorBase extends TestCase { * @see com.sun.star.sheet.XSubTotalCalculatable * @see com.sun.star.sheet.SubTotalDescriptor */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { log.println("getting sheets"); diff --git a/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java index 376953e0f0f4..6cdfe325ad51 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java @@ -58,6 +58,7 @@ public class ScSubTotalFieldObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override public void initialize( TestParameters Param, PrintWriter log ) { // creation of the testobject here // first we write what we are intend to do to log file @@ -78,6 +79,7 @@ public class ScSubTotalFieldObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc) ; @@ -95,6 +97,7 @@ public class ScSubTotalFieldObj extends TestCase { * @see com.sun.star.sheet.XSubTotalCalculatable * @see com.sun.star.sheet.SubTotalField */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { log.println("getting sheets"); diff --git a/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java b/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java index 51a3580ac3d4..59e809ff6b7a 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java @@ -89,6 +89,7 @@ public class ScTabViewObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override public void initialize( TestParameters Param, PrintWriter log ) { // get a soffice factory object @@ -110,6 +111,7 @@ public class ScTabViewObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSpreadsheetDoc) ; @@ -133,6 +135,7 @@ public class ScTabViewObj extends TestCase { * @see com.sun.star.frame.XModel * @see com.sun.star.sheet.SpreadsheetView */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XDrawPage oDrawPage = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java b/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java index f4fb466f5dcb..72cc8cb38f4a 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java @@ -64,6 +64,7 @@ public class ScTableColumnObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -81,6 +82,7 @@ public class ScTableColumnObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; @@ -103,6 +105,7 @@ public class ScTableColumnObj extends TestCase { * @see com.sun.star.table.XColumnRowRange * @see com.sun.star.table.TableColumn */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java b/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java index b00f162a6e60..d2d49551a16d 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java @@ -65,6 +65,7 @@ public class ScTableColumnsObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -82,6 +83,7 @@ public class ScTableColumnsObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; @@ -97,6 +99,7 @@ public class ScTableColumnsObj extends TestCase { * @see com.sun.star.table.XColumnRowRange * @see com.sun.star.table.TableColumns */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java b/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java index f799f33d1056..e2235f5cc331 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java @@ -63,6 +63,7 @@ public class ScTableConditionalEntry extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -80,6 +81,7 @@ public class ScTableConditionalEntry extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc) ; @@ -99,6 +101,7 @@ public class ScTableConditionalEntry extends TestCase { * @see com.sun.star.sheet.XSheetConditionalEntries * @see com.sun.star.sheet.TableConditionalEntry */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java b/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java index b18cb869ee12..589b70b19e75 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java @@ -68,6 +68,7 @@ public class ScTableConditionalFormat extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -85,6 +86,7 @@ public class ScTableConditionalFormat extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc) ; @@ -102,6 +104,7 @@ public class ScTableConditionalFormat extends TestCase { * <code>com.sun.star.sheet.TableConditionalFormat</code>. * @see com.sun.star.sheet.TableConditionalFormat */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java b/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java index a32ece10babd..0a4fe2dd5ccc 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java @@ -61,6 +61,7 @@ public class ScTableRowObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -78,6 +79,7 @@ public class ScTableRowObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; @@ -99,6 +101,7 @@ public class ScTableRowObj extends TestCase { * @see com.sun.star.table.XColumnRowRange * @see com.sun.star.table.TableRow */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScTableRowsObj.java b/qadevOOo/tests/java/mod/_sc/ScTableRowsObj.java index 992cc63ccbef..a70cd7394e10 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableRowsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableRowsObj.java @@ -62,6 +62,7 @@ public class ScTableRowsObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -78,6 +79,7 @@ public class ScTableRowsObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc) ; @@ -93,6 +95,7 @@ public class ScTableRowsObj extends TestCase { * @see com.sun.star.table.XColumnRowRange * @see com.sun.star.table.TableRows */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java b/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java index d80d60f277cf..4f99925d27ef 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java @@ -125,6 +125,7 @@ public class ScTableSheetObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -143,6 +144,7 @@ public class ScTableSheetObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xSheetDoc "); @@ -180,6 +182,7 @@ public class ScTableSheetObj extends TestCase { * </ul> * @see com.sun.star.sheet.XArrayFormulaRange */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java b/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java index accd5c3e7575..c167fd882584 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java @@ -65,6 +65,7 @@ public class ScTableSheetsObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override public void initialize( TestParameters Param, PrintWriter log ) { // get a soffice factory object @@ -81,6 +82,7 @@ public class ScTableSheetsObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println("disposing xSpreadsheetDocument"); XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSpreadsheetDoc); @@ -106,6 +108,7 @@ public class ScTableSheetsObj extends TestCase { * @see com.sun.star.sheet.XSpreadsheetDocument * @see com.sun.star.sheet.Spreadsheet */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); diff --git a/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java b/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java index 8321c59eb45f..1b7efbb4c925 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java @@ -59,6 +59,7 @@ public class ScTableValidationObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -76,6 +77,7 @@ public class ScTableValidationObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xSheetDoc " ); XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc) ; @@ -90,6 +92,7 @@ public class ScTableValidationObj extends TestCase { * is the instance of the service <code>com.sun.star.sheet.TableValidation</code>. * @see com.sun.star.sheet.TableValidation */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java index 01f45b995f7a..1e3624e8d3ff 100644 --- a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java @@ -46,6 +46,7 @@ public class ScUniqueCellFormatsEnumeration extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -64,10 +65,12 @@ public class ScUniqueCellFormatsEnumeration extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { util.DesktopTools.closeDoc(xSheetDoc); } + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("Getting the first sheet"); diff --git a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java index 4ad6f34ce751..5c9376a589e0 100644 --- a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java @@ -45,6 +45,7 @@ public class ScUniqueCellFormatsObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -63,10 +64,12 @@ public class ScUniqueCellFormatsObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { util.DesktopTools.closeDoc(xSheetDoc); } + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("Getting the first sheet"); diff --git a/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java b/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java index 57ca9dc9e38d..d140c786b1da 100644 --- a/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java @@ -69,6 +69,7 @@ public class ScViewPaneObj extends TestCase { /** * Creates Spreadsheet document. */ + @Override public void initialize( TestParameters Param, PrintWriter log ) { // get a soffice factory object SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -85,6 +86,7 @@ public class ScViewPaneObj extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println("disposing xSpreadsheetDocument"); XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSpreadsheetDoc); @@ -106,6 +108,7 @@ public class ScViewPaneObj extends TestCase { * </ul> * @see com.sun.star.frame.XModel */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XDrawPage oDrawPage; diff --git a/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java b/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java index 58b70add46ff..5d2979d2a8d6 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java @@ -72,6 +72,7 @@ public class XMLContentExporter extends TestCase { /** * New spreadsheet document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -85,6 +86,7 @@ public class XMLContentExporter extends TestCase { } } + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xCalcDoc " ); util.DesktopTools.closeDoc(xSheetDoc); @@ -111,6 +113,7 @@ public class XMLContentExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF() ; diff --git a/qadevOOo/tests/java/mod/_sc/XMLContentImporter.java b/qadevOOo/tests/java/mod/_sc/XMLContentImporter.java index 314ec72816cf..6d8cbecf5eec 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLContentImporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLContentImporter.java @@ -67,6 +67,7 @@ public class XMLContentImporter extends TestCase { /** * New spreadsheet document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -85,6 +86,7 @@ public class XMLContentImporter extends TestCase { /** * Spreadsheet document destroyed. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing document " ); util.DesktopTools.closeDoc(comp); @@ -110,6 +112,7 @@ public class XMLContentImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/XMLExporter.java b/qadevOOo/tests/java/mod/_sc/XMLExporter.java index dd00dc9c8551..d8b9b329e21f 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLExporter.java @@ -70,6 +70,7 @@ public class XMLExporter extends TestCase { /** * New spreadsheet document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -85,6 +86,7 @@ public class XMLExporter extends TestCase { /** * Spreadsheet document disposed */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xCalcDoc " ); util.DesktopTools.closeDoc(xSheetDoc); @@ -110,6 +112,7 @@ public class XMLExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF() ; diff --git a/qadevOOo/tests/java/mod/_sc/XMLImporter.java b/qadevOOo/tests/java/mod/_sc/XMLImporter.java index e96f919ceb33..6f54e1a21dfa 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLImporter.java @@ -66,6 +66,7 @@ public class XMLImporter extends TestCase { /** * New spreadsheet document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -84,6 +85,7 @@ public class XMLImporter extends TestCase { /** * Spreadsheet document destroyed. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing document " ); util.DesktopTools.closeDoc(xSheetDoc); @@ -108,6 +110,7 @@ public class XMLImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java index dfa6fdc6c4ca..f2e9e88a6176 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java @@ -68,6 +68,7 @@ public class XMLMetaExporter extends TestCase { /** * New spreadsheet document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -84,6 +85,7 @@ public class XMLMetaExporter extends TestCase { /** * Spreadsheet document disposed */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xCalcDoc " ); util.DesktopTools.closeDoc(xSheetDoc); @@ -110,6 +112,7 @@ public class XMLMetaExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java index 603279c2cc73..721a87435c4a 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java @@ -68,6 +68,7 @@ public class XMLMetaImporter extends TestCase { /** * New spreadsheet document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -86,6 +87,7 @@ public class XMLMetaImporter extends TestCase { /** * Spreadsheet document destroyed. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing document " ); util.DesktopTools.closeDoc(comp); @@ -111,6 +113,7 @@ public class XMLMetaImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java index 420fe4d4b1c8..f2b80392ed16 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java @@ -68,6 +68,7 @@ public class XMLSettingsExporter extends TestCase { /** * New spreadsheet document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -84,6 +85,7 @@ public class XMLSettingsExporter extends TestCase { /** * Spreadsheet document disposed */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xCalcDoc " ); util.DesktopTools.closeDoc(xSheetDoc); @@ -109,6 +111,7 @@ public class XMLSettingsExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java index 3a25b689b34c..28aca586e30b 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java @@ -69,6 +69,7 @@ public class XMLSettingsImporter extends TestCase { /** * New spreadsheet document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -87,6 +88,7 @@ public class XMLSettingsImporter extends TestCase { /** * Spreadsheet document destroyed. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing document " ); util.DesktopTools.closeDoc(comp); @@ -112,6 +114,7 @@ public class XMLSettingsImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java index 5de216d40ee8..d105a475fa4b 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java @@ -70,6 +70,7 @@ public class XMLStylesExporter extends TestCase { /** * New spreadsheet document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -86,6 +87,7 @@ public class XMLStylesExporter extends TestCase { /** * Spreadsheet document disposed */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xCalcDoc " ); util.DesktopTools.closeDoc(xSheetDoc); @@ -112,6 +114,7 @@ public class XMLStylesExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); diff --git a/qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java index fd067f92481b..e9c69b1bac61 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java @@ -68,6 +68,7 @@ public class XMLStylesImporter extends TestCase { /** * New spreadsheet document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -86,6 +87,7 @@ public class XMLStylesImporter extends TestCase { /** * Spreadsheet document destroyed. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing document " ); util.DesktopTools.closeDoc(comp); @@ -111,6 +113,7 @@ public class XMLStylesImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sch/AccArea.java b/qadevOOo/tests/java/mod/_sch/AccArea.java index 785ec8f1c15e..c19628bb7ebe 100644 --- a/qadevOOo/tests/java/mod/_sch/AccArea.java +++ b/qadevOOo/tests/java/mod/_sch/AccArea.java @@ -41,6 +41,7 @@ public class AccArea extends TestCase { XChartDocument xChartDoc = null; + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -97,6 +98,7 @@ public class AccArea extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); diff --git a/qadevOOo/tests/java/mod/_sch/AccAxis.java b/qadevOOo/tests/java/mod/_sch/AccAxis.java index 4dc8907a996c..b6fb88289b33 100644 --- a/qadevOOo/tests/java/mod/_sch/AccAxis.java +++ b/qadevOOo/tests/java/mod/_sch/AccAxis.java @@ -41,6 +41,7 @@ public class AccAxis extends TestCase { XChartDocument xChartDoc = null; + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -95,6 +96,7 @@ public class AccAxis extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); diff --git a/qadevOOo/tests/java/mod/_sch/AccDataPoint.java b/qadevOOo/tests/java/mod/_sch/AccDataPoint.java index 733c60d958c7..faa126a37364 100644 --- a/qadevOOo/tests/java/mod/_sch/AccDataPoint.java +++ b/qadevOOo/tests/java/mod/_sch/AccDataPoint.java @@ -41,6 +41,7 @@ public class AccDataPoint extends TestCase { XChartDocument xChartDoc = null; + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -96,6 +97,7 @@ public class AccDataPoint extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); diff --git a/qadevOOo/tests/java/mod/_sch/AccDataSeries.java b/qadevOOo/tests/java/mod/_sch/AccDataSeries.java index 4a6fbad30243..dbb3b05dfdbb 100644 --- a/qadevOOo/tests/java/mod/_sch/AccDataSeries.java +++ b/qadevOOo/tests/java/mod/_sch/AccDataSeries.java @@ -41,6 +41,7 @@ public class AccDataSeries extends TestCase { XChartDocument xChartDoc = null; + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -96,6 +97,7 @@ public class AccDataSeries extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); diff --git a/qadevOOo/tests/java/mod/_sch/AccDiagram.java b/qadevOOo/tests/java/mod/_sch/AccDiagram.java index 03c23b1f37d3..2fb633870748 100644 --- a/qadevOOo/tests/java/mod/_sch/AccDiagram.java +++ b/qadevOOo/tests/java/mod/_sch/AccDiagram.java @@ -41,6 +41,7 @@ public class AccDiagram extends TestCase { XChartDocument xChartDoc = null; + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -96,6 +97,7 @@ public class AccDiagram extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); diff --git a/qadevOOo/tests/java/mod/_sch/AccFloor.java b/qadevOOo/tests/java/mod/_sch/AccFloor.java index e678189fb123..b9105df020f7 100644 --- a/qadevOOo/tests/java/mod/_sch/AccFloor.java +++ b/qadevOOo/tests/java/mod/_sch/AccFloor.java @@ -42,6 +42,7 @@ public class AccFloor extends TestCase { XChartDocument xChartDoc = null; + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -120,6 +121,7 @@ public class AccFloor extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); diff --git a/qadevOOo/tests/java/mod/_sch/AccGrid.java b/qadevOOo/tests/java/mod/_sch/AccGrid.java index 6007c92c1681..207581ff428e 100644 --- a/qadevOOo/tests/java/mod/_sch/AccGrid.java +++ b/qadevOOo/tests/java/mod/_sch/AccGrid.java @@ -41,6 +41,7 @@ public class AccGrid extends TestCase { XChartDocument xChartDoc = null; + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -97,6 +98,7 @@ public class AccGrid extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); diff --git a/qadevOOo/tests/java/mod/_sch/AccLegend.java b/qadevOOo/tests/java/mod/_sch/AccLegend.java index 539f27b08ecc..01b0e091fa84 100644 --- a/qadevOOo/tests/java/mod/_sch/AccLegend.java +++ b/qadevOOo/tests/java/mod/_sch/AccLegend.java @@ -41,6 +41,7 @@ public class AccLegend extends TestCase { XChartDocument xChartDoc = null; + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -95,6 +96,7 @@ public class AccLegend extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); diff --git a/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java b/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java index ae2f8b55ec15..0ef4c0f93845 100644 --- a/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java +++ b/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java @@ -41,6 +41,7 @@ public class AccLegendEntry extends TestCase { XChartDocument xChartDoc = null; + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -95,6 +96,7 @@ public class AccLegendEntry extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); diff --git a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java index bca4797461ed..f0d3fa889a33 100644 --- a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java +++ b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java @@ -42,6 +42,7 @@ public class AccStatisticsObject extends TestCase { XChartDocument xChartDoc = null; + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -99,6 +100,7 @@ public class AccStatisticsObject extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); diff --git a/qadevOOo/tests/java/mod/_sch/AccTitle.java b/qadevOOo/tests/java/mod/_sch/AccTitle.java index 526f0188cf5e..d1c7d25eb852 100644 --- a/qadevOOo/tests/java/mod/_sch/AccTitle.java +++ b/qadevOOo/tests/java/mod/_sch/AccTitle.java @@ -41,6 +41,7 @@ public class AccTitle extends TestCase { XChartDocument xChartDoc = null; + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -95,6 +96,7 @@ public class AccTitle extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); diff --git a/qadevOOo/tests/java/mod/_sch/AccWall.java b/qadevOOo/tests/java/mod/_sch/AccWall.java index 890d69d92c4f..c620e1c470b3 100644 --- a/qadevOOo/tests/java/mod/_sch/AccWall.java +++ b/qadevOOo/tests/java/mod/_sch/AccWall.java @@ -42,6 +42,7 @@ public class AccWall extends TestCase { XChartDocument xChartDoc = null; + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -119,6 +120,7 @@ public class AccWall extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); diff --git a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java index 0c40cbe520af..9cf450c544cb 100644 --- a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java +++ b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java @@ -41,6 +41,7 @@ public class AccessibleDocumentView extends TestCase { XChartDocument xChartDoc = null; + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -86,6 +87,7 @@ public class AccessibleDocumentView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); @@ -103,6 +105,7 @@ public class AccessibleDocumentView extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java b/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java index 4e5efac69a74..1a8a7f20c857 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java @@ -57,6 +57,7 @@ public class ChXChartAxis extends TestCase { /** * Creates Chart document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -74,6 +75,7 @@ public class ChXChartAxis extends TestCase { /** * Disposes Chart document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); @@ -91,6 +93,7 @@ public class ChXChartAxis extends TestCase { * @see com.sun.star.chart.XAxisYSupplier * @see com.sun.star.chart.ChartAxis */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XPropertySet oObj = null; diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartData.java b/qadevOOo/tests/java/mod/_sch/ChXChartData.java index f3341bd9b709..7985996a0670 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartData.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartData.java @@ -45,6 +45,7 @@ public class ChXChartData extends TestCase { /** * Creates Chart document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -62,6 +63,7 @@ public class ChXChartData extends TestCase { /** * Disposes Chart document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); @@ -76,6 +78,7 @@ public class ChXChartData extends TestCase { * of the service <code>com.sun.star.chart.ChartData</code>. * @see com.sun.star.chart.ChartData */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { // get the Data diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java b/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java index f79ca800f572..9ef21056b8e0 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java @@ -48,6 +48,7 @@ public class ChXChartDataArray extends TestCase { /** * Creates Chart document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -65,6 +66,7 @@ public class ChXChartDataArray extends TestCase { /** * Disposes Chart document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); @@ -80,6 +82,7 @@ public class ChXChartDataArray extends TestCase { * <code>com.sun.star.chart.ChartDataArray</code>. * @see com.sun.star.chart.ChartDataArray */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { // get the Data diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java b/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java index 4730be8e9e02..1b3be1c6bcb4 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java @@ -66,6 +66,7 @@ public class ChXChartDocument extends TestCase { /** * Disposes Chart documents. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); @@ -105,6 +106,7 @@ public class ChXChartDocument extends TestCase { * @see com.sun.star.chart.XChartData * @see com.sun.star.chart.ChartDocument */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { // get a soffice factory object diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartView.java b/qadevOOo/tests/java/mod/_sch/ChXChartView.java index 9a04e9a1a82c..3b1edb11ab59 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartView.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartView.java @@ -56,6 +56,7 @@ public class ChXChartView extends TestCase { /** * Creates Chart document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -73,6 +74,7 @@ public class ChXChartView extends TestCase { /** * Disposes Chart document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); @@ -93,6 +95,7 @@ public class ChXChartView extends TestCase { * </ul> * @see com.sun.star.frame.XModel */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XController oObj = null; diff --git a/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java b/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java index edefbc25fed6..d6f2405b0679 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java +++ b/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java @@ -70,6 +70,7 @@ public class ChXDataPoint extends TestCase { /** * Creates Chart document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -89,6 +90,7 @@ public class ChXDataPoint extends TestCase { /** * Disposes Chart document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); @@ -114,6 +116,7 @@ public class ChXDataPoint extends TestCase { * {@link ifc.chart._Chart3DBarProperties}(the created bar-diagram)</li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XPropertySet oObj = null; diff --git a/qadevOOo/tests/java/mod/_sch/ChXDataRow.java b/qadevOOo/tests/java/mod/_sch/ChXDataRow.java index ac1967ef1f88..bf3bfdb0d435 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXDataRow.java +++ b/qadevOOo/tests/java/mod/_sch/ChXDataRow.java @@ -76,6 +76,7 @@ public class ChXDataRow extends TestCase { /** * Creates Chart document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -95,6 +96,7 @@ public class ChXDataRow extends TestCase { /** * Disposes Chart document. */ + @Override protected synchronized void cleanup( TestParameters tParam, PrintWriter log ) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); @@ -121,6 +123,7 @@ public class ChXDataRow extends TestCase { * {@link ifc.chart._Chart3DBarProperties}(the created bar-diagram)</li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XPropertySet oObj = null; diff --git a/qadevOOo/tests/java/mod/_sch/ChXDiagram.java b/qadevOOo/tests/java/mod/_sch/ChXDiagram.java index a9f64a035c6d..fdc658c5434f 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXDiagram.java +++ b/qadevOOo/tests/java/mod/_sch/ChXDiagram.java @@ -137,6 +137,7 @@ public class ChXDiagram extends TestCase { /** * Creates Spreadsheet document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -154,6 +155,7 @@ public class ChXDiagram extends TestCase { /** * Disposes Spreadsheet document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " closing xSheetDoc " ); util.DesktopTools.closeDoc(xSheetDoc); @@ -207,6 +209,7 @@ public class ChXDiagram extends TestCase { * @see com.sun.star.chart.Diagram * @see com.sun.star.chart.StockDiagram */ + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sch/ChartArea.java b/qadevOOo/tests/java/mod/_sch/ChartArea.java index 6a3b236e4122..b52d2d170aa0 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartArea.java +++ b/qadevOOo/tests/java/mod/_sch/ChartArea.java @@ -61,6 +61,7 @@ public class ChartArea extends TestCase { /** * Creates Chart document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -80,6 +81,7 @@ public class ChartArea extends TestCase { /** * Disposes Chart document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); @@ -95,6 +97,7 @@ public class ChartArea extends TestCase { * @see com.sun.star.chart.XChartDocument * @see com.sun.star.chart.ChartArea */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { // get the Area diff --git a/qadevOOo/tests/java/mod/_sch/ChartGrid.java b/qadevOOo/tests/java/mod/_sch/ChartGrid.java index aa9a78e5ddb1..418f3ee07204 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartGrid.java +++ b/qadevOOo/tests/java/mod/_sch/ChartGrid.java @@ -52,6 +52,7 @@ public class ChartGrid extends TestCase { /** * Creates Chart document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -69,6 +70,7 @@ public class ChartGrid extends TestCase { /** * Disposes Chart document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); @@ -86,6 +88,7 @@ public class ChartGrid extends TestCase { * @see com.sun.star.chart.XAxisXSupplier * @see com.sun.star.chart.ChartGrid */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XPropertySet oObj = null; XShape oDiagram = null; diff --git a/qadevOOo/tests/java/mod/_sch/ChartLegend.java b/qadevOOo/tests/java/mod/_sch/ChartLegend.java index 652386183aab..b544872dcf2a 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartLegend.java +++ b/qadevOOo/tests/java/mod/_sch/ChartLegend.java @@ -78,6 +78,7 @@ public class ChartLegend extends TestCase { /** * Creates Chart document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -97,6 +98,7 @@ public class ChartLegend extends TestCase { /** * Disposes Chart document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); @@ -111,6 +113,7 @@ public class ChartLegend extends TestCase { * diagram is the instance of the service * <code>com.sun.star.chart.ChartLegend</code>. */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XShape oObj = null; diff --git a/qadevOOo/tests/java/mod/_sch/ChartLine.java b/qadevOOo/tests/java/mod/_sch/ChartLine.java index 5f20dac3681e..b12ca1347865 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartLine.java +++ b/qadevOOo/tests/java/mod/_sch/ChartLine.java @@ -51,6 +51,7 @@ public class ChartLine extends TestCase { /** * Creates Chart document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -68,6 +69,7 @@ public class ChartLine extends TestCase { /** * Disposes Chart document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); @@ -84,6 +86,7 @@ public class ChartLine extends TestCase { * the service <code>com.sun.star.chart.ChartLine</code>. * @see com.sun.star.chart.ChartLine */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XPropertySet oObj = null; diff --git a/qadevOOo/tests/java/mod/_sch/ChartTitle.java b/qadevOOo/tests/java/mod/_sch/ChartTitle.java index 1556800e6f02..f933ad5f3d3b 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartTitle.java +++ b/qadevOOo/tests/java/mod/_sch/ChartTitle.java @@ -63,6 +63,7 @@ public class ChartTitle extends TestCase { /** * Creates Chart document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -80,6 +81,7 @@ public class ChartTitle extends TestCase { /** * Disposes Chart document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); @@ -94,6 +96,7 @@ public class ChartTitle extends TestCase { * The retrieved shape is the instance of the service * <code>com.sun.star.chart.ChartTitle</code>. */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { // get the Title diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java b/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java index 14dc7631a6af..6aa6607480d4 100644 --- a/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java +++ b/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java @@ -61,6 +61,7 @@ public class AccessibleDrawDocumentView extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -134,6 +135,7 @@ public class AccessibleDrawDocumentView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing Draw document"); util.DesktopTools.closeDoc(xDrawDoc); @@ -149,6 +151,7 @@ public class AccessibleDrawDocumentView extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java index ae830123c16a..7fe75461aa6b 100644 --- a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java +++ b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java @@ -59,6 +59,7 @@ public class AccessibleOutlineView extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -99,6 +100,7 @@ public class AccessibleOutlineView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log ) { log.println("disposing Impress document"); util.DesktopTools.closeDoc(xImpressDoc); @@ -114,6 +116,7 @@ public class AccessibleOutlineView extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java b/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java index da7c9ff8c2dc..93e2100209c5 100644 --- a/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java +++ b/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java @@ -59,6 +59,7 @@ public class AccessibleSlideView extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -106,6 +107,7 @@ public class AccessibleSlideView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log ) { log.println("disposing impress document"); util.DesktopTools.closeDoc(xImpressDoc); @@ -121,6 +123,7 @@ public class AccessibleSlideView extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java b/qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java index d2d383b894c1..9aed41fc284b 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java @@ -84,6 +84,7 @@ public class DrawController_DrawView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing impress documents"); util.DesktopTools.closeDoc(xDrawDoc); @@ -125,6 +126,7 @@ public class DrawController_DrawView extends TestCase { * @see com.sun.star.frame.XModel * @see com.sun.star.drawing.DrawingDocumentDrawView */ + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java b/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java index 2c910bcb981f..9b55bbd2fa18 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java @@ -88,6 +88,7 @@ public class DrawController_HandoutView extends TestCase { * <code>com.sun.star.frame.Desktop</code>. * @see com.sun.star.frame.Desktop */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop( @@ -100,6 +101,7 @@ public class DrawController_HandoutView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing impress documents"); util.DesktopTools.closeDoc(xDrawDoc); @@ -143,6 +145,7 @@ public class DrawController_HandoutView extends TestCase { * @see com.sun.star.frame.XModel * @see com.sun.star.drawing.DrawingDocumentDrawView */ + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java b/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java index eeaef89e1c0d..42feb43e810a 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java @@ -88,6 +88,7 @@ public class DrawController_NotesView extends TestCase { * <code>com.sun.star.frame.Desktop</code>. * @see com.sun.star.frame.Desktop */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop( @@ -100,6 +101,7 @@ public class DrawController_NotesView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing impress documents"); util.DesktopTools.closeDoc(xDrawDoc); @@ -143,6 +145,7 @@ public class DrawController_NotesView extends TestCase { * @see com.sun.star.frame.XModel * @see com.sun.star.drawing.DrawingDocumentDrawView */ + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java b/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java index 61d2e9fcf8ba..f48b6efe51d7 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java @@ -88,6 +88,7 @@ public class DrawController_OutlineView extends TestCase { * <code>com.sun.star.frame.Desktop</code>. * @see com.sun.star.frame.Desktop */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop( @@ -100,6 +101,7 @@ public class DrawController_OutlineView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing impress documents"); util.DesktopTools.closeDoc(xDrawDoc); @@ -143,6 +145,7 @@ public class DrawController_OutlineView extends TestCase { * @see com.sun.star.frame.XModel * @see com.sun.star.drawing.DrawingDocumentDrawView */ + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java b/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java index cebb7667dd47..73780a85681f 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java @@ -88,6 +88,7 @@ public class DrawController_PresentationView extends TestCase { * <code>com.sun.star.frame.Desktop</code>. * @see com.sun.star.frame.Desktop */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop( @@ -100,6 +101,7 @@ public class DrawController_PresentationView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing impress documents"); util.DesktopTools.closeDoc(xDrawDoc); @@ -143,6 +145,7 @@ public class DrawController_PresentationView extends TestCase { * @see com.sun.star.frame.XModel * @see com.sun.star.drawing.DrawingDocumentDrawView */ + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java b/qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java index ffdb88a03fb5..97364e784adb 100644 --- a/qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java +++ b/qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java @@ -51,6 +51,7 @@ public class SdDocLinkTargets extends TestCase { /** * Creates Drawing document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -69,6 +70,7 @@ public class SdDocLinkTargets extends TestCase { /** * Disposes Drawing document. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing xDrawDoc"); util.DesktopTools.closeDoc(xDrawDoc); @@ -82,6 +84,7 @@ public class SdDocLinkTargets extends TestCase { * @see com.sun.star.document.XLinkTargetSupplier * @see com.sun.star.document.LinkTargets */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sd/SdDrawPage.java b/qadevOOo/tests/java/mod/_sd/SdDrawPage.java index d391608b3e8e..e40efd57048d 100644 --- a/qadevOOo/tests/java/mod/_sd/SdDrawPage.java +++ b/qadevOOo/tests/java/mod/_sd/SdDrawPage.java @@ -89,6 +89,7 @@ public class SdDrawPage extends TestCase { /** * Creates Drawing document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -107,6 +108,7 @@ public class SdDrawPage extends TestCase { /** * Disposes Drawing document. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing xDrawDoc"); util.DesktopTools.closeDoc(xDrawDoc); @@ -134,6 +136,7 @@ public class SdDrawPage extends TestCase { * @see com.sun.star.drawing.DrawPage * @see com.sun.star.drawing.XDrawPagesSupplier */ + @Override protected synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java b/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java index 5ad6094a7c65..230e794b1042 100644 --- a/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java +++ b/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java @@ -61,6 +61,7 @@ public class SdDrawPagesAccess extends TestCase { /** * Creates Drawing document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -79,6 +80,7 @@ public class SdDrawPagesAccess extends TestCase { /** * Disposes Drawing document. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing xDrawDoc"); util.DesktopTools.closeDoc(xDrawDoc); @@ -92,6 +94,7 @@ public class SdDrawPagesAccess extends TestCase { * <code>com.sun.star.drawing.DrawPages</code>. * @see com.sun.star.drawing.DrawPages */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sd/SdGenericDrawPage.java b/qadevOOo/tests/java/mod/_sd/SdGenericDrawPage.java index 049e84938704..5c3d41639433 100644 --- a/qadevOOo/tests/java/mod/_sd/SdGenericDrawPage.java +++ b/qadevOOo/tests/java/mod/_sd/SdGenericDrawPage.java @@ -82,6 +82,7 @@ public class SdGenericDrawPage extends TestCase { /** * Creates Drawing document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -100,6 +101,7 @@ public class SdGenericDrawPage extends TestCase { /** * Disposes Drawing document. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing xDrawDoc"); util.DesktopTools.closeDoc(xDrawDoc); @@ -123,6 +125,7 @@ public class SdGenericDrawPage extends TestCase { * @see com.sun.star.drawing.DrawPage * @see com.sun.star.drawing.XDrawPagesSupplier */ + @Override protected synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sd/SdLayer.java b/qadevOOo/tests/java/mod/_sd/SdLayer.java index 4e09d7865515..866eac2359f0 100644 --- a/qadevOOo/tests/java/mod/_sd/SdLayer.java +++ b/qadevOOo/tests/java/mod/_sd/SdLayer.java @@ -56,6 +56,7 @@ public class SdLayer extends TestCase { /** * Creates Drawing document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -73,6 +74,7 @@ public class SdLayer extends TestCase { /** * Disposes Drawing document. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing xDrawDoc"); util.DesktopTools.closeDoc(xDrawDoc); @@ -85,6 +87,7 @@ public class SdLayer extends TestCase { * <code>com.sun.star.drawing.Layer</code>. * @see com.sun.star.drawing.Layer */ + @Override protected synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sd/SdLayerManager.java b/qadevOOo/tests/java/mod/_sd/SdLayerManager.java index 39101db98ef8..feaaa0246a94 100644 --- a/qadevOOo/tests/java/mod/_sd/SdLayerManager.java +++ b/qadevOOo/tests/java/mod/_sd/SdLayerManager.java @@ -66,6 +66,7 @@ public class SdLayerManager extends TestCase { /** * Creates Drawing document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -84,6 +85,7 @@ public class SdLayerManager extends TestCase { /** * Disposes Drawing document. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing xDrawDoc"); util.DesktopTools.closeDoc(xDrawDoc); @@ -105,6 +107,7 @@ public class SdLayerManager extends TestCase { * @see com.sun.star.drawing.XLayerSupplier * @see com.sun.star.drawing.LayerManager */ + @Override protected synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sd/SdMasterPage.java b/qadevOOo/tests/java/mod/_sd/SdMasterPage.java index 486ea3b85577..975c5a5e14e2 100644 --- a/qadevOOo/tests/java/mod/_sd/SdMasterPage.java +++ b/qadevOOo/tests/java/mod/_sd/SdMasterPage.java @@ -83,6 +83,7 @@ public class SdMasterPage extends TestCase { /** * Creates Drawing document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -101,6 +102,7 @@ public class SdMasterPage extends TestCase { /** * Disposes Drawing document. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing xDrawDoc"); util.DesktopTools.closeDoc(xDrawDoc); @@ -124,6 +126,7 @@ public class SdMasterPage extends TestCase { * </ul> * @see com.sun.star.drawing.XMasterPagesSupplier */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sd/SdMasterPagesAccess.java b/qadevOOo/tests/java/mod/_sd/SdMasterPagesAccess.java index 3008a51eaad5..33662cc3283b 100644 --- a/qadevOOo/tests/java/mod/_sd/SdMasterPagesAccess.java +++ b/qadevOOo/tests/java/mod/_sd/SdMasterPagesAccess.java @@ -55,6 +55,7 @@ public class SdMasterPagesAccess extends TestCase { /** * Creates Drawing document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -73,6 +74,7 @@ public class SdMasterPagesAccess extends TestCase { /** * Disposes Drawing document. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing xDrawDoc"); util.DesktopTools.closeDoc(xDrawDoc); @@ -87,6 +89,7 @@ public class SdMasterPagesAccess extends TestCase { * @see com.sun.star.drawing.XMasterPagesSupplier * @see com.sun.star.drawing.MasterPages */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java b/qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java index cb22180eb742..1d100d718f79 100644 --- a/qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java +++ b/qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java @@ -56,6 +56,7 @@ public class SdPageLinkTargets extends TestCase { /** * Creates Drawing document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -74,6 +75,7 @@ public class SdPageLinkTargets extends TestCase { /** * Disposes Drawing document. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing xDrawDoc"); util.DesktopTools.closeDoc(xDrawDoc); @@ -89,6 +91,7 @@ public class SdPageLinkTargets extends TestCase { * @see com.sun.star.document.XLinkTargetSupplier * @see com.sun.star.document.LinkTargets */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java b/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java index 4a2e68abe3e1..8a12b9a49534 100644 --- a/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java +++ b/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java @@ -85,6 +85,7 @@ public class SdUnoDrawView extends TestCase { * <code>com.sun.star.frame.Desktop</code>. * @see com.sun.star.frame.Desktop */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop( @@ -97,6 +98,7 @@ public class SdUnoDrawView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing draw documents"); util.DesktopTools.closeDoc(xDrawDoc); @@ -138,6 +140,7 @@ public class SdUnoDrawView extends TestCase { * @see com.sun.star.frame.XModel * @see com.sun.star.drawing.DrawingDocumentDrawView */ + @Override public synchronized lib.TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java b/qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java index 4ded8addd6ce..898af44eee57 100644 --- a/qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java +++ b/qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java @@ -80,6 +80,7 @@ public class SdUnoOutlineView extends TestCase { * Creates the instance of the service <code>com.sun.star.frame.Desktop</code>. * @see com.sun.star.frame.Desktop */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop( @@ -92,6 +93,7 @@ public class SdUnoOutlineView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing impress documents"); util.DesktopTools.closeDoc(xImpressDoc); @@ -123,6 +125,7 @@ public class SdUnoOutlineView extends TestCase { * </ul> * @see com.sun.star.frame.XModel */ + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java b/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java index 47e5f950a517..466b4374e06d 100644 --- a/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java +++ b/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java @@ -84,6 +84,7 @@ public class SdUnoPresView extends TestCase { * Creates the instance of the service <code>com.sun.star.frame.Desktop</code>. * @see com.sun.star.frame.Desktop */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop( @@ -96,6 +97,7 @@ public class SdUnoPresView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing impress documents"); util.DesktopTools.closeDoc(xImpressDoc); @@ -136,6 +138,7 @@ public class SdUnoPresView extends TestCase { * @see com.sun.star.frame.XModel * @see com.sun.star.drawing.DrawingDocumentDrawView */ + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoSlideView.java b/qadevOOo/tests/java/mod/_sd/SdUnoSlideView.java index 1b1dbe934956..ac3cb35b3eb6 100644 --- a/qadevOOo/tests/java/mod/_sd/SdUnoSlideView.java +++ b/qadevOOo/tests/java/mod/_sd/SdUnoSlideView.java @@ -52,6 +52,7 @@ public class SdUnoSlideView extends TestCase { * Creates the instance of the service <code>com.sun.star.frame.Desktop</code>. * @see com.sun.star.frame.Desktop */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop( @@ -64,6 +65,7 @@ public class SdUnoSlideView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing impress documents"); util.DesktopTools.closeDoc(xImpressDoc); @@ -95,6 +97,7 @@ public class SdUnoSlideView extends TestCase { * </ul> * @see com.sun.star.frame.XModel */ + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java index fbbe880a0e9d..fb1f79e4aac3 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java +++ b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java @@ -69,6 +69,7 @@ public class SdXCustomPresentation extends TestCase { /** * Creates Impress document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -88,6 +89,7 @@ public class SdXCustomPresentation extends TestCase { /** * Disposes Impress document. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing xImpressDoc"); util.DesktopTools.closeDoc(xImpressDoc); @@ -114,6 +116,7 @@ public class SdXCustomPresentation extends TestCase { * @see com.sun.star.presentation.XCustomPresentationSupplier * @see com.sun.star.presentation.CustomPresentation */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java index a62e4a74b2cc..8f48f000fa3f 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java +++ b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java @@ -62,6 +62,7 @@ public class SdXCustomPresentationAccess extends TestCase { /** * Creates Impress document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -80,6 +81,7 @@ public class SdXCustomPresentationAccess extends TestCase { /** * Disposes Impress document. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing xImpressDoc"); util.DesktopTools.closeDoc(xImpressDoc); @@ -112,6 +114,7 @@ public class SdXCustomPresentationAccess extends TestCase { * @see com.sun.star.lang.XSingleServiceFactory * @see com.sun.star.presentation.CustomPresentationAccess */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java b/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java index 518458706afe..6c548d67506d 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java +++ b/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java @@ -93,6 +93,7 @@ public class SdXImpressDocument extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println("disposing xImpressDoc"); util.DesktopTools.closeDoc(xImpressDoc); @@ -105,6 +106,7 @@ public class SdXImpressDocument extends TestCase { * <code>com.sun.star.presentation.PresentationDocument</code>. * @see com.sun.star.presentation.PresentationDocument */ + @Override public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sd/SdXPresentation.java b/qadevOOo/tests/java/mod/_sd/SdXPresentation.java index dc730216b203..ea20d01df373 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXPresentation.java +++ b/qadevOOo/tests/java/mod/_sd/SdXPresentation.java @@ -56,6 +56,7 @@ public class SdXPresentation extends TestCase { /** * Creates Impress document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -73,6 +74,7 @@ public class SdXPresentation extends TestCase { /** * Disposes Impress document. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing xImpressDoc"); util.DesktopTools.closeDoc(xImpressDoc); @@ -96,6 +98,7 @@ public class SdXPresentation extends TestCase { * @see com.sun.star.presentation.Presentation * @see com.sun.star.presentation.XCustomPresentationSupplier */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sd/SdXShape.java b/qadevOOo/tests/java/mod/_sd/SdXShape.java index 2facdb56d7b0..50bf57432843 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXShape.java +++ b/qadevOOo/tests/java/mod/_sd/SdXShape.java @@ -68,6 +68,7 @@ public class SdXShape extends TestCase { /** * Creates Drawing document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -85,6 +86,7 @@ public class SdXShape extends TestCase { /** * Disposes Drawing document. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing xDrawDoc"); util.DesktopTools.closeDoc(xDrawDoc); @@ -112,6 +114,7 @@ public class SdXShape extends TestCase { * @see com.sun.star.drawing.XDrawPagesSupplier * @see com.sun.star.drawing.Shape */ + @Override protected synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_servicemgr/uno/OServiceManager.java b/qadevOOo/tests/java/mod/_servicemgr/uno/OServiceManager.java index a29f64b73337..bc43d17ab822 100644 --- a/qadevOOo/tests/java/mod/_servicemgr/uno/OServiceManager.java +++ b/qadevOOo/tests/java/mod/_servicemgr/uno/OServiceManager.java @@ -86,6 +86,7 @@ public class OServiceManager extends TestCase { * and one of services contained in it is taken.</li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sfx/AppDispatchProvider.java b/qadevOOo/tests/java/mod/_sfx/AppDispatchProvider.java index d942bd231d59..007fde45c938 100644 --- a/qadevOOo/tests/java/mod/_sfx/AppDispatchProvider.java +++ b/qadevOOo/tests/java/mod/_sfx/AppDispatchProvider.java @@ -57,6 +57,7 @@ public class AppDispatchProvider extends TestCase { * {@link ifc.frame._XFrameLoader} </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sfx/DocumentTemplates.java b/qadevOOo/tests/java/mod/_sfx/DocumentTemplates.java index 0662caf684f0..f2a65f42f5bc 100644 --- a/qadevOOo/tests/java/mod/_sfx/DocumentTemplates.java +++ b/qadevOOo/tests/java/mod/_sfx/DocumentTemplates.java @@ -45,11 +45,13 @@ public class DocumentTemplates extends TestCase { XTextDocument xTextDoc; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { String aURL=util.utils.getFullTestURL("report2.stw"); xTextDoc = util.WriterTools.loadTextDoc(tParam.getMSF(),aURL); } + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); xTextDoc.dispose(); @@ -60,6 +62,7 @@ public class DocumentTemplates extends TestCase { * Creates an instance of the service * <code>com.sun.star.frame.DocumentTemplates</code>. */ + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sfx/FrameLoader.java b/qadevOOo/tests/java/mod/_sfx/FrameLoader.java index 223b34c810f8..b7aa4bc5da51 100644 --- a/qadevOOo/tests/java/mod/_sfx/FrameLoader.java +++ b/qadevOOo/tests/java/mod/_sfx/FrameLoader.java @@ -54,6 +54,7 @@ public class FrameLoader extends TestCase { * {@link ifc.frame._XFrameLoader} </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sfx/SfxMacroLoader.java b/qadevOOo/tests/java/mod/_sfx/SfxMacroLoader.java index 07ecf780d1fd..e3878055e374 100644 --- a/qadevOOo/tests/java/mod/_sfx/SfxMacroLoader.java +++ b/qadevOOo/tests/java/mod/_sfx/SfxMacroLoader.java @@ -57,6 +57,7 @@ public class SfxMacroLoader extends TestCase { * {@link ifc.frame._XFrameLoader} </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader.java b/qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader.java index cd73eed70b72..6bf6ba473751 100644 --- a/qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader.java +++ b/qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader.java @@ -45,6 +45,7 @@ public class DLLComponentLoader extends TestCase { /** * Does nothing. */ + @Override protected void initialize ( TestParameters Param, PrintWriter log) { } @@ -61,6 +62,7 @@ public class DLLComponentLoader extends TestCase { * <li> <code>'ImplementationName'</code> : Name of the implementation.</li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_simplereg/uno/SimpleRegistry.java b/qadevOOo/tests/java/mod/_simplereg/uno/SimpleRegistry.java index 4e0474605c93..8fd5b48bda1c 100644 --- a/qadevOOo/tests/java/mod/_simplereg/uno/SimpleRegistry.java +++ b/qadevOOo/tests/java/mod/_simplereg/uno/SimpleRegistry.java @@ -106,6 +106,7 @@ public class SimpleRegistry extends TestCase { * temp directory. </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object oInterface = null; diff --git a/qadevOOo/tests/java/mod/_simreg/SimpleRegistry.java b/qadevOOo/tests/java/mod/_simreg/SimpleRegistry.java index 8dfa8e397b3f..edafcccd5f9c 100644 --- a/qadevOOo/tests/java/mod/_simreg/SimpleRegistry.java +++ b/qadevOOo/tests/java/mod/_simreg/SimpleRegistry.java @@ -109,6 +109,7 @@ public class SimpleRegistry extends TestCase { * temp directory. </li> * </ul> */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java index f58c9b30f10b..917ced6eff36 100644 --- a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java +++ b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java @@ -66,6 +66,7 @@ public class SmEditAccessible extends TestCase { * Creates a <code>StarMath</code> document and obtains an accessibility * component with the role <code>AccessibleRole.PANEL</code>. */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() ); @@ -147,6 +148,7 @@ public class SmEditAccessible extends TestCase { * Disposes the document created in <code>createTestEnvironment</code> * method. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println( " disposing xMathDoc " ); diff --git a/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java b/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java index 0ad4873e237f..fd5cf056370a 100644 --- a/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java +++ b/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java @@ -68,6 +68,7 @@ public class SmGraphicAccessible extends TestCase { * Creates a <code>StarMath</code> document and obtains an accessibility * component with the role <code>AccessibleRole.PANEL</code>. */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() ); @@ -150,6 +151,7 @@ public class SmGraphicAccessible extends TestCase { * Disposes the document created in <code>createTestEnvironment</code> * method. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println( " disposing xMathDoc " ); diff --git a/qadevOOo/tests/java/mod/_sm/SmModel.java b/qadevOOo/tests/java/mod/_sm/SmModel.java index fd5ef458310d..ca501c45efa4 100644 --- a/qadevOOo/tests/java/mod/_sm/SmModel.java +++ b/qadevOOo/tests/java/mod/_sm/SmModel.java @@ -51,6 +51,7 @@ public class SmModel extends TestCase { * Creates a <code>StarMath</code> document and passes it as * tested component. */ + @Override public synchronized TestEnvironment createTestEnvironment ( TestParameters Param, PrintWriter log ) throws StatusException { @@ -79,6 +80,7 @@ public class SmModel extends TestCase { * Disposes the document created in <code>createTestEnvironment</code> * method. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println( " disposing xMathDoc " ); diff --git a/qadevOOo/tests/java/mod/_sm/XMLExporter.java b/qadevOOo/tests/java/mod/_sm/XMLExporter.java index de8b256da454..d44f26f57906 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLExporter.java @@ -65,6 +65,7 @@ public class XMLExporter extends TestCase { /** * New math document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -81,6 +82,7 @@ public class XMLExporter extends TestCase { /** * Document disposed here. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xMathDoc " ); xMathDoc.dispose(); @@ -107,6 +109,7 @@ public class XMLExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sm/XMLImporter.java b/qadevOOo/tests/java/mod/_sm/XMLImporter.java index 41e21d453f08..89961f0da7d6 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLImporter.java @@ -64,6 +64,7 @@ public class XMLImporter extends TestCase { /** * New math document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -78,6 +79,7 @@ public class XMLImporter extends TestCase { /** * Disposes document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xMathDoc " ); xMathDoc.dispose(); @@ -102,6 +104,7 @@ public class XMLImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment ( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java index f77da4ca0be4..0a2e7d431f6d 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java @@ -67,6 +67,7 @@ public class XMLMetaExporter extends TestCase { /** * New math document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -83,6 +84,7 @@ public class XMLMetaExporter extends TestCase { /** * Document disposed here. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xMathDoc " ); xMathDoc.dispose(); @@ -109,6 +111,7 @@ public class XMLMetaExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF() ; diff --git a/qadevOOo/tests/java/mod/_sm/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_sm/XMLMetaImporter.java index 3f5d864c286f..9ba5608aba43 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLMetaImporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLMetaImporter.java @@ -67,6 +67,7 @@ public class XMLMetaImporter extends TestCase { /** * New math document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -81,6 +82,7 @@ public class XMLMetaImporter extends TestCase { /** * Disposes document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xMathDoc " ); xMathDoc.dispose(); @@ -106,6 +108,7 @@ public class XMLMetaImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment ( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java index 8f3c3464b987..e8c198ebf1a2 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java @@ -65,6 +65,7 @@ public class XMLSettingsExporter extends TestCase { /** * New math document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -81,6 +82,7 @@ public class XMLSettingsExporter extends TestCase { /** * Document disposed here. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xMathDoc " ); xMathDoc.dispose(); @@ -108,6 +110,7 @@ public class XMLSettingsExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF() ; diff --git a/qadevOOo/tests/java/mod/_sm/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_sm/XMLSettingsImporter.java index 76c71d629a51..7f76df0b59f2 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLSettingsImporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLSettingsImporter.java @@ -63,6 +63,7 @@ public class XMLSettingsImporter extends TestCase { /** * New math document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -77,6 +78,7 @@ public class XMLSettingsImporter extends TestCase { /** * Disposes document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xMathDoc " ); xMathDoc.dispose(); @@ -102,6 +104,7 @@ public class XMLSettingsImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment ( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_smgr/OServiceManager.java b/qadevOOo/tests/java/mod/_smgr/OServiceManager.java index 131e70940c4b..7ce85c9d3414 100644 --- a/qadevOOo/tests/java/mod/_smgr/OServiceManager.java +++ b/qadevOOo/tests/java/mod/_smgr/OServiceManager.java @@ -88,6 +88,7 @@ public class OServiceManager extends TestCase { * and one of services contained in it is taken.</li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_smplmail/SimpleSystemMail.java b/qadevOOo/tests/java/mod/_smplmail/SimpleSystemMail.java index 4c4cf3d43096..bcf6590ea49e 100644 --- a/qadevOOo/tests/java/mod/_smplmail/SimpleSystemMail.java +++ b/qadevOOo/tests/java/mod/_smplmail/SimpleSystemMail.java @@ -65,6 +65,7 @@ public class SimpleSystemMail extends TestCase { * parameter.</li> * </ul> */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_srtrs/SortedDynamicResultSetFactory.java b/qadevOOo/tests/java/mod/_srtrs/SortedDynamicResultSetFactory.java index d511d9fb6188..c73099fe02c7 100644 --- a/qadevOOo/tests/java/mod/_srtrs/SortedDynamicResultSetFactory.java +++ b/qadevOOo/tests/java/mod/_srtrs/SortedDynamicResultSetFactory.java @@ -49,6 +49,7 @@ public class SortedDynamicResultSetFactory extends TestCase { * Creates an instance of the service * <code>com.sun.star.ucb.SortedDynamicResultSetFactory</code>. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_stm/DataInputStream.java b/qadevOOo/tests/java/mod/_stm/DataInputStream.java index 9207381f2647..f88722d64330 100644 --- a/qadevOOo/tests/java/mod/_stm/DataInputStream.java +++ b/qadevOOo/tests/java/mod/_stm/DataInputStream.java @@ -79,6 +79,7 @@ public class DataInputStream extends TestCase { * {@link ifc.io._XActiveDataSink}(an input stream to set and get) </li> * </ul> */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_stm/DataOutputStream.java b/qadevOOo/tests/java/mod/_stm/DataOutputStream.java index 46b5e6cec5e7..797fc48118f6 100644 --- a/qadevOOo/tests/java/mod/_stm/DataOutputStream.java +++ b/qadevOOo/tests/java/mod/_stm/DataOutputStream.java @@ -76,6 +76,7 @@ public class DataOutputStream extends TestCase { * ifc.io._XOutputStream.StreamChecker ) </li> * </ul> */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_stm/MarkableInputStream.java b/qadevOOo/tests/java/mod/_stm/MarkableInputStream.java index bd91175f8902..529c0d454473 100644 --- a/qadevOOo/tests/java/mod/_stm/MarkableInputStream.java +++ b/qadevOOo/tests/java/mod/_stm/MarkableInputStream.java @@ -80,6 +80,7 @@ public class MarkableInputStream extends TestCase { * @see com.sun.star.io.MarkableInputStream * @see com.sun.star.io.MarkableOutputStream */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java index c656580bd62e..f9a382ce2ecb 100644 --- a/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java +++ b/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java @@ -86,6 +86,7 @@ public class MarkableOutputStream extends TestCase { * @see com.sun.star.io.MarkableInputStream * @see com.sun.star.io.MarkableOutputStream */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java b/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java index 9f67ac91b5b8..4dc4dc88d57b 100644 --- a/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java +++ b/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java @@ -78,6 +78,7 @@ public class ObjectInputStream extends TestCase { * <code>com.sun.star.cmp.PersistObject</code> if not yet registered. * @see com.sun.star.cmp.PersistObject */ + @Override public void initialize(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); Object oPersObj = null; @@ -169,6 +170,7 @@ public class ObjectInputStream extends TestCase { * @see com.sun.star.io.MarkableOutputStream * @see com.sun.star.cmp.PersistObject */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java b/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java index 07a4588bd07b..8361b300bd60 100644 --- a/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java +++ b/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java @@ -75,6 +75,7 @@ public class ObjectOutputStream extends TestCase { * <code>com.sun.star.cmp.PersistObject</code> if not yet registered. * @see com.sun.star.cmp.PersistObject */ + @Override public void initialize(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); Object oPersObj = null; @@ -161,6 +162,7 @@ public class ObjectOutputStream extends TestCase { * @see com.sun.star.io.MarkableOutputStream * @see com.sun.star.cmp.PersistObject */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_stm/Pipe.java b/qadevOOo/tests/java/mod/_stm/Pipe.java index da2ecfaa8a24..a1f84073c4bb 100644 --- a/qadevOOo/tests/java/mod/_stm/Pipe.java +++ b/qadevOOo/tests/java/mod/_stm/Pipe.java @@ -58,6 +58,7 @@ public class Pipe extends TestCase { * </ul> * @see com.sun.star.io.Pipe */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_stm/Pump.java b/qadevOOo/tests/java/mod/_stm/Pump.java index 9c6332609685..c96981e93768 100644 --- a/qadevOOo/tests/java/mod/_stm/Pump.java +++ b/qadevOOo/tests/java/mod/_stm/Pump.java @@ -66,6 +66,7 @@ public class Pump extends TestCase { * </ul> * @see com.sun.star.io.Pump */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java b/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java index eada6b1b4ad6..731d0dd6b096 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java @@ -77,6 +77,7 @@ public class DataInputStream extends TestCase { * {@link ifc.io._XActiveDataSink}(an input stream to set and get) </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { Object oInterface = null; diff --git a/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java index 475a84562840..bf7c0e259be5 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java @@ -74,6 +74,7 @@ public class DataOutputStream extends TestCase { * ifc.io._XOutputStream.StreamChecker ) </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_streams/uno/MarkableInputStream.java b/qadevOOo/tests/java/mod/_streams/uno/MarkableInputStream.java index 6466d90cb383..bd3c9f3e3039 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/MarkableInputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/MarkableInputStream.java @@ -78,6 +78,7 @@ public class MarkableInputStream extends TestCase { * @see com.sun.star.io.MarkableInputStream * @see com.sun.star.io.MarkableOutputStream */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XMultiServiceFactory xMSF = Param.getMSF(); diff --git a/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java index cbaa335273e7..e26dd900d9bb 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java @@ -84,6 +84,7 @@ public class MarkableOutputStream extends TestCase { * @see com.sun.star.io.MarkableInputStream * @see com.sun.star.io.MarkableOutputStream */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java b/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java index 24a80aca25b9..0ae322442b86 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java @@ -76,6 +76,7 @@ public class ObjectInputStream extends TestCase { * <code>com.sun.star.cmp.PersistObject</code> if not yet registered. * @see com.sun.star.cmp.PersistObject */ + @Override public void initialize(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); Object oPersObj = null; @@ -167,6 +168,7 @@ public class ObjectInputStream extends TestCase { * @see com.sun.star.io.MarkableOutputStream * @see com.sun.star.cmp.PersistObject */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { System.out.println("create TestEnvironment started."); diff --git a/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java index ffbbf547f8ed..cc3a55f7444e 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java @@ -73,6 +73,7 @@ public class ObjectOutputStream extends TestCase { * <code>com.sun.star.cmp.PersistObject</code> if not yet registered. * @see com.sun.star.cmp.PersistObject */ + @Override public void initialize(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); Object oPersObj = null; @@ -159,6 +160,7 @@ public class ObjectOutputStream extends TestCase { * @see com.sun.star.io.MarkableOutputStream * @see com.sun.star.cmp.PersistObject */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_streams/uno/Pipe.java b/qadevOOo/tests/java/mod/_streams/uno/Pipe.java index e7decc3184e6..5b23f0bcdeb1 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/Pipe.java +++ b/qadevOOo/tests/java/mod/_streams/uno/Pipe.java @@ -56,6 +56,7 @@ public class Pipe extends TestCase { * </ul> * @see com.sun.star.io.Pipe */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_streams/uno/Pump.java b/qadevOOo/tests/java/mod/_streams/uno/Pump.java index 3a08a8aed9ef..51c2d4dd670f 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/Pump.java +++ b/qadevOOo/tests/java/mod/_streams/uno/Pump.java @@ -64,6 +64,7 @@ public class Pump extends TestCase { * </ul> * @see com.sun.star.io.Pump */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { Object oInterface = null; diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java index 894930acc8f6..1f2853b2b906 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java @@ -51,6 +51,7 @@ public class AccessibleBrowseBox extends TestCase { /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop(Param.getMSF())); @@ -60,6 +61,7 @@ public class AccessibleBrowseBox extends TestCase { * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println("disposing xTextDoc"); @@ -81,6 +83,7 @@ public class AccessibleBrowseBox extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java index d7c169cbeae1..05edbc4a9bb0 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java @@ -71,6 +71,7 @@ public class AccessibleBrowseBoxHeaderBar extends TestCase { /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( @@ -81,6 +82,7 @@ public class AccessibleBrowseBoxHeaderBar extends TestCase { * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println("disposing xTextDoc"); @@ -109,6 +111,7 @@ public class AccessibleBrowseBoxHeaderBar extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java index 3d01fdc8e4e7..2b2157bae7e0 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java @@ -69,6 +69,7 @@ public class AccessibleBrowseBoxHeaderCell extends TestCase { /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop(Param.getMSF())); @@ -78,6 +79,7 @@ public class AccessibleBrowseBoxHeaderCell extends TestCase { * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing xTextDoc"); @@ -110,6 +112,7 @@ public class AccessibleBrowseBoxHeaderCell extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ + @Override protected TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java index 5ae328093a03..37ad7e9b99b2 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java @@ -67,6 +67,7 @@ public class AccessibleBrowseBoxTable extends TestCase { /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( @@ -77,6 +78,7 @@ public class AccessibleBrowseBoxTable extends TestCase { * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println("disposing xTextDoc"); @@ -108,6 +110,7 @@ public class AccessibleBrowseBoxTable extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java index 5f1ef2b4a44d..0d70e85fed40 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java @@ -68,6 +68,7 @@ public class AccessibleBrowseBoxTableCell extends TestCase { /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop(Param.getMSF()) ); @@ -77,6 +78,7 @@ public class AccessibleBrowseBoxTableCell extends TestCase { * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing xTextDoc"); @@ -108,6 +110,7 @@ public class AccessibleBrowseBoxTableCell extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println( "creating a test environment" ); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java index 378a8ef136b4..024fb6329eba 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java @@ -78,6 +78,7 @@ public class AccessibleIconChoiceCtrl extends TestCase { /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( @@ -89,6 +90,7 @@ public class AccessibleIconChoiceCtrl extends TestCase { * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println("closing HyperlinkDialog"); @@ -129,6 +131,7 @@ public class AccessibleIconChoiceCtrl extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java index d00f0769eac0..1121c00e45d0 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java @@ -78,6 +78,7 @@ public class AccessibleIconChoiceCtrlEntry extends TestCase { /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop(Param.getMSF())); @@ -88,6 +89,7 @@ public class AccessibleIconChoiceCtrlEntry extends TestCase { * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("closing HyperlinkDialog"); @@ -134,6 +136,7 @@ public class AccessibleIconChoiceCtrlEntry extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ + @Override protected TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java index 8c7231679f2e..0ec0a1c59290 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java @@ -45,6 +45,7 @@ public class AccessibleTabBar extends TestCase { * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println("disposing xCalcDoc"); @@ -71,6 +72,7 @@ public class AccessibleTabBar extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java index ce890931f79f..866ab780ea99 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java @@ -71,6 +71,7 @@ public class AccessibleTabBarPage extends TestCase { * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing xCalcDoc"); @@ -97,6 +98,7 @@ public class AccessibleTabBarPage extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java index 3cdbe225bde7..05f7b207625b 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java @@ -72,6 +72,7 @@ public class AccessibleTabBarPageList extends TestCase { * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println("disposing xDoc"); @@ -98,6 +99,7 @@ public class AccessibleTabBarPageList extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java index 8682e1e3bf61..f1c5b63689e0 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java @@ -74,6 +74,7 @@ public class AccessibleTreeListBox extends TestCase { /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop(Param.getMSF())); @@ -83,6 +84,7 @@ public class AccessibleTreeListBox extends TestCase { * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing xTextDoc"); @@ -116,6 +118,7 @@ public class AccessibleTreeListBox extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ + @Override protected TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java index af8bff7f3db2..7e33393ef782 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java @@ -83,6 +83,7 @@ public class AccessibleTreeListBoxEntry extends TestCase { /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( @@ -93,6 +94,7 @@ public class AccessibleTreeListBoxEntry extends TestCase { * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println("disposing xTextDoc"); @@ -133,6 +135,7 @@ public class AccessibleTreeListBoxEntry extends TestCase { * @see com.sun.star.accessibility.XAccessibleSelection * @see com.sun.star.accessibility.XAccessibleText */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java index b32b949967bd..455be5adc371 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java @@ -44,6 +44,7 @@ public class AccessibleControlShape extends TestCase { static XComponent xDrawDoc; static XModel aModel; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -63,11 +64,13 @@ public class AccessibleControlShape extends TestCase { /** * Disposes the Draw document loaded before. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); } + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java index 6650bb477424..c439f3bab00a 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java @@ -54,6 +54,7 @@ public class AccessibleEditableTextPara extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -105,6 +106,7 @@ public class AccessibleEditableTextPara extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println( " disposing xSheetDoc " ); util.DesktopTools.closeDoc(xSpreadsheetDoc); @@ -120,6 +122,7 @@ public class AccessibleEditableTextPara extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java index ca795805ed12..2ddab77ed271 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java @@ -44,6 +44,7 @@ public class AccessibleGraphicShape extends TestCase { static XComponent xDrawDoc; static XModel aModel; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -63,11 +64,13 @@ public class AccessibleGraphicShape extends TestCase { /** * Disposes the Draw document loaded before. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); } + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java index 7868b126bd8f..ade6fa7c5f4f 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java @@ -45,6 +45,7 @@ public class AccessibleOLEShape extends TestCase { static XComponent xDrawDoc; static XModel aModel; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -64,11 +65,13 @@ public class AccessibleOLEShape extends TestCase { /** * Disposes the Draw document loaded before. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); } + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java index 7cb5db9ee976..7683a3ba500e 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java @@ -44,6 +44,7 @@ public class AccessiblePageShape extends TestCase { static XComponent xDrawDoc; static XModel aModel; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -63,11 +64,13 @@ public class AccessiblePageShape extends TestCase { /** * Disposes the Draw document loaded before. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); } + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java index e14278352131..912705a6aa1d 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java @@ -46,6 +46,7 @@ public class AccessiblePresentationGraphicShape extends TestCase { static XComponent xDoc; static XModel aModel; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -65,11 +66,13 @@ public class AccessiblePresentationGraphicShape extends TestCase { /** * Disposes the Draw document loaded before. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDoc); } + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java index e38d0be52eb1..c9fe78910256 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java @@ -46,6 +46,7 @@ public class AccessiblePresentationOLEShape extends TestCase { static XComponent xDrawDoc; static XModel aModel; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -65,11 +66,13 @@ public class AccessiblePresentationOLEShape extends TestCase { /** * Disposes the Draw document loaded before. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); } + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java index 21af46fff40c..2bef30f86950 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java @@ -46,6 +46,7 @@ public class AccessiblePresentationShape extends TestCase { static XComponent xDrawDoc; static XModel aModel; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -65,11 +66,13 @@ public class AccessiblePresentationShape extends TestCase { /** * Disposes the Draw document loaded before. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); } + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java index 1c4a9e848f48..0bab2ea5db25 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java @@ -44,6 +44,7 @@ public class AccessibleShape extends TestCase { static XComponent xDrawDoc; static XModel aModel; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -63,11 +64,13 @@ public class AccessibleShape extends TestCase { /** * Disposes the Draw document loaded before. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); } + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_svx/GraphicExporter.java b/qadevOOo/tests/java/mod/_svx/GraphicExporter.java index 91e5482349d6..d6a734bac182 100644 --- a/qadevOOo/tests/java/mod/_svx/GraphicExporter.java +++ b/qadevOOo/tests/java/mod/_svx/GraphicExporter.java @@ -71,6 +71,7 @@ public class GraphicExporter extends TestCase { /** * Creates a new draw document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a drawdoc"); xDrawDoc = DrawTools.createDrawDoc( @@ -80,6 +81,7 @@ public class GraphicExporter extends TestCase { /** * Disposes the draw document created before */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xDrawDoc "); util.DesktopTools.closeDoc(xDrawDoc); @@ -114,6 +116,7 @@ public class GraphicExporter extends TestCase { * </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java b/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java index e4e88cdbdf03..03f858bd8a8a 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java +++ b/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java @@ -93,6 +93,7 @@ public class SvxDrawPage extends TestCase { /** * Creates a new Draw document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -111,6 +112,7 @@ public class SvxDrawPage extends TestCase { /** * Disposes the Draw document created before */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xSheetDoc "); util.DesktopTools.closeDoc(xDoc); @@ -134,6 +136,7 @@ public class SvxDrawPage extends TestCase { * <code>com.sun.star.drawing.Line</code> service </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java b/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java index 352caae06981..467ec7c41715 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java +++ b/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java @@ -62,6 +62,7 @@ public class SvxGraphCtrlAccessibleContext extends TestCase{ * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -168,6 +169,7 @@ public class SvxGraphCtrlAccessibleContext extends TestCase{ * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { XModel aModel = UnoRuntime.queryInterface(XModel.class, xDrawDoc); @@ -206,6 +208,7 @@ public class SvxGraphCtrlAccessibleContext extends TestCase{ * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); diff --git a/qadevOOo/tests/java/mod/_svx/SvxGraphicObject.java b/qadevOOo/tests/java/mod/_svx/SvxGraphicObject.java index fc37ba104857..0d9bca9525b9 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxGraphicObject.java +++ b/qadevOOo/tests/java/mod/_svx/SvxGraphicObject.java @@ -102,6 +102,7 @@ public class SvxGraphicObject extends TestCase { /** * Creates a new Draw document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { log.println( "creating a drawdoc" ); @@ -111,6 +112,7 @@ public class SvxGraphicObject extends TestCase { /** * Disposes the Draw document created before */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); @@ -146,6 +148,7 @@ public class SvxGraphicObject extends TestCase { * service. </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_svx/SvxShape.java b/qadevOOo/tests/java/mod/_svx/SvxShape.java index a7d3cbc264e9..0979ef9461f7 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShape.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShape.java @@ -116,6 +116,7 @@ public class SvxShape extends TestCase { * Loads a Draw document with name 'SvxShape.sxd' from test * documents directory */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -134,6 +135,7 @@ public class SvxShape extends TestCase { /** * Disposes the Draw document loaded before. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); @@ -158,6 +160,7 @@ public class SvxShape extends TestCase { * service. </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java b/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java index 673f92036291..13d76012aa8b 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java @@ -113,6 +113,7 @@ public class SvxShapeCircle extends TestCase { * Loads a Draw document with name 'SvxShape.sxd' from test * documents directory */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -131,6 +132,7 @@ public class SvxShapeCircle extends TestCase { /** * Disposes the Draw document loaded before. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); @@ -157,6 +159,7 @@ public class SvxShapeCircle extends TestCase { * service. </li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeCollection.java b/qadevOOo/tests/java/mod/_svx/SvxShapeCollection.java index e005bc8caac3..06fdc02a9c46 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeCollection.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeCollection.java @@ -50,6 +50,7 @@ public class SvxShapeCollection extends TestCase { * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { try { @@ -73,6 +74,7 @@ public class SvxShapeCollection extends TestCase { * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); @@ -90,6 +92,7 @@ public class SvxShapeCollection extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeConnector.java b/qadevOOo/tests/java/mod/_svx/SvxShapeConnector.java index 8ca037bb4976..537869ed5f65 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeConnector.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeConnector.java @@ -78,6 +78,7 @@ public class SvxShapeConnector extends TestCase { * * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { try { @@ -101,6 +102,7 @@ public class SvxShapeConnector extends TestCase { * * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); @@ -118,6 +120,7 @@ public class SvxShapeConnector extends TestCase { * @see TestParameters * * @see PrintWriter */ + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java b/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java index 236d1904e0da..9c778479f48d 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java @@ -52,6 +52,7 @@ public class SvxShapeControl extends TestCase { * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { try { @@ -75,6 +76,7 @@ public class SvxShapeControl extends TestCase { * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); @@ -92,6 +94,7 @@ public class SvxShapeControl extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java b/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java index 95bf79fdcf14..8dfec5f4be84 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java @@ -53,6 +53,7 @@ public class SvxShapeDimensioning extends TestCase { * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { try { @@ -76,6 +77,7 @@ public class SvxShapeDimensioning extends TestCase { * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); @@ -93,6 +95,7 @@ public class SvxShapeDimensioning extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java b/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java index 38f04646d20d..e10949afbb8c 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java @@ -58,7 +58,8 @@ public class SvxShapeGroup extends TestCase { * in general this method initializes the document */ - protected void initialize(TestParameters Param, PrintWriter log) { + @Override + protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -78,7 +79,8 @@ public class SvxShapeGroup extends TestCase { * in general this method disposes the document */ - protected void cleanup( TestParameters Param, PrintWriter log) { + @Override + protected void cleanup( TestParameters Param, PrintWriter log) { log.println("disposing xDrawDoc"); util.DesktopTools.closeDoc(xDrawDoc); @@ -88,6 +90,7 @@ public class SvxShapeGroup extends TestCase { /** * creating a Testenvironment for the interfaces to be tested */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log ) { diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java index 7194f1b337a5..e2a3018d573e 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java @@ -125,6 +125,7 @@ public class SvxShapePolyPolygon extends TestCase { * * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -151,6 +152,7 @@ public class SvxShapePolyPolygon extends TestCase { * * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); @@ -168,6 +170,7 @@ public class SvxShapePolyPolygon extends TestCase { * @see TestParameters * * @see PrintWriter */ + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java index 8ab5061436b2..b5bebdbcd0a9 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java @@ -127,6 +127,7 @@ public class SvxShapePolyPolygonBezier extends TestCase { * * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -153,6 +154,7 @@ public class SvxShapePolyPolygonBezier extends TestCase { * * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); @@ -170,6 +172,7 @@ public class SvxShapePolyPolygonBezier extends TestCase { * @see TestParameters * * @see PrintWriter */ + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoNumberingRules.java b/qadevOOo/tests/java/mod/_svx/SvxUnoNumberingRules.java index 767f839e484e..646a14c191b1 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoNumberingRules.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoNumberingRules.java @@ -37,12 +37,14 @@ import util.DrawTools; public class SvxUnoNumberingRules extends TestCase { static XComponent xDrawDoc; + @Override protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a drawdoc"); xDrawDoc = DrawTools.createDrawDoc( tParam.getMSF()); } + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory docMSF = UnoRuntime.queryInterface( @@ -78,6 +80,7 @@ public class SvxUnoNumberingRules extends TestCase { return tEnv; } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xDrawDoc "); util.DesktopTools.closeDoc(xDrawDoc); diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoText.java b/qadevOOo/tests/java/mod/_svx/SvxUnoText.java index 9190cdacfd92..ac8bf08c1e55 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoText.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoText.java @@ -54,6 +54,7 @@ public class SvxUnoText extends TestCase { * * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { try { log.println( "creating a drawdoc" ); @@ -76,6 +77,7 @@ public class SvxUnoText extends TestCase { * * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); @@ -100,6 +102,7 @@ public class SvxUnoText extends TestCase { * @see TestParameters * * @see PrintWriter */ + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextContent.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextContent.java index e9d77dadb19f..594473c1434e 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextContent.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextContent.java @@ -53,6 +53,7 @@ public class SvxUnoTextContent extends TestCase { * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { try { log.println( "creating a drawdoc" ); @@ -75,6 +76,7 @@ public class SvxUnoTextContent extends TestCase { * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); @@ -92,6 +94,7 @@ public class SvxUnoTextContent extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextContentEnum.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextContentEnum.java index de7405616d30..e84bd7c06f91 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextContentEnum.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextContentEnum.java @@ -51,6 +51,7 @@ public class SvxUnoTextContentEnum extends TestCase { * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { try { log.println( "creating a drawdoc" ); @@ -73,6 +74,7 @@ public class SvxUnoTextContentEnum extends TestCase { * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); @@ -90,6 +92,7 @@ public class SvxUnoTextContentEnum extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override public TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextCursor.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextCursor.java index 45a61846cb77..4aabb846eb23 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextCursor.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextCursor.java @@ -50,6 +50,7 @@ public class SvxUnoTextCursor extends TestCase { * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { try { log.println( "creating a drawdoc" ); @@ -72,6 +73,7 @@ public class SvxUnoTextCursor extends TestCase { * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); @@ -89,6 +91,7 @@ public class SvxUnoTextCursor extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override public TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextField.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextField.java index c4be63e1a7b6..99d80f51224c 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextField.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextField.java @@ -60,6 +60,7 @@ public class SvxUnoTextField extends TestCase { * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { try { @@ -83,6 +84,7 @@ public class SvxUnoTextField extends TestCase { * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); @@ -98,6 +100,7 @@ public class SvxUnoTextField extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextRange.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextRange.java index 70cc43d3b88e..077a9646afbc 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextRange.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextRange.java @@ -53,6 +53,7 @@ public class SvxUnoTextRange extends TestCase { * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { try { log.println( "creating a drawdoc" ); @@ -75,6 +76,7 @@ public class SvxUnoTextRange extends TestCase { * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); @@ -92,6 +94,7 @@ public class SvxUnoTextRange extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextRangeEnumeration.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextRangeEnumeration.java index 55b5823cc375..65de077e7a27 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextRangeEnumeration.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextRangeEnumeration.java @@ -53,6 +53,7 @@ public class SvxUnoTextRangeEnumeration extends TestCase { * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { try { log.println( "creating a drawdoc" ); @@ -75,6 +76,7 @@ public class SvxUnoTextRangeEnumeration extends TestCase { * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xDrawDoc); @@ -92,6 +94,7 @@ public class SvxUnoTextRangeEnumeration extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/CharacterStyle.java b/qadevOOo/tests/java/mod/_sw/CharacterStyle.java index 0ba6d0decc3f..eb74ef78f267 100644 --- a/qadevOOo/tests/java/mod/_sw/CharacterStyle.java +++ b/qadevOOo/tests/java/mod/_sw/CharacterStyle.java @@ -51,6 +51,7 @@ public class CharacterStyle extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -65,6 +66,7 @@ public class CharacterStyle extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); DesktopTools.closeDoc(xTextDoc); @@ -89,6 +91,7 @@ public class CharacterStyle extends TestCase { * <code>XIndexAccess</code> interface.</li> * </ul> */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; diff --git a/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java b/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java index 23df9ef54078..ee7f2f4e4d27 100644 --- a/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java +++ b/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java @@ -53,6 +53,7 @@ public class ConditionalParagraphStyle extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -67,6 +68,7 @@ public class ConditionalParagraphStyle extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); DesktopTools.closeDoc(xTextDoc); @@ -79,6 +81,7 @@ public class ConditionalParagraphStyle extends TestCase { * @param tParam The test parameters * @param log The log writer. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XNameAccess oSFNA = null; diff --git a/qadevOOo/tests/java/mod/_sw/DocumentSettings.java b/qadevOOo/tests/java/mod/_sw/DocumentSettings.java index 89724efe6526..935c84b1e0cd 100644 --- a/qadevOOo/tests/java/mod/_sw/DocumentSettings.java +++ b/qadevOOo/tests/java/mod/_sw/DocumentSettings.java @@ -37,6 +37,7 @@ public class DocumentSettings extends TestCase /** * Creates text document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { log.println(" opening xTextDoc "); @@ -47,12 +48,14 @@ public class DocumentSettings extends TestCase /** * Disposes text document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) diff --git a/qadevOOo/tests/java/mod/_sw/PageStyle.java b/qadevOOo/tests/java/mod/_sw/PageStyle.java index 623956b726ac..b41875765fcc 100644 --- a/qadevOOo/tests/java/mod/_sw/PageStyle.java +++ b/qadevOOo/tests/java/mod/_sw/PageStyle.java @@ -53,6 +53,7 @@ public class PageStyle extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -67,11 +68,13 @@ public class PageStyle extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); DesktopTools.closeDoc(xTextDoc); } + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XNameAccess oSFNA = null; diff --git a/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java b/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java index e1e023835d4c..aad213a58d2c 100644 --- a/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java +++ b/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java @@ -53,6 +53,7 @@ public class ParagraphStyle extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -67,11 +68,13 @@ public class ParagraphStyle extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); DesktopTools.closeDoc(xTextDoc); } + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; XNameAccess oSFNA = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java index 5e0ef45823fd..854cb2f218a8 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java @@ -60,6 +60,7 @@ public class SwAccessibleDocumentPageView extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -162,6 +163,7 @@ public class SwAccessibleDocumentPageView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("dispose text document"); util.DesktopTools.closeDoc(xTextDoc); @@ -177,6 +179,7 @@ public class SwAccessibleDocumentPageView extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); xTextDoc = WriterTools.createTextDoc( Param.getMSF()); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java index 6a44cb9c86a4..a8e70493aa09 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java @@ -64,6 +64,7 @@ public class SwAccessibleDocumentView extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -152,6 +153,7 @@ public class SwAccessibleDocumentView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("dispose text document"); util.DesktopTools.closeDoc(xTextDoc); @@ -166,6 +168,7 @@ public class SwAccessibleDocumentView extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); xTextDoc = WriterTools.createTextDoc(Param.getMSF()); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java index 3b0eb2bf3d58..c6823a6c742e 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java @@ -59,6 +59,7 @@ public class SwAccessibleEndnoteView extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -157,6 +158,7 @@ public class SwAccessibleEndnoteView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("dispose text document"); util.DesktopTools.closeDoc(xTextDoc); @@ -172,6 +174,7 @@ public class SwAccessibleEndnoteView extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); xTextDoc = WriterTools.createTextDoc(Param.getMSF()); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java index ae1928810164..b643744263b9 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java @@ -69,6 +69,7 @@ public class SwAccessibleFooterView extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -161,6 +162,7 @@ public class SwAccessibleFooterView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("dispose text document"); util.DesktopTools.closeDoc(xTextDoc); @@ -175,6 +177,7 @@ public class SwAccessibleFooterView extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); xTextDoc = WriterTools.createTextDoc(Param.getMSF()); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java index 6009a8e8eaef..efdd158eb842 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java @@ -59,6 +59,7 @@ public class SwAccessibleFootnoteView extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -158,6 +159,7 @@ public class SwAccessibleFootnoteView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("dispose text document"); util.DesktopTools.closeDoc(xTextDoc); @@ -173,6 +175,7 @@ public class SwAccessibleFootnoteView extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); xTextDoc = WriterTools.createTextDoc(Param.getMSF()); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java index 6c2edb6a70fa..6edc9808bf9c 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java @@ -67,6 +67,7 @@ public class SwAccessibleHeaderView extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -151,6 +152,7 @@ public class SwAccessibleHeaderView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("dispose text document"); util.DesktopTools.closeDoc(xTextDoc); @@ -165,6 +167,7 @@ public class SwAccessibleHeaderView extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); xTextDoc = WriterTools.createTextDoc(Param.getMSF()); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java index 88587d79873c..428bee5106d7 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java @@ -67,6 +67,7 @@ public class SwAccessiblePageView extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -232,6 +233,7 @@ public class SwAccessiblePageView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("dispose text document"); util.DesktopTools.closeDoc(xTextDoc); @@ -247,6 +249,7 @@ public class SwAccessiblePageView extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); xTextDoc = WriterTools.createTextDoc(Param.getMSF()); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java index 1761527d2681..89785b805151 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java @@ -58,6 +58,7 @@ public class SwAccessibleParagraphView extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -104,6 +105,7 @@ public class SwAccessibleParagraphView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("dispose text document"); util.DesktopTools.closeDoc(xTextDoc); @@ -118,6 +120,7 @@ public class SwAccessibleParagraphView extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); xTextDoc = WriterTools.createTextDoc( Param.getMSF()); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java index 80c908a8371d..b83f80114200 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java @@ -62,6 +62,7 @@ public class SwAccessibleTableCellView extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XAccessibleContext oObj = null; @@ -114,6 +115,7 @@ public class SwAccessibleTableCellView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println("dispose text document"); util.DesktopTools.closeDoc(xTextDoc); @@ -128,6 +130,7 @@ public class SwAccessibleTableCellView extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { log.println("creating a text document"); xTextDoc = WriterTools.createTextDoc( Param.getMSF()); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java index 34152dbb400d..cb8bfea423db 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java @@ -64,6 +64,7 @@ public class SwAccessibleTableView extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -131,6 +132,7 @@ public class SwAccessibleTableView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("dispose text document"); util.DesktopTools.closeDoc(xTextDoc); @@ -145,6 +147,7 @@ public class SwAccessibleTableView extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); xTextDoc = WriterTools.createTextDoc(Param.getMSF()); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java index 611d2edfa9be..ab9a9764b359 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java @@ -60,6 +60,7 @@ public class SwAccessibleTextEmbeddedObject extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -116,6 +117,7 @@ public class SwAccessibleTextEmbeddedObject extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("dispose text document"); util.DesktopTools.closeDoc(xTextDoc); @@ -131,6 +133,7 @@ public class SwAccessibleTextEmbeddedObject extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { log.println( "open a text document" ); String testdoc = utils.getFullTestURL("SwXTextEmbeddedObject.sxw"); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java index cfb3f000c213..db0679727650 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java @@ -68,6 +68,7 @@ public class SwAccessibleTextFrameView extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -149,6 +150,7 @@ public class SwAccessibleTextFrameView extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("dispose text document"); util.DesktopTools.closeDoc(xTextDoc); @@ -163,6 +165,7 @@ public class SwAccessibleTextFrameView extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); xTextDoc = WriterTools.createTextDoc(Param.getMSF()); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java index 8802056e7d80..c7c682eed8e4 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java @@ -66,6 +66,7 @@ public class SwAccessibleTextGraphicObject extends TestCase { * @see TestEnvironment * @see #getTestEnvironment */ + @Override protected TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) { @@ -139,6 +140,7 @@ public class SwAccessibleTextGraphicObject extends TestCase { * @param Param test parameters * @param log writer to log information while testing */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println("dispose text document"); util.DesktopTools.closeDoc(xTextDoc); @@ -153,6 +155,7 @@ public class SwAccessibleTextGraphicObject extends TestCase { * * @see #initializeTestCase */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); xTextDoc = WriterTools.createTextDoc(Param.getMSF()); diff --git a/qadevOOo/tests/java/mod/_sw/SwXAutoTextContainer.java b/qadevOOo/tests/java/mod/_sw/SwXAutoTextContainer.java index 317dbe7bd2e1..eac6e2131171 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXAutoTextContainer.java +++ b/qadevOOo/tests/java/mod/_sw/SwXAutoTextContainer.java @@ -53,6 +53,7 @@ public class SwXAutoTextContainer extends TestCase { * Creates an instance of the service * <code>com.sun.star.text.AutoTextContainer</code>.<p> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { XAutoTextContainer oContainer = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry.java b/qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry.java index 1ed259c4b5ee..ac541437b406 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry.java +++ b/qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry.java @@ -71,6 +71,7 @@ public class SwXAutoTextEntry extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { XMultiServiceFactory msf = tParam.getMSF(); SOfficeFactory SOF = SOfficeFactory.getFactory( msf ); @@ -86,6 +87,7 @@ public class SwXAutoTextEntry extends TestCase { /** * Removes added element from AutoTextGroup */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { try { if ( oGroup.hasByName("NewEntryName") ) { @@ -116,6 +118,7 @@ public class SwXAutoTextEntry extends TestCase { * {@link ifc.text._XAutoTextEntry} : text document</li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sw/SwXAutoTextGroup.java b/qadevOOo/tests/java/mod/_sw/SwXAutoTextGroup.java index cd79331ed178..d67f4fbe51b2 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXAutoTextGroup.java +++ b/qadevOOo/tests/java/mod/_sw/SwXAutoTextGroup.java @@ -69,6 +69,7 @@ public class SwXAutoTextGroup extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -83,6 +84,7 @@ public class SwXAutoTextGroup extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -99,6 +101,7 @@ public class SwXAutoTextGroup extends TestCase { * {@link ifc.text._XAutoTextGroup} range of text</li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXBodyText.java b/qadevOOo/tests/java/mod/_sw/SwXBodyText.java index e6f4befb4230..3dfda81a2fbb 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXBodyText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXBodyText.java @@ -72,6 +72,7 @@ public class SwXBodyText extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -86,6 +87,7 @@ public class SwXBodyText extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -105,6 +107,7 @@ public class SwXBodyText extends TestCase { * {@link ifc.text._XRelativeTextContentInsert} : paragraph creator</li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXBookmark.java b/qadevOOo/tests/java/mod/_sw/SwXBookmark.java index c351e76d454a..d58df6ba2bce 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXBookmark.java +++ b/qadevOOo/tests/java/mod/_sw/SwXBookmark.java @@ -59,6 +59,7 @@ public class SwXBookmark extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -73,6 +74,7 @@ public class SwXBookmark extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -82,6 +84,7 @@ public class SwXBookmark extends TestCase { * Creating a Testenvironment for the interfaces to be tested. After creating * a bookmark, it is inserted to the text document. */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXBookmarks.java b/qadevOOo/tests/java/mod/_sw/SwXBookmarks.java index 6cbc6053630b..6ce603e8d9f5 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXBookmarks.java +++ b/qadevOOo/tests/java/mod/_sw/SwXBookmarks.java @@ -55,6 +55,7 @@ public class SwXBookmarks extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -69,6 +70,7 @@ public class SwXBookmarks extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -80,6 +82,7 @@ public class SwXBookmarks extends TestCase { * are gotten from text document using <code>XBookmarksSupplier</code> * interface. */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXCell.java b/qadevOOo/tests/java/mod/_sw/SwXCell.java index 5ed1172b3e3c..b1e909996ecb 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXCell.java +++ b/qadevOOo/tests/java/mod/_sw/SwXCell.java @@ -54,6 +54,7 @@ public class SwXCell extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -68,6 +69,7 @@ public class SwXCell extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -84,6 +86,7 @@ public class SwXCell extends TestCase { * within a text</li> * </ul> */ + @Override public TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXCellRange.java b/qadevOOo/tests/java/mod/_sw/SwXCellRange.java index 2069fd9fb65b..4df54ae3bdbc 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXCellRange.java +++ b/qadevOOo/tests/java/mod/_sw/SwXCellRange.java @@ -56,6 +56,7 @@ public class SwXCellRange extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -70,6 +71,7 @@ public class SwXCellRange extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -87,6 +89,7 @@ public class SwXCellRange extends TestCase { * within a text</li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java b/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java index e341a3cdaa5e..a95ce939baf3 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java +++ b/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java @@ -58,6 +58,7 @@ public class SwXChapterNumbering extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -72,6 +73,7 @@ public class SwXChapterNumbering extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -82,6 +84,7 @@ public class SwXChapterNumbering extends TestCase { * numbering rules are gotten from text document using interface * <code>XChapterNumberingSupplier</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java index 0ba46a60c9d2..6d0b426aafee 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java +++ b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java @@ -64,6 +64,7 @@ public class SwXDocumentIndex extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -78,6 +79,7 @@ public class SwXDocumentIndex extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -90,6 +92,7 @@ public class SwXDocumentIndex extends TestCase { * is inserted to the text of the document as content. * */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XTextContent xTC = null; Object instance = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexMark.java b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexMark.java index 235d525544c9..03c52cc111aa 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexMark.java +++ b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexMark.java @@ -65,6 +65,7 @@ public class SwXDocumentIndexMark extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -79,6 +80,7 @@ public class SwXDocumentIndexMark extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -92,6 +94,7 @@ public class SwXDocumentIndexMark extends TestCase { * created DocumentIndexMark, and inserts DocumentIndexMark to the * text document. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XText oText = xTextDoc.getText(); diff --git a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java index 3ca0a041023b..fd6ae1c004df 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java +++ b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java @@ -58,6 +58,7 @@ public class SwXDocumentIndexes extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -72,6 +73,7 @@ public class SwXDocumentIndexes extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -85,6 +87,7 @@ public class SwXDocumentIndexes extends TestCase { * inserted to the text document, and finally all document indexes are gotten * from a text document using <code>XDocumentIndexesSupplier</code> interface. */ + @Override public TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXDrawPage.java b/qadevOOo/tests/java/mod/_sw/SwXDrawPage.java index ae7298b45412..f2407f63ab47 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXDrawPage.java +++ b/qadevOOo/tests/java/mod/_sw/SwXDrawPage.java @@ -83,6 +83,7 @@ public class SwXDrawPage extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -97,6 +98,7 @@ public class SwXDrawPage extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -116,6 +118,7 @@ public class SwXDrawPage extends TestCase { * testing.</li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXEndnoteProperties.java b/qadevOOo/tests/java/mod/_sw/SwXEndnoteProperties.java index 0f1ed1efb9be..b6a101ce98a4 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXEndnoteProperties.java +++ b/qadevOOo/tests/java/mod/_sw/SwXEndnoteProperties.java @@ -55,6 +55,7 @@ public class SwXEndnoteProperties extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -69,6 +70,7 @@ public class SwXEndnoteProperties extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -81,6 +83,7 @@ public class SwXEndnoteProperties extends TestCase { * to the text document, and finally endnote settings are gotten from text * document using <code>XEndnotesSupplier</code> interface. */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { XEndnotesSupplier oInterface = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXFieldEnumeration.java b/qadevOOo/tests/java/mod/_sw/SwXFieldEnumeration.java index 53ff8d35d029..5c891e716b64 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFieldEnumeration.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFieldEnumeration.java @@ -55,6 +55,7 @@ public class SwXFieldEnumeration extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -69,6 +70,7 @@ public class SwXFieldEnumeration extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -90,6 +92,7 @@ public class SwXFieldEnumeration extends TestCase { * {@link ifc.container._XEnumeration} : text fields</li> * </ul> */ + @Override public TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXFieldMaster.java b/qadevOOo/tests/java/mod/_sw/SwXFieldMaster.java index d7387fca274f..d5a4cefc7f3e 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFieldMaster.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFieldMaster.java @@ -53,6 +53,7 @@ public class SwXFieldMaster extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -67,6 +68,7 @@ public class SwXFieldMaster extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -78,6 +80,7 @@ public class SwXFieldMaster extends TestCase { * Creates an instance of the service * <code>com.sun.star.text.FieldMaster.Database</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXFootnote.java b/qadevOOo/tests/java/mod/_sw/SwXFootnote.java index 7c8fbe05844a..3f8a16132a3f 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFootnote.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFootnote.java @@ -72,6 +72,7 @@ public class SwXFootnote extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -86,6 +87,7 @@ public class SwXFootnote extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -102,6 +104,7 @@ public class SwXFootnote extends TestCase { * {@link ifc.text._XText} </li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XFootnote oFootnote; diff --git a/qadevOOo/tests/java/mod/_sw/SwXFootnoteProperties.java b/qadevOOo/tests/java/mod/_sw/SwXFootnoteProperties.java index 6b80f52a6683..de75d200e95f 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFootnoteProperties.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFootnoteProperties.java @@ -54,6 +54,7 @@ public class SwXFootnoteProperties extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -68,6 +69,7 @@ public class SwXFootnoteProperties extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -80,6 +82,7 @@ public class SwXFootnoteProperties extends TestCase { * to the text document, and finally gets footnote settings from text * document through <code>XFootnotesSupplier</code> interface.<br> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { XFootnotesSupplier oInterface = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXFootnoteText.java b/qadevOOo/tests/java/mod/_sw/SwXFootnoteText.java index edf29d7e8f97..45b0db7d174f 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFootnoteText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFootnoteText.java @@ -76,6 +76,7 @@ public class SwXFootnoteText extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -90,6 +91,7 @@ public class SwXFootnoteText extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -112,6 +114,7 @@ public class SwXFootnoteText extends TestCase { * {@link ifc.text._XRelativeTextContentInsert} : paragraph creator</li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXFootnotes.java b/qadevOOo/tests/java/mod/_sw/SwXFootnotes.java index 08655a3e42e3..fd6ca04f9c08 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFootnotes.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFootnotes.java @@ -57,6 +57,7 @@ public class SwXFootnotes extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -71,6 +72,7 @@ public class SwXFootnotes extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -83,6 +85,7 @@ public class SwXFootnotes extends TestCase { * to the text, and finally gets all footnotes of text document * through <code>XFootnotesSupplier</code> interface. */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { XFootnotesSupplier oInterface = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXFrames.java b/qadevOOo/tests/java/mod/_sw/SwXFrames.java index 7cf813260e15..42497af5d5f0 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFrames.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFrames.java @@ -60,6 +60,7 @@ public class SwXFrames extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -74,6 +75,7 @@ public class SwXFrames extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -86,6 +88,7 @@ public class SwXFrames extends TestCase { * to the text, and finally gets all frames of text document using * <code>XTextFramesSupplier</code> interface.<br> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXHeadFootText.java b/qadevOOo/tests/java/mod/_sw/SwXHeadFootText.java index 5f6f3d6b9c2c..866e0b3400e4 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXHeadFootText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXHeadFootText.java @@ -78,6 +78,7 @@ public class SwXHeadFootText extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -92,6 +93,7 @@ public class SwXHeadFootText extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -113,6 +115,7 @@ public class SwXHeadFootText extends TestCase { * {@link ifc.text._XRelativeTextContentInsert} : paragraph creator</li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XPropertySet PropSet; diff --git a/qadevOOo/tests/java/mod/_sw/SwXLineNumberingProperties.java b/qadevOOo/tests/java/mod/_sw/SwXLineNumberingProperties.java index 8d4ba8a1fac9..c57698110c08 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXLineNumberingProperties.java +++ b/qadevOOo/tests/java/mod/_sw/SwXLineNumberingProperties.java @@ -53,6 +53,7 @@ public class SwXLineNumberingProperties extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -67,6 +68,7 @@ public class SwXLineNumberingProperties extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -78,6 +80,7 @@ public class SwXLineNumberingProperties extends TestCase { * string and control character to the text document, line numbering * properties are gotten using <code>XLineNumberingProperties</code> interface. */ + @Override public TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java index 9855b6b2991c..adec0208fe73 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java +++ b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java @@ -52,6 +52,7 @@ import lib.TestParameters; */ public class SwXMailMerge extends TestCase { + @Override public void initialize( TestParameters Param, PrintWriter log ) { if (! Param.containsKey("uniqueSuffix")){ Param.put("uniqueSuffix", new Integer(0)); @@ -70,6 +71,7 @@ public class SwXMailMerge extends TestCase { * {@link ifc.task._XJob} : Object[]</li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -385,6 +387,7 @@ public class SwXMailMerge extends TestCase { } + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println("closing connections..."); XMultiServiceFactory xMsf = Param.getMSF(); diff --git a/qadevOOo/tests/java/mod/_sw/SwXModule.java b/qadevOOo/tests/java/mod/_sw/SwXModule.java index b2c813e34eec..45165e99e978 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXModule.java +++ b/qadevOOo/tests/java/mod/_sw/SwXModule.java @@ -49,6 +49,7 @@ public class SwXModule extends TestCase { * Creates an instance of the service * <code>com.sun.star.text.GlobalSettings</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java b/qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java index b770d98ad06e..4bc18aa2d11f 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java +++ b/qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java @@ -67,6 +67,7 @@ public class SwXNumberingRules extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -81,6 +82,7 @@ public class SwXNumberingRules extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -94,6 +96,7 @@ public class SwXNumberingRules extends TestCase { * is obtained. At the end property value 'NumberingRules' is obtained from * given style. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; XIndexAccess NumStyleI = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXParagraph.java b/qadevOOo/tests/java/mod/_sw/SwXParagraph.java index 735d30dc20aa..304dfa8b6683 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXParagraph.java +++ b/qadevOOo/tests/java/mod/_sw/SwXParagraph.java @@ -88,10 +88,12 @@ public class SwXParagraph extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -128,6 +130,7 @@ public class SwXParagraph extends TestCase { * a property 'NumberingRules'. </li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sw/SwXParagraphEnumeration.java b/qadevOOo/tests/java/mod/_sw/SwXParagraphEnumeration.java index 207d8dd9dbbf..fca0a8b5f5ab 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXParagraphEnumeration.java +++ b/qadevOOo/tests/java/mod/_sw/SwXParagraphEnumeration.java @@ -53,6 +53,7 @@ public class SwXParagraphEnumeration extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -67,6 +68,7 @@ public class SwXParagraphEnumeration extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -85,6 +87,7 @@ public class SwXParagraphEnumeration extends TestCase { * <code>XEnumerationAccess</code> interface.</li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXPrintSettings.java b/qadevOOo/tests/java/mod/_sw/SwXPrintSettings.java index 216243102161..8e5690f8b7e7 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXPrintSettings.java +++ b/qadevOOo/tests/java/mod/_sw/SwXPrintSettings.java @@ -50,6 +50,7 @@ public class SwXPrintSettings extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -64,6 +65,7 @@ public class SwXPrintSettings extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -75,6 +77,7 @@ public class SwXPrintSettings extends TestCase { * <code>com.sun.star.text.GlobalSettings</code>, then print settings are * gotten using <code>XPrintSettingsSupplier</code> interface. */ + @Override public TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXPropertySet.java b/qadevOOo/tests/java/mod/_sw/SwXPropertySet.java index 4804732ca16e..fe6fc556d642 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXPropertySet.java +++ b/qadevOOo/tests/java/mod/_sw/SwXPropertySet.java @@ -45,6 +45,7 @@ public class SwXPropertySet extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -54,6 +55,7 @@ public class SwXPropertySet extends TestCase { * Creating a Testenvironment for the interfaces to be tested. * Method creates text document as a test component. */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sw/SwXPropertySetInfo.java b/qadevOOo/tests/java/mod/_sw/SwXPropertySetInfo.java index 040c41e4fb43..0eeebc95a158 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXPropertySetInfo.java +++ b/qadevOOo/tests/java/mod/_sw/SwXPropertySetInfo.java @@ -49,6 +49,7 @@ public class SwXPropertySetInfo extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters Param, PrintWriter log) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -59,6 +60,7 @@ public class SwXPropertySetInfo extends TestCase { * creates text document, then obtains PropertySetInfo of created text * document using <code>XPropertySet</code> interface. */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXReferenceMark.java b/qadevOOo/tests/java/mod/_sw/SwXReferenceMark.java index 47d82163c98d..1fc6a5a3b915 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXReferenceMark.java +++ b/qadevOOo/tests/java/mod/_sw/SwXReferenceMark.java @@ -60,6 +60,7 @@ public class SwXReferenceMark extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -74,6 +75,7 @@ public class SwXReferenceMark extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -87,6 +89,7 @@ public class SwXReferenceMark extends TestCase { * Finally, renamed ReferenceMark is inserted to a major text of text * document as a text content. */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; XText oText = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXReferenceMarks.java b/qadevOOo/tests/java/mod/_sw/SwXReferenceMarks.java index 601acd8fd34d..1c7ef0c20f15 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXReferenceMarks.java +++ b/qadevOOo/tests/java/mod/_sw/SwXReferenceMarks.java @@ -61,6 +61,7 @@ public class SwXReferenceMarks extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -75,6 +76,7 @@ public class SwXReferenceMarks extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -89,6 +91,7 @@ public class SwXReferenceMarks extends TestCase { * ReferenceMarks are gotten from text document using * <code>XReferenceMarksSupplier</code> interface. */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXShape.java b/qadevOOo/tests/java/mod/_sw/SwXShape.java index d8606f31552b..1a19f15eb8ec 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXShape.java +++ b/qadevOOo/tests/java/mod/_sw/SwXShape.java @@ -65,6 +65,7 @@ public class SwXShape extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -79,6 +80,7 @@ public class SwXShape extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -90,6 +92,7 @@ public class SwXShape extends TestCase { * interface. Then shape (rectangle) is created and added to DrawPage * obtained before, then returned as a test component. */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXStyle.java b/qadevOOo/tests/java/mod/_sw/SwXStyle.java index 96c8a8d74961..c17daf18d90a 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXStyle.java +++ b/qadevOOo/tests/java/mod/_sw/SwXStyle.java @@ -68,6 +68,7 @@ public class SwXStyle extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -82,6 +83,7 @@ public class SwXStyle extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -106,6 +108,7 @@ public class SwXStyle extends TestCase { * <code>XIndexAccess</code> interface.</li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sw/SwXStyleFamilies.java b/qadevOOo/tests/java/mod/_sw/SwXStyleFamilies.java index 23e33e8b59c5..04b319b98cfc 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXStyleFamilies.java +++ b/qadevOOo/tests/java/mod/_sw/SwXStyleFamilies.java @@ -57,6 +57,7 @@ public class SwXStyleFamilies extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -71,6 +72,7 @@ public class SwXStyleFamilies extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -81,6 +83,7 @@ public class SwXStyleFamilies extends TestCase { * are gotten from text document using <code>XStyleFamiliesSupplier</code> * interface and returned as a test component. */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java b/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java index fc6af688885e..bd6d1f339d35 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java +++ b/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java @@ -67,6 +67,7 @@ public class SwXStyleFamily extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -81,6 +82,7 @@ public class SwXStyleFamily extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -113,6 +115,7 @@ public class SwXStyleFamily extends TestCase { * <code>com.sun.star.style.CharacterStyle</code>.</li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XNameAccess oSFNA = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java b/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java index 191cc4c29828..17733762910b 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java @@ -75,6 +75,7 @@ public class SwXTableCellText extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -89,6 +90,7 @@ public class SwXTableCellText extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -111,6 +113,7 @@ public class SwXTableCellText extends TestCase { * {@link ifc.text._XText} : creates text sections</li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXTableColumns.java b/qadevOOo/tests/java/mod/_sw/SwXTableColumns.java index 69a79797e2cb..a2a2a98a7b5f 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTableColumns.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTableColumns.java @@ -61,6 +61,7 @@ public class SwXTableColumns extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -75,6 +76,7 @@ public class SwXTableColumns extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -85,6 +87,7 @@ public class SwXTableColumns extends TestCase { * of text table, it is inserted to text document, then columns are gotten * from table. */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXTableRows.java b/qadevOOo/tests/java/mod/_sw/SwXTableRows.java index 88b935ced48f..877b53f5c5a5 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTableRows.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTableRows.java @@ -56,6 +56,7 @@ public class SwXTableRows extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -70,6 +71,7 @@ public class SwXTableRows extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -80,6 +82,7 @@ public class SwXTableRows extends TestCase { * of text table, it is inserted to text document, then rows are gotten * from table. */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextColumns.java b/qadevOOo/tests/java/mod/_sw/SwXTextColumns.java index 1ea7e3bf86a5..39106dfbc9d5 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextColumns.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextColumns.java @@ -62,6 +62,7 @@ public class SwXTextColumns extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -76,6 +77,7 @@ public class SwXTextColumns extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -91,6 +93,7 @@ public class SwXTextColumns extends TestCase { * of this style is returned as a test component. Finally, several * paragraphs within the text are inserted to a text document. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; TestEnvironment tEnv = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java b/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java index cbe088ab8736..472cd96882a0 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java @@ -95,6 +95,7 @@ public class SwXTextCursor extends TestCase { /** * Creates text document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -110,6 +111,7 @@ public class SwXTextCursor extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); @@ -126,6 +128,7 @@ public class SwXTextCursor extends TestCase { * {@link ifc.text._XTextRange} : major text of text document</li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextDefaults.java b/qadevOOo/tests/java/mod/_sw/SwXTextDefaults.java index 16bedd3c6436..b2c4013d12c5 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextDefaults.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextDefaults.java @@ -70,6 +70,7 @@ public class SwXTextDefaults extends TestCase { /** * Creates the service <code>com.sun.star.text.Defaults</code> */ + @Override protected TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log) { @@ -92,6 +93,7 @@ public class SwXTextDefaults extends TestCase { /** * Creates text document. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -106,6 +108,7 @@ public class SwXTextDefaults extends TestCase { /** * Disposes text document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextDocument.java b/qadevOOo/tests/java/mod/_sw/SwXTextDocument.java index 84e35edfe4d9..b09b636abd3c 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextDocument.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextDocument.java @@ -53,9 +53,11 @@ public class SwXTextDocument extends TestCase { XTextDocument xTextDoc; XTextDocument xSecondTextDoc; + @Override protected void initialize(TestParameters tParam, PrintWriter log) { } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); DesktopTools.closeDoc(xSecondTextDoc); @@ -65,6 +67,7 @@ public class SwXTextDocument extends TestCase { /** * creating a Testenvironment for the interfaces to be tested */ + @Override public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java b/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java index 9c1745154572..c8318815bbdb 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java @@ -66,6 +66,7 @@ public class SwXTextEmbeddedObject extends TestCase { * @see PrintWriter * */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -91,6 +92,7 @@ public class SwXTextEmbeddedObject extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObjects.java b/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObjects.java index f1f23365a7e3..c74203b85e56 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObjects.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObjects.java @@ -51,6 +51,7 @@ public class SwXTextEmbeddedObjects extends TestCase { * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -74,6 +75,7 @@ public class SwXTextEmbeddedObjects extends TestCase { * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(oDoc); @@ -91,6 +93,7 @@ public class SwXTextEmbeddedObjects extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override public TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextField.java b/qadevOOo/tests/java/mod/_sw/SwXTextField.java index c2cca418794f..dafdbe78cda6 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextField.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextField.java @@ -60,6 +60,7 @@ public class SwXTextField extends TestCase { * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -84,6 +85,7 @@ public class SwXTextField extends TestCase { * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -101,6 +103,7 @@ public class SwXTextField extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFieldMasters.java b/qadevOOo/tests/java/mod/_sw/SwXTextFieldMasters.java index e32cdcb2ebd1..f3cb6f0e7a95 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextFieldMasters.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextFieldMasters.java @@ -56,6 +56,7 @@ public class SwXTextFieldMasters extends TestCase { * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -80,6 +81,7 @@ public class SwXTextFieldMasters extends TestCase { * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -97,6 +99,7 @@ public class SwXTextFieldMasters extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override public TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFieldTypes.java b/qadevOOo/tests/java/mod/_sw/SwXTextFieldTypes.java index 2d45a8cbed09..c2ab4699c67e 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextFieldTypes.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextFieldTypes.java @@ -54,6 +54,7 @@ public class SwXTextFieldTypes extends TestCase { * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -78,6 +79,7 @@ public class SwXTextFieldTypes extends TestCase { * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -95,6 +97,7 @@ public class SwXTextFieldTypes extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override public TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java b/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java index 9fa5e3736dda..8e3e5131f14d 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java @@ -45,6 +45,7 @@ import com.sun.star.uno.XInterface; public class SwXTextFrame extends TestCase { XTextDocument xTextDoc; + @Override protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -58,6 +59,7 @@ public class SwXTextFrame extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); @@ -66,6 +68,7 @@ public class SwXTextFrame extends TestCase { /** * creating a Testenvironment for the interfaces to be tested */ + @Override public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java b/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java index 5d9b47f8a2f8..5efc3a1a933e 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java @@ -51,6 +51,7 @@ import com.sun.star.uno.XInterface; public class SwXTextFrameText extends TestCase { XTextDocument xTextDoc; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -64,6 +65,7 @@ public class SwXTextFrameText extends TestCase { } } + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -80,6 +82,7 @@ public class SwXTextFrameText extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log ) { diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java index 1b37e78d3bf4..5261ca90f771 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java @@ -51,6 +51,7 @@ public class SwXTextGraphicObject extends TestCase { * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -74,6 +75,7 @@ public class SwXTextGraphicObject extends TestCase { * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -91,6 +93,7 @@ public class SwXTextGraphicObject extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java index 94cbf3e038e8..299648662f21 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java @@ -50,6 +50,7 @@ public class SwXTextGraphicObjects extends TestCase { * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -73,6 +74,7 @@ public class SwXTextGraphicObjects extends TestCase { * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -90,6 +92,7 @@ public class SwXTextGraphicObjects extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override public TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java b/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java index 0a3d44dcbeb9..87a25bfeca5c 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java @@ -47,6 +47,7 @@ import com.sun.star.uno.XInterface; public class SwXTextPortion extends TestCase { XTextDocument xTextDoc; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -60,6 +61,7 @@ public class SwXTextPortion extends TestCase { } } + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -76,6 +78,7 @@ public class SwXTextPortion extends TestCase { * @see TestParameters * * @see PrintWriter */ + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java b/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java index 6e298f529919..e9bec556c25b 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java @@ -47,6 +47,7 @@ public class SwXTextPortionEnumeration extends TestCase { XTextDocument xTextDoc; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -60,6 +61,7 @@ public class SwXTextPortionEnumeration extends TestCase { } } + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -76,6 +78,7 @@ public class SwXTextPortionEnumeration extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface param = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextRange.java b/qadevOOo/tests/java/mod/_sw/SwXTextRange.java index 32d510467c52..ca6c9cfa3e0b 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextRange.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextRange.java @@ -35,6 +35,7 @@ import com.sun.star.uno.XInterface; public class SwXTextRange extends TestCase { XTextDocument xTextDoc; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -48,6 +49,7 @@ public class SwXTextRange extends TestCase { } } + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -56,6 +58,7 @@ public class SwXTextRange extends TestCase { /** * creating a Testenvironment for the interfaces to be tested */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextRanges.java b/qadevOOo/tests/java/mod/_sw/SwXTextRanges.java index d6f4856d7168..bb3d9f07569e 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextRanges.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextRanges.java @@ -45,6 +45,7 @@ import com.sun.star.util.XSearchable; public class SwXTextRanges extends TestCase { XTextDocument xTextDoc; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -58,6 +59,7 @@ public class SwXTextRanges extends TestCase { } } + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -74,6 +76,7 @@ public class SwXTextRanges extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextSearch.java b/qadevOOo/tests/java/mod/_sw/SwXTextSearch.java index da2c371099a3..ec8dc1e7c96b 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextSearch.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextSearch.java @@ -46,6 +46,7 @@ import com.sun.star.util.XSearchable; public class SwXTextSearch extends TestCase { XTextDocument xTextDoc; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -59,6 +60,7 @@ public class SwXTextSearch extends TestCase { } } + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -75,6 +77,7 @@ public class SwXTextSearch extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log ) { diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextSection.java b/qadevOOo/tests/java/mod/_sw/SwXTextSection.java index dcd5c115039b..ab0cd927b58c 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextSection.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextSection.java @@ -56,6 +56,7 @@ import com.sun.star.uno.XInterface; public class SwXTextSection extends TestCase { XTextDocument xTextDoc; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -69,6 +70,7 @@ public class SwXTextSection extends TestCase { } } + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -77,6 +79,7 @@ public class SwXTextSection extends TestCase { /** * creating a Testenvironment for the interfaces to be tested */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextSections.java b/qadevOOo/tests/java/mod/_sw/SwXTextSections.java index 3af9c0c74aa8..4a136e168d86 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextSections.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextSections.java @@ -45,6 +45,7 @@ import com.sun.star.uno.XInterface; public class SwXTextSections extends TestCase { XTextDocument xTextDoc; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -58,6 +59,7 @@ public class SwXTextSections extends TestCase { } } + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -66,6 +68,7 @@ public class SwXTextSections extends TestCase { /** * creating a Testenvironment for the interfaces to be tested */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java index ef0546a441b2..5dbdea9f32ec 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java @@ -48,6 +48,7 @@ public class SwXTextTable extends TestCase { SOfficeFactory SOF; XTextDocument xTextDoc; + @Override protected void initialize(TestParameters tParam, PrintWriter log) { SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -61,6 +62,7 @@ public class SwXTextTable extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); @@ -77,6 +79,7 @@ public class SwXTextTable extends TestCase { @see TestParameters @see PrintWriter */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { // creation of testobject here diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java b/qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java index 68bb47a3f041..0755c1e0afb8 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java @@ -40,6 +40,7 @@ import com.sun.star.uno.XInterface; public class SwXTextTableCursor extends TestCase { XTextDocument xTextDoc; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -53,6 +54,7 @@ public class SwXTextTableCursor extends TestCase { } } + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -70,6 +72,7 @@ public class SwXTextTableCursor extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java b/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java index 0b16413a6ca0..c31b643174b2 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java @@ -42,6 +42,7 @@ import com.sun.star.uno.XInterface; public class SwXTextTableRow extends TestCase { XTextDocument xTextDoc; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -55,11 +56,13 @@ public class SwXTextTableRow extends TestCase { } } + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTables.java b/qadevOOo/tests/java/mod/_sw/SwXTextTables.java index 8e2253c7d5c2..11f987e73f62 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextTables.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextTables.java @@ -44,6 +44,7 @@ import com.sun.star.uno.XInterface; public class SwXTextTables extends TestCase { XTextDocument xTextDoc; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -57,6 +58,7 @@ public class SwXTextTables extends TestCase { } } + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -74,6 +76,7 @@ public class SwXTextTables extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextView.java b/qadevOOo/tests/java/mod/_sw/SwXTextView.java index 9c12c67017dd..0603d40584b9 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextView.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextView.java @@ -76,6 +76,7 @@ public class SwXTextView extends TestCase { * * @see PrintWriter * */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -102,6 +103,7 @@ public class SwXTextView extends TestCase { * * @see PrintWriter * */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -119,6 +121,7 @@ public class SwXTextView extends TestCase { * @see TestParameters * * @see PrintWriter */ + @Override public TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log )throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextViewCursor.java b/qadevOOo/tests/java/mod/_sw/SwXTextViewCursor.java index dc942b9f3ff0..448e2ea9e4ff 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextViewCursor.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextViewCursor.java @@ -51,6 +51,7 @@ import com.sun.star.uno.XInterface; public class SwXTextViewCursor extends TestCase { XTextDocument xTextDoc; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -64,6 +65,7 @@ public class SwXTextViewCursor extends TestCase { } } + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -81,6 +83,7 @@ public class SwXTextViewCursor extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sw/SwXViewSettings.java b/qadevOOo/tests/java/mod/_sw/SwXViewSettings.java index cadd80967c07..6b9a93a88ed0 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXViewSettings.java +++ b/qadevOOo/tests/java/mod/_sw/SwXViewSettings.java @@ -41,6 +41,7 @@ import com.sun.star.view.XViewSettingsSupplier; public class SwXViewSettings extends TestCase { XTextDocument xTextDoc; + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -54,6 +55,7 @@ public class SwXViewSettings extends TestCase { } } + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -71,6 +73,7 @@ public class SwXViewSettings extends TestCase { * @see TestParameters * @see PrintWriter */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log ) { diff --git a/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java b/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java index 30765eea3ec2..901249737d1c 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java @@ -67,6 +67,7 @@ public class XMLContentExporter extends TestCase { /** * New text document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -83,6 +84,7 @@ public class XMLContentExporter extends TestCase { /** * Document disposed here. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -109,6 +111,7 @@ public class XMLContentExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment ( TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sw/XMLContentImporter.java b/qadevOOo/tests/java/mod/_sw/XMLContentImporter.java index 1e4e812f4160..1cca405298da 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLContentImporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLContentImporter.java @@ -63,6 +63,7 @@ public class XMLContentImporter extends TestCase { /** * New text document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -79,6 +80,7 @@ public class XMLContentImporter extends TestCase { /** * Text document destroyed. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -102,6 +104,7 @@ public class XMLContentImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sw/XMLExporter.java b/qadevOOo/tests/java/mod/_sw/XMLExporter.java index 8a380749ee1b..967389feaa71 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLExporter.java @@ -67,6 +67,7 @@ public class XMLExporter extends TestCase { /** * New text document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -83,6 +84,7 @@ public class XMLExporter extends TestCase { /** * Document disposed here. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -109,6 +111,7 @@ public class XMLExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sw/XMLImporter.java b/qadevOOo/tests/java/mod/_sw/XMLImporter.java index 9d04f6e42749..e3016f20219c 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLImporter.java @@ -64,6 +64,7 @@ public class XMLImporter extends TestCase { /** * New text document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -80,6 +81,7 @@ public class XMLImporter extends TestCase { /** * Text document destroyed. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -103,6 +105,7 @@ public class XMLImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment ( TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java index d8a67d589152..3bc515977f49 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java @@ -68,6 +68,7 @@ public class XMLMetaExporter extends TestCase { /** * New text document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { @@ -84,6 +85,7 @@ public class XMLMetaExporter extends TestCase { /** * Document disposed here. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -110,6 +112,7 @@ public class XMLMetaExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment ( TestParameters tParam, PrintWriter log ) throws StatusException { final String TITLE = "Title for testing of XMLMetaExporter"; diff --git a/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java index c8d56fec4a15..39c142119b75 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java @@ -65,6 +65,7 @@ public class XMLMetaImporter extends TestCase { /** * New text document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -81,6 +82,7 @@ public class XMLMetaImporter extends TestCase { /** * Text document destroyed. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -105,6 +107,7 @@ public class XMLMetaImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java index 8b1f4badffe9..819d27ce87ed 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java @@ -69,6 +69,7 @@ public class XMLSettingsExporter extends TestCase { /** * New text document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -87,6 +88,7 @@ public class XMLSettingsExporter extends TestCase { /** * Document disposed here. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -113,6 +115,7 @@ public class XMLSettingsExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_sw/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_sw/XMLSettingsImporter.java index d17430c02b27..c8fa3c31dc83 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLSettingsImporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLSettingsImporter.java @@ -66,6 +66,7 @@ public class XMLSettingsImporter extends TestCase { /** * New text document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -82,6 +83,7 @@ public class XMLSettingsImporter extends TestCase { /** * Text document destroyed. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -106,6 +108,7 @@ public class XMLSettingsImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java index 7873a957679a..9196d13e026c 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java @@ -67,6 +67,7 @@ public class XMLStylesExporter extends TestCase { /** * New text document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -83,6 +84,7 @@ public class XMLStylesExporter extends TestCase { /** * Document disposed here. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -109,6 +111,7 @@ public class XMLStylesExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment ( TestParameters tParam, PrintWriter log ) { diff --git a/qadevOOo/tests/java/mod/_sw/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_sw/XMLStylesImporter.java index e1cdafae68c1..7f5de472adc8 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLStylesImporter.java @@ -65,6 +65,7 @@ public class XMLStylesImporter extends TestCase { /** * New text document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); @@ -81,6 +82,7 @@ public class XMLStylesImporter extends TestCase { /** * Text document destroyed. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xTextDoc " ); util.DesktopTools.closeDoc(xTextDoc); @@ -105,6 +107,7 @@ public class XMLStylesImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_sysdtrans/SystemClipboard.java b/qadevOOo/tests/java/mod/_sysdtrans/SystemClipboard.java index a0e68953c4da..f964d1ed8e8a 100644 --- a/qadevOOo/tests/java/mod/_sysdtrans/SystemClipboard.java +++ b/qadevOOo/tests/java/mod/_sysdtrans/SystemClipboard.java @@ -31,6 +31,7 @@ import com.sun.star.uno.XInterface; public class SystemClipboard extends TestCase { + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_syssh/SystemShellExecute.java b/qadevOOo/tests/java/mod/_syssh/SystemShellExecute.java index 54a0b8164761..0b18c007c8ee 100644 --- a/qadevOOo/tests/java/mod/_syssh/SystemShellExecute.java +++ b/qadevOOo/tests/java/mod/_syssh/SystemShellExecute.java @@ -31,6 +31,7 @@ import com.sun.star.uno.XInterface; public class SystemShellExecute extends TestCase { + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_tcv/TypeConverter.java b/qadevOOo/tests/java/mod/_tcv/TypeConverter.java index 10ce9c07d70d..3287f38361d8 100644 --- a/qadevOOo/tests/java/mod/_tcv/TypeConverter.java +++ b/qadevOOo/tests/java/mod/_tcv/TypeConverter.java @@ -30,6 +30,7 @@ import com.sun.star.uno.XInterface; public class TypeConverter extends TestCase { + @Override protected void initialize ( TestParameters Param, PrintWriter log) { } @@ -37,6 +38,7 @@ public class TypeConverter extends TestCase { /** * creating a Testenvironment for the interfaces to be tested */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_tdmgr/TypeDescriptionManager.java b/qadevOOo/tests/java/mod/_tdmgr/TypeDescriptionManager.java index f01c53603b65..73c95c05ccb8 100644 --- a/qadevOOo/tests/java/mod/_tdmgr/TypeDescriptionManager.java +++ b/qadevOOo/tests/java/mod/_tdmgr/TypeDescriptionManager.java @@ -33,6 +33,7 @@ import com.sun.star.uno.XInterface; public class TypeDescriptionManager extends TestCase { + @Override protected void initialize ( TestParameters Param, PrintWriter log) { } @@ -40,6 +41,7 @@ public class TypeDescriptionManager extends TestCase { /** * creating a Testenvironment for the interfaces to be tested */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_text/DefaultNumberingProvider.java b/qadevOOo/tests/java/mod/_text/DefaultNumberingProvider.java index 3032d31647d3..825095437b10 100644 --- a/qadevOOo/tests/java/mod/_text/DefaultNumberingProvider.java +++ b/qadevOOo/tests/java/mod/_text/DefaultNumberingProvider.java @@ -47,6 +47,7 @@ public class DefaultNumberingProvider extends TestCase { * Creates an instance of the service * <code>com.sun.star.text.DefaultNumberingProvider</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java index cfd8853f6433..07340ad82f3c 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java @@ -83,6 +83,7 @@ public class AccessibleButton extends lib.TestCase { * window) and finds accessible button 'OK' walking through the * accessible component tree. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -158,6 +159,7 @@ public class AccessibleButton extends lib.TestCase { * Closes the dialog using accessible button 'OK' found in * <code>createTestEnvironment()</code>. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -175,6 +177,7 @@ public class AccessibleButton extends lib.TestCase { /** * Opens new writer document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { try { SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -198,6 +201,7 @@ public class AccessibleButton extends lib.TestCase { this.msf = msf; } + @Override public void run() { XModel aModel = UnoRuntime.queryInterface(XModel.class, xTextDoc); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java index 83d4b1caf652..6c90c96f0c93 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java @@ -88,6 +88,7 @@ public class AccessibleCheckBox extends TestCase { * window) and finds first accessible check box walking through the * accessible component tree. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XMultiServiceFactory msf = Param.getMSF(); @@ -182,6 +183,7 @@ public class AccessibleCheckBox extends TestCase { * Closes the dialog using accessible button 'Cancel' found in * <code>createTestEnvironment()</code>. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { try { log.println("closing dialog"); @@ -199,6 +201,7 @@ public class AccessibleCheckBox extends TestCase { } } + @Override protected void initialize(TestParameters Param, PrintWriter log) { } @@ -214,6 +217,7 @@ public class AccessibleCheckBox extends TestCase { this.msf = msf; } + @Override public void run() { XModel aModel = UnoRuntime.queryInterface(XModel.class, xTextDoc); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java index a2c3fb246300..527770386fe2 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java @@ -77,6 +77,7 @@ public class AccessibleComboBox extends TestCase { * finds AccessibleComboBox walking through the * accessible component tree. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -159,6 +160,7 @@ public class AccessibleComboBox extends TestCase { * Closes the dialog using accessible button 'Cancel' found in * <code>createTestEnvironment()</code>. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println(" closing dialog "); @@ -176,6 +178,7 @@ public class AccessibleComboBox extends TestCase { /** * Creates writer doc */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { try { SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -199,6 +202,7 @@ public class AccessibleComboBox extends TestCase { this.msf = msf; } + @Override public void run() { XModel aModel = UnoRuntime.queryInterface(XModel.class, xTextDoc); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java index dd0efb327a79..0823bd120f0b 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java @@ -69,6 +69,7 @@ public class AccessibleDropDownComboBox extends TestCase { * Finds AccessibleDropDownComboBox walking through the * accessible component tree of a writer document. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -108,6 +109,7 @@ public class AccessibleDropDownComboBox extends TestCase { /** * Creates writer document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { try { SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -121,6 +123,7 @@ public class AccessibleDropDownComboBox extends TestCase { /** * Disposes writer document. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { util.DesktopTools.closeDoc(xTextDoc); } diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java index 4f3e88021f0b..0b33fb0b4a03 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java @@ -68,6 +68,7 @@ public class AccessibleDropDownListBox extends TestCase { * Finds AccessibleDropDownListBox walking through the * accessible component tree of a writer document. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -109,6 +110,7 @@ public class AccessibleDropDownListBox extends TestCase { /** * Creates writer document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { try { SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -123,6 +125,7 @@ public class AccessibleDropDownListBox extends TestCase { /** * Disposes writer document. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { util.DesktopTools.closeDoc(xTextDoc); } diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java index bd81276a0b3d..b22dd6b98dd4 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java @@ -85,6 +85,7 @@ public class AccessibleEdit extends TestCase { * button 'Close' (for closing this dialog when disposing) * walking through the accessible component tree. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -183,6 +184,7 @@ public class AccessibleEdit extends TestCase { /** * Closes dialog using action of button 'Close' */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println(" Closing dialog ... "); @@ -200,6 +202,7 @@ public class AccessibleEdit extends TestCase { /** * Creates writer document */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { try { SOfficeFactory SOF = SOfficeFactory.getFactory( diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java index ab5554a6e3ec..0e73f6b97076 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java @@ -73,6 +73,7 @@ public class AccessibleFixedText extends TestCase { * displays it. Then the text's accessible component is * obtained. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -177,6 +178,7 @@ public class AccessibleFixedText extends TestCase { /** * Closes dialog using action of button 'Close' */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println(" Closing dialog ... "); xWinDlg.dispose(); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java index 605b976c260a..9839db5ebeb7 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java @@ -62,6 +62,7 @@ public class AccessibleList extends TestCase { * Then the TREE component is found and the 'New Document' tab is * selected to make list box visible. After that list box is obtained. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -185,6 +186,7 @@ public class AccessibleList extends TestCase { /** * Closes dialog using action of button 'Close' */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println(" Closing dialog ... "); @@ -202,6 +204,7 @@ public class AccessibleList extends TestCase { /** * Creates writer document */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { try { msf = Param.getMSF(); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java index e90299444f89..9a77b694fd86 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java @@ -84,6 +84,7 @@ public class AccessibleListBox extends TestCase { * Then the TREE component is found and the 'New Document' tab is * selected to make list box visible. After that list box is obtained. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -198,6 +199,7 @@ public class AccessibleListBox extends TestCase { /** * Closes dialog using action of button 'Close' */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println(" Closing dialog ... "); @@ -215,6 +217,7 @@ public class AccessibleListBox extends TestCase { /** * Creates writer document */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { try { SOfficeFactory SOF = SOfficeFactory.getFactory( diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java index 25f84f4c056b..e2f8debccfca 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java @@ -82,6 +82,7 @@ public class AccessibleListItem extends TestCase { * Then the TREE component is found and the 'New Document' tab is * selected to make list box visible. After that listbox item is obtained. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -190,6 +191,7 @@ public class AccessibleListItem extends TestCase { /** * Closes dialog using action of button 'Close' */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println(" Closing dialog ... "); @@ -207,6 +209,7 @@ public class AccessibleListItem extends TestCase { /** * Creates writer document */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { try { SOfficeFactory SOF = SOfficeFactory.getFactory( diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java index cbebff7874a8..cfde728a1783 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java @@ -80,6 +80,7 @@ public class AccessibleMenu extends TestCase { * Finds accessible component with role <code>MENU</code> * walking through the accessible component tree of a document. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XMultiServiceFactory msf = Param.getMSF(); @@ -156,6 +157,7 @@ public class AccessibleMenu extends TestCase { return tEnv; } + @Override protected void cleanup(TestParameters Param, PrintWriter log) { try { util.DesktopTools.closeDoc(xTextDoc); @@ -167,6 +169,7 @@ public class AccessibleMenu extends TestCase { /** * Creates a new writer document */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { } diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java index 9bf61b719ff1..661f2571d84f 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java @@ -68,6 +68,7 @@ public class AccessibleMenuBar extends TestCase { * Finds accessible component with role <code>MENUBAR</code> * walking through the accessible component tree of a document. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { shortWait(); @@ -111,6 +112,7 @@ public class AccessibleMenuBar extends TestCase { /** * Creates writer document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { try { SOfficeFactory SOF = SOfficeFactory.getFactory( @@ -124,6 +126,7 @@ public class AccessibleMenuBar extends TestCase { /** * Disposes document. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { util.DesktopTools.closeDoc(xTextDoc); } diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java index ef3d4db6fc14..46ff5cda834e 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java @@ -79,6 +79,7 @@ public class AccessibleMenuItem extends TestCase { * Finds first accessible component with role <code>MENUITEM</code> * walking through the accessible component tree of a document. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -160,6 +161,7 @@ public class AccessibleMenuItem extends TestCase { /** * Creates writer document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { try { msf = Param.getMSF(); @@ -174,6 +176,7 @@ public class AccessibleMenuItem extends TestCase { /** * Disposes document. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { util.DesktopTools.closeDoc(xTextDoc); } diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java index 5a405b3d6002..66ea499273fc 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java @@ -70,6 +70,7 @@ public class AccessibleMenuSeparator extends TestCase { * and implementation name <code>AccessibleMenuSeparator</code> * walking through the accessible component tree of a document. */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { shortWait(); @@ -126,6 +127,7 @@ public class AccessibleMenuSeparator extends TestCase { /** * Creates writer document. */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { try { msf = Param.getMSF(); @@ -140,6 +142,7 @@ public class AccessibleMenuSeparator extends TestCase { /** * Disposes document. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { util.DesktopTools.closeDoc(xTextDoc); } diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java index cf2b424c76d7..bfa7ffbed1d7 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java @@ -53,6 +53,7 @@ public class AccessiblePopupMenu extends TestCase { /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( @@ -63,6 +64,7 @@ public class AccessiblePopupMenu extends TestCase { * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println("release the popup menu"); @@ -107,6 +109,7 @@ public class AccessiblePopupMenu extends TestCase { * @see com.sun.star.accessibility.XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleText */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java index 32f9ee052954..3859963faac0 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java @@ -90,6 +90,7 @@ public class AccessibleRadioButton extends TestCase { /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( @@ -100,6 +101,7 @@ public class AccessibleRadioButton extends TestCase { * Closes a Hyperlink dialog, disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { try { if (accCloseButton != null) { @@ -148,6 +150,7 @@ public class AccessibleRadioButton extends TestCase { * @see com.sun.star.accessibility.XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleText */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java index a493590b19a4..8b4a2fe1461a 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java @@ -77,6 +77,7 @@ public class AccessibleScrollBar extends TestCase { /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( @@ -87,6 +88,7 @@ public class AccessibleScrollBar extends TestCase { * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println("disposing xTextDoc"); @@ -114,6 +116,7 @@ public class AccessibleScrollBar extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java index 66d029140eba..5d27cb6adf8b 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java @@ -78,6 +78,7 @@ public class AccessibleStatusBar extends TestCase { * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println("disposing xTextDoc"); @@ -105,6 +106,7 @@ public class AccessibleStatusBar extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java index 80d8ae461340..cf6eb04f417a 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java @@ -77,6 +77,7 @@ public class AccessibleStatusBarItem extends TestCase { /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( @@ -87,6 +88,7 @@ public class AccessibleStatusBarItem extends TestCase { * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println("disposing xTextDoc"); @@ -114,6 +116,7 @@ public class AccessibleStatusBarItem extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java index 8387f0ec941e..b602b0d74162 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java @@ -84,6 +84,7 @@ public class AccessibleTabControl extends TestCase { /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( @@ -94,6 +95,7 @@ public class AccessibleTabControl extends TestCase { * Closes an InsertFields dialog, disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { try { if (accCloseButton != null) { @@ -136,6 +138,7 @@ public class AccessibleTabControl extends TestCase { * @see com.sun.star.accessibility.XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleSelection */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java index c5a755d18e08..61b4e7dd5665 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java @@ -80,6 +80,7 @@ public class AccessibleTabPage extends TestCase { /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( @@ -90,6 +91,7 @@ public class AccessibleTabPage extends TestCase { * Closes an InsertFields dialog, disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { try { if (accCloseButton != null) { @@ -129,6 +131,7 @@ public class AccessibleTabPage extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java index 248ac4410a74..98ccf2e3b132 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java @@ -68,6 +68,7 @@ public class AccessibleToolBox extends TestCase { /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( @@ -78,6 +79,7 @@ public class AccessibleToolBox extends TestCase { * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println("disposing xTextDoc"); @@ -106,6 +108,7 @@ public class AccessibleToolBox extends TestCase { * @see ifc.accessibility._XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleEventBroadcaster */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java index 22e32670870c..bd6ff32f6c5d 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java @@ -81,6 +81,7 @@ public class AccessibleToolBoxItem extends TestCase { /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( @@ -91,6 +92,7 @@ public class AccessibleToolBoxItem extends TestCase { * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println("disposing xTextDoc"); @@ -122,6 +124,7 @@ public class AccessibleToolBoxItem extends TestCase { * @see com.sun.star.accessibility.XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleText */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java index d755471254ca..2853f6873c3e 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java @@ -83,6 +83,7 @@ public class AccessibleWindow extends TestCase { /** * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>). */ + @Override protected void initialize(TestParameters Param, PrintWriter log) { UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( @@ -93,6 +94,7 @@ public class AccessibleWindow extends TestCase { * Disposes the document, if exists, created in * <code>createTestEnvironment</code> method. */ + @Override protected void cleanup(TestParameters Param, PrintWriter log) { log.println("disposing xTextDoc"); @@ -124,6 +126,7 @@ public class AccessibleWindow extends TestCase { * @see com.sun.star.accessibility.XAccessibleEventBroadcaster * @see com.sun.star.accessibility.XAccessibleText */ + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { log.println("creating a test environment"); diff --git a/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java b/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java index 751987727042..aaa9f987a781 100644 --- a/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java @@ -40,6 +40,7 @@ public class MutableTreeDataModel extends TestCase { /** * Creates StarOffice Writer document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( @@ -49,12 +50,14 @@ public class MutableTreeDataModel extends TestCase { /** * Disposes StarOffice Writer document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java b/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java index c632116fcbfe..ea0d8b1368b4 100644 --- a/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java +++ b/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java @@ -46,6 +46,7 @@ public class MutableTreeNode extends TestCase { /** * Creates StarOffice Writer document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { mxMSF = tParam.getMSF(); } @@ -53,12 +54,14 @@ public class MutableTreeNode extends TestCase { /** * Disposes StarOffice Writer document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XMutableTreeNode xNode; diff --git a/qadevOOo/tests/java/mod/_toolkit/TabController.java b/qadevOOo/tests/java/mod/_toolkit/TabController.java index 42eab4b8dbf7..49523a7a8e17 100644 --- a/qadevOOo/tests/java/mod/_toolkit/TabController.java +++ b/qadevOOo/tests/java/mod/_toolkit/TabController.java @@ -45,6 +45,7 @@ import util.utils; public class TabController extends TestCase { private static XTextDocument xTextDoc = null; + @Override protected void initialize(TestParameters param, PrintWriter log) { try { log.println("creating a textdocument"); @@ -57,11 +58,13 @@ public class TabController extends TestCase { } } + @Override protected void cleanup(TestParameters param, PrintWriter log) { log.println("disposing xTextDoc"); util.DesktopTools.closeDoc(xTextDoc); } + @Override public TestEnvironment createTestEnvironment(TestParameters param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java b/qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java index 563720abd1ae..ca73fa5aa1fa 100644 --- a/qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java @@ -36,6 +36,7 @@ import util.utils; public class TabControllerModel extends TestCase { private static XTextDocument xTextDoc; + @Override protected void initialize(TestParameters param, PrintWriter log) { try { log.println("creating a textdocument"); @@ -47,11 +48,13 @@ public class TabControllerModel extends TestCase { } } + @Override protected void cleanup(TestParameters param, PrintWriter log) { log.println("disposing xTextDoc"); util.DesktopTools.closeDoc(xTextDoc); } + @Override public TestEnvironment createTestEnvironment(TestParameters param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/Toolkit.java b/qadevOOo/tests/java/mod/_toolkit/Toolkit.java index aeae187dc6de..33b4b4c45051 100644 --- a/qadevOOo/tests/java/mod/_toolkit/Toolkit.java +++ b/qadevOOo/tests/java/mod/_toolkit/Toolkit.java @@ -47,6 +47,7 @@ import util.utils; public class Toolkit extends TestCase { private static XTextDocument xTextDoc; + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -61,6 +62,7 @@ public class Toolkit extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); @@ -70,6 +72,7 @@ public class Toolkit extends TestCase { * Creating a Testenvironment for the interfaces to be tested. * Creates <code>com.sun.star.awt.Toolkit</code> service. */ + @Override public TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java index ec2dcaf4cf79..4f65ea9f11e8 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java @@ -48,6 +48,7 @@ public class UnoControlButton extends TestCase { private static XTextDocument xTextDoc; private static XTextDocument xTD2; + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -64,6 +65,7 @@ public class UnoControlButton extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -71,6 +73,7 @@ public class UnoControlButton extends TestCase { util.DesktopTools.closeDoc(xTD2); } + @Override public TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java index ee8960131b49..8ada3adf21ad 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java @@ -37,6 +37,7 @@ public class UnoControlButtonModel extends TestCase { /** * Creates StarOffice Writer document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( @@ -46,12 +47,14 @@ public class UnoControlButtonModel extends TestCase { /** * Disposes StarOffice Writer document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java index d5c863d52316..324c8d808a6b 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java @@ -49,6 +49,7 @@ public class UnoControlCheckBox extends TestCase { private static XTextDocument xTextDoc; private static XTextDocument xTD2; + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -65,6 +66,7 @@ public class UnoControlCheckBox extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -72,6 +74,7 @@ public class UnoControlCheckBox extends TestCase { util.DesktopTools.closeDoc(xTD2); } + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBoxModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBoxModel.java index 8b0476578f48..192d1470fdd5 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBoxModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBoxModel.java @@ -37,6 +37,7 @@ public class UnoControlCheckBoxModel extends TestCase { /** * Creates StarOffice Writer document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( @@ -46,12 +47,14 @@ public class UnoControlCheckBoxModel extends TestCase { /** * Disposes StarOffice Writer document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java index f72b5f560816..34ad3f819784 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java @@ -46,6 +46,7 @@ import com.sun.star.view.XControlAccess; public class UnoControlComboBox extends TestCase { private static XTextDocument xTextDoc; + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -59,12 +60,14 @@ public class UnoControlComboBox extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBoxModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBoxModel.java index 2a1abf6908cd..7d43ba9adc34 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBoxModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBoxModel.java @@ -36,6 +36,7 @@ public class UnoControlComboBoxModel extends TestCase { /** * Creates StarOffice Writer document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( @@ -45,12 +46,14 @@ public class UnoControlComboBoxModel extends TestCase { /** * Disposes StarOffice Writer document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java index 38fbd61d7287..8701e6a80110 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java @@ -54,6 +54,7 @@ public class UnoControlContainer extends TestCase { private static XControl xCtrl1; private static XControl xCtrl2; + @Override protected void initialize(TestParameters param, PrintWriter log) { try { log.println("creating a textdocument"); @@ -68,6 +69,7 @@ public class UnoControlContainer extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -75,6 +77,7 @@ public class UnoControlContainer extends TestCase { util.DesktopTools.closeDoc(xTD2); } + @Override public TestEnvironment createTestEnvironment(TestParameters param, PrintWriter log) { // create Object Relations ------------------------------------------- diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java index 0142d93bcc3d..ddd15e450731 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java @@ -30,6 +30,7 @@ import util.utils; public class UnoControlContainerModel extends TestCase { + @Override public TestEnvironment createTestEnvironment(TestParameters param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java index e17e9cac4da8..7c511d75019e 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java @@ -47,6 +47,7 @@ import util.utils; public class UnoControlCurrencyField extends TestCase { private static XTextDocument xTextDoc; + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -61,12 +62,14 @@ public class UnoControlCurrencyField extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyFieldModel.java index 264f5abb3123..a21d810acb86 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyFieldModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyFieldModel.java @@ -36,6 +36,7 @@ public class UnoControlCurrencyFieldModel extends TestCase { /** * Creates StarOffice Writer document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( @@ -45,12 +46,14 @@ public class UnoControlCurrencyFieldModel extends TestCase { /** * Disposes StarOffice Writer document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java index 8d81569bb6fe..3e6fb99b21a4 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java @@ -49,6 +49,7 @@ public class UnoControlDateField extends TestCase { private static XTextDocument xTextDoc; private static XTextDocument xTD2; + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -65,6 +66,7 @@ public class UnoControlDateField extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -72,6 +74,7 @@ public class UnoControlDateField extends TestCase { util.DesktopTools.closeDoc(xTD2); } + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDateFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateFieldModel.java index aaa5b9856a8f..90c56c8c7a8a 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDateFieldModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateFieldModel.java @@ -36,6 +36,7 @@ public class UnoControlDateFieldModel extends TestCase { /** * Creates StarOffice Writer document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( @@ -45,12 +46,14 @@ public class UnoControlDateFieldModel extends TestCase { /** * Disposes StarOffice Writer document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialog.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialog.java index edcfe8ec1ea1..c588fd23fdcf 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialog.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialog.java @@ -82,6 +82,7 @@ public class UnoControlDialog extends TestCase { * for Control, adds to Dialog a button, sets its size and * sets the dialog visible. <p> */ + @Override public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; @@ -221,6 +222,7 @@ public class UnoControlDialog extends TestCase { return tEnv; } // finish method getTestEnvironment + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println("Disposing dialog ..."); xWinDlg.dispose(); @@ -229,6 +231,7 @@ public class UnoControlDialog extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } + @Override protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java index 32fc7c71cac2..b499032646f3 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java @@ -70,6 +70,7 @@ public class UnoControlDialogModel extends TestCase { * {@link ifc.io._XPersistObject} </li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java index 7886ec93be46..07eb8fe7bedd 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java @@ -47,6 +47,7 @@ import util.utils; public class UnoControlEdit extends TestCase { private static XTextDocument xTextDoc; + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -61,12 +62,14 @@ public class UnoControlEdit extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlEditModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlEditModel.java index 8568c629b579..f5cae4650233 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlEditModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlEditModel.java @@ -36,6 +36,7 @@ public class UnoControlEditModel extends TestCase { /** * Creates StarOffice Writer document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( @@ -45,12 +46,14 @@ public class UnoControlEditModel extends TestCase { /** * Disposes StarOffice Writer document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java index d9e696c9fc78..5b3cb2ef005b 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java @@ -47,6 +47,7 @@ import util.utils; public class UnoControlFileControl extends TestCase { private static XTextDocument xTextDoc; + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -61,12 +62,14 @@ public class UnoControlFileControl extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControlModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControlModel.java index cce999e8df2b..50c89524f59a 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControlModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControlModel.java @@ -36,6 +36,7 @@ public class UnoControlFileControlModel extends TestCase { /** * Creates StarOffice Writer document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( @@ -45,12 +46,14 @@ public class UnoControlFileControlModel extends TestCase { /** * Disposes StarOffice Writer document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedLineModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedLineModel.java index 5158a29a4b09..489ae468f4b7 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedLineModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedLineModel.java @@ -64,6 +64,7 @@ public class UnoControlFixedLineModel extends TestCase { * {@link ifc.io._XPersistObject} </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java index dce7d7535b45..0649bcb20a46 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java @@ -46,6 +46,7 @@ import util.utils; public class UnoControlFixedText extends TestCase { private static XTextDocument xTextDoc; + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -60,12 +61,14 @@ public class UnoControlFixedText extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedTextModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedTextModel.java index 93eacd929823..152ab74459fc 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedTextModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedTextModel.java @@ -36,6 +36,7 @@ public class UnoControlFixedTextModel extends TestCase { /** * Creates StarOffice Writer document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( @@ -45,12 +46,14 @@ public class UnoControlFixedTextModel extends TestCase { /** * Disposes StarOffice Writer document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java index e9c5563af172..0cebbfd74aa5 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java @@ -48,6 +48,7 @@ import util.utils; public class UnoControlFormattedField extends TestCase { private static XTextDocument xTextDoc; + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -62,12 +63,14 @@ public class UnoControlFormattedField extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedFieldModel.java index 4694d7919562..f0c11096638b 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedFieldModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedFieldModel.java @@ -36,6 +36,7 @@ public class UnoControlFormattedFieldModel extends TestCase { /** * Creates StarOffice Writer document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( @@ -45,12 +46,14 @@ public class UnoControlFormattedFieldModel extends TestCase { /** * Disposes StarOffice Writer document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java index d4119e2408e6..d26b0a62a377 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java @@ -46,6 +46,7 @@ import util.utils; public class UnoControlGroupBox extends TestCase { private static XTextDocument xTextDoc; + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -60,12 +61,14 @@ public class UnoControlGroupBox extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBoxModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBoxModel.java index b5955de75f16..afa579a724ae 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBoxModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBoxModel.java @@ -36,6 +36,7 @@ public class UnoControlGroupBoxModel extends TestCase { /** * Creates StarOffice Writer document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( @@ -45,12 +46,14 @@ public class UnoControlGroupBoxModel extends TestCase { /** * Disposes StarOffice Writer document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java index 5c0054870921..1bf267dec6d5 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java @@ -47,6 +47,7 @@ import util.utils; public class UnoControlImageControl extends TestCase { private static XTextDocument xTextDoc; + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -61,12 +62,14 @@ public class UnoControlImageControl extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControlModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControlModel.java index a9a6bebe868f..6efaf71c5cf9 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControlModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControlModel.java @@ -29,6 +29,7 @@ import util.utils; public class UnoControlImageControlModel extends TestCase { + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java index 8ade3fe1d847..089b5ab2e170 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java @@ -47,6 +47,7 @@ import util.utils; public class UnoControlListBox extends TestCase { private static XTextDocument xTextDoc; + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -61,12 +62,14 @@ public class UnoControlListBox extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlListBoxModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBoxModel.java index 5b71c36bc585..e12d527a2ae5 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlListBoxModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBoxModel.java @@ -36,6 +36,7 @@ public class UnoControlListBoxModel extends TestCase { /** * Creates StarOffice Writer document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( @@ -45,12 +46,14 @@ public class UnoControlListBoxModel extends TestCase { /** * Disposes StarOffice Writer document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java index cc16a49edef0..0fea72e8d8aa 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java @@ -47,6 +47,7 @@ import com.sun.star.view.XControlAccess; public class UnoControlNumericField extends TestCase { private static XTextDocument xTextDoc; + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -60,6 +61,7 @@ public class UnoControlNumericField extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); @@ -74,6 +76,7 @@ public class UnoControlNumericField extends TestCase { } } + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericFieldModel.java index 66bf0a4846d0..8a363333ee1c 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericFieldModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericFieldModel.java @@ -36,6 +36,7 @@ public class UnoControlNumericFieldModel extends TestCase { /** * Creates StarOffice Writer document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( @@ -45,12 +46,14 @@ public class UnoControlNumericFieldModel extends TestCase { /** * Disposes StarOffice Writer document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java index a78384f278b2..a9c2283944ed 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java @@ -47,6 +47,7 @@ import util.utils; public class UnoControlPatternField extends TestCase { private static XTextDocument xTextDoc; + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -61,12 +62,14 @@ public class UnoControlPatternField extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternFieldModel.java index 1b64fb547aee..40ac0e324092 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternFieldModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternFieldModel.java @@ -29,6 +29,7 @@ import util.utils; public class UnoControlPatternFieldModel extends TestCase { + @Override public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlProgressBarModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlProgressBarModel.java index 620f9c390aba..998cc03cd96a 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlProgressBarModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlProgressBarModel.java @@ -62,6 +62,7 @@ public class UnoControlProgressBarModel extends TestCase { * {@link ifc.io._XPersistObject} </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java index df039b941be2..0d232ab48fbf 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java @@ -46,6 +46,7 @@ import util.utils; public class UnoControlRadioButton extends TestCase { private static XTextDocument xTextDoc; + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -60,12 +61,14 @@ public class UnoControlRadioButton extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButtonModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButtonModel.java index 2b9f4888ad3f..2dcc519ecd91 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButtonModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButtonModel.java @@ -29,6 +29,7 @@ import util.utils; public class UnoControlRadioButtonModel extends TestCase { + @Override public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlScrollBarModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlScrollBarModel.java index 5a47b5065334..38b18bde0945 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlScrollBarModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlScrollBarModel.java @@ -64,6 +64,7 @@ public class UnoControlScrollBarModel extends TestCase { * {@link ifc.io._XPersistObject} </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java index 7a8db780dcf6..d7ebd7b7c2b0 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java @@ -47,6 +47,7 @@ import util.utils; public class UnoControlTimeField extends TestCase { private static XTextDocument xTextDoc; + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -61,12 +62,14 @@ public class UnoControlTimeField extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeFieldModel.java index 4c31d10cab48..96a35e2bb2bb 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeFieldModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeFieldModel.java @@ -29,6 +29,7 @@ import util.utils; public class UnoControlTimeFieldModel extends TestCase { + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java index b416b10cc981..8f722cb243e9 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java @@ -51,6 +51,7 @@ import util.utils; public class UnoScrollBarControl extends TestCase { private static XTextDocument xTextDoc; + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -83,12 +84,14 @@ public class UnoScrollBarControl extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java index 04ca2b7ee276..843e05c9abca 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java @@ -45,18 +45,21 @@ import util.utils; public class UnoSpinButtonControl extends TestCase { private static XTextDocument xTextDoc; + @Override protected void initialize(TestParameters Param, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( Param.getMSF()); } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControlModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControlModel.java index 173da055d942..06dea1740239 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControlModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControlModel.java @@ -35,6 +35,7 @@ public class UnoSpinButtonControlModel extends TestCase { * Creates an instance of the service * <code>com.sun.star.awt.UnoControlSpinButtonModel</code>. */ + @Override public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java index fbfce88507e4..9ad723e77751 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java @@ -51,6 +51,7 @@ public class UnoTreeControl extends TestCase { private static XMutableTreeDataModel mXTreeDataModel; private static XMultiServiceFactory mxMSF; + @Override protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); @@ -65,9 +66,11 @@ public class UnoTreeControl extends TestCase { } } + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { } + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { String sTreeControlName = "UnoTreeControl-Test"; @@ -261,6 +264,7 @@ public class UnoTreeControl extends TestCase { mXDialog = xDialog; } + @Override public void run() { mXDialog.endExecute(); } diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoTreeModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoTreeModel.java index 8350cb980923..7467e9dc5d2f 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoTreeModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoTreeModel.java @@ -36,6 +36,7 @@ public class UnoTreeModel extends TestCase { /** * Creates StarOffice Writer document. */ + @Override protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( @@ -45,12 +46,14 @@ public class UnoTreeModel extends TestCase { /** * Disposes StarOffice Writer document. */ + @Override protected void cleanup(TestParameters tParam, PrintWriter log) { log.println(" disposing xTextDoc "); util.DesktopTools.closeDoc(xTextDoc); } + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_typeconverter/uno/TypeConverter.java b/qadevOOo/tests/java/mod/_typeconverter/uno/TypeConverter.java index 48d8da811fb8..5fb5d5621c86 100644 --- a/qadevOOo/tests/java/mod/_typeconverter/uno/TypeConverter.java +++ b/qadevOOo/tests/java/mod/_typeconverter/uno/TypeConverter.java @@ -27,6 +27,7 @@ import lib.TestParameters; public class TypeConverter extends TestCase { + @Override protected void initialize ( TestParameters Param, PrintWriter log) { } @@ -34,6 +35,7 @@ public class TypeConverter extends TestCase { /** * creating a Testenvironment for the interfaces to be tested */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object oInterface = null; diff --git a/qadevOOo/tests/java/mod/_typemgr/uno/TypeDescriptionManager.java b/qadevOOo/tests/java/mod/_typemgr/uno/TypeDescriptionManager.java index d3291073e13a..9e85c608366f 100644 --- a/qadevOOo/tests/java/mod/_typemgr/uno/TypeDescriptionManager.java +++ b/qadevOOo/tests/java/mod/_typemgr/uno/TypeDescriptionManager.java @@ -30,6 +30,7 @@ import lib.TestParameters; public class TypeDescriptionManager extends TestCase { + @Override protected void initialize ( TestParameters Param, PrintWriter log) { } @@ -37,6 +38,7 @@ public class TypeDescriptionManager extends TestCase { /** * creating a Testenvironment for the interfaces to be tested */ + @Override protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; Object oInterface = null; diff --git a/qadevOOo/tests/java/mod/_ucb/UcbContentProviderProxyFactory.java b/qadevOOo/tests/java/mod/_ucb/UcbContentProviderProxyFactory.java index 5f57465c196a..3a93e662a8c3 100644 --- a/qadevOOo/tests/java/mod/_ucb/UcbContentProviderProxyFactory.java +++ b/qadevOOo/tests/java/mod/_ucb/UcbContentProviderProxyFactory.java @@ -39,6 +39,7 @@ public class UcbContentProviderProxyFactory extends TestCase { * Creates an instance of the service * <code>com.sun.star.ucb.ContentProviderFactory</code>. */ + @Override public TestEnvironment createTestEnvironment (TestParameters Param,PrintWriter log ) { diff --git a/qadevOOo/tests/java/mod/_ucb/UcbPropertiesManager.java b/qadevOOo/tests/java/mod/_ucb/UcbPropertiesManager.java index d0cfab324884..4f518b1c3cca 100644 --- a/qadevOOo/tests/java/mod/_ucb/UcbPropertiesManager.java +++ b/qadevOOo/tests/java/mod/_ucb/UcbPropertiesManager.java @@ -30,6 +30,7 @@ import com.sun.star.uno.XInterface; public class UcbPropertiesManager extends TestCase { + @Override public TestEnvironment createTestEnvironment ( TestParameters Param, PrintWriter log ) { diff --git a/qadevOOo/tests/java/mod/_ucb/UcbStore.java b/qadevOOo/tests/java/mod/_ucb/UcbStore.java index 4faef44df613..dfd95164caee 100644 --- a/qadevOOo/tests/java/mod/_ucb/UcbStore.java +++ b/qadevOOo/tests/java/mod/_ucb/UcbStore.java @@ -39,6 +39,7 @@ public class UcbStore extends TestCase { * Creates an instance of the service * <code>com.sun.star.ucb.Store</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_ucb/UniversalContentBroker.java b/qadevOOo/tests/java/mod/_ucb/UniversalContentBroker.java index 6548c25f14e1..1728ae31a062 100644 --- a/qadevOOo/tests/java/mod/_ucb/UniversalContentBroker.java +++ b/qadevOOo/tests/java/mod/_ucb/UniversalContentBroker.java @@ -41,6 +41,7 @@ public class UniversalContentBroker extends TestCase { * Creates an instance of the service * <code>com.sun.star.ucb.UniversalContentBroker</code>. */ + @Override public TestEnvironment createTestEnvironment ( TestParameters Param, PrintWriter log ) { diff --git a/qadevOOo/tests/java/mod/_ucpchelp/CHelpContentProvider.java b/qadevOOo/tests/java/mod/_ucpchelp/CHelpContentProvider.java index 0904f2a1ca09..522cbca1c23e 100644 --- a/qadevOOo/tests/java/mod/_ucpchelp/CHelpContentProvider.java +++ b/qadevOOo/tests/java/mod/_ucpchelp/CHelpContentProvider.java @@ -32,6 +32,7 @@ import com.sun.star.uno.XInterface; public class CHelpContentProvider extends TestCase { + @Override public TestEnvironment createTestEnvironment ( TestParameters Param,PrintWriter log ) { diff --git a/qadevOOo/tests/java/mod/_ucpdav/WebDAVContentProvider.java b/qadevOOo/tests/java/mod/_ucpdav/WebDAVContentProvider.java index dab69a2dbfcc..0cdba640549f 100644 --- a/qadevOOo/tests/java/mod/_ucpdav/WebDAVContentProvider.java +++ b/qadevOOo/tests/java/mod/_ucpdav/WebDAVContentProvider.java @@ -40,6 +40,7 @@ public class WebDAVContentProvider extends TestCase { * and adds a <code>XContentIdentifierFactory</code> instance as a "FACTORY" * relation for <code>XContentProviderTest</code>. */ + @Override public TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_ucpfile/FileProvider.java b/qadevOOo/tests/java/mod/_ucpfile/FileProvider.java index 3958666f7d46..0b1d7d192b66 100644 --- a/qadevOOo/tests/java/mod/_ucpfile/FileProvider.java +++ b/qadevOOo/tests/java/mod/_ucpfile/FileProvider.java @@ -32,6 +32,7 @@ import com.sun.star.uno.XInterface; public class FileProvider extends TestCase { + @Override public TestEnvironment createTestEnvironment ( TestParameters Param,PrintWriter log ) { diff --git a/qadevOOo/tests/java/mod/_ucpftp/FTPContentProvider.java b/qadevOOo/tests/java/mod/_ucpftp/FTPContentProvider.java index c7a484efe285..d967505d2cbc 100644 --- a/qadevOOo/tests/java/mod/_ucpftp/FTPContentProvider.java +++ b/qadevOOo/tests/java/mod/_ucpftp/FTPContentProvider.java @@ -32,6 +32,7 @@ import com.sun.star.uno.XInterface; public class FTPContentProvider extends TestCase { + @Override public TestEnvironment createTestEnvironment ( TestParameters Param,PrintWriter log ) { diff --git a/qadevOOo/tests/java/mod/_ucphier/HierarchyContentProvider.java b/qadevOOo/tests/java/mod/_ucphier/HierarchyContentProvider.java index 6a298cede86a..dc2f70455b23 100644 --- a/qadevOOo/tests/java/mod/_ucphier/HierarchyContentProvider.java +++ b/qadevOOo/tests/java/mod/_ucphier/HierarchyContentProvider.java @@ -32,6 +32,7 @@ import com.sun.star.uno.XInterface; public class HierarchyContentProvider extends TestCase { + @Override public TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log ) { diff --git a/qadevOOo/tests/java/mod/_ucphier/HierarchyDataSource.java b/qadevOOo/tests/java/mod/_ucphier/HierarchyDataSource.java index fc478c770590..c0d5a8146346 100644 --- a/qadevOOo/tests/java/mod/_ucphier/HierarchyDataSource.java +++ b/qadevOOo/tests/java/mod/_ucphier/HierarchyDataSource.java @@ -34,6 +34,7 @@ import com.sun.star.uno.XInterface; * @see ifc.lang._XMultiServiceFactory */ public class HierarchyDataSource extends TestCase { + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_ucppkg/PackageContentProvider.java b/qadevOOo/tests/java/mod/_ucppkg/PackageContentProvider.java index b0905ea7e49c..0b4760155a50 100644 --- a/qadevOOo/tests/java/mod/_ucppkg/PackageContentProvider.java +++ b/qadevOOo/tests/java/mod/_ucppkg/PackageContentProvider.java @@ -32,6 +32,7 @@ import com.sun.star.uno.XInterface; public class PackageContentProvider extends TestCase { + @Override public TestEnvironment createTestEnvironment ( TestParameters Param,PrintWriter log ) { diff --git a/qadevOOo/tests/java/mod/_ucprmt/ContentProvider.java b/qadevOOo/tests/java/mod/_ucprmt/ContentProvider.java index e4d4ef97341a..eceb9d7d5558 100644 --- a/qadevOOo/tests/java/mod/_ucprmt/ContentProvider.java +++ b/qadevOOo/tests/java/mod/_ucprmt/ContentProvider.java @@ -72,6 +72,7 @@ public class ContentProvider extends TestCase { * content URL for this provider </li> * </ul> */ + @Override public TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log ) { XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_ucprmt/ProviderAcceptor.java b/qadevOOo/tests/java/mod/_ucprmt/ProviderAcceptor.java index d22192f56289..ac8116e82f85 100644 --- a/qadevOOo/tests/java/mod/_ucprmt/ProviderAcceptor.java +++ b/qadevOOo/tests/java/mod/_ucprmt/ProviderAcceptor.java @@ -31,6 +31,7 @@ import com.sun.star.uno.XInterface; public class ProviderAcceptor extends TestCase { + @Override public TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_ucprmt/ProxyProvider.java b/qadevOOo/tests/java/mod/_ucprmt/ProxyProvider.java index 4305317ad5df..83e0f44c5c77 100644 --- a/qadevOOo/tests/java/mod/_ucprmt/ProxyProvider.java +++ b/qadevOOo/tests/java/mod/_ucprmt/ProxyProvider.java @@ -33,6 +33,7 @@ import com.sun.star.uno.XInterface; public class ProxyProvider extends TestCase { + @Override public TestEnvironment createTestEnvironment ( TestParameters Param, PrintWriter log ) { diff --git a/qadevOOo/tests/java/mod/_uui/UUIInteractionHandler.java b/qadevOOo/tests/java/mod/_uui/UUIInteractionHandler.java index e3eedf3ff6ed..ef5858a5f2af 100644 --- a/qadevOOo/tests/java/mod/_uui/UUIInteractionHandler.java +++ b/qadevOOo/tests/java/mod/_uui/UUIInteractionHandler.java @@ -46,6 +46,7 @@ public class UUIInteractionHandler extends TestCase { * Creates an instance of the service * <code>com.sun.star.uui.InteractionHandler</code>. */ + @Override public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_uuresolver/UnoUrlResolver.java b/qadevOOo/tests/java/mod/_uuresolver/UnoUrlResolver.java index 715520cee7fb..8f421ab7f3ff 100644 --- a/qadevOOo/tests/java/mod/_uuresolver/UnoUrlResolver.java +++ b/qadevOOo/tests/java/mod/_uuresolver/UnoUrlResolver.java @@ -32,6 +32,7 @@ import com.sun.star.uno.XInterface; public class UnoUrlResolver extends TestCase { + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_uuresolver/uno/UnoUrlResolver.java b/qadevOOo/tests/java/mod/_uuresolver/uno/UnoUrlResolver.java index 1d56dddf4c2f..ee850a982240 100644 --- a/qadevOOo/tests/java/mod/_uuresolver/uno/UnoUrlResolver.java +++ b/qadevOOo/tests/java/mod/_uuresolver/uno/UnoUrlResolver.java @@ -30,6 +30,7 @@ import lib.TestParameters; public class UnoUrlResolver extends TestCase { + @Override protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF(); diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java index 643374cae18e..08511618e68d 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java @@ -66,6 +66,7 @@ public class XMLContentExporter extends TestCase { /** * New text document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -84,6 +85,7 @@ public class XMLContentExporter extends TestCase { /** * Close document */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); @@ -113,6 +115,7 @@ public class XMLContentExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { XMultiServiceFactory xMSF = tParam.getMSF() ; diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java index 9830a6699a76..47ec935175ee 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java @@ -65,6 +65,7 @@ public class XMLContentImporter extends TestCase { /** * New chart document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -84,6 +85,7 @@ public class XMLContentImporter extends TestCase { /** * Close document */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); @@ -112,6 +114,7 @@ public class XMLContentImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log ) { diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java index b93689caee55..4ec04319ca6b 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java @@ -66,6 +66,7 @@ public class XMLExporter extends TestCase { /** * New text document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -84,6 +85,7 @@ public class XMLExporter extends TestCase { /** * Close document */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); @@ -113,6 +115,7 @@ public class XMLExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log ) { diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java index 1e370a0b0c9f..38dfd69099f0 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java @@ -65,6 +65,7 @@ public class XMLImporter extends TestCase { /** * New chart document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -84,6 +85,7 @@ public class XMLImporter extends TestCase { /** * Close document */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); @@ -112,6 +114,7 @@ public class XMLImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java index 76718a42b959..f5247f3cb182 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java @@ -65,6 +65,7 @@ public class XMLStylesExporter extends TestCase { /** * New text document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -83,6 +84,7 @@ public class XMLStylesExporter extends TestCase { /** * Close document */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); @@ -109,6 +111,7 @@ public class XMLStylesExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java index c4c22c9184c3..de74a68716a7 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java @@ -63,6 +63,7 @@ public class XMLStylesImporter extends TestCase { /** * New chart document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -82,6 +83,7 @@ public class XMLStylesImporter extends TestCase { /** * Close document */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { if( xChartDoc!=null ) { log.println( " closing xChartDoc" ); @@ -107,6 +109,7 @@ public class XMLStylesImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java index 8e1cddef4767..a6ec9130dabf 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java @@ -69,6 +69,7 @@ public class XMLContentExporter extends TestCase { /** * New text document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -85,6 +86,7 @@ public class XMLContentExporter extends TestCase { /** * Document disposed here. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); xDrawDoc.dispose(); @@ -111,6 +113,7 @@ public class XMLContentExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentImporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentImporter.java index 06ba7832d3db..ef0e22a53762 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentImporter.java @@ -65,6 +65,7 @@ public class XMLContentImporter extends TestCase { /** * New spreadsheet document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -83,6 +84,7 @@ public class XMLContentImporter extends TestCase { /** * Spreadsheet document destroyed. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing document " ); xDrawDoc.dispose(); @@ -107,6 +109,7 @@ public class XMLContentImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java index 733fbf2b5e72..022a2f6132fe 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java @@ -69,6 +69,7 @@ public class XMLExporter extends TestCase { /** * New text document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -87,6 +88,7 @@ public class XMLExporter extends TestCase { /** * Document disposed here. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); xDrawDoc.dispose(); @@ -113,6 +115,7 @@ public class XMLExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLImporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLImporter.java index c777933c9ff9..e0280b19959f 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLImporter.java @@ -65,6 +65,7 @@ public class XMLImporter extends TestCase { /** * New spreadsheet document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -83,6 +84,7 @@ public class XMLImporter extends TestCase { /** * Spreadsheet document destroyed. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing document " ); xDrawDoc.dispose(); @@ -107,6 +109,7 @@ public class XMLImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java index 0f2b9206a620..a4edaa81c105 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java @@ -67,6 +67,7 @@ public class XMLMetaExporter extends TestCase { /** * New draw document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -85,6 +86,7 @@ public class XMLMetaExporter extends TestCase { /** * Document disposed here. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); xDrawDoc.dispose(); @@ -111,6 +113,7 @@ public class XMLMetaExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaImporter.java index 62780d13661a..592274ec30ea 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaImporter.java @@ -64,6 +64,7 @@ public class XMLMetaImporter extends TestCase { /** * New draw document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -82,6 +83,7 @@ public class XMLMetaImporter extends TestCase { /** * Draw document destroyed. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing document " ); xDrawDoc.dispose(); @@ -106,6 +108,7 @@ public class XMLMetaImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam,PrintWriter log ) { diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java index 5792ce07234b..0c7223a869cd 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java @@ -68,6 +68,7 @@ public class XMLSettingsExporter extends TestCase { /** * New draw document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -86,6 +87,7 @@ public class XMLSettingsExporter extends TestCase { /** * Document disposed here. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); xDrawDoc.dispose(); @@ -112,6 +114,7 @@ public class XMLSettingsExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java index 1940b61622d1..97dc7c8db94d 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java @@ -65,6 +65,7 @@ public class XMLSettingsImporter extends TestCase { /** * New draw document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -83,6 +84,7 @@ public class XMLSettingsImporter extends TestCase { /** * Text draw destroyed. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing document " ); xDrawDoc.dispose(); @@ -108,6 +110,7 @@ public class XMLSettingsImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java index 10cf2af86323..59b3aded3543 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java @@ -70,6 +70,7 @@ public class XMLStylesExporter extends TestCase { /** * New draw document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -88,6 +89,7 @@ public class XMLStylesExporter extends TestCase { /** * Document disposed here. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xDrawDoc " ); xDrawDoc.dispose(); @@ -114,6 +116,7 @@ public class XMLStylesExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java index 04f7eae5c6c2..deab847ff0a7 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java @@ -65,6 +65,7 @@ public class XMLStylesImporter extends TestCase { /** * New draw document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -83,6 +84,7 @@ public class XMLStylesImporter extends TestCase { /** * Text draw destroyed. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing document " ); xDrawDoc.dispose(); @@ -108,6 +110,7 @@ public class XMLStylesImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java index b19b30f2089c..ae7572eb0d4b 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java @@ -68,6 +68,7 @@ public class XMLContentExporter extends TestCase { /** * New text document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -86,6 +87,7 @@ public class XMLContentExporter extends TestCase { /** * Document disposed here. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xImpressDoc " ); xImpressDoc.dispose(); @@ -112,6 +114,7 @@ public class XMLContentExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentImporter.java index 8f9400c03d7e..5129138c9841 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentImporter.java @@ -65,6 +65,7 @@ public class XMLContentImporter extends TestCase { /** * New chart document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -83,6 +84,7 @@ public class XMLContentImporter extends TestCase { /** * Disposes document. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing document " ); xImpressDoc.dispose(); @@ -107,6 +109,7 @@ public class XMLContentImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam,PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java index 53aebf752dfc..28c277af29c2 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java @@ -69,6 +69,7 @@ public class XMLExporter extends TestCase { /** * New impress document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -87,6 +88,7 @@ public class XMLExporter extends TestCase { /** * Document disposed here. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xImpressDoc " ); xImpressDoc.dispose(); @@ -113,6 +115,7 @@ public class XMLExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override protected synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java index bebf287a2c94..85be38d653c2 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java @@ -65,6 +65,7 @@ public class XMLImporter extends TestCase { /** * New impress document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -83,6 +84,7 @@ public class XMLImporter extends TestCase { /** * Impress document destroyed. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing document " ); xImpressDoc.dispose(); @@ -107,6 +109,7 @@ public class XMLImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java index 2bb7dbfd0fd7..0d59606af15f 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java @@ -67,6 +67,7 @@ public class XMLMetaExporter extends TestCase { /** * New impress document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -85,6 +86,7 @@ public class XMLMetaExporter extends TestCase { /** * Impress document disposed */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( "disposing xImpressDoc " ); xImpressDoc.dispose(); @@ -111,6 +113,7 @@ public class XMLMetaExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java index 0e31de46438a..ac1c4763deda 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java @@ -64,6 +64,7 @@ public class XMLMetaImporter extends TestCase { /** * New impress document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -82,6 +83,7 @@ public class XMLMetaImporter extends TestCase { /** * Impress document destroyed. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing document " ); xImpressDoc.dispose(); @@ -106,6 +108,7 @@ public class XMLMetaImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam,PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java index ffdebd848a1e..dbc6657fbce3 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java @@ -68,6 +68,7 @@ public class XMLSettingsExporter extends TestCase { /** * New text document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); @@ -84,6 +85,7 @@ public class XMLSettingsExporter extends TestCase { /** * Document disposed here. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xImpressDoc " ); xImpressDoc.dispose(); @@ -109,6 +111,7 @@ public class XMLSettingsExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java index 96cdd54b309e..02dfd150ed1f 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java @@ -66,6 +66,7 @@ public class XMLSettingsImporter extends TestCase { /** * New impress document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -84,6 +85,7 @@ public class XMLSettingsImporter extends TestCase { /** * Impress document destroyed. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing document " ); xImpressDoc.dispose(); @@ -108,6 +110,7 @@ public class XMLSettingsImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java index 52c0db40a40d..2567b7b2230c 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java @@ -70,6 +70,7 @@ public class XMLStylesExporter extends TestCase { /** * New spreadsheet document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -88,6 +89,7 @@ public class XMLStylesExporter extends TestCase { /** * Spreadsheet document disposed */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing xImpressDoc " ); xImpressDoc.dispose(); @@ -114,6 +116,7 @@ public class XMLStylesExporter extends TestCase { * {@link ifc.document._XExporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) throws StatusException { diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java index e3d36c6fd858..c0dfe550aa33 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java @@ -65,6 +65,7 @@ public class XMLStylesImporter extends TestCase { /** * New spreadsheet document created. */ + @Override protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object @@ -83,6 +84,7 @@ public class XMLStylesImporter extends TestCase { /** * Spreadsheet document destroyed. */ + @Override protected void cleanup( TestParameters tParam, PrintWriter log ) { log.println( " disposing document " ); xImpressDoc.dispose(); @@ -107,6 +109,7 @@ public class XMLStylesImporter extends TestCase { * {@link ifc.document._XImporter} interface </li> * </ul> */ + @Override public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log ) throws StatusException { diff --git a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java index 5b5704c32cb3..c02406add999 100644 --- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java +++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java @@ -84,6 +84,7 @@ public class SDBCReportDataFactory implements DataSourceFactory this.maxRows = maxRows; } + @Override public boolean equals(Object obj) { if (obj == null) @@ -118,6 +119,7 @@ public class SDBCReportDataFactory implements DataSourceFactory return true; } + @Override public int hashCode() { int hash = 3; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory.java index c1c6c235483f..b0dd3d637925 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory.java @@ -109,6 +109,7 @@ public class StarReportDataFactory implements ReportDataFactory, Cloneable } } + @Override public Object clone() throws CloneNotSupportedException { return super.clone(); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java index a7b3e1620152..d7d4e10f097c 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java @@ -49,6 +49,7 @@ public class FixedTextLayoutController { } + @Override public boolean isValueChanged() { final FlowController controller = getFlowController(); @@ -57,6 +58,7 @@ public class FixedTextLayoutController return reportDataRow.getCursor() == 0; } + @Override protected LayoutController delegateContentGeneration(final ReportTarget target) throws ReportProcessingException, ReportDataFactoryException, DataSourceException diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java index 1c7c9973ac8e..a3c024116fd8 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java @@ -51,6 +51,7 @@ public class FormattedTextLayoutController { } + @Override public boolean isValueChanged() { try @@ -70,6 +71,7 @@ public class FormattedTextLayoutController } } + @Override protected LayoutController delegateContentGeneration(final ReportTarget target) throws ReportProcessingException, ReportDataFactoryException, DataSourceException diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController.java index bd5d529553d5..31dda966b0ca 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController.java @@ -66,6 +66,7 @@ public class ImageElementLayoutController { } + @Override protected LayoutController delegateContentGeneration(final ReportTarget target) throws ReportProcessingException, ReportDataFactoryException, DataSourceException @@ -230,6 +231,7 @@ public class ImageElementLayoutController return null; } + @Override public boolean isValueChanged() { final ImageElement imageElement = (ImageElement) getNode(); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ObjectOleLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ObjectOleLayoutController.java index 3a5c31dd1435..58c946878aa2 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ObjectOleLayoutController.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ObjectOleLayoutController.java @@ -44,6 +44,7 @@ public class ObjectOleLayoutController extends AbstractReportElementLayoutContro { } + @Override public boolean isValueChanged() { final ObjectOleElement element = (ObjectOleElement) getNode(); @@ -68,6 +69,7 @@ public class ObjectOleLayoutController extends AbstractReportElementLayoutContro return false; } + @Override protected LayoutController delegateContentGeneration(final ReportTarget target) throws ReportProcessingException, ReportDataFactoryException, DataSourceException { final ObjectOleElement element = (ObjectOleElement) getNode(); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java index 40dd5c0488f6..6c9d5ab2c881 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java @@ -66,6 +66,7 @@ public class OfficeDetailLayoutController extends SectionLayoutController * @throws org.jfree.report.ReportDataFactoryException * if a query failed. */ + @Override public void initialize(final Object node, final FlowController flowController, final LayoutController parent) @@ -90,6 +91,7 @@ public class OfficeDetailLayoutController extends SectionLayoutController * @throws org.jfree.report.ReportDataFactoryException * if a query failed. */ + @Override protected LayoutController startElement(final ReportTarget target) throws DataSourceException, ReportProcessingException, ReportDataFactoryException { @@ -120,6 +122,7 @@ public class OfficeDetailLayoutController extends SectionLayoutController return super.startElement(target); } + @Override protected void resetSectionForRepeat() { super.resetSectionForRepeat(); @@ -135,6 +138,7 @@ public class OfficeDetailLayoutController extends SectionLayoutController * @return the joined layout controller that incorperates all changes from the * delegate. */ + @Override public LayoutController join(final FlowController flowController) { if (waitForJoin) diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java index ad402e03a994..42c81a00bd9d 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java @@ -54,6 +54,7 @@ public class OfficeGroupInstanceSectionLayoutController extends SectionLayoutCon { } + @Override public void initialize(final Object node, final FlowController flowController, final LayoutController parent) throws DataSourceException, ReportDataFactoryException, ReportProcessingException { @@ -61,6 +62,7 @@ public class OfficeGroupInstanceSectionLayoutController extends SectionLayoutCon state = STATE_PROCESS_VARIABLES; } + @Override protected LayoutController processContent(final ReportTarget target) throws DataSourceException, ReportProcessingException, ReportDataFactoryException { @@ -80,6 +82,7 @@ public class OfficeGroupInstanceSectionLayoutController extends SectionLayoutCon // isDisplayable is private in version 0.9.1, so until the upgrade we keep this copy of the method // todo: Delete it unce the sun-cvs contains version 0.9.2. + @Override protected LayoutController processChild(final SectionLayoutController derived, final Node node, final FlowController flowController) @@ -101,6 +104,7 @@ public class OfficeGroupInstanceSectionLayoutController extends SectionLayoutCon } } + @Override protected boolean isDisplayable(final Node node) throws DataSourceException { if (!(node instanceof OfficeGroupSection)) @@ -131,6 +135,7 @@ public class OfficeGroupInstanceSectionLayoutController extends SectionLayoutCon return Boolean.TRUE.equals(result); } + @Override protected void resetSectionForRepeat() { super.resetSectionForRepeat(); @@ -146,6 +151,7 @@ public class OfficeGroupInstanceSectionLayoutController extends SectionLayoutCon * @return the joined layout controller that incorperates all changes from the * delegate. */ + @Override public LayoutController join(final FlowController flowController) { if (waitForJoin) @@ -159,6 +165,7 @@ public class OfficeGroupInstanceSectionLayoutController extends SectionLayoutCon return super.join(flowController); } + @Override protected AttributeMap computeAttributes(final FlowController fc, final Element element, final ReportTarget target) throws DataSourceException { diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java index 293a6dbdd001..bfe50b844aa4 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java @@ -73,6 +73,7 @@ public class OfficeGroupLayoutController extends SectionLayoutController * @throws org.jfree.report.ReportDataFactoryException * if a query failed. */ + @Override public void initialize(final Object node, final FlowController flowController, final LayoutController parent) @@ -92,6 +93,7 @@ public class OfficeGroupLayoutController extends SectionLayoutController repeatFooter = (footer != null && footer.isRepeatSection()); } + @Override protected LayoutController processContent(final ReportTarget target) throws DataSourceException, ReportProcessingException, ReportDataFactoryException @@ -145,6 +147,7 @@ public class OfficeGroupLayoutController extends SectionLayoutController * @return the joined layout controller that incorperates all changes from the * delegate. */ + @Override public LayoutController join(final FlowController flowController) { if (waitForJoin) @@ -183,6 +186,7 @@ public class OfficeGroupLayoutController extends SectionLayoutController return variablesCollection; } + @Override protected AttributeMap computeAttributes(final FlowController fc, final Element element, final ReportTarget target) throws DataSourceException { diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java index a709bdce9ec4..4cc7b1691dbb 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java @@ -48,6 +48,7 @@ public class OfficeGroupSectionLayoutController extends SectionLayoutController { } + @Override protected LayoutController startElement(final ReportTarget target) throws DataSourceException, ReportProcessingException, ReportDataFactoryException { @@ -74,6 +75,7 @@ public class OfficeGroupSectionLayoutController extends SectionLayoutController return clone; } + @Override protected AttributeMap computeAttributes(final FlowController fc, final Element element, final ReportTarget target) diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficePageSectionLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficePageSectionLayoutController.java index 069ec7dfa298..5442c4de30f9 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficePageSectionLayoutController.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficePageSectionLayoutController.java @@ -37,6 +37,7 @@ public class OfficePageSectionLayoutController extends SectionLayoutController { } + @Override protected AttributeMap computeAttributes(final FlowController flowController, final Element element, final ReportTarget reportTarget) throws DataSourceException { final AttributeMap map = new AttributeMap(super.computeAttributes(flowController, element, reportTarget)); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java index a9cc10fc8de5..7e258336abc9 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java @@ -78,6 +78,7 @@ public class OfficeReportLayoutController extends ElementLayoutController * @throws org.jfree.report.ReportDataFactoryException * if a query failed. */ + @Override public void initialize(final Object node, final FlowController flowController, final LayoutController parent) throws DataSourceException, ReportDataFactoryException, @@ -104,6 +105,7 @@ public class OfficeReportLayoutController extends ElementLayoutController * @throws org.jfree.report.ReportDataFactoryException * if a query failed. */ + @Override protected LayoutController processContent(final ReportTarget target) throws DataSourceException, ReportProcessingException, ReportDataFactoryException diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableLayoutController.java index ed5d63887051..b217e223a12e 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableLayoutController.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableLayoutController.java @@ -42,6 +42,7 @@ public class OfficeTableLayoutController extends SectionLayoutController { } + @Override protected AttributeMap computeAttributes(final FlowController fc, final Element element, final ReportTarget target) throws DataSourceException { diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java index e610fc421cb7..48180b12405c 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java @@ -65,6 +65,7 @@ public class OfficeTableTemplateLayoutController extends SectionLayoutController * @throws org.jfree.report.ReportDataFactoryException * if a query failed. */ + @Override public void initialize(final Object node, final FlowController flowController, final LayoutController parent) throws DataSourceException, ReportDataFactoryException, ReportProcessingException { @@ -172,6 +173,7 @@ public class OfficeTableTemplateLayoutController extends SectionLayoutController } } + @Override public Node[] getNodes() { return nodes; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java index a9e0ef058b38..6baada276f0c 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java @@ -56,6 +56,7 @@ public class TableCellLayoutController extends SectionLayoutController { } + @Override protected AttributeMap computeAttributes(final FlowController fc, final Element element, final ReportTarget target) diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputResourceKey.java b/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputResourceKey.java index 917b43cc223a..c0ddbe453fc9 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputResourceKey.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputResourceKey.java @@ -46,6 +46,7 @@ public class InputResourceKey implements Serializable return path; } + @Override public String toString() { return "InputResourceKey{" + "inputRepositoryId=" + inputRepositoryId + ", path='" + path + '\'' + '}'; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyles.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyles.java index 5a87a989ad3c..59cedd951902 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyles.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyles.java @@ -69,6 +69,7 @@ public class OfficeStyles extends Element return name; } + @Override public boolean equals(final Object obj) { if (this != obj) @@ -88,6 +89,7 @@ public class OfficeStyles extends Element return true; } + @Override public int hashCode() { int result = family.hashCode(); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/ImageProducer.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/ImageProducer.java index c4d545c49d85..3f39b3e9359e 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/ImageProducer.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/ImageProducer.java @@ -114,6 +114,7 @@ public class ImageProducer this.keyData = keyData; } + @Override public boolean equals(final Object o) { if (this != o) @@ -133,6 +134,7 @@ public class ImageProducer return true; } + @Override public int hashCode() { if (hashCode != null) diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java index f58cf30c5e4b..5d9e6dba5d4e 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java @@ -238,6 +238,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget this.groupWithRepeatingSection = groupWithRepeatingSection; } + @Override public String toString() { return "GroupContext{" + "parent=" + parent + ", iterationCount=" + iterationCount + ", groupWithRepeatingSection=" + groupWithRepeatingSection + '}'; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportProcessor.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportProcessor.java index f8256bc6ff57..544b40506a56 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportProcessor.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportProcessor.java @@ -77,6 +77,7 @@ public class ChartRawReportProcessor extends SinglePassReportProcessor this.dataSourceFactory = dataSourceFactory; } + @Override protected ReportTarget createReportTarget(final ReportJob job) throws ReportProcessingException { @@ -87,6 +88,7 @@ public class ChartRawReportProcessor extends SinglePassReportProcessor inputRepository, outputRepository, targetName, imageService, dataSourceFactory); } + @Override public void processReport(final ReportJob job) throws ReportDataFactoryException, DataSourceException, ReportProcessingException { diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java index 2658942fe33c..05ca93ad990e 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java @@ -62,6 +62,7 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget super(reportJob, resourceManager, baseResource, inputRepository, outputRepository, target, imageService, dataSourceFactory); } + @Override protected String getTargetMimeType() { return "application/vnd.oasis.opendocument.chart"; @@ -77,6 +78,7 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget return "raw/" + PentahoReportEngineMetaData.OPENDOCUMENT_CHART; } + @Override protected void startContent(final AttributeMap attrs) throws IOException, DataSourceException, ReportProcessingException { inFilterElements = false; @@ -88,6 +90,7 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget ++closeTags; } + @Override protected void endContent(final AttributeMap attrs) throws IOException, DataSourceException, ReportProcessingException { final XmlWriter xmlWriter = getXmlWriter(); @@ -98,15 +101,18 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget } } + @Override protected void startReportSection(final AttributeMap attrs, final int role) throws ReportProcessingException { } + @Override protected void endReportSection(final AttributeMap attrs, final int role) { } + @Override protected void startOther(final AttributeMap attrs) throws IOException, DataSourceException, ReportProcessingException { final String namespace = ReportTargetUtil.getNamespaceFromAttribute(attrs); @@ -129,6 +135,7 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget return OfficeToken.TABLE_HEADER_COLUMNS.equals(elementType) || OfficeToken.TABLE_HEADER_ROWS.equals(elementType) || OfficeToken.TABLE_COLUMNS.equals(elementType); } + @Override protected void endOther(final AttributeMap attrs) throws IOException, DataSourceException, ReportProcessingException { if (tableRowsStarted && getCurrentRole() == ROLE_TEMPLATE) @@ -169,6 +176,7 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget } } + @Override public void processContent(final DataFlags value) throws DataSourceException, ReportProcessingException { @@ -227,6 +235,7 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget } + @Override public void processText(final String text) throws DataSourceException, ReportProcessingException { if (inFilterElements && tableCount > 1) @@ -236,6 +245,7 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget super.processText(text); } + @Override public void endReport(final ReportStructureRoot report) throws DataSourceException, ReportProcessingException { diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java index e61194797c70..777fa20e9333 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java @@ -95,6 +95,7 @@ public class SpreadsheetRawReportProcessor extends AbstractReportProcessor processReportRun(job, reportTarget); } + @Override protected ReportContext createReportContext(final ReportJob job, final ReportTarget target) { 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 dbe1f4ce1abb..8c4807c28ddb 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java @@ -134,11 +134,13 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget } } + @Override public boolean equals(final Object obj) { return obj instanceof ColumnBoundary && ((ColumnBoundary) obj).boundary == boundary; } + @Override public int hashCode() { assert false : "hashCode not designed"; @@ -180,6 +182,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget oleHandled = false; } + @Override public void startOther(final AttributeMap attrs) throws DataSourceException, ReportProcessingException { if (ReportTargetUtil.isElementOfType(JFreeReportInfo.REPORT_NAMESPACE, OfficeToken.OBJECT_OLE, attrs)) @@ -264,6 +267,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget } } + @Override protected void startReportSection(final AttributeMap attrs, final int role) throws ReportProcessingException { if ((role == OfficeDocumentReportTarget.ROLE_SPREADSHEET_PAGE_HEADER || role == OfficeDocumentReportTarget.ROLE_SPREADSHEET_PAGE_FOOTER) && (!PageSection.isPrintWithReportHeader(attrs) || !PageSection.isPrintWithReportFooter(attrs))) @@ -276,6 +280,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget } } + @Override protected void endReportSection(final AttributeMap attrs, final int role) throws IOException, ReportProcessingException { if ((role == OfficeDocumentReportTarget.ROLE_SPREADSHEET_PAGE_HEADER || role == OfficeDocumentReportTarget.ROLE_SPREADSHEET_PAGE_FOOTER) && (!PageSection.isPrintWithReportHeader(attrs) || !PageSection.isPrintWithReportFooter(attrs))) @@ -609,6 +614,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget } } + @Override protected void endOther(final AttributeMap attrs) throws DataSourceException, ReportProcessingException { if (ReportTargetUtil.isElementOfType(JFreeReportInfo.REPORT_NAMESPACE, OfficeToken.OBJECT_OLE, attrs) || oleHandled) @@ -693,6 +699,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget } + @Override public void processText(final String text) throws DataSourceException, ReportProcessingException { if (!(isRepeatingSection() || isElementBoundaryCollectionPass())) @@ -702,6 +709,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget } } + @Override public void processContent(final DataFlags value) throws DataSourceException, ReportProcessingException { if (!(isRepeatingSection() || isElementBoundaryCollectionPass())) @@ -716,6 +724,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget return "spreadsheet"; } + @Override protected void startContent(final AttributeMap attrs) throws IOException, DataSourceException, ReportProcessingException { @@ -795,6 +804,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget return masterPage.getStyleName(); } + @Override protected void endContent(final AttributeMap attrs) throws IOException, DataSourceException, ReportProcessingException { @@ -807,6 +817,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget } } + @Override public void endReport(final ReportStructureRoot report) throws DataSourceException, ReportProcessingException { super.endReport(report); @@ -928,6 +939,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget return span; } + @Override protected String getTargetMimeType() { return "application/vnd.oasis.opendocument.spreadsheet"; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java index 82cf13a9a978..5f0bb70a5255 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java @@ -58,6 +58,7 @@ public class MasterPageFactory this.pageFooter = pageFooter; } + @Override public boolean equals(final Object o) { if (this != o) @@ -89,6 +90,7 @@ public class MasterPageFactory return true; } + @Override public int hashCode() { int result = (template != null ? template.hashCode() : 0); @@ -115,6 +117,7 @@ public class MasterPageFactory this.footerHeight = footerHeight; } + @Override public boolean equals(final Object o) { if (this == o) @@ -143,6 +146,7 @@ public class MasterPageFactory } + @Override public int hashCode() { int result; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportProcessor.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportProcessor.java index b0dd06eab9ff..8718043bf389 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportProcessor.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportProcessor.java @@ -80,6 +80,7 @@ public class TextRawReportProcessor extends SinglePassReportProcessor this.dataSourceFactory = dataSourceFactory; } + @Override protected ReportTarget createReportTarget(final ReportJob job) throws ReportProcessingException { @@ -90,6 +91,7 @@ public class TextRawReportProcessor extends SinglePassReportProcessor inputRepository, outputRepository, targetName, imageService, dataSourceFactory); } + @Override protected ReportContext createReportContext(final ReportJob job, final ReportTarget target) { 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 486b62d2eee3..266f59eeaed7 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java @@ -140,6 +140,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget this.tableLayoutConfig = TABLE_LAYOUT_SINGLE_DETAIL_TABLE; } + @Override protected String getTargetMimeType() { return "application/vnd.oasis.opendocument.text"; @@ -425,6 +426,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget * @throws org.jfree.report.ReportProcessingException * if some other error occured. */ + @Override public void startReport(final ReportStructureRoot report) throws DataSourceException, ReportProcessingException { @@ -505,6 +507,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget return variablesSectionStyle; } + @Override protected void startContent(final AttributeMap attrs) throws IOException, DataSourceException, ReportProcessingException { @@ -527,6 +530,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget } + @Override protected void startOther(final AttributeMap attrs) throws IOException, DataSourceException, ReportProcessingException { @@ -1049,6 +1053,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget } + @Override protected void startReportSection(final AttributeMap attrs, final int role) throws ReportProcessingException { @@ -1098,6 +1103,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget } } + @Override protected void startGroup(final AttributeMap attrs) { super.startGroup(attrs); @@ -1134,6 +1140,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget } } + @Override protected void startGroupInstance(final AttributeMap attrs) { if (getGroupContext().isGroupWithRepeatingSection()) @@ -1142,6 +1149,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget } } + @Override protected void endGroup(final AttributeMap attrs) throws ReportProcessingException { @@ -1174,6 +1182,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget } } + @Override protected void endReportSection(final AttributeMap attrs, final int role) throws IOException, ReportProcessingException { @@ -1234,6 +1243,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget } + @Override public void endReport(final ReportStructureRoot report) throws DataSourceException, ReportProcessingException { @@ -1277,6 +1287,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget } } + @Override protected void endOther(final AttributeMap attrs) throws IOException, DataSourceException, ReportProcessingException { @@ -1383,6 +1394,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget } } + @Override protected void endGroupBody(final AttributeMap attrs) throws IOException { @@ -1396,6 +1408,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget } + @Override protected void endContent(final AttributeMap attrs) throws IOException, DataSourceException, ReportProcessingException { diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/ElementReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/ElementReadHandler.java index c311f45d1390..012daff093d3 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/ElementReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/ElementReadHandler.java @@ -41,6 +41,7 @@ public abstract class ElementReadHandler extends AbstractXmlReadHandler * @param attrs the attributes. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void startParsing(final Attributes attrs) throws SAXException { final Element element = getElement(); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java index edcb56cb9f71..c7f04ea8c921 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java @@ -34,6 +34,7 @@ public class OfficeDocumentXmlResourceFactory extends JFreeReportXmlResourceFact { } + @Override public Class getFactoryType() { return OfficeDocument.class; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeStylesXmlResourceFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeStylesXmlResourceFactory.java index 18267f21382f..36ab76e91da8 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeStylesXmlResourceFactory.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeStylesXmlResourceFactory.java @@ -37,6 +37,7 @@ public class OfficeStylesXmlResourceFactory extends AbstractXmlResourceFactory { } + @Override protected Configuration getConfiguration() { return JFreeReportBoot.getInstance().getGlobalConfig(); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/chart/ChartReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/chart/ChartReadHandler.java index a7a6e55ceb31..4956dfb7a455 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/chart/ChartReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/chart/ChartReadHandler.java @@ -57,6 +57,7 @@ public class ChartReadHandler extends ElementReadHandler * @return the handler or null, if the tagname is invalid. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -84,6 +85,7 @@ public class ChartReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void doneParsing() throws SAXException { for (ElementReadHandler handler : children) @@ -92,6 +94,7 @@ public class ChartReadHandler extends ElementReadHandler } } + @Override public Element getElement() { return element; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/data/DataStyleReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/data/DataStyleReadHandler.java index 693ed0173b79..a3ef5963fd63 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/data/DataStyleReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/data/DataStyleReadHandler.java @@ -55,6 +55,7 @@ public class DataStyleReadHandler extends ElementReadHandler * @return the handler or null, if the tagname is invalid. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -78,6 +79,7 @@ public class DataStyleReadHandler extends ElementReadHandler * @param length the length. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override public void characters(final char[] ch, final int start, final int length) throws SAXException { @@ -92,6 +94,7 @@ public class DataStyleReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void doneParsing() throws SAXException { for (int i = 0; i < children.size(); i++) @@ -114,6 +117,7 @@ public class DataStyleReadHandler extends ElementReadHandler return dataStyle; } + @Override public Element getElement() { return dataStyle; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler.java index 291490752619..d4d49fe00c30 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler.java @@ -47,6 +47,7 @@ public class ObjectOleReadHandler extends ElementReadHandler * @param attrs the attributes. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void startParsing(final Attributes attrs) throws SAXException { super.startParsing(attrs); @@ -68,6 +69,7 @@ public class ObjectOleReadHandler extends ElementReadHandler } } + @Override public Element getElement() { return element; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/BodyReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/BodyReadHandler.java index 0baecda6261d..d7d7fafb8964 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/BodyReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/BodyReadHandler.java @@ -49,6 +49,7 @@ public class BodyReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) throws SAXException @@ -67,6 +68,7 @@ public class BodyReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void doneParsing() throws SAXException { if (reportReadHandler != null) @@ -75,6 +77,7 @@ public class BodyReadHandler extends ElementReadHandler } } + @Override public Element getElement() { return body; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java index 6557227f8dd7..d9b2d0922282 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java @@ -65,6 +65,7 @@ public class DocumentContentReadHandler extends AbstractXmlReadHandler * @param attrs the attributes. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void startParsing(final Attributes attrs) throws SAXException { @@ -158,6 +159,7 @@ public class DocumentContentReadHandler extends AbstractXmlReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -199,6 +201,7 @@ public class DocumentContentReadHandler extends AbstractXmlReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void doneParsing() throws SAXException { diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentStylesReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentStylesReadHandler.java index 958fd896d9ba..70320ce5e671 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentStylesReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentStylesReadHandler.java @@ -56,6 +56,7 @@ public class DocumentStylesReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -89,6 +90,7 @@ public class DocumentStylesReadHandler extends ElementReadHandler return null; } + @Override public Element getElement() { return officeStylesCollection; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/FontFaceDeclsReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/FontFaceDeclsReadHandler.java index de13cf10a53a..8f7ae01eb47c 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/FontFaceDeclsReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/FontFaceDeclsReadHandler.java @@ -66,6 +66,7 @@ public class FontFaceDeclsReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -90,6 +91,7 @@ public class FontFaceDeclsReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void doneParsing() throws SAXException { @@ -100,6 +102,7 @@ public class FontFaceDeclsReadHandler extends ElementReadHandler } } + @Override public Element getElement() { return fontFaceDecls; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/MasterStylesReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/MasterStylesReadHandler.java index 0b2b25430090..5b0065b94f21 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/MasterStylesReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/MasterStylesReadHandler.java @@ -67,6 +67,7 @@ public class MasterStylesReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -90,6 +91,7 @@ public class MasterStylesReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void doneParsing() throws SAXException { @@ -106,6 +108,7 @@ public class MasterStylesReadHandler extends ElementReadHandler } } + @Override public Element getElement() { return masterStyles; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java index a15f1610e770..cb70d44364c9 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java @@ -44,6 +44,7 @@ public class ConditionalPrintExpressionReadHandler this.element = element; } + @Override protected void startParsing(final Attributes attrs) throws SAXException { super.startParsing(attrs); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FixedContentReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FixedContentReadHandler.java index ab0fc52b1fee..7f5297c129d6 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FixedContentReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FixedContentReadHandler.java @@ -53,6 +53,7 @@ public class FixedContentReadHandler extends ElementReadHandler * @return the handler or null, if the tagname is invalid. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -81,6 +82,7 @@ public class FixedContentReadHandler extends ElementReadHandler return null; } + @Override public Element getElement() { return element; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormatConditionReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormatConditionReadHandler.java index cb3fa0a96039..8c3cb6ca9fbf 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormatConditionReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormatConditionReadHandler.java @@ -48,6 +48,7 @@ public class FormatConditionReadHandler extends AbstractXmlReadHandler this.element = element; } + @Override protected void startParsing(final Attributes attrs) throws SAXException { super.startParsing(attrs); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormattedTextReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormattedTextReadHandler.java index a1408d20dd52..5a6356abdc8b 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormattedTextReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormattedTextReadHandler.java @@ -50,6 +50,7 @@ public class FormattedTextReadHandler extends ElementReadHandler * @param attrs the attributes. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void startParsing(final Attributes attrs) throws SAXException { super.startParsing(attrs); @@ -80,6 +81,7 @@ public class FormattedTextReadHandler extends ElementReadHandler * @return the handler or null, if the tagname is invalid. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -101,6 +103,7 @@ public class FormattedTextReadHandler extends ElementReadHandler return null; } + @Override public Element getElement() { return element; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FunctionReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FunctionReadHandler.java index b1352d20c909..86194d557d01 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FunctionReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FunctionReadHandler.java @@ -50,6 +50,7 @@ public class FunctionReadHandler extends AbstractXmlReadHandler * @param attrs the attributes. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void startParsing(final Attributes attrs) throws SAXException { diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/GroupReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/GroupReadHandler.java index 7843d8afd160..642c6ded91dd 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/GroupReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/GroupReadHandler.java @@ -66,6 +66,7 @@ public class GroupReadHandler extends ElementReadHandler * @param attrs the attributes. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void startParsing(final Attributes attrs) throws SAXException { super.startParsing(attrs); @@ -92,6 +93,7 @@ public class GroupReadHandler extends ElementReadHandler * @return the handler or null, if the tagname is invalid. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -137,6 +139,7 @@ public class GroupReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void doneParsing() throws SAXException { for (int i = 0; i < functionHandlers.size(); i++) @@ -170,6 +173,7 @@ public class GroupReadHandler extends ElementReadHandler } } + @Override public Element getElement() { return group; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java index 2f3d9a1cc433..5a0be92e478a 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java @@ -54,6 +54,7 @@ public class ImageReadHandler extends ElementReadHandler * @param attrs the attributes. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void startParsing(final Attributes attrs) throws SAXException { super.startParsing(attrs); @@ -79,6 +80,7 @@ public class ImageReadHandler extends ElementReadHandler * @return the handler or null, if the tagname is invalid. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -111,6 +113,7 @@ public class ImageReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void doneParsing() throws SAXException { // if we have static content (as well or only), that one goes into the @@ -123,6 +126,7 @@ public class ImageReadHandler extends ElementReadHandler } } + @Override public Element getElement() { return contentElement; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/MasterDetailReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/MasterDetailReadHandler.java index 7fe32ecc5d70..ba39e7ba0c01 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/MasterDetailReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/MasterDetailReadHandler.java @@ -52,6 +52,7 @@ public class MasterDetailReadHandler extends ElementReadHandler * @param attrs the attributes. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void startParsing(final Attributes attrs) throws SAXException { super.startParsing(attrs); @@ -74,6 +75,7 @@ public class MasterDetailReadHandler extends ElementReadHandler * @return the handler or null, if the tagname is invalid. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -89,6 +91,7 @@ public class MasterDetailReadHandler extends ElementReadHandler return null; } + @Override public Element getElement() { return element; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportElementReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportElementReadHandler.java index c29488435fa3..6e032aaaa501 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportElementReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportElementReadHandler.java @@ -45,6 +45,7 @@ public class ReportElementReadHandler extends ElementReadHandler this.element = element; } + @Override public Element getElement() { return element; @@ -56,6 +57,7 @@ public class ReportElementReadHandler extends ElementReadHandler * @param attrs the attributes. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void startParsing(final Attributes attrs) throws SAXException { @@ -74,6 +76,7 @@ public class ReportElementReadHandler extends ElementReadHandler * @return the handler or null, if the tagname is invalid. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportReadHandler.java index ec270543b904..55b413b5e2e8 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportReadHandler.java @@ -67,6 +67,7 @@ public class ReportReadHandler extends ElementReadHandler * @return the handler or null, if the tagname is invalid. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -142,6 +143,7 @@ public class ReportReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void doneParsing() throws SAXException { if (pageHeader != null) @@ -196,6 +198,7 @@ public class ReportReadHandler extends ElementReadHandler } } + @Override public Element getElement() { return rootSection; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/RootTableReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/RootTableReadHandler.java index 54b753b8f630..c7d2aaf37f57 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/RootTableReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/RootTableReadHandler.java @@ -58,6 +58,7 @@ public class RootTableReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -80,6 +81,7 @@ public class RootTableReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void doneParsing() throws SAXException { @@ -89,6 +91,7 @@ public class RootTableReadHandler extends ElementReadHandler } } + @Override public Element getElement() { return section; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/SubDocumentReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/SubDocumentReadHandler.java index c815a69ba7ae..6698fc5962a9 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/SubDocumentReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/SubDocumentReadHandler.java @@ -60,6 +60,7 @@ public class SubDocumentReadHandler extends NoCDATATextContentReadHandler * @param attrs the attributes. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void startParsing(final Attributes attrs) throws SAXException { if (!ignore) @@ -76,6 +77,7 @@ public class SubDocumentReadHandler extends NoCDATATextContentReadHandler * @return the handler or null, if the tagname is invalid. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/FontFaceReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/FontFaceReadHandler.java index d6f7ed04f78b..6430cf664fe9 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/FontFaceReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/FontFaceReadHandler.java @@ -39,6 +39,7 @@ public class FontFaceReadHandler extends ElementReadHandler this.fontFaceElement = new FontFaceElement(); } + @Override public Element getElement() { return fontFaceElement; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/MasterPageReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/MasterPageReadHandler.java index 993331d02933..82438add799e 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/MasterPageReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/MasterPageReadHandler.java @@ -62,6 +62,7 @@ public class MasterPageReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -78,6 +79,7 @@ public class MasterPageReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void doneParsing() throws SAXException { @@ -88,6 +90,7 @@ public class MasterPageReadHandler extends ElementReadHandler } } + @Override public Element getElement() { return masterPage; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStyleReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStyleReadHandler.java index d6689b179531..0c4a7d20c916 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStyleReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStyleReadHandler.java @@ -56,6 +56,7 @@ public class OfficeStyleReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -72,6 +73,7 @@ public class OfficeStyleReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void doneParsing() throws SAXException { for (int i = 0; i < children.size(); i++) @@ -86,6 +88,7 @@ public class OfficeStyleReadHandler extends ElementReadHandler return officeStyle; } + @Override public Element getElement() { return officeStyle; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStylesReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStylesReadHandler.java index 17e684838bae..6bff691ae801 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStylesReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStylesReadHandler.java @@ -60,6 +60,7 @@ public class OfficeStylesReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) throws SAXException @@ -96,6 +97,7 @@ public class OfficeStylesReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void doneParsing() throws SAXException { for (int i = 0; i < textStyleChildren.size(); i++) @@ -123,6 +125,7 @@ public class OfficeStylesReadHandler extends ElementReadHandler } } + @Override public Element getElement() { return officeStyles; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/PageLayoutReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/PageLayoutReadHandler.java index f0ff7c8f3572..06346e6b02f0 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/PageLayoutReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/PageLayoutReadHandler.java @@ -57,6 +57,7 @@ public class PageLayoutReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -73,6 +74,7 @@ public class PageLayoutReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void doneParsing() throws SAXException { for (int i = 0; i < children.size(); i++) @@ -87,6 +89,7 @@ public class PageLayoutReadHandler extends ElementReadHandler return pageLayout; } + @Override public Element getElement() { return pageLayout; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/StyleDefinitionReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/StyleDefinitionReadHandler.java index b50f7f9767e4..667a4964a5da 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/StyleDefinitionReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/StyleDefinitionReadHandler.java @@ -57,6 +57,7 @@ public class StyleDefinitionReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -73,6 +74,7 @@ public class StyleDefinitionReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void doneParsing() throws SAXException { @@ -83,6 +85,7 @@ public class StyleDefinitionReadHandler extends ElementReadHandler } } + @Override public Element getElement() { return rawSection; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java index 1ce8fd7346e2..dd83d4666c3e 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java @@ -41,6 +41,7 @@ public class TextUnderlineWidthMapper extends OneOfConstantsMapper addMapping("thick", BorderWidth.THICK); } + @Override public void updateStyle(final String uri, final String attrName, final String attrValue, diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/CoveredCellReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/CoveredCellReadHandler.java index c2cba6187024..5adb6d596005 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/CoveredCellReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/CoveredCellReadHandler.java @@ -37,6 +37,7 @@ public class CoveredCellReadHandler extends ElementReadHandler coveredCell = new Section(); } + @Override public Element getElement() { return coveredCell; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnReadHandler.java index ba83447ea4f6..adfc956daebc 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnReadHandler.java @@ -36,6 +36,7 @@ public class TableColumnReadHandler extends ElementReadHandler tableColumn = new Section(); } + @Override public Element getElement() { return tableColumn; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnsReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnsReadHandler.java index d8e866991053..35da849ce25c 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnsReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnsReadHandler.java @@ -57,6 +57,7 @@ public class TableColumnsReadHandler extends ElementReadHandler * @return the handler or null, if the tagname is invalid. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -77,6 +78,7 @@ public class TableColumnsReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void doneParsing() throws SAXException { for (int i = 0; i < columns.size(); i++) @@ -86,6 +88,7 @@ public class TableColumnsReadHandler extends ElementReadHandler } } + @Override public Element getElement() { return tableColumns; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableReadHandler.java index eec0954eeff6..3c8e90f20b09 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableReadHandler.java @@ -57,6 +57,7 @@ public class TableReadHandler extends ElementReadHandler * @param attrs the attributes. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void startParsing(final Attributes attrs) throws SAXException { @@ -81,6 +82,7 @@ public class TableReadHandler extends ElementReadHandler * @return the handler or null, if the tagname is invalid. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -119,6 +121,7 @@ public class TableReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void doneParsing() throws SAXException { for (int i = 0; i < children.size(); i++) @@ -128,6 +131,7 @@ public class TableReadHandler extends ElementReadHandler } } + @Override public Element getElement() { return table; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowReadHandler.java index 413cfaefbb68..2f4bad5a4c40 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowReadHandler.java @@ -57,6 +57,7 @@ public class TableRowReadHandler extends ElementReadHandler * @return the handler or null, if the tagname is invalid. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -94,6 +95,7 @@ public class TableRowReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void doneParsing() throws SAXException { for (int i = 0; i < tableCells.size(); i++) @@ -109,6 +111,7 @@ public class TableRowReadHandler extends ElementReadHandler * * @return the object. */ + @Override public Element getElement() { return tableRow; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowsReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowsReadHandler.java index 019fdbdc8c34..33e253f246bf 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowsReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowsReadHandler.java @@ -53,6 +53,7 @@ public class TableRowsReadHandler extends ElementReadHandler * @return the handler or null, if the tagname is invalid. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -73,6 +74,7 @@ public class TableRowsReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void doneParsing() throws SAXException { for (int i = 0; i < rows.size(); i++) @@ -82,6 +84,7 @@ public class TableRowsReadHandler extends ElementReadHandler } } + @Override public Element getElement() { return tableRows; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/NoCDATATextContentReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/NoCDATATextContentReadHandler.java index dc6464e7a961..83ab022a1440 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/NoCDATATextContentReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/NoCDATATextContentReadHandler.java @@ -75,6 +75,7 @@ public class NoCDATATextContentReadHandler extends ElementReadHandler * @param attrs the attributes. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void startParsing(final Attributes attrs) throws SAXException { super.startParsing(attrs); @@ -94,6 +95,7 @@ public class NoCDATATextContentReadHandler extends ElementReadHandler * @return the handler or null, if the tagname is invalid. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -157,6 +159,7 @@ public class NoCDATATextContentReadHandler extends ElementReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void doneParsing() throws SAXException { for (int i = 0; i < children.size(); i++) @@ -174,6 +177,7 @@ public class NoCDATATextContentReadHandler extends ElementReadHandler } } + @Override public Element getElement() { return section; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/TextContentReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/TextContentReadHandler.java index 08a410a5c7bc..371026905cad 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/TextContentReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/TextContentReadHandler.java @@ -52,6 +52,7 @@ public class TextContentReadHandler extends NoCDATATextContentReadHandler * @param length the length. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override public void characters(final char[] ch, final int start, final int length) throws SAXException { diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/xlink/XLinkReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/xlink/XLinkReadHandler.java index beb57b2eabb9..5c9050fb2a3a 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/xlink/XLinkReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/xlink/XLinkReadHandler.java @@ -46,6 +46,7 @@ public class XLinkReadHandler extends AbstractXmlReadHandler * @param attrs the attributes. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void startParsing(final Attributes attrs) throws SAXException { uri = attrs.getValue(OfficeNamespaces.XLINK_NS, "uri"); @@ -65,6 +66,7 @@ public class XLinkReadHandler extends AbstractXmlReadHandler return uri; } + @Override public String getUri() { return uri; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperKey.java b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperKey.java index 605df59aa36a..c55cae1eefe0 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperKey.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperKey.java @@ -72,6 +72,7 @@ public final class StyleMapperKey return attributeName; } + @Override public boolean equals(final Object o) { if (this != o) @@ -101,6 +102,7 @@ public final class StyleMapperKey return result; } + @Override public int hashCode() { return hashCode; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperXmlResourceFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperXmlResourceFactory.java index 5ae6d1a2dd6e..03ce26ffca11 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperXmlResourceFactory.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperXmlResourceFactory.java @@ -34,6 +34,7 @@ public class StyleMapperXmlResourceFactory extends AbstractXmlResourceFactory { } + @Override protected Configuration getConfiguration() { return JFreeReportBoot.getInstance().getGlobalConfig(); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingDocumentReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingDocumentReadHandler.java index e96f89d92fbb..a7ba49b04f51 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingDocumentReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingDocumentReadHandler.java @@ -53,6 +53,7 @@ public class StyleMappingDocumentReadHandler extends AbstractXmlReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected XmlReadHandler getHandlerForChild(final String uri, final String tagName, final Attributes atts) @@ -72,6 +73,7 @@ public class StyleMappingDocumentReadHandler extends AbstractXmlReadHandler * * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void doneParsing() throws SAXException { diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingReadHandler.java index 8c3fbc1ba98e..09a1b13070a5 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingReadHandler.java @@ -43,6 +43,7 @@ public class StyleMappingReadHandler extends AbstractXmlReadHandler * @param attrs the attributes. * @throws org.xml.sax.SAXException if there is a parsing error. */ + @Override protected void startParsing(final Attributes attrs) throws SAXException { diff --git a/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java b/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java index 117f9d6f05aa..fef19cf7f200 100644 --- a/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java +++ b/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java @@ -215,6 +215,7 @@ public final class TypeDescription implements ITypeDescription { } // @see Object#toString + @Override public String toString() { return "[" + getClass().getName() + ": " + getTypeClass() + ", " + getTypeName() + "]"; diff --git a/ridljar/com/sun/star/lib/util/WeakMap.java b/ridljar/com/sun/star/lib/util/WeakMap.java index 69c2cb0146b6..75b89b12c7d8 100644 --- a/ridljar/com/sun/star/lib/util/WeakMap.java +++ b/ridljar/com/sun/star/lib/util/WeakMap.java @@ -245,10 +245,12 @@ public final class WeakMap<K,V> implements Map { return map.entrySet(); } + @Override public boolean equals(Object o) { return map.equals(o); } + @Override public int hashCode() { return map.hashCode(); } diff --git a/ridljar/test/com/sun/star/uno/UnoRuntime_Test.java b/ridljar/test/com/sun/star/uno/UnoRuntime_Test.java index cfc773f5296f..5992eda802b2 100644 --- a/ridljar/test/com/sun/star/uno/UnoRuntime_Test.java +++ b/ridljar/test/com/sun/star/uno/UnoRuntime_Test.java @@ -171,6 +171,7 @@ public final class UnoRuntime_Test { } private final class TestThread extends Thread { + @Override public void run() { //TODO: JUnit does not notice if these asserts fail: assertNull(UnoRuntime.getCurrentContext()); 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 16ba11e8fe93..01eda4dcd276 100644 --- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java @@ -165,6 +165,7 @@ public class ParcelBrowseNode extends PropertySet return BrowseNodeTypes.CONTAINER; } + @Override public String toString() { return getName(); diff --git a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java index c83237c5cdfc..2ef57466457e 100644 --- a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java @@ -39,6 +39,7 @@ public class PkgProviderBrowseNode extends ProviderBrowseNode } + @Override public String getName() { String name = "Unknown"; if ( container != null ) diff --git a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java index 7c53fae52bbb..3000ece25e64 100644 --- a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java @@ -157,6 +157,7 @@ public class ProviderBrowseNode extends PropertySet return BrowseNodeTypes.CONTAINER; } + @Override public String toString() { return getName(); diff --git a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java index 5b6ef9d1d55e..f59b9594c1a1 100644 --- a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java @@ -137,6 +137,7 @@ public class ScriptBrowseNode extends PropertySet return BrowseNodeTypes.SCRIPT; } + @Override public String toString() { return getName(); } diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java index b02e3624577f..ddd3fa712ebf 100644 --- a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java +++ b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java @@ -70,6 +70,7 @@ public class ScriptEntry implements Cloneable { this("Java", languagename, location); } + @Override public Object clone() throws CloneNotSupportedException { return super.clone(); } @@ -113,6 +114,7 @@ public class ScriptEntry implements Cloneable { return description; } + @Override public String toString() { return "\nLogicalName = " + logicalname + "\nLanguageName = " + languagename + "\nLocation = " + location + "\nLanguaguageProperties = " + languagedepprops; } diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java index 48cb3edd25b4..71d0ed285536 100644 --- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java +++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java @@ -90,6 +90,7 @@ public class ScriptMetaData extends ScriptEntry { } } + @Override public Object clone() throws CloneNotSupportedException { return super.clone(); } @@ -230,6 +231,7 @@ public class ScriptMetaData extends ScriptEntry { } + @Override public String toString() { return "\nParcelLocation = " + getParcelLocation() + "\nLocationPlaceHolder = " + locationPlaceHolder + super.toString(); diff --git a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java index fb470a25fe15..34fc62f5bbe0 100644 --- a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java +++ b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java @@ -178,6 +178,7 @@ public class UnoPkgContainer extends ParcelContainer } + @Override public ScriptMetaData findScript( ParsedScriptUri psu ) throws com.sun.star.container.NoSuchElementException, com.sun.star.lang.WrappedTargetException { diff --git a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java index 613b628d8687..2dd7381f2bb7 100644 --- a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java +++ b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java @@ -46,6 +46,7 @@ public class UCBStreamHandler extends URLStreamHandler { this.m_xSimpleFileAccess = xSFA; } + @Override public void parseURL(URL url, String spec, int start, int limit) { LogUtils.DEBUG("**XUCBStreamHandler, parseURL: " + url + " spec: " + spec + " start: " + start + " limit: " + limit ); @@ -60,6 +61,7 @@ public class UCBStreamHandler extends URLStreamHandler { setURL(url, m_ucbscheme, null, -1, null, null, file, null, null); } + @Override public URLConnection openConnection(URL u) throws IOException { return new UCBConnection(u); } @@ -70,9 +72,11 @@ public class UCBStreamHandler extends URLStreamHandler { super(url); } + @Override public void connect() { } + @Override public InputStream getInputStream() throws IOException { LogUtils.DEBUG("UCBConnectionHandler GetInputStream on " + url ); String sUrl = url.toString(); @@ -88,6 +92,7 @@ public class UCBStreamHandler extends URLStreamHandler { return getUCBStream(file, path); } } + @Override public OutputStream getOutputStream() throws IOException { LogUtils.DEBUG("UCBConnectionHandler getOutputStream on " + url ); OutputStream os = null; diff --git a/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java b/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java index a482e0bb138b..a1e27793f4f1 100644 --- a/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java +++ b/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java @@ -27,6 +27,7 @@ public class XInputStreamWrapper extends InputStream { m_xInputStream = xInputStream; } + @Override public int read() throws java.io.IOException { byte[][] byteRet = new byte[1][0]; @@ -45,6 +46,7 @@ public class XInputStreamWrapper extends InputStream { return byteRet[0][0]; } + @Override public int read( byte[] b ) throws java.io.IOException { byte[][] byteRet = new byte[1][]; @@ -59,6 +61,7 @@ public class XInputStreamWrapper extends InputStream { } } + @Override public long skip(long n) throws java.io.IOException { try { @@ -70,6 +73,7 @@ public class XInputStreamWrapper extends InputStream { } } + @Override public int available() throws java.io.IOException { try { @@ -80,6 +84,7 @@ public class XInputStreamWrapper extends InputStream { } } + @Override public void close() throws java.io.IOException { try { diff --git a/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java index 17c0869cb5e0..e3c561cff48d 100644 --- a/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java +++ b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java @@ -25,6 +25,7 @@ public class XOutputStreamWrapper extends OutputStream { public XOutputStreamWrapper(XOutputStream xOs ) { this.m_xOutputStream = xOs; } + @Override public void write(int b) throws java.io.IOException { @@ -43,6 +44,7 @@ public class XOutputStreamWrapper extends OutputStream { throw new java.io.IOException(ioe.getMessage()); } } + @Override public void write(byte[] b) throws java.io.IOException { @@ -60,6 +62,7 @@ public class XOutputStreamWrapper extends OutputStream { throw new java.io.IOException(ioe.getMessage()); } } + @Override public void write( byte[] b, int off, int len ) throws java.io.IOException { @@ -82,6 +85,7 @@ public class XOutputStreamWrapper extends OutputStream { } } + @Override public void flush() throws java.io.IOException { @@ -98,6 +102,7 @@ public class XOutputStreamWrapper extends OutputStream { throw new java.io.IOException(ioe.getMessage()); } } + @Override public void close() throws java.io.IOException { diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java index 3d886215d807..9fb9f15f12aa 100644 --- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java +++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java @@ -443,6 +443,7 @@ public abstract class ScriptProvider return BrowseNodeTypes.CONTAINER; } + @Override public String toString() { return getName(); diff --git a/scripting/java/com/sun/star/script/framework/provider/SwingInvocation.java b/scripting/java/com/sun/star/script/framework/provider/SwingInvocation.java index fae371605de0..74e95546af35 100644 --- a/scripting/java/com/sun/star/script/framework/provider/SwingInvocation.java +++ b/scripting/java/com/sun/star/script/framework/provider/SwingInvocation.java @@ -27,6 +27,7 @@ import javax.swing.SwingUtilities; public final class SwingInvocation { public static void invoke(final Runnable doRun) { new Thread("SwingInvocation") { + @Override public void run() { SwingUtilities.invokeLater(doRun); } }.start(); } diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java index 78459c2d0409..04ca755a6a72 100644 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java @@ -175,6 +175,7 @@ class GlyphGutter extends JComponent { setSize(d); } + @Override public void paintComponent(Graphics g) { JTextArea textArea = view.getTextArea(); diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java index ff85de923605..fb88968159a8 100644 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java @@ -278,6 +278,7 @@ public class ScriptEditorForBeanShell frame.addWindowListener( new WindowAdapter() { + @Override public void windowClosing(WindowEvent e) { doClose(); } diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java index cf4bcf114cf3..7df4f5cf645e 100644 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java @@ -56,6 +56,7 @@ public class ScriptProviderForBeanShell super (ctx, "BeanShell"); } + @Override public XScript getScript( /*IN*/String scriptURI ) throws com.sun.star.uno.RuntimeException, ScriptFrameworkErrorException @@ -74,11 +75,13 @@ public class ScriptProviderForBeanShell } } + @Override public boolean hasScriptEditor() { return true; } + @Override public ScriptEditor getScriptEditor() { return ScriptEditorForBeanShell.getEditor(); diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java index 2f795fba27a6..98f29c08c2b7 100644 --- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java +++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java @@ -174,6 +174,7 @@ public class ScriptDescriptor * * @return The scriptName including the parameters. */ + @Override public String toString() { StringBuffer description = new StringBuffer( m_name ); diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java index 07bde156c7b8..0ae4247bb982 100644 --- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java +++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java @@ -52,6 +52,7 @@ public class ScriptProviderForJava super (ctx, "Java"); } + @Override public XScript getScript( /*IN*/String scriptURI ) throws com.sun.star.uno.RuntimeException, ScriptFrameworkErrorException @@ -77,11 +78,13 @@ public class ScriptProviderForJava } + @Override public boolean hasScriptEditor() { return false; } + @Override public ScriptEditor getScriptEditor() { return null; diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java index 0bd3a25192e2..28c6a4f6e4f3 100644 --- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java +++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java @@ -266,11 +266,13 @@ public class ScriptEditorForJavaScript implements ScriptEditor }); Context.addContextListener(sdb); sdb.setScopeProvider(new ScopeProvider() { + @Override public Scriptable getScope() { return org.mozilla.javascript.tools.shell.Main.getScope(); } }); sdb.addWindowListener( new WindowAdapter() { + @Override public void windowClosing(WindowEvent e) { shutdown(); } 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 25b0da6fd550..b8625a6bc804 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 @@ -57,6 +57,7 @@ public class ScriptProviderForJavaScript super(ctx, "JavaScript"); } + @Override public XScript getScript( /*IN*/String scriptURI ) throws com.sun.star.uno.RuntimeException, ScriptFrameworkErrorException @@ -75,11 +76,13 @@ public class ScriptProviderForJavaScript } } + @Override public boolean hasScriptEditor() { return true; } + @Override public ScriptEditor getScriptEditor() { return ScriptEditorForJavaScript.getEditor(); diff --git a/scripting/java/org/openoffice/idesupport/OfficeInstallation.java b/scripting/java/org/openoffice/idesupport/OfficeInstallation.java index 11d15fb99813..abc08bf185ed 100644 --- a/scripting/java/org/openoffice/idesupport/OfficeInstallation.java +++ b/scripting/java/org/openoffice/idesupport/OfficeInstallation.java @@ -94,6 +94,7 @@ public class OfficeInstallation implements java.io.Serializable { return true; } + @Override public String toString() { return getName(); } diff --git a/scripting/java/org/openoffice/idesupport/filter/AllFilesFilter.java b/scripting/java/org/openoffice/idesupport/filter/AllFilesFilter.java index e8e7a87696fe..a27400342d6b 100644 --- a/scripting/java/org/openoffice/idesupport/filter/AllFilesFilter.java +++ b/scripting/java/org/openoffice/idesupport/filter/AllFilesFilter.java @@ -32,6 +32,7 @@ public class AllFilesFilter implements FileFilter { return true; } + @Override public String toString() { return "<all files>"; } diff --git a/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java b/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java index abecd9e8e389..9f4610bb252d 100644 --- a/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java +++ b/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java @@ -36,6 +36,7 @@ public class BinaryOnlyFilter implements FileFilter { return false; } + @Override public String toString() { /* StringBuffer buf = new StringBuffer(DESCRIPTION + ": "); diff --git a/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java b/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java index 9110562a6342..36bee314c47d 100644 --- a/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java +++ b/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java @@ -40,6 +40,7 @@ public class ExceptParcelFilter implements FileFilter { return false; } + @Override public String toString() { StringBuffer buf = new StringBuffer(DESCRIPTION + ": "); diff --git a/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java b/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java index a8d0b973131b..5f598d500046 100644 --- a/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java +++ b/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java @@ -61,6 +61,7 @@ public final class LocalOfficeImpl * to the office distribution. * @param port is a communication port. */ + @Override protected void connect(String officePath, int port) throws ConnectException { @@ -76,6 +77,7 @@ public final class LocalOfficeImpl * * @param uri is an identifier of storage has to be refreshed. */ + @Override public void refreshStorage(String uri) { try { @@ -95,6 +97,7 @@ System.out.println("*** LocalOfficeImpl.refreshStorage: DONE"); /** * Closes the connection to the running office. */ + @Override public void disconnect() { /* diff --git a/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java b/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java index ffa1b61041ae..15f472188b80 100644 --- a/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java +++ b/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java @@ -89,6 +89,7 @@ public class ScriptPanel extends JPanel { column.setCellEditor(new DefaultCellEditor(new JTextField())); table.addFocusListener(new FocusAdapter() { + @Override public void focusLost(FocusEvent evt) { tableFocusLost(); } @@ -138,6 +139,7 @@ public class ScriptPanel extends JPanel { return scripts.size(); } + @Override public String getColumnName(int col) { return columnNames[col]; } @@ -178,6 +180,7 @@ public class ScriptPanel extends JPanel { return result; } + @Override public boolean isCellEditable(int row, int col) { if (col == 0) return false; @@ -185,6 +188,7 @@ public class ScriptPanel extends JPanel { return true; } + @Override public void setValueAt(Object value, int row, int col) { ScriptEntry entry = scripts.get(row); entry.setLogicalName((String)value); diff --git a/scripting/workben/ifc/scripting/SecurityDialogUtil.java b/scripting/workben/ifc/scripting/SecurityDialogUtil.java index d0858dfc4c72..8c95fc165ac0 100644 --- a/scripting/workben/ifc/scripting/SecurityDialogUtil.java +++ b/scripting/workben/ifc/scripting/SecurityDialogUtil.java @@ -73,6 +73,7 @@ public boolean hasErrorMessage() /** * Press the named button in the currently visible dialog box. */ +@Override public void run() { // wait for the message box to appear diff --git a/scripting/workben/ifc/scripting/_XFunction.java b/scripting/workben/ifc/scripting/_XFunction.java index eb0d9c96a949..e4c04b257c0d 100644 --- a/scripting/workben/ifc/scripting/_XFunction.java +++ b/scripting/workben/ifc/scripting/_XFunction.java @@ -36,6 +36,7 @@ public class _XFunction extends MultiMethodTest { /** * Retrieves object relation. */ + @Override public void before() throws StatusException { log.println("getting provider"); oProvider = (XFunctionProvider) tEnv.getObjRelation("provider"); diff --git a/scripting/workben/ifc/scripting/_XFunctionProvider.java b/scripting/workben/ifc/scripting/_XFunctionProvider.java index 2f1d3e2e2df4..143e33febbd7 100644 --- a/scripting/workben/ifc/scripting/_XFunctionProvider.java +++ b/scripting/workben/ifc/scripting/_XFunctionProvider.java @@ -35,6 +35,7 @@ public class _XFunctionProvider extends MultiMethodTest { /** * Retrieves object relation. */ + @Override public void before() throws StatusException { } diff --git a/scripting/workben/ifc/scripting/_XScriptInfo.java b/scripting/workben/ifc/scripting/_XScriptInfo.java index ed08e44a3655..cd78ad7b1817 100644 --- a/scripting/workben/ifc/scripting/_XScriptInfo.java +++ b/scripting/workben/ifc/scripting/_XScriptInfo.java @@ -36,6 +36,7 @@ public class _XScriptInfo extends MultiMethodTest { /** * Retrieves object relation. */ + @Override public void before() throws StatusException { } diff --git a/scripting/workben/ifc/scripting/_XScriptInfoAccess.java b/scripting/workben/ifc/scripting/_XScriptInfoAccess.java index 9cc0a3429fe2..b6107d3da7ef 100644 --- a/scripting/workben/ifc/scripting/_XScriptInfoAccess.java +++ b/scripting/workben/ifc/scripting/_XScriptInfoAccess.java @@ -36,6 +36,7 @@ public class _XScriptInfoAccess extends MultiMethodTest { /** * Retrieves object relation. */ + @Override public void before() throws StatusException { } diff --git a/scripting/workben/ifc/scripting/_XScriptInvocation.java b/scripting/workben/ifc/scripting/_XScriptInvocation.java index 7aa4a56054ea..ba96ccc55f78 100644 --- a/scripting/workben/ifc/scripting/_XScriptInvocation.java +++ b/scripting/workben/ifc/scripting/_XScriptInvocation.java @@ -45,9 +45,11 @@ public class _XScriptInvocation extends MultiMethodTest { /** * Retrieves object relation. */ + @Override public void before() throws StatusException { } + @Override public void after() throws StatusException { } diff --git a/scripting/workben/ifc/scripting/_XScriptNameResolver.java b/scripting/workben/ifc/scripting/_XScriptNameResolver.java index 307ba73f584e..f62c0baf24d8 100644 --- a/scripting/workben/ifc/scripting/_XScriptNameResolver.java +++ b/scripting/workben/ifc/scripting/_XScriptNameResolver.java @@ -44,6 +44,7 @@ public class _XScriptNameResolver extends MultiMethodTest { /** * Retrieves object relation. */ + @Override public void before() throws StatusException { } diff --git a/scripting/workben/ifc/scripting/_XScriptSecurity.java b/scripting/workben/ifc/scripting/_XScriptSecurity.java index 2c72f0c742bf..bbaf7dd02ea0 100644 --- a/scripting/workben/ifc/scripting/_XScriptSecurity.java +++ b/scripting/workben/ifc/scripting/_XScriptSecurity.java @@ -45,9 +45,11 @@ public class _XScriptSecurity extends MultiMethodTest { /** * Retrieves object relation. */ + @Override public void before() throws StatusException { } + @Override public void after() throws StatusException { } diff --git a/scripting/workben/ifc/scripting/_XScriptStorageManager.java b/scripting/workben/ifc/scripting/_XScriptStorageManager.java index 4a18fd80a867..f8eab044c772 100644 --- a/scripting/workben/ifc/scripting/_XScriptStorageManager.java +++ b/scripting/workben/ifc/scripting/_XScriptStorageManager.java @@ -38,6 +38,7 @@ public class _XScriptStorageManager extends MultiMethodTest { /** * Retrieves object relation. */ + @Override public void before() throws StatusException { } diff --git a/scripting/workben/ifc/scripting/_XScriptStorageRefresh.java b/scripting/workben/ifc/scripting/_XScriptStorageRefresh.java index 0f6eb8eddb02..bae6a3e5a20d 100644 --- a/scripting/workben/ifc/scripting/_XScriptStorageRefresh.java +++ b/scripting/workben/ifc/scripting/_XScriptStorageRefresh.java @@ -34,6 +34,7 @@ public class _XScriptStorageRefresh extends MultiMethodTest { /** * Retrieves object relation. */ + @Override public void before() throws StatusException { } diff --git a/scripting/workben/installer/Banner.java b/scripting/workben/installer/Banner.java index fd7bb0847f6b..aea91a2caebd 100644 --- a/scripting/workben/installer/Banner.java +++ b/scripting/workben/installer/Banner.java @@ -29,17 +29,20 @@ public class Banner extends Canvas img = Toolkit.getDefaultToolkit().createImage("sidebar.jpg"); } + @Override public void paint(Graphics g) { g.drawImage(img, 0, 0, Color.white, null); g.dispose(); } + @Override public void update(Graphics g) { super.update(g); } + @Override public Dimension getPreferredSize() { return new Dimension(137, 358); diff --git a/scripting/workben/installer/Final.java b/scripting/workben/installer/Final.java index 9fcf6b96cf3e..640bd93d0054 100644 --- a/scripting/workben/installer/Final.java +++ b/scripting/workben/installer/Final.java @@ -61,6 +61,7 @@ public class Final extends javax.swing.JPanel implements ActionListener, Install }//GEN-END:initComponents + @Override public java.awt.Dimension getPreferredSize() { return new java.awt.Dimension(InstallWizard.DEFWIDTH, InstallWizard.DEFHEIGHT); } diff --git a/scripting/workben/installer/IdeFinal.java b/scripting/workben/installer/IdeFinal.java index e1969bc54f1d..33612f1907ef 100644 --- a/scripting/workben/installer/IdeFinal.java +++ b/scripting/workben/installer/IdeFinal.java @@ -58,6 +58,7 @@ public class IdeFinal extends javax.swing.JPanel implements ActionListener, Inst add(nav, java.awt.BorderLayout.SOUTH); }//GEN-END:initComponents + @Override public java.awt.Dimension getPreferredSize() { return new java.awt.Dimension(InstallWizard.DEFWIDTH, InstallWizard.DEFHEIGHT); } diff --git a/scripting/workben/installer/IdeUpdater.java b/scripting/workben/installer/IdeUpdater.java index 1de610656121..3efe04e1f282 100644 --- a/scripting/workben/installer/IdeUpdater.java +++ b/scripting/workben/installer/IdeUpdater.java @@ -110,6 +110,7 @@ public class IdeUpdater extends Thread { }// setStop + @Override public void run() { internalThread = Thread.currentThread(); diff --git a/scripting/workben/installer/IdeVersion.java b/scripting/workben/installer/IdeVersion.java index 1b9cf5142f33..bd6fc1012c59 100644 --- a/scripting/workben/installer/IdeVersion.java +++ b/scripting/workben/installer/IdeVersion.java @@ -82,6 +82,7 @@ public class IdeVersion extends javax.swing.JPanel implements ActionListener, Ta tableModel.addTableModelListener(this); JTable tableVersions = new JTable(tableModel) { + @Override public String getToolTipText(MouseEvent event) { int col = columnAtPoint( event.getPoint() ); @@ -100,6 +101,7 @@ public class IdeVersion extends javax.swing.JPanel implements ActionListener, Ta return o.toString(); } + @Override public Point getToolTipLocation(MouseEvent event) { int col = columnAtPoint( event.getPoint() ); @@ -145,6 +147,7 @@ public class IdeVersion extends javax.swing.JPanel implements ActionListener, Ta }// initComponents + @Override public java.awt.Dimension getPreferredSize() { return new java.awt.Dimension(320, 280); } @@ -278,6 +281,7 @@ class MyTableModelIDE extends AbstractTableModel { return data.size(); } + @Override public String getColumnName(int col) { return colNames[col]; } @@ -291,10 +295,12 @@ class MyTableModelIDE extends AbstractTableModel { return aRow.get(col); } + @Override public Class getColumnClass(int c) { return getValueAt(0, c).getClass(); } + @Override public boolean isCellEditable(int row, int col) { if (col == 0) { return true; @@ -303,6 +309,7 @@ class MyTableModelIDE extends AbstractTableModel { } } + @Override public void setValueAt(Object value, int row, int col) { ArrayList<Object> aRow = data.get(row); aRow.set(col, value); diff --git a/scripting/workben/installer/IdeWelcome.java b/scripting/workben/installer/IdeWelcome.java index 014daf54f75b..a0d3a5145ee0 100644 --- a/scripting/workben/installer/IdeWelcome.java +++ b/scripting/workben/installer/IdeWelcome.java @@ -57,6 +57,7 @@ public class IdeWelcome extends javax.swing.JPanel implements ActionListener { }//GEN-END:initComponents + @Override public java.awt.Dimension getPreferredSize() { return new java.awt.Dimension(InstallWizard.DEFWIDTH, InstallWizard.DEFHEIGHT); } diff --git a/scripting/workben/installer/InstallWizard.java b/scripting/workben/installer/InstallWizard.java index 3d4e92064722..c9d73ba7c126 100644 --- a/scripting/workben/installer/InstallWizard.java +++ b/scripting/workben/installer/InstallWizard.java @@ -111,6 +111,7 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener screens = new javax.swing.JPanel(); addWindowListener(new java.awt.event.WindowAdapter() { + @Override public void windowClosing(java.awt.event.WindowEvent evt) { exitForm(); } diff --git a/scripting/workben/installer/LogStream.java b/scripting/workben/installer/LogStream.java index e8cb77031a23..3fde653709f3 100644 --- a/scripting/workben/installer/LogStream.java +++ b/scripting/workben/installer/LogStream.java @@ -38,6 +38,7 @@ public class LogStream extends PrintStream { super( new FileOutputStream( logFileName ) ); } + @Override public void println(String x) { super.println( getTimeStamp() + x ); diff --git a/scripting/workben/installer/Version.java b/scripting/workben/installer/Version.java index 8ff366dc00bc..a7982636575a 100644 --- a/scripting/workben/installer/Version.java +++ b/scripting/workben/installer/Version.java @@ -79,6 +79,7 @@ public class Version extends javax.swing.JPanel implements ActionListener, Table tableModel.addTableModelListener(this); JTable tableVersions = new JTable(tableModel) { + @Override public String getToolTipText(MouseEvent event) { int col = columnAtPoint( event.getPoint() ); @@ -97,6 +98,7 @@ public class Version extends javax.swing.JPanel implements ActionListener, Table return o.toString(); } + @Override public Point getToolTipLocation(MouseEvent event) { int col = columnAtPoint( event.getPoint() ); @@ -202,6 +204,7 @@ public class Version extends javax.swing.JPanel implements ActionListener, Table } } + @Override public java.awt.Dimension getPreferredSize() { return new java.awt.Dimension(320, 280); } @@ -290,6 +293,7 @@ class MyTableModel extends AbstractTableModel { return data.size(); } + @Override public String getColumnName(int col) { return colNames[col]; } @@ -303,10 +307,12 @@ class MyTableModel extends AbstractTableModel { return aRow.get(col); } + @Override public Class getColumnClass(int c) { return getValueAt(0, c).getClass(); } + @Override public boolean isCellEditable(int row, int col) { if (col == 0) { return true; @@ -315,6 +321,7 @@ class MyTableModel extends AbstractTableModel { } } + @Override public void setValueAt(Object value, int row, int col) { ArrayList<Object> aRow = data.get(row); aRow.set(col, value); diff --git a/scripting/workben/installer/Welcome.java b/scripting/workben/installer/Welcome.java index c125d7afa6bf..a2c5f0f7ed37 100644 --- a/scripting/workben/installer/Welcome.java +++ b/scripting/workben/installer/Welcome.java @@ -62,6 +62,7 @@ public class Welcome extends javax.swing.JPanel implements ActionListener { } + @Override public java.awt.Dimension getPreferredSize() { return new java.awt.Dimension(InstallWizard.DEFWIDTH, InstallWizard.DEFHEIGHT); } diff --git a/scripting/workben/installer/XmlUpdater.java b/scripting/workben/installer/XmlUpdater.java index 5b0d14d3fc2f..8c5763a3b05f 100644 --- a/scripting/workben/installer/XmlUpdater.java +++ b/scripting/workben/installer/XmlUpdater.java @@ -149,6 +149,7 @@ public class XmlUpdater extends Thread { }// setStop + @Override public void run() { internalThread = Thread.currentThread(); diff --git a/scripting/workben/mod/_scripting/Dispatch.java b/scripting/workben/mod/_scripting/Dispatch.java index 2985e3e0c3ff..00b4ee5900bf 100644 --- a/scripting/workben/mod/_scripting/Dispatch.java +++ b/scripting/workben/mod/_scripting/Dispatch.java @@ -42,9 +42,11 @@ import com.sun.star.util.XURLTransformer; public class Dispatch extends TestCase { private String scriptURL = "script://HighlightText.showForm"; + @Override public void initialize( TestParameters tParam, PrintWriter log ) { } + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { log.println("creating test environment"); @@ -84,6 +86,7 @@ public class Dispatch extends TestCase { return tEnv ; } + @Override public synchronized void disposeTestEnvironment( TestEnvironment tEnv, TestParameters tParam) { } diff --git a/scripting/workben/mod/_scripting/Function.java b/scripting/workben/mod/_scripting/Function.java index 5b1d857c6fe0..97c90771a25e 100644 --- a/scripting/workben/mod/_scripting/Function.java +++ b/scripting/workben/mod/_scripting/Function.java @@ -37,9 +37,11 @@ public class Function extends TestCase { private String script = "script://returns-Integer"; private String doc = "doc_with_beanshell_scripts.sxw"; + @Override public void initialize( TestParameters tParam, PrintWriter log ) { } + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { XInterface oObj = null; @@ -72,6 +74,7 @@ public class Function extends TestCase { return tEnv ; } + @Override public synchronized void disposeTestEnvironment( TestEnvironment tEnv, TestParameters tParam) { } diff --git a/scripting/workben/mod/_scripting/FunctionProvider.java b/scripting/workben/mod/_scripting/FunctionProvider.java index a5ae0ef3c6a5..beb5d6c9f714 100644 --- a/scripting/workben/mod/_scripting/FunctionProvider.java +++ b/scripting/workben/mod/_scripting/FunctionProvider.java @@ -33,9 +33,11 @@ import com.sun.star.frame.XDesktop; public class FunctionProvider extends TestCase { String docPath = null; + @Override public void initialize( TestParameters tParam, PrintWriter log ) { } + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { XInterface oObj = null; @@ -63,6 +65,7 @@ public class FunctionProvider extends TestCase { return tEnv ; } + @Override public synchronized void disposeTestEnvironment( TestEnvironment tEnv, TestParameters tParam) { } diff --git a/scripting/workben/mod/_scripting/ScriptInfo.java b/scripting/workben/mod/_scripting/ScriptInfo.java index 344e990ae65f..4dce6625054f 100644 --- a/scripting/workben/mod/_scripting/ScriptInfo.java +++ b/scripting/workben/mod/_scripting/ScriptInfo.java @@ -35,6 +35,7 @@ import drafts.com.sun.star.script.framework.storage.XScriptInfo; public class ScriptInfo extends TestCase { String docPath = null; + @Override public void initialize( TestParameters tParam, PrintWriter log ) { // Get path to test documents String rootDocPath = ( String )tParam.get( "DOCPTH" ); @@ -55,6 +56,7 @@ public class ScriptInfo extends TestCase { } + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { @@ -89,6 +91,7 @@ public class ScriptInfo extends TestCase { return tEnv ; } + @Override public synchronized void disposeTestEnvironment( TestEnvironment tEnv, TestParameters tParam) { } diff --git a/scripting/workben/mod/_scripting/ScriptRuntimeManager.java b/scripting/workben/mod/_scripting/ScriptRuntimeManager.java index 66fb906e2c52..79f84ac109ec 100644 --- a/scripting/workben/mod/_scripting/ScriptRuntimeManager.java +++ b/scripting/workben/mod/_scripting/ScriptRuntimeManager.java @@ -27,9 +27,11 @@ import lib.TestParameters; public class ScriptRuntimeManager extends TestCase { + @Override public void initialize( TestParameters tParam, PrintWriter log ) { } + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { @@ -50,6 +52,7 @@ public class ScriptRuntimeManager extends TestCase { return tEnv ; } + @Override public synchronized void disposeTestEnvironment( TestEnvironment tEnv, TestParameters tParam) { } diff --git a/scripting/workben/mod/_scripting/ScriptStorage.java b/scripting/workben/mod/_scripting/ScriptStorage.java index 3666a187992a..3ecb91e508aa 100644 --- a/scripting/workben/mod/_scripting/ScriptStorage.java +++ b/scripting/workben/mod/_scripting/ScriptStorage.java @@ -32,6 +32,7 @@ import com.sun.star.uno.UnoRuntime; public class ScriptStorage extends TestCase { String docPath = null; + @Override public void initialize( TestParameters tParam, PrintWriter log ) { // Get path to test documents String rootDocPath = ( String )tParam.get( "DOCPTH" ); @@ -52,6 +53,7 @@ public class ScriptStorage extends TestCase { } + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { @@ -84,6 +86,7 @@ public class ScriptStorage extends TestCase { return tEnv ; } + @Override public synchronized void disposeTestEnvironment( TestEnvironment tEnv, TestParameters tParam) { } diff --git a/scripting/workben/mod/_scripting/ScriptStorageManager.java b/scripting/workben/mod/_scripting/ScriptStorageManager.java index 596fe4133b52..64d993edfdc4 100644 --- a/scripting/workben/mod/_scripting/ScriptStorageManager.java +++ b/scripting/workben/mod/_scripting/ScriptStorageManager.java @@ -31,9 +31,11 @@ import lib.TestParameters; public class ScriptStorageManager extends TestCase { + @Override public void initialize( TestParameters tParam, PrintWriter log ) { } + @Override public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { @@ -63,6 +65,7 @@ public class ScriptStorageManager extends TestCase { return tEnv ; } + @Override public synchronized void disposeTestEnvironment( TestEnvironment tEnv, TestParameters tParam) { } diff --git a/stoc/test/javavm/testapplet/TestApplet.java b/stoc/test/javavm/testapplet/TestApplet.java index 4275358c3e89..ad090f3d8ce0 100644 --- a/stoc/test/javavm/testapplet/TestApplet.java +++ b/stoc/test/javavm/testapplet/TestApplet.java @@ -33,6 +33,7 @@ public class TestApplet extends java.applet.Applet { /** Initialization method that will be called after the applet is loaded * into the browser. */ + @Override public void init () { setBackground( Color.green); resize( 300, 300); @@ -56,6 +57,7 @@ public class TestApplet extends java.applet.Applet { } + @Override public void paint( Graphics g) { super.paint( g); } diff --git a/sw/qa/complex/writer/TextPortionEnumerationTest.java b/sw/qa/complex/writer/TextPortionEnumerationTest.java index 7871d7eed97b..8ef7b8870b8e 100644 --- a/sw/qa/complex/writer/TextPortionEnumerationTest.java +++ b/sw/qa/complex/writer/TextPortionEnumerationTest.java @@ -95,6 +95,7 @@ class TreeNode TreeNode() { m_Children = new ArrayList<TreeNode>(); } TreeNode appendChild(TreeNode child) { m_Children.add(child); return this; } + @Override public String toString() { return "<" + getType() + ">"; } @@ -113,6 +114,7 @@ abstract class MarkNode extends TreeNode return (other.m_Name.equals(m_Name)) && (other.m_isPoint == m_isPoint) && (other.m_isStart == m_isStart); } + @Override public String toString() { return super.toString() + "\tname: " + m_Name + "\tisPoint: " + m_isPoint + "\tisStart: " + m_isStart; @@ -123,17 +125,21 @@ class BookmarkNode extends MarkNode { private StringPair m_XmlId; StringPair getXmlId() { return m_XmlId; } + @Override BookmarkNode dup() { return new BookmarkNode(getName(), getXmlId()); } BookmarkNode(String name) { this(name, new StringPair()); } BookmarkNode(String name, StringPair xmlid) { super(name); m_XmlId = xmlid; } + @Override String getType() { return "Bookmark"; } + @Override public boolean equals(Object other) { return (other instanceof BookmarkNode) && super.equals((MarkNode) other) && MetaNode.eq(((BookmarkNode) other).m_XmlId, m_XmlId); } + @Override public String toString() { return super.toString() + "\txmlid: " + m_XmlId.First + "#" + m_XmlId.Second; @@ -142,6 +148,7 @@ class BookmarkNode extends MarkNode class BookmarkStartNode extends BookmarkNode { + @Override BookmarkStartNode dup() { return new BookmarkStartNode(getName()); } BookmarkStartNode(String name) { this(name, new StringPair()); } BookmarkStartNode(String name, StringPair xmlid) { @@ -151,6 +158,7 @@ class BookmarkStartNode extends BookmarkNode class BookmarkEndNode extends BookmarkNode { + @Override BookmarkEndNode dup() { return new BookmarkEndNode(getName()); } BookmarkEndNode(String name) { this(name, new StringPair()); } BookmarkEndNode(String name, StringPair xmlid) { @@ -160,9 +168,12 @@ class BookmarkEndNode extends BookmarkNode class ReferenceMarkNode extends MarkNode { + @Override ReferenceMarkNode dup() { return new ReferenceMarkNode(getName()); } ReferenceMarkNode(String name) { super(name); } + @Override String getType() { return "ReferenceMark"; } + @Override public boolean equals(Object other) { return (other instanceof ReferenceMarkNode) && super.equals((MarkNode) other); @@ -171,6 +182,7 @@ class ReferenceMarkNode extends MarkNode class ReferenceMarkStartNode extends ReferenceMarkNode { + @Override ReferenceMarkStartNode dup() { return new ReferenceMarkStartNode(getName()); } ReferenceMarkStartNode(String name) { @@ -180,6 +192,7 @@ class ReferenceMarkStartNode extends ReferenceMarkNode class ReferenceMarkEndNode extends ReferenceMarkNode { + @Override ReferenceMarkEndNode dup() { return new ReferenceMarkEndNode(getName()); } ReferenceMarkEndNode(String name) { @@ -189,10 +202,13 @@ class ReferenceMarkEndNode extends ReferenceMarkNode class DocumentIndexMarkNode extends MarkNode { + @Override DocumentIndexMarkNode dup() { return new DocumentIndexMarkNode(getName()); } DocumentIndexMarkNode(String name) { super(name); } + @Override String getType() { return "DocumentIndexMark"; } + @Override public boolean equals(Object other) { return (other instanceof DocumentIndexMarkNode) && super.equals((MarkNode) other); @@ -201,6 +217,7 @@ class DocumentIndexMarkNode extends MarkNode class DocumentIndexMarkStartNode extends DocumentIndexMarkNode { + @Override DocumentIndexMarkStartNode dup() { return new DocumentIndexMarkStartNode(getName()); } DocumentIndexMarkStartNode(String name) { @@ -210,6 +227,7 @@ class DocumentIndexMarkStartNode extends DocumentIndexMarkNode class DocumentIndexMarkEndNode extends DocumentIndexMarkNode { + @Override DocumentIndexMarkEndNode dup() { return new DocumentIndexMarkEndNode(getName()); } DocumentIndexMarkEndNode(String name) { @@ -221,13 +239,16 @@ abstract class ContentNode extends TreeNode { private String m_Content; String getContent() { return m_Content; } + @Override boolean hasContent() { return true; } ContentNode(String content) { m_Content = content; } + @Override TreeNode appendChild(TreeNode t) { throw new RuntimeException("ContentNode.appendChild"); } + @Override public String toString() { return super.toString() + "\tcontent: " + m_Content; } @@ -238,9 +259,12 @@ abstract class ContentNode extends TreeNode class TextNode extends ContentNode { + @Override TextNode dup() { return new TextNode(getContent()); } TextNode(String content) { super(content); } + @Override String getType() { return "Text"; } + @Override public boolean equals(Object other) { return (other instanceof TextNode) && super.equals((ContentNode) other); } @@ -248,9 +272,12 @@ class TextNode extends ContentNode class TextFieldNode extends ContentNode { + @Override TextFieldNode dup() { return new TextFieldNode(getContent()); } TextFieldNode(String content) { super(content); } + @Override String getType() { return "TextField"; } + @Override public boolean equals(Object other) { return (other instanceof TextFieldNode) && super.equals((ContentNode) other); @@ -263,16 +290,20 @@ class FrameNode extends TreeNode private TextContentAnchorType m_Anchor; String getName() { return m_Name; } TextContentAnchorType getAnchor() { return m_Anchor; } + @Override FrameNode dup() { return new FrameNode(getName(), getAnchor()); } FrameNode(String name, TextContentAnchorType anchor) { m_Name = name; m_Anchor = anchor; } + @Override String getType() { return "Frame"; } + @Override public boolean equals(Object other) { return (other instanceof FrameNode) && (((FrameNode) other).m_Name.equals(m_Name)) && (((FrameNode) other).m_Anchor == m_Anchor); } + @Override public String toString() { return super.toString() + "\tname: " + m_Name + "\tanchor: " + toString(m_Anchor); @@ -293,13 +324,17 @@ class FootnoteNode extends TreeNode { private String m_Label; String getLabel() { return m_Label; } + @Override FootnoteNode dup() { return new FootnoteNode(getLabel()); } FootnoteNode(String label) { m_Label = label; } + @Override String getType() { return "Footnote"; } + @Override public boolean equals(Object other) { return (other instanceof FootnoteNode) && (((FootnoteNode) other).m_Label.equals(m_Label)); } + @Override public String toString() { return super.toString() + "\tlabel: " + m_Label; } @@ -309,13 +344,17 @@ class ControlCharacterNode extends TreeNode { private short m_Char; short getChar() { return m_Char; } + @Override ControlCharacterNode dup() { return new ControlCharacterNode(getChar()); } ControlCharacterNode(short c) { m_Char = c; } + @Override String getType() { return "ControlCharacter"; } + @Override public boolean equals(Object other) { return (other instanceof ControlCharacterNode) && (((ControlCharacterNode) other).m_Char == m_Char); } + @Override public String toString() { return super.toString() + "\tchar: " + m_Char; } @@ -323,7 +362,9 @@ class ControlCharacterNode extends TreeNode class SoftPageBreakNode extends TreeNode { + @Override String getType() { return "SoftPageBreak"; } + @Override public boolean equals(Object other) { return (other instanceof SoftPageBreakNode); } @@ -333,17 +374,22 @@ class HyperlinkNode extends TreeNode { private String m_URL; String getURL() { return m_URL; } + @Override HyperlinkNode dup() { return new HyperlinkNode(getURL()); } HyperlinkNode(String url) { if (url.length() == 0) throw new RuntimeException("HyperlinkNode"); m_URL = url; } + @Override String getType() { return "Hyperlink"; } + @Override boolean isNesting() { return true; } + @Override public boolean equals(Object other) { return (other instanceof HyperlinkNode) && (((HyperlinkNode) other).m_URL.equals(m_URL)); } + @Override public String toString() { return super.toString() + "\turl: " + m_URL; } @@ -353,17 +399,22 @@ class RubyNode extends TreeNode { private String m_Ruby; String getRubyText() { return m_Ruby; } + @Override RubyNode dup() { return new RubyNode(getRubyText()); } RubyNode(String ruby) { if (ruby.length() == 0) throw new RuntimeException("RubyNode"); m_Ruby = ruby; } + @Override String getType() { return "Ruby"; } + @Override boolean isNesting() { return true; } + @Override public boolean equals(Object other) { return (other instanceof RubyNode) && (((RubyNode) other).m_Ruby.equals(m_Ruby)); } + @Override public String toString() { return super.toString() + "\trubytext: " + m_Ruby; } @@ -373,10 +424,14 @@ class MetaNode extends TreeNode { private StringPair m_XmlId; StringPair getXmlId() { return m_XmlId; } + @Override MetaNode dup() { return new MetaNode(getXmlId()); } MetaNode (StringPair xmlid) { m_XmlId = xmlid; } + @Override String getType() { return "InContentMetadata"; } + @Override boolean isNesting() { return true; } + @Override public boolean equals(Object other) { return (other instanceof MetaNode) && eq(((MetaNode) other).m_XmlId, m_XmlId); @@ -386,6 +441,7 @@ class MetaNode extends TreeNode return left.First.equals(right.First) && left.Second.equals(right.Second); } + @Override public String toString() { return super.toString() + "\txmlid: " + m_XmlId.First + "#" + m_XmlId.Second; @@ -394,8 +450,10 @@ class MetaNode extends TreeNode class MetaFieldNode extends MetaNode { + @Override MetaFieldNode dup() { return new MetaFieldNode(getXmlId()); } MetaFieldNode (StringPair xmlid) { super(xmlid); } + @Override String getType() { return "MetadataField"; } } @@ -3307,10 +3365,13 @@ public class TextPortionEnumerationTest { doMetaXTextAttach( new AttachHelper() { + @Override boolean isAttribute() { return true; } + @Override TreeNode mkTreeNode() { return new DocumentIndexMarkNode( mkName("toxmark") ); } + @Override XTextContent mkTextContent(Inserter inserter, TreeNode node) throws Exception { return inserter.makeDocumentIndexMark( @@ -3323,10 +3384,13 @@ public class TextPortionEnumerationTest { doMetaXTextAttach( new AttachHelper() { + @Override boolean isAttribute() { return true; } + @Override TreeNode mkTreeNode() { return new ReferenceMarkNode( mkName("refmark") ); } + @Override XTextContent mkTextContent(Inserter inserter, TreeNode node) throws Exception { return inserter.makeReferenceMark( @@ -3339,10 +3403,13 @@ public class TextPortionEnumerationTest { doMetaXTextAttach( new AttachHelper() { + @Override boolean isAttribute() { return false; } + @Override TreeNode mkTreeNode() { return new TextFieldNode( mkName("field") ); } + @Override XTextContent mkTextContent(Inserter inserter, TreeNode node) throws Exception { return inserter.makeTextField( @@ -3355,10 +3422,13 @@ public class TextPortionEnumerationTest { doMetaXTextAttach( new AttachHelper() { + @Override boolean isAttribute() { return false; } + @Override TreeNode mkTreeNode() { return new FootnoteNode( mkName("ftn") ); } + @Override XTextContent mkTextContent(Inserter inserter, TreeNode node) throws Exception { return inserter.makeFootnote( @@ -3371,10 +3441,13 @@ public class TextPortionEnumerationTest { doMetaXTextAttach( new AttachHelper() { + @Override boolean isAttribute() { return true; } + @Override TreeNode mkTreeNode() { return new MetaNode( mkId("id") ); } + @Override XTextContent mkTextContent(Inserter inserter, TreeNode node) throws Exception { return inserter.makeMeta(); @@ -3790,6 +3863,7 @@ public class TextPortionEnumerationTest .appendChild( new MetaFieldNode(mkId_("id16")) .appendChild( new TextNode("12") ) ) ) ) .appendChild( new MetaNode(mkId_("")) { + @Override public boolean equals(Object other) { return (other instanceof MetaNode); } } diff --git a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java index b06c0d7d97b5..8f82364d076c 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java +++ b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java @@ -44,11 +44,13 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback { } + @Override public void handleComment( char[] data,int pos ) { // insert code to handle comments } + @Override public void handleEndTag( HTML.Tag t,int pos ) { if ( t == HTML.Tag.TEXTAREA ) @@ -69,10 +71,12 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback } } + @Override public void handleError( String errorMsg,int pos ) { } + @Override public void handleSimpleTag( HTML.Tag t, MutableAttributeSet a,int pos ) { // insert code to handle simple tags @@ -118,6 +122,7 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback } + @Override public void handleStartTag( HTML.Tag t, MutableAttributeSet a,int pos ) { // insert code to handle starting tags diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java b/swext/mediawiki/src/com/sun/star/wiki/Helper.java index 20491b972790..52800a1aa3e5 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java +++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java @@ -721,6 +721,7 @@ public class Helper static private class HTMLParse extends HTMLEditorKit { + @Override public HTMLEditorKit.Parser getParser() { return super.getParser(); diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java index 1570c3d635e2..384e77b79c08 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java @@ -92,6 +92,7 @@ public class WikiEditSettingDialog extends WikiDialog InitSaveCheckbox( xContext, bInitSaveCheckBox ); } + @Override public boolean show( ) { SetThrobberVisible( false ); @@ -347,6 +348,7 @@ public class WikiEditSettingDialog extends WikiDialog } } + @Override public boolean callHandlerMethod( XDialog xDialog, Object EventObject, String MethodName ) { if ( MethodName.equals( sOKMethod ) ) @@ -365,6 +367,7 @@ public class WikiEditSettingDialog extends WikiDialog m_bThreadFinished = false; m_aThread = new Thread( "com.sun.star.thread.WikiEditorSendingThread" ) { + @Override public void run() { try @@ -412,6 +415,7 @@ public class WikiEditSettingDialog extends WikiDialog return false; } + @Override public void windowClosed( EventObject e ) { ThreadStop( false ); diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java index e6718572732d..48f4c424c624 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java @@ -102,6 +102,7 @@ public class WikiPropDialog extends WikiDialog{ } } + @Override public boolean show() { EnableControls( true ); @@ -113,6 +114,7 @@ public class WikiPropDialog extends WikiDialog{ return bResult; } + @Override public synchronized void ThreadStop( boolean bSelf ) { boolean bShowError = ( !bSelf && m_aThread != null && !m_bThreadFinished ); @@ -236,6 +238,7 @@ public class WikiPropDialog extends WikiDialog{ } } + @Override public boolean callHandlerMethod( XDialog xDialog, Object EventObject, String MethodName ) { if ( MethodName.equals( sSendMethod ) ) @@ -286,6 +289,7 @@ public class WikiPropDialog extends WikiDialog{ { m_aThread = new Thread( "com.sun.star.thread.WikiEditorSendingThread" ) { + @Override public void run() { try @@ -359,6 +363,7 @@ public class WikiPropDialog extends WikiDialog{ return false; } + @Override public void windowClosed( EventObject e ) { ThreadStop( false ); diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java b/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java index 755dd80304b9..95e31b1b3b1d 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java @@ -146,11 +146,13 @@ class WikiProtocolSocketFactory implements SecureProtocolSocketFactory return GetNotSoSecureSSLContext().getSocketFactory().createSocket( aSocket, sHost, nPort, bAutoClose ); } + @Override public boolean equals(Object obj) { return ((obj != null) && obj.getClass().equals(WikiProtocolSocketFactory.class)); } + @Override public int hashCode() { return WikiProtocolSocketFactory.class.hashCode(); diff --git a/testtools/qa/cli/CLITest.java b/testtools/qa/cli/CLITest.java index 370e5ebf0dde..29ba7a235b0b 100644 --- a/testtools/qa/cli/CLITest.java +++ b/testtools/qa/cli/CLITest.java @@ -23,6 +23,7 @@ import java.io.*; public class CLITest extends ComplexTestCase { + @Override public String[] getTestMethodNames() { // TODO think about trigger of sub-tests from outside @@ -84,6 +85,7 @@ class Reader extends Thread start(); } + @Override public void run() { try diff --git a/testtools/qa/cliversioning/VersionTestCase.java b/testtools/qa/cliversioning/VersionTestCase.java index 4112ed318e8e..3a3d666e0f8a 100644 --- a/testtools/qa/cliversioning/VersionTestCase.java +++ b/testtools/qa/cliversioning/VersionTestCase.java @@ -23,6 +23,7 @@ import complexlib.ComplexTestCase; public class VersionTestCase extends ComplexTestCase { + @Override public String[] getTestMethodNames() { return new String[] @@ -82,6 +83,7 @@ class Reader extends Thread start(); } + @Override public void run() { try diff --git a/testtools/source/servicetests/LocalServiceTest.java b/testtools/source/servicetests/LocalServiceTest.java index 713b9129b1af..ee890faa4ec9 100644 --- a/testtools/source/servicetests/LocalServiceTest.java +++ b/testtools/source/servicetests/LocalServiceTest.java @@ -25,6 +25,7 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; public final class LocalServiceTest extends TestBase { + @Override protected TestServiceFactory getTestServiceFactory() throws Exception { return new TestServiceFactory() { public Object get() throws Exception { diff --git a/testtools/source/servicetests/RemoteServiceTest.java b/testtools/source/servicetests/RemoteServiceTest.java index cbc5eea95b4c..a176f9cb42a3 100644 --- a/testtools/source/servicetests/RemoteServiceTest.java +++ b/testtools/source/servicetests/RemoteServiceTest.java @@ -34,6 +34,7 @@ import java.io.InputStreamReader; import java.io.PrintStream; public final class RemoteServiceTest extends TestBase { + @Override protected TestServiceFactory getTestServiceFactory() throws Exception { final Process p = Runtime.getRuntime().exec(new String[] { "java", "-classpath", System.getProperty("java.class.path"), @@ -87,6 +88,7 @@ public final class RemoteServiceTest extends TestBase { private void pipe(final InputStream in, final PrintStream out, final String prefix) { new Thread("Pipe: " + prefix) { + @Override public void run() { BufferedReader r = new BufferedReader(new InputStreamReader(in)); diff --git a/testtools/source/servicetests/TestBase.java b/testtools/source/servicetests/TestBase.java index f3d2651ac453..56ef66fe5709 100644 --- a/testtools/source/servicetests/TestBase.java +++ b/testtools/source/servicetests/TestBase.java @@ -23,6 +23,7 @@ import complexlib.ComplexTestCase; import util.WaitUnreachable; public abstract class TestBase extends ComplexTestCase { + @Override public final String[] getTestMethodNames() { return new String[] { "test" }; } diff --git a/toolkit/test/accessibility/AccTreeNode.java b/toolkit/test/accessibility/AccTreeNode.java index ab673ed7bdc4..73eb9a757e29 100644 --- a/toolkit/test/accessibility/AccTreeNode.java +++ b/toolkit/test/accessibility/AccTreeNode.java @@ -75,6 +75,7 @@ class AccTreeNode object. This is done by replacing every handler by a new one. An update method at each handler would be better of course. */ + @Override public void update () { for (int i=0; i<maHandlers.size(); i++) @@ -165,6 +166,7 @@ class AccTreeNode return aDescriptor; } + @Override public int getChildCount() { int nChildCount = 0; @@ -177,6 +179,7 @@ class AccTreeNode } /** iterate over handlers until the child is found */ + @Override public AccessibleTreeNode getChild (int nIndex) throws IndexOutOfBoundsException { @@ -200,6 +203,7 @@ class AccTreeNode return null; } + @Override public AccessibleTreeNode getChildNoCreate (int nIndex) throws IndexOutOfBoundsException { @@ -223,6 +227,7 @@ class AccTreeNode return null; } + @Override public boolean removeChild (int nIndex) throws IndexOutOfBoundsException { @@ -251,6 +256,7 @@ class AccTreeNode } + @Override public int indexOf (AccessibleTreeNode aNode) { int nBaseIndex = 0; @@ -272,11 +278,13 @@ class AccTreeNode /** this node is a leaf if have no handlers, or is those handlers show no children */ + @Override public boolean isLeaf() { return (maHandlers.size() == 0); } + @Override public boolean equals (Object aOther) { return (this == aOther) || (aOther!=null && aOther.equals(mxContext)); @@ -298,6 +306,7 @@ class AccTreeNode } } + @Override public void performAction( int nIndex ) { if( nIndex >= 0 ) diff --git a/toolkit/test/accessibility/AccessibilityTree.java b/toolkit/test/accessibility/AccessibilityTree.java index aa8ab1da4e4d..091209e349c9 100644 --- a/toolkit/test/accessibility/AccessibilityTree.java +++ b/toolkit/test/accessibility/AccessibilityTree.java @@ -234,10 +234,15 @@ public class AccessibilityTree { maTree=aTree; } + @Override public void mousePressed(MouseEvent e) { popupTrigger(e); } + @Override public void mouseClicked(MouseEvent e) { popupTrigger(e); } + @Override public void mouseEntered(MouseEvent e) { popupTrigger(e); } + @Override public void mouseExited(MouseEvent e) { popupTrigger(e); } + @Override public void mouseReleased(MouseEvent e) { popupTrigger(e); } public boolean popupTrigger( MouseEvent e ) @@ -359,12 +364,14 @@ public class AccessibilityTree /** expand all nodes */ class AllExpander extends Expander { + @Override public boolean expand(Object aObject) { return true; } } /** expand all nodes with accessibility roles > 100 */ class ShapeExpander extends Expander { + @Override public boolean expand (Object aObject) { if (aObject instanceof AccTreeNode) diff --git a/toolkit/test/accessibility/AccessibilityTreeModel.java b/toolkit/test/accessibility/AccessibilityTreeModel.java index 875a4c1b7cf9..623507a70e5a 100644 --- a/toolkit/test/accessibility/AccessibilityTreeModel.java +++ b/toolkit/test/accessibility/AccessibilityTreeModel.java @@ -87,6 +87,7 @@ public class AccessibilityTreeModel + @Override public synchronized void setRoot (AccessibleTreeNode aRoot) { if (getRoot() == null) @@ -95,6 +96,7 @@ public class AccessibilityTreeModel { lock (); maNodeMap.ForEach (new NodeMapCallback () { + @Override public void Apply (AccTreeNode aNode) { if (maCanvas != null) @@ -119,6 +121,7 @@ public class AccessibilityTreeModel /** Delegate the request to the parent and then register listeners at the child and add the child to the canvas. */ + @Override public Object getChild (Object aParent, int nIndex) { AccessibleTreeNode aChild = (AccessibleTreeNode)super.getChild (aParent, nIndex); @@ -132,6 +135,7 @@ public class AccessibilityTreeModel return aChild; } + @Override public Object getChildNoCreate (Object aParent, int nIndex) { AccessibleTreeNode aChild = (AccessibleTreeNode)super.getChildNoCreate (aParent, nIndex); diff --git a/toolkit/test/accessibility/AccessibilityWorkBench.java b/toolkit/test/accessibility/AccessibilityWorkBench.java index ea9e624210e0..e466f568204c 100644 --- a/toolkit/test/accessibility/AccessibilityWorkBench.java +++ b/toolkit/test/accessibility/AccessibilityWorkBench.java @@ -103,7 +103,8 @@ public class AccessibilityWorkBench maAccessibilityTree.getComponent().addTreeSelectionListener (this); addWindowListener (new WindowAdapter () - { public void windowClosing (WindowEvent e) + { @Override + public void windowClosing (WindowEvent e) { System.exit(0); } }); diff --git a/toolkit/test/accessibility/AccessibleActionHandler.java b/toolkit/test/accessibility/AccessibleActionHandler.java index e30627c6801d..4abfb09ccaac 100644 --- a/toolkit/test/accessibility/AccessibleActionHandler.java +++ b/toolkit/test/accessibility/AccessibleActionHandler.java @@ -24,6 +24,7 @@ import com.sun.star.lang.IndexOutOfBoundsException; class AccessibleActionHandler extends NodeHandler { + @Override public NodeHandler createHandler (XAccessibleContext xContext) { XAccessibleAction xEComponent = @@ -51,6 +52,7 @@ class AccessibleActionHandler XAccessibleAction.class, aParent.getContext()); } + @Override public AccessibleTreeNode createChild ( AccessibleTreeNode aParent, int nIndex) diff --git a/toolkit/test/accessibility/AccessibleActionNode.java b/toolkit/test/accessibility/AccessibleActionNode.java index f4dc4f541704..fcb029b4d3cc 100644 --- a/toolkit/test/accessibility/AccessibleActionNode.java +++ b/toolkit/test/accessibility/AccessibleActionNode.java @@ -32,12 +32,14 @@ class AccessibleActionNode mnActionIndex = nActionIndex; } + @Override public String[] getActions () { return new String[] {"Perform Action"}; } /** perform action */ + @Override public void performAction (int nIndex) { if (nIndex != 0) diff --git a/toolkit/test/accessibility/AccessibleCellHandler.java b/toolkit/test/accessibility/AccessibleCellHandler.java index c3a8ab91b689..6ba28a1411b9 100644 --- a/toolkit/test/accessibility/AccessibleCellHandler.java +++ b/toolkit/test/accessibility/AccessibleCellHandler.java @@ -24,6 +24,7 @@ import com.sun.star.accessibility.XAccessible; class AccessibleCellHandler extends NodeHandler { + @Override public NodeHandler createHandler (XAccessibleContext xContext) { AccessibleCellHandler aCellHandler = null; @@ -59,6 +60,7 @@ class AccessibleCellHandler extends NodeHandler XAccessibleTable.class, aObject); } + @Override public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex) { AccessibleTreeNode aChild = null; diff --git a/toolkit/test/accessibility/AccessibleComponentHandler.java b/toolkit/test/accessibility/AccessibleComponentHandler.java index 2c4476417893..23125fd32b63 100644 --- a/toolkit/test/accessibility/AccessibleComponentHandler.java +++ b/toolkit/test/accessibility/AccessibleComponentHandler.java @@ -25,6 +25,7 @@ class AccessibleComponentHandler extends NodeHandler { + @Override public NodeHandler createHandler (XAccessibleContext xContext) { XAccessibleComponent xComponent = @@ -47,6 +48,7 @@ class AccessibleComponentHandler maChildList.setSize (6); } + @Override public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex) { AccessibleTreeNode aChild = null; @@ -109,6 +111,7 @@ class AccessibleComponentHandler return aChild; } + @Override public void update (AccessibleTreeNode aNode) { maChildList.clear(); diff --git a/toolkit/test/accessibility/AccessibleContextHandler.java b/toolkit/test/accessibility/AccessibleContextHandler.java index 71fa7982a771..a6f32efdd786 100644 --- a/toolkit/test/accessibility/AccessibleContextHandler.java +++ b/toolkit/test/accessibility/AccessibleContextHandler.java @@ -26,6 +26,7 @@ class AccessibleContextHandler { protected int nChildrenCount; + @Override public NodeHandler createHandler (XAccessibleContext xContext) { if (xContext != null) @@ -46,6 +47,7 @@ class AccessibleContextHandler maChildList.setSize (4); } + @Override public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex) { XAccessibleContext xContext = null; diff --git a/toolkit/test/accessibility/AccessibleEditableTextHandler.java b/toolkit/test/accessibility/AccessibleEditableTextHandler.java index 8fb8b843c3d8..fa9b0d521217 100644 --- a/toolkit/test/accessibility/AccessibleEditableTextHandler.java +++ b/toolkit/test/accessibility/AccessibleEditableTextHandler.java @@ -23,6 +23,7 @@ import com.sun.star.accessibility.XAccessibleEditableText; class AccessibleEditableTextHandler extends NodeHandler { + @Override public NodeHandler createHandler (XAccessibleContext xContext) { XAccessibleEditableText xText = @@ -50,6 +51,7 @@ class AccessibleEditableTextHandler extends NodeHandler XAccessibleEditableText.class, aNode.getContext()); } + @Override public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex) { return new StringNode ("XAccessibleEditableText is supported", aParent); diff --git a/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java b/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java index fe0bb855ed7d..4adb6274078c 100644 --- a/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java +++ b/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java @@ -24,6 +24,7 @@ import com.sun.star.accessibility.XAccessibleExtendedComponent; class AccessibleExtendedComponentHandler extends NodeHandler { + @Override public NodeHandler createHandler (XAccessibleContext xContext) { XAccessibleExtendedComponent xEComponent = @@ -53,6 +54,7 @@ class AccessibleExtendedComponentHandler } + @Override public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex) { AccessibleTreeNode aChild = null; diff --git a/toolkit/test/accessibility/AccessibleHyperlinkHandler.java b/toolkit/test/accessibility/AccessibleHyperlinkHandler.java index e1869a59ee99..d46288e529cd 100644 --- a/toolkit/test/accessibility/AccessibleHyperlinkHandler.java +++ b/toolkit/test/accessibility/AccessibleHyperlinkHandler.java @@ -23,6 +23,7 @@ import com.sun.star.accessibility.XAccessibleHyperlink; class AccessibleHyperlinkHandler extends AccessibleTreeHandler { + @Override public NodeHandler createHandler (XAccessibleContext xContext) { XAccessibleHyperlink xLink = @@ -52,6 +53,7 @@ class AccessibleHyperlinkHandler extends AccessibleTreeHandler return xHyperlink; } + @Override public AccessibleTreeNode getChild (AccessibleTreeNode aParent, int nIndex) { return new StringNode ("interface XAccessibleHyperlink is supported", aParent); diff --git a/toolkit/test/accessibility/AccessibleHypertextHandler.java b/toolkit/test/accessibility/AccessibleHypertextHandler.java index adcd19827a1e..cba62589d201 100644 --- a/toolkit/test/accessibility/AccessibleHypertextHandler.java +++ b/toolkit/test/accessibility/AccessibleHypertextHandler.java @@ -23,6 +23,7 @@ import com.sun.star.accessibility.XAccessibleHypertext; class AccessibleHypertextHandler extends AccessibleTreeHandler { + @Override public NodeHandler createHandler (XAccessibleContext xContext) { XAccessibleHypertext xText = @@ -52,6 +53,7 @@ class AccessibleHypertextHandler extends AccessibleTreeHandler return xHypertext; } + @Override public AccessibleTreeNode getChild (AccessibleTreeNode aParent, int nIndex) { return new StringNode ("interface XAccessibleHypertext is supported", aParent); diff --git a/toolkit/test/accessibility/AccessibleImageHandler.java b/toolkit/test/accessibility/AccessibleImageHandler.java index f9c40998dc03..cec93c55e97f 100644 --- a/toolkit/test/accessibility/AccessibleImageHandler.java +++ b/toolkit/test/accessibility/AccessibleImageHandler.java @@ -23,6 +23,7 @@ import com.sun.star.accessibility.XAccessibleImage; class AccessibleImageHandler extends NodeHandler { + @Override public NodeHandler createHandler (XAccessibleContext xContext) { XAccessibleImage xImage = @@ -50,6 +51,7 @@ class AccessibleImageHandler extends NodeHandler XAccessibleImage.class, aNode.getContext()); } + @Override public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex) { if (aParent instanceof AccTreeNode) diff --git a/toolkit/test/accessibility/AccessibleRelationHandler.java b/toolkit/test/accessibility/AccessibleRelationHandler.java index 6882f2648f71..884f0493c7cd 100644 --- a/toolkit/test/accessibility/AccessibleRelationHandler.java +++ b/toolkit/test/accessibility/AccessibleRelationHandler.java @@ -28,6 +28,7 @@ import tools.NameProvider; class AccessibleRelationHandler extends NodeHandler { + @Override public NodeHandler createHandler( XAccessibleContext xContext ) { AccessibleRelationHandler aHandler = null; @@ -51,6 +52,7 @@ class AccessibleRelationHandler maChildList.setSize( 1 ); } + @Override public AccessibleTreeNode createChild( AccessibleTreeNode aParent, int nIndex ) { diff --git a/toolkit/test/accessibility/AccessibleSelectionHandler.java b/toolkit/test/accessibility/AccessibleSelectionHandler.java index 4791444d5a6a..546bd6913941 100644 --- a/toolkit/test/accessibility/AccessibleSelectionHandler.java +++ b/toolkit/test/accessibility/AccessibleSelectionHandler.java @@ -27,6 +27,7 @@ import com.sun.star.lang.IndexOutOfBoundsException; class AccessibleSelectionHandler extends NodeHandler { + @Override public NodeHandler createHandler( XAccessibleContext xContext ) { XAccessibleSelection xSelection = @@ -46,6 +47,7 @@ class AccessibleSelectionHandler maChildList.setSize( 2 ); } + @Override public AccessibleTreeNode createChild( AccessibleTreeNode aParent, int nIndex ) { @@ -120,6 +122,7 @@ class AccessibleSelectionHandler } + @Override public String[] getActions (AccessibleTreeNode aNode) { if( aNode instanceof AccTreeNode ) @@ -134,6 +137,7 @@ class AccessibleSelectionHandler return new String[0]; } + @Override public void performAction (AccessibleTreeNode aNode, int nIndex) { new SelectionDialog( (AccTreeNode)aNode ).show(); diff --git a/toolkit/test/accessibility/AccessibleTableHandler.java b/toolkit/test/accessibility/AccessibleTableHandler.java index 372c2cb5a26f..9ec6ccb2de7d 100644 --- a/toolkit/test/accessibility/AccessibleTableHandler.java +++ b/toolkit/test/accessibility/AccessibleTableHandler.java @@ -23,6 +23,7 @@ import com.sun.star.accessibility.XAccessibleTable; class AccessibleTableHandler extends NodeHandler { + @Override public NodeHandler createHandler (XAccessibleContext xContext) { XAccessibleTable xTable = @@ -50,6 +51,7 @@ class AccessibleTableHandler extends NodeHandler XAccessibleTable.class, aObject); } + @Override public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex) { AccessibleTreeNode aChild = null; diff --git a/toolkit/test/accessibility/AccessibleTextHandler.java b/toolkit/test/accessibility/AccessibleTextHandler.java index ff424a9f8d76..6fc9b832eed0 100644 --- a/toolkit/test/accessibility/AccessibleTextHandler.java +++ b/toolkit/test/accessibility/AccessibleTextHandler.java @@ -51,6 +51,7 @@ import javax.swing.text.JTextComponent; class AccessibleTextHandler extends NodeHandler { + @Override public NodeHandler createHandler (XAccessibleContext xContext) { XAccessibleText xText = UnoRuntime.queryInterface ( @@ -71,6 +72,7 @@ class AccessibleTextHandler extends NodeHandler maChildList.setSize (8); } + @Override public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex) { AccessibleTreeNode aChild = null; @@ -379,6 +381,7 @@ class AccessibleTextHandler extends NodeHandler new String[] { "select...", "copy...", "cut...", "paste...", "edit...", "format..." }; + @Override public String[] getActions (AccessibleTreeNode aNode) { XAccessibleEditableText xEText = null; @@ -388,6 +391,7 @@ class AccessibleTextHandler extends NodeHandler return (xEText == null) ? aTextActions : aEditableTextActions; } + @Override public void performAction (AccessibleTreeNode aNode, int nIndex) { if ( ! (aNode instanceof AccTreeNode)) @@ -404,6 +408,7 @@ class AccessibleTextHandler extends NodeHandler "Select range:", "select" ) { + @Override boolean action( JTextComponent aText, AccTreeNode aNode ) throws IndexOutOfBoundsException @@ -419,6 +424,7 @@ class AccessibleTextHandler extends NodeHandler "Select range and copy:", "copy" ) { + @Override boolean action( JTextComponent aText, AccTreeNode aNode ) throws IndexOutOfBoundsException @@ -434,6 +440,7 @@ class AccessibleTextHandler extends NodeHandler "Select range and cut:", "cut" ) { + @Override boolean action( JTextComponent aText, AccTreeNode aNode ) throws IndexOutOfBoundsException @@ -449,6 +456,7 @@ class AccessibleTextHandler extends NodeHandler "Place Caret and paste:", "paste" ) { + @Override boolean action( JTextComponent aText, AccTreeNode aNode ) throws IndexOutOfBoundsException @@ -602,6 +610,7 @@ class TextEditDialog extends TextActionDialog super( aNode, sExplanation, sButtonText ); } + @Override protected void init( String sExplanation, String sText, String sButtonText ) @@ -612,6 +621,7 @@ class TextEditDialog extends TextActionDialog /** edit the text */ + @Override boolean action( JTextComponent aText, AccTreeNode aNode ) { // is this text editable? if not, fudge you and return @@ -694,6 +704,7 @@ class TextAttributeDialog extends TextActionDialog private JCheckBox aBold, aUnderline, aItalics; private Color aForeground, aBackground; + @Override protected void init( String sExplanation, String sText, String sButtonText ) @@ -767,6 +778,7 @@ class TextAttributeDialog extends TextActionDialog /** edit the text */ + @Override boolean action( JTextComponent aText, AccTreeNode aNode ) throws IndexOutOfBoundsException { diff --git a/toolkit/test/accessibility/AccessibleTreeCellRenderer.java b/toolkit/test/accessibility/AccessibleTreeCellRenderer.java index 43705abb055e..c46058c551da 100644 --- a/toolkit/test/accessibility/AccessibleTreeCellRenderer.java +++ b/toolkit/test/accessibility/AccessibleTreeCellRenderer.java @@ -44,6 +44,7 @@ public class AccessibleTreeCellRenderer maChangedLines = new ArrayList<Boolean> (); } + @Override public Component getTreeCellRendererComponent ( JTree tree, Object value, diff --git a/toolkit/test/accessibility/AccessibleTreeHandler.java b/toolkit/test/accessibility/AccessibleTreeHandler.java index a6945a532079..5f9830f6574c 100644 --- a/toolkit/test/accessibility/AccessibleTreeHandler.java +++ b/toolkit/test/accessibility/AccessibleTreeHandler.java @@ -30,6 +30,7 @@ class AccessibleTreeHandler { protected XAccessibleContext mxContext; + @Override public NodeHandler createHandler (XAccessibleContext xContext) { if (xContext != null) @@ -57,6 +58,7 @@ class AccessibleTreeHandler } } + @Override public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex) { AccessibleTreeNode aChild = null; @@ -117,6 +119,7 @@ class AccessibleTreeHandler /** Update only the child count node. Trust on other ways to update the accessible children. */ + @Override public void update (AccessibleTreeNode aNode) { synchronized (maChildList) diff --git a/toolkit/test/accessibility/AccessibleTreeNode.java b/toolkit/test/accessibility/AccessibleTreeNode.java index c9d3a6b51446..9398385df714 100644 --- a/toolkit/test/accessibility/AccessibleTreeNode.java +++ b/toolkit/test/accessibility/AccessibleTreeNode.java @@ -102,6 +102,7 @@ class AccessibleTreeNode return true; } + @Override public String toString() { return maDisplayObject.toString(); diff --git a/toolkit/test/accessibility/AccessibleUNOHandler.java b/toolkit/test/accessibility/AccessibleUNOHandler.java index a516ba3dde76..353cca482f8c 100644 --- a/toolkit/test/accessibility/AccessibleUNOHandler.java +++ b/toolkit/test/accessibility/AccessibleUNOHandler.java @@ -29,6 +29,7 @@ import com.sun.star.uno.Type; class AccessibleUNOHandler extends NodeHandler { + @Override public NodeHandler createHandler (XAccessibleContext xContext) { if (xContext == null) @@ -62,6 +63,7 @@ class AccessibleUNOHandler return xTypeProvider; } + @Override public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex) { diff --git a/toolkit/test/accessibility/Canvas.java b/toolkit/test/accessibility/Canvas.java index 13458a69787a..d815f9df3ff1 100644 --- a/toolkit/test/accessibility/Canvas.java +++ b/toolkit/test/accessibility/Canvas.java @@ -208,6 +208,7 @@ class Canvas } + @Override public void paintComponent (Graphics g) { synchronized (g) diff --git a/toolkit/test/accessibility/CanvasShape.java b/toolkit/test/accessibility/CanvasShape.java index 266da3bbb6f5..41d82b1230c7 100644 --- a/toolkit/test/accessibility/CanvasShape.java +++ b/toolkit/test/accessibility/CanvasShape.java @@ -292,6 +292,7 @@ class CanvasShape return mxComponent; } + @Override public String toString () { return ">"+msName+", "+msDescription+" +"+maPosition.x+"+"+maPosition.y diff --git a/toolkit/test/accessibility/ChildEventHandler.java b/toolkit/test/accessibility/ChildEventHandler.java index b39a1568ecb8..3a3eb5af30ff 100644 --- a/toolkit/test/accessibility/ChildEventHandler.java +++ b/toolkit/test/accessibility/ChildEventHandler.java @@ -34,6 +34,7 @@ class ChildEventHandler XAccessible.class, aEvent.NewValue); } + @Override public void PrintOldAndNew (PrintStream out) { if (mxOldChild != null) @@ -42,6 +43,7 @@ class ChildEventHandler out.println (" adding child " + mxNewChild); } + @Override public void Process () { // Insertion and removal of children should be mutually exclusive. diff --git a/toolkit/test/accessibility/ContextEventHandler.java b/toolkit/test/accessibility/ContextEventHandler.java index a9095e05c314..12ffd0648ce6 100644 --- a/toolkit/test/accessibility/ContextEventHandler.java +++ b/toolkit/test/accessibility/ContextEventHandler.java @@ -32,6 +32,7 @@ class ContextEventHandler super (aEvent, aTreeModel); } + @Override public void PrintOldAndNew (PrintStream out) { switch (mnEventId) @@ -61,6 +62,7 @@ class ContextEventHandler } + @Override public void Process () { maTreeModel.updateNode (mxEventSource, AccessibleContextHandler.class); diff --git a/toolkit/test/accessibility/GeometryEventHandler.java b/toolkit/test/accessibility/GeometryEventHandler.java index 1c2fea0f8b36..c55ee3acc4b1 100644 --- a/toolkit/test/accessibility/GeometryEventHandler.java +++ b/toolkit/test/accessibility/GeometryEventHandler.java @@ -28,11 +28,13 @@ class GeometryEventHandler super (aEvent, aTreeModel); } + @Override public void PrintOldAndNew (PrintStream out) { out.println (" children not relevant"); } + @Override public void Process () { AccTreeNode aNode = maTreeModel.updateNode (mxEventSource, diff --git a/toolkit/test/accessibility/HelpWindow.java b/toolkit/test/accessibility/HelpWindow.java index 4d15114874ce..13d2beb0a315 100644 --- a/toolkit/test/accessibility/HelpWindow.java +++ b/toolkit/test/accessibility/HelpWindow.java @@ -89,6 +89,7 @@ class HelpWindow maFrame = new JFrame (); maFrame.addWindowListener (new WindowAdapter () { + @Override public void windowClosing (WindowEvent e) { maInstance = null; diff --git a/toolkit/test/accessibility/MessageArea.java b/toolkit/test/accessibility/MessageArea.java index d0a1094cb6b4..bce68273ffa4 100644 --- a/toolkit/test/accessibility/MessageArea.java +++ b/toolkit/test/accessibility/MessageArea.java @@ -106,6 +106,7 @@ public class MessageArea + @Override public void paintComponent (Graphics g) { synchronized (g) diff --git a/toolkit/test/accessibility/TableEventHandler.java b/toolkit/test/accessibility/TableEventHandler.java index c5f157cc950f..09a3adbbc308 100644 --- a/toolkit/test/accessibility/TableEventHandler.java +++ b/toolkit/test/accessibility/TableEventHandler.java @@ -29,6 +29,7 @@ class TableEventHandler super (aEvent, aTreeModel); } + @Override public void PrintOldAndNew (PrintStream out) { switch (mnEventId) @@ -47,6 +48,7 @@ class TableEventHandler } } + @Override public void Process () { maTreeModel.updateNode (mxEventSource, AccessibleTableHandler.class); diff --git a/toolkit/test/accessibility/VectorNode.java b/toolkit/test/accessibility/VectorNode.java index 2a63b81dad0d..68cfbfd66844 100644 --- a/toolkit/test/accessibility/VectorNode.java +++ b/toolkit/test/accessibility/VectorNode.java @@ -40,28 +40,33 @@ class VectorNode maChildren.add (aChild); } + @Override public int getChildCount () { return maChildren.size(); } + @Override public AccessibleTreeNode getChild (int nIndex) throws IndexOutOfBoundsException { return maChildren.get(nIndex); } + @Override public boolean removeChild (int nIndex) throws IndexOutOfBoundsException { return maChildren.remove (nIndex) != null; } + @Override public int indexOf (AccessibleTreeNode aNode) { return maChildren.indexOf (aNode); } + @Override public boolean isLeaf() { return maChildren.isEmpty(); diff --git a/toolkit/test/accessibility/ov/ContextView.java b/toolkit/test/accessibility/ov/ContextView.java index 36d03694bbfe..e3144ccb37b2 100644 --- a/toolkit/test/accessibility/ov/ContextView.java +++ b/toolkit/test/accessibility/ov/ContextView.java @@ -92,6 +92,7 @@ public class ContextView add (maRole, constraints); } + @Override public void Update () { if (mxContext == null) @@ -108,6 +109,7 @@ public class ContextView } } + @Override public String GetTitle () { return ("Context"); @@ -115,6 +117,7 @@ public class ContextView /** Listen for changes regarding displayed values. */ + @Override public void notifyEvent (AccessibleEventObject aEvent) { switch (aEvent.EventId) diff --git a/toolkit/test/accessibility/ov/FocusView.java b/toolkit/test/accessibility/ov/FocusView.java index fa87ef5a7d92..00a9258ad534 100644 --- a/toolkit/test/accessibility/ov/FocusView.java +++ b/toolkit/test/accessibility/ov/FocusView.java @@ -78,6 +78,7 @@ public class FocusView /** Additionally to the context store a reference to the XAccessibleComponent interface. */ + @Override public void SetObject (XAccessibleContext xObject) { mxComponent = UnoRuntime.queryInterface( @@ -85,12 +86,14 @@ public class FocusView super.SetObject (xObject); } + @Override synchronized public void Destroy () { super.Destroy(); maGrabFocus.removeActionListener (this); } + @Override synchronized public void Update () { if (mxContext == null) @@ -110,6 +113,7 @@ public class FocusView } } + @Override public String GetTitle () { return ("Focus"); @@ -123,6 +127,7 @@ public class FocusView } } + @Override public void notifyEvent (AccessibleEventObject aEvent) { System.out.println (aEvent); diff --git a/toolkit/test/accessibility/ov/ListeningObjectView.java b/toolkit/test/accessibility/ov/ListeningObjectView.java index dd9291fe8231..32bde199d9f6 100644 --- a/toolkit/test/accessibility/ov/ListeningObjectView.java +++ b/toolkit/test/accessibility/ov/ListeningObjectView.java @@ -40,6 +40,7 @@ abstract class ListeningObjectView /** Add this object as event listener at the broadcasting accessible object. */ + @Override public void SetObject (XAccessibleContext xContext) { super.SetObject (xContext); @@ -54,6 +55,7 @@ abstract class ListeningObjectView /** Remove this object as event listener from the broadcasting accessible object. */ + @Override public void Destroy () { super.Destroy (); diff --git a/toolkit/test/accessibility/ov/SelectionView.java b/toolkit/test/accessibility/ov/SelectionView.java index e6a06d7593c6..0d84579eb844 100644 --- a/toolkit/test/accessibility/ov/SelectionView.java +++ b/toolkit/test/accessibility/ov/SelectionView.java @@ -70,6 +70,7 @@ class SelectionView Layout(); } + @Override public String GetTitle () { return "Selection"; @@ -127,6 +128,7 @@ class SelectionView } + @Override public void SetObject (XAccessibleContext xContext) { mxSelection = UnoRuntime.queryInterface( @@ -135,6 +137,7 @@ class SelectionView } + @Override public void Update () { maChildrenSelector.removeAll (); @@ -228,6 +231,7 @@ class SelectionView } + @Override public void notifyEvent (AccessibleEventObject aEvent) { if (aEvent.EventId == AccessibleEventId.SELECTION_CHANGED) diff --git a/toolkit/test/accessibility/ov/StateSetView.java b/toolkit/test/accessibility/ov/StateSetView.java index ce0a3ff8582e..a2a7c2632f01 100644 --- a/toolkit/test/accessibility/ov/StateSetView.java +++ b/toolkit/test/accessibility/ov/StateSetView.java @@ -88,11 +88,13 @@ public class StateSetView + @Override public String GetTitle () { return ("StateSet"); } + @Override public void notifyEvent (AccessibleEventObject aEvent) { if (aEvent.EventId == AccessibleEventId.STATE_CHANGED) @@ -146,6 +148,7 @@ public static class StateSetAllView setMinimumSize (new Dimension(200,80)); } + @Override public void paintChildren (Graphics g) { synchronized (g) @@ -237,6 +240,7 @@ public static class StateSetSetView } + @Override synchronized public void Update () { XAccessibleStateSet xStateSet = mxContext.getAccessibleStateSet(); diff --git a/toolkit/test/accessibility/ov/TextView.java b/toolkit/test/accessibility/ov/TextView.java index c93e6086e2f4..a38b426b2cf1 100644 --- a/toolkit/test/accessibility/ov/TextView.java +++ b/toolkit/test/accessibility/ov/TextView.java @@ -84,6 +84,7 @@ public class TextView /** Additionally to the context store a reference to the XAccessibleText interface. */ + @Override public void SetObject (XAccessibleContext xObject) { mxText = UnoRuntime.queryInterface( @@ -91,11 +92,13 @@ public class TextView super.SetObject (xObject); } + @Override synchronized public void Destroy () { super.Destroy(); } + @Override synchronized public void Update () { if (mxText == null) @@ -110,11 +113,13 @@ public class TextView } } + @Override public String GetTitle () { return ("Text"); } + @Override public void notifyEvent (AccessibleEventObject aEvent) { System.out.println (aEvent); diff --git a/ucb/qa/complex/tdoc/_XCommandProcessor.java b/ucb/qa/complex/tdoc/_XCommandProcessor.java index 6afe124e2f28..1e04f59d7fa9 100644 --- a/ucb/qa/complex/tdoc/_XCommandProcessor.java +++ b/ucb/qa/complex/tdoc/_XCommandProcessor.java @@ -226,6 +226,7 @@ public class _XCommandProcessor { command = new Command(commandName, -1, arg); Thread aborter = new Thread() { + @Override public void run() { for (int i = 0; i < 10; i++) { log.println("try to abort command"); diff --git a/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java b/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java index 6258301f35c5..b3e159769efa 100644 --- a/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java +++ b/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java @@ -46,10 +46,12 @@ public final class GlobalTransfer_Test extends ComplexTestCase { static private final String fileTargetDir = "file:///d:/temp/"; + @Override public String getTestObjectName() { return getClass().getName(); } + @Override public String[] getTestMethodNames() { return new String[] { "testNameClashASK" }; } diff --git a/unotest/source/java/org/openoffice/test/OfficeConnection.java b/unotest/source/java/org/openoffice/test/OfficeConnection.java index fac8417a0f16..ac996ae350d6 100644 --- a/unotest/source/java/org/openoffice/test/OfficeConnection.java +++ b/unotest/source/java/org/openoffice/test/OfficeConnection.java @@ -202,6 +202,7 @@ public final class OfficeConnection { { final Thread t1 = Thread.currentThread(); Thread t2 = new Thread("waitForProcess") { + @Override public void run() { try { Thread.sleep(millis); @@ -238,6 +239,7 @@ public final class OfficeConnection { this.out = out; } + @Override public void run() { for (;;) { byte[] buf = new byte[1024]; diff --git a/unoxml/qa/complex/unoxml/DOMTest.java b/unoxml/qa/complex/unoxml/DOMTest.java index 0211da376eed..4d4c9bcaa2ac 100644 --- a/unoxml/qa/complex/unoxml/DOMTest.java +++ b/unoxml/qa/complex/unoxml/DOMTest.java @@ -2941,9 +2941,11 @@ public class DOMTest } public NodeType getNodeType() { return ELEMENT_NODE; } + @Override public XNamedNodeMap getAttributes() { return new MockNodeMap(m_attributes); } + @Override public boolean hasAttributes() { return m_attributes.length != 0; } public String getAttribute(String n) { diff --git a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java index a6e69da9ef60..ea5a7617d276 100644 --- a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java +++ b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java @@ -50,6 +50,7 @@ public class PlaceholderTextElement extends TextElement xmsf = xmsf_; } + @Override public void write(Object textRange) { super.write(textRange); diff --git a/wizards/com/sun/star/wizards/common/TextElement.java b/wizards/com/sun/star/wizards/common/TextElement.java index 383089172145..0a07f2c0216f 100644 --- a/wizards/com/sun/star/wizards/common/TextElement.java +++ b/wizards/com/sun/star/wizards/common/TextElement.java @@ -39,6 +39,7 @@ public class TextElement extends ParaStyled text = text_; } + @Override public void write(Object textRange) { UnoRuntime.queryInterface(XTextRange.class, textRange).setString(text); diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java index bbe917b59094..1887751af855 100644 --- a/wizards/com/sun/star/wizards/db/RecordParser.java +++ b/wizards/com/sun/star/wizards/db/RecordParser.java @@ -285,6 +285,7 @@ public class RecordParser extends QueryMetaData return true; } + @Override public void dispose() { if (xRowSetComponent != null) diff --git a/wizards/com/sun/star/wizards/db/TableDescriptor.java b/wizards/com/sun/star/wizards/db/TableDescriptor.java index 2d34c4fe504c..b7215cc85b0d 100644 --- a/wizards/com/sun/star/wizards/db/TableDescriptor.java +++ b/wizards/com/sun/star/wizards/db/TableDescriptor.java @@ -100,6 +100,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen } } + @Override public boolean getConnection(PropertyValue[] _curPropertyValue) { if (super.getConnection(_curPropertyValue)) diff --git a/wizards/com/sun/star/wizards/document/TimeStampControl.java b/wizards/com/sun/star/wizards/document/TimeStampControl.java index 476c6bfdfd3d..00e0bb28f326 100644 --- a/wizards/com/sun/star/wizards/document/TimeStampControl.java +++ b/wizards/com/sun/star/wizards/document/TimeStampControl.java @@ -99,17 +99,20 @@ public class TimeStampControl extends DatabaseControl oTimeControl = new DatabaseControl(_oGridControl, _curfieldcolumn, DataType.TIME, _curfieldcolumn.getFieldTitle() + PropertyNames.SPACE + sTimeAppendix); } + @Override public void setPropertyValue(String _sPropertyName, Object _aPropertyValue) throws Exception { oDateControl.setPropertyValue(_sPropertyName, _aPropertyValue); oTimeControl.setPropertyValue(_sPropertyName, _aPropertyValue); } + @Override public int getPreferredWidth() { return nDBWidth; } + @Override public void setSize(Size _aSize) { try @@ -125,17 +128,20 @@ public class TimeStampControl extends DatabaseControl } } + @Override public Size getSize() { int ncontrolwidth = oDateControl.xShape.getSize().Width + oTimeControl.xShape.getSize().Width; return new Size(ncontrolwidth, oDateControl.xShape.getSize().Height); } + @Override public Point getPosition() { return xShapeGroup.getPosition(); } + @Override public void setPosition(Point _aPoint) { // --> TESTING @@ -145,6 +151,7 @@ public class TimeStampControl extends DatabaseControl Point aAfterPt = xShapeGroup.getPosition(); } + @Override public int getControlType() { return FormHandler.SODATETIMECONTROL; diff --git a/wizards/com/sun/star/wizards/form/CallFormWizard.java b/wizards/com/sun/star/wizards/form/CallFormWizard.java index 4445937f1506..4bec58437111 100644 --- a/wizards/com/sun/star/wizards/form/CallFormWizard.java +++ b/wizards/com/sun/star/wizards/form/CallFormWizard.java @@ -128,6 +128,7 @@ public class CallFormWizard return (booleanSupportsService); } + @Override public byte[] getImplementationId() { return new byte[0]; @@ -146,6 +147,7 @@ public class CallFormWizard * @return Sequence of all types (usually interface types) provided by the * service. */ + @Override public Type[] getTypes() { Type[] typeReturn = diff --git a/wizards/com/sun/star/wizards/form/FieldLinker.java b/wizards/com/sun/star/wizards/form/FieldLinker.java index 7ebf56607fcb..2dd3ab33c09a 100644 --- a/wizards/com/sun/star/wizards/form/FieldLinker.java +++ b/wizards/com/sun/star/wizards/form/FieldLinker.java @@ -48,6 +48,7 @@ public class FieldLinker extends DBLimitedFieldSelection super(_CurUnoDialog, iStep, iCompPosX, iCompPosY, iCompWidth, _firsthelpid); } + @Override protected void insertControlGroup(int i) { try @@ -154,6 +155,7 @@ public class FieldLinker extends DBLimitedFieldSelection } } + @Override protected void enableNextControlRow(int curindex) { boolean bSlaveField = lstSlaveFields[curindex].getSelectedItemPos() > 0; @@ -169,6 +171,7 @@ public class FieldLinker extends DBLimitedFieldSelection } } + @Override protected int getMaxSelIndex() { int MaxSelIndex = -1; @@ -182,6 +185,7 @@ public class FieldLinker extends DBLimitedFieldSelection return MaxSelIndex; } + @Override protected void toggleControlRow(int i, boolean bDoEnable) { if (i < rowcount) @@ -198,6 +202,7 @@ public class FieldLinker extends DBLimitedFieldSelection } } + @Override protected void updateFromNextControlRow(int curindex) { short iNextMasterItemPos = lstMasterFields[curindex + 1].getSelectedItemPos(); diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java b/wizards/com/sun/star/wizards/form/FormWizard.java index 5d2407213d73..edcb8c3e3550 100644 --- a/wizards/com/sun/star/wizards/form/FormWizard.java +++ b/wizards/com/sun/star/wizards/form/FormWizard.java @@ -90,6 +90,7 @@ public class FormWizard extends DatabaseObjectWizard } // @Override + @Override protected void enterStep(int nOldStep, int nNewStep) { try @@ -164,6 +165,7 @@ public class FormWizard extends DatabaseObjectWizard } // @Override + @Override protected void leaveStep(int nOldStep, int nNewStep) { switch (nOldStep) @@ -279,6 +281,7 @@ public class FormWizard extends DatabaseObjectWizard } // @Override + @Override public boolean finishWizard() { int ncurStep = getCurrentStep(); @@ -311,6 +314,7 @@ public class FormWizard extends DatabaseObjectWizard } // @Override + @Override public void cancelWizard() { m_success = false; diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java index 2ab4b9217fe5..cd51e78de6ea 100644 --- a/wizards/com/sun/star/wizards/query/QueryWizard.java +++ b/wizards/com/sun/star/wizards/query/QueryWizard.java @@ -254,6 +254,7 @@ public class QueryWizard extends DatabaseObjectWizard } } + @Override public boolean finishWizard() { int ncurStep = getCurrentStep(); @@ -271,6 +272,7 @@ public class QueryWizard extends DatabaseObjectWizard return false; } + @Override protected void enterStep(int nOldStep, int nNewStep) { try @@ -318,6 +320,7 @@ public class QueryWizard extends DatabaseObjectWizard } } + @Override protected void leaveStep(int nOldStep, int nNewStep) { switch (nOldStep) diff --git a/wizards/com/sun/star/wizards/report/CallReportWizard.java b/wizards/com/sun/star/wizards/report/CallReportWizard.java index 9ac3ac3f324d..91da0b0846bb 100644 --- a/wizards/com/sun/star/wizards/report/CallReportWizard.java +++ b/wizards/com/sun/star/wizards/report/CallReportWizard.java @@ -160,6 +160,7 @@ public class CallReportWizard return (booleanSupportsService); } + @Override public byte[] getImplementationId() { return new byte[0]; @@ -178,6 +179,7 @@ public class CallReportWizard * @return Sequence of all types (usually interface types) provided by the * service. */ + @Override public Type[] getTypes() { Type[] typeReturn = diff --git a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java index d6185880a9cd..31c68ed2aa24 100644 --- a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java +++ b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java @@ -115,6 +115,7 @@ public class GroupFieldHandler extends FieldSelection CurDBMetaData.GroupFieldNames = GroupFieldNames; } // @Override + @Override protected void toggleListboxButtons(short iFieldsSelIndex, short iSelFieldsSelIndex) { super.toggleListboxButtons(iFieldsSelIndex, iSelFieldsSelIndex); @@ -125,6 +126,7 @@ public class GroupFieldHandler extends FieldSelection } } + @Override public void selectFields(boolean bMoveAll) { int iSelCount = xSelectedFieldsListBox.getItemCount(); diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java index 89d757107142..e76f93c0cf50 100644 --- a/wizards/com/sun/star/wizards/report/ReportWizard.java +++ b/wizards/com/sun/star/wizards/report/ReportWizard.java @@ -119,6 +119,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener } } + @Override protected void enterStep(int nOldStep, int nNewStep) { if ((nOldStep >= SOTEMPLATEPAGE) && (nNewStep < SOTEMPLATEPAGE)) @@ -162,6 +163,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener } } + @Override protected void leaveStep(int nOldStep, int nNewStep) { @@ -331,6 +333,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener enableNavigationButtons(false, false, false); } + @Override public boolean finishWizard() { final int ncurStep = getCurrentStep(); @@ -350,6 +353,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener return false; } + @Override public void cancelWizard() { xDialog.endExecute(); @@ -611,10 +615,12 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener } } + @Override public void disposing(EventObject EventObject) { } + @Override public void setmodified(int _ndialogpage, Object ooldValue, Object onewValue) { switch (_ndialogpage) diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java index ac166083dd9b..d553d24d7600 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java @@ -41,6 +41,7 @@ public class ColumnarSingleColumn extends ReportBuilderLayouter return getResource().getResText(UIConsts.RID_REPORT + 81); } + @Override protected void insertDetailFields() { copyDetailProperties(); @@ -82,6 +83,7 @@ public class ColumnarSingleColumn extends ReportBuilderLayouter doNotBreakInTable(xSection); } + @Override protected void insertDetailFieldTitles(int lastGroupPostion) { // we won't extra field titles diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java index 82281f548be4..e12d87087ada 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java @@ -29,16 +29,19 @@ public class ColumnarThreeColumns extends ColumnarTwoColumns super(_xDefinitionAccess, _aResource); } + @Override public String getName() { return "ColumnarThreeColumnsLayoutOfData"; } + @Override public String getLocalizedName() { return getResource().getResText(UIConsts.RID_REPORT + 83); } + @Override protected void insertDetailFields() { insertDetailFields(3); diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java index e75eefc21359..2d5b618e7abd 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java @@ -41,6 +41,7 @@ public class ColumnarTwoColumns extends ReportBuilderLayouter return getResource().getResText(UIConsts.RID_REPORT + 82); } + @Override protected void insertDetailFields() { insertDetailFields(2); @@ -114,6 +115,7 @@ public class ColumnarTwoColumns extends ReportBuilderLayouter doNotBreakInTable(xSection); } + @Override protected void insertDetailFieldTitles(int lastGroupPostion) { // we won't extra field titles diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java index 00319ce2f856..46d8f7bc62e5 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java @@ -31,16 +31,19 @@ public class InBlocksLabelsAbove extends ColumnarTwoColumns super(_xDefinitionAccess, _aResource); } + @Override public String getName() { return "InBlocksLabelsAboveLayoutOfData"; } + @Override public String getLocalizedName() { return getResource().getResText(UIConsts.RID_REPORT + 85); } + @Override protected void insertDetailFields() { copyDetailProperties(); @@ -137,6 +140,7 @@ public class InBlocksLabelsAbove extends ColumnarTwoColumns doNotBreakInTable(xSection); } + @Override protected void insertDetailFieldTitles(int lastGroupPostion) { // we won't extra field titles diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java index f7fef368ab02..5fea096e9989 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java @@ -32,16 +32,19 @@ public class InBlocksLabelsLeft extends ColumnarTwoColumns super(_xDefinitionAccess, _aResource); } + @Override public String getName() { return "InBlocksLabelsLeftLayoutOfData"; } + @Override public String getLocalizedName() { return getResource().getResText(UIConsts.RID_REPORT + 84); } + @Override protected void insertDetailFields() { copyDetailProperties(); @@ -108,6 +111,7 @@ public class InBlocksLabelsLeft extends ColumnarTwoColumns doNotBreakInTable(xSection); } + @Override protected void insertDetailFieldTitles(int lastGroupPostion) { // we won't extra field titles diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java index 27c30f85feb5..f8f03c4c0483 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java @@ -32,6 +32,7 @@ public class SectionEmptyObject extends SectionObject return new SectionEmptyObject(); } + @Override public FontDescriptor getFontDescriptor() { return null; diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java index 5a1c0e24790e..5eecc8e4ec97 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java @@ -37,6 +37,7 @@ public class SectionLabel extends SectionObject * Return the current FontDescriptor * @return */ + @Override public FontDescriptor getFontDescriptor() { FontDescriptor a = null; diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java index fae7d9a2fe37..749df02b1e7d 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java @@ -34,6 +34,7 @@ public class SectionTextField extends SectionObject return new SectionTextField(_aFormattedField); } + @Override public FontDescriptor getFontDescriptor() { FontDescriptor a = null; diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java b/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java index fe9f4db8f6e6..ed676f1aa3c6 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java @@ -44,6 +44,7 @@ public class Tabular extends ReportBuilderLayouter return getResource().getResText(UIConsts.RID_REPORT + 80); } + @Override protected void insertDetailFields() { copyDetailProperties(); @@ -76,6 +77,7 @@ public class Tabular extends ReportBuilderLayouter xSection.setHeight(nHeight); } + @Override protected void insertDetailFieldTitles(int lastGroupPostion) { final String[] aFieldTitleNames = getFieldTitleNames(); diff --git a/wizards/com/sun/star/wizards/table/CallTableWizard.java b/wizards/com/sun/star/wizards/table/CallTableWizard.java index 0674ff72d301..8ee247b6255b 100644 --- a/wizards/com/sun/star/wizards/table/CallTableWizard.java +++ b/wizards/com/sun/star/wizards/table/CallTableWizard.java @@ -135,6 +135,7 @@ public class CallTableWizard return (booleanSupportsService); } + @Override public byte[] getImplementationId() { return new byte[0]; @@ -153,6 +154,7 @@ public class CallTableWizard * @return Sequence of all types (usually interface types) provided by the * service. */ + @Override public Type[] getTypes() { Type[] typeReturn = diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java index 5c20f78275ae..67cd319b6031 100644 --- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java +++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java @@ -190,6 +190,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X super.initialize(oCGTable.getFieldNames(bcolumnnameislimited, imaxcolumnchars), true); } + @Override public String[] getSelectedFieldNames() { String[] displayfieldnames = super.getSelectedFieldNames(); diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java index f3e74be9abf2..8ee556da7e22 100644 --- a/wizards/com/sun/star/wizards/table/TableWizard.java +++ b/wizards/com/sun/star/wizards/table/TableWizard.java @@ -85,6 +85,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener } } + @Override protected void leaveStep(int nOldStep, int nNewStep) { switch (nOldStep) @@ -107,6 +108,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener } } + @Override protected void enterStep(int nOldStep, int nNewStep) { switch (nNewStep) @@ -131,6 +133,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener /* (non-Javadoc) * @see com.sun.star.wizards.ui.XCompletion#iscompleted(int) */ + @Override public boolean iscompleted(int _ndialogpage) { switch (_ndialogpage) @@ -155,6 +158,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener /* (non-Javadoc) * @see com.sun.star.wizards.ui.XCompletion#setcompleted(int, boolean) */ + @Override public void setcompleted(int _ndialogpage, boolean _biscompleted) { boolean bScenarioiscompleted = _biscompleted; @@ -276,6 +280,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener return bIsSuccessfull; } + @Override public boolean finishWizard() { super.switchToStep(super.getCurrentStep(), SOFINALPAGE); @@ -332,6 +337,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener } } + @Override public void cancelWizard() { xDialog.endExecute(); diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index 5ce45963b124..c49f21784a1b 100644 --- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java +++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java @@ -198,6 +198,7 @@ public class AggregateComponent extends ControlScroller return Count; } + @Override protected void insertControlGroup(int i, int ypos) { if (i == 0) @@ -220,6 +221,7 @@ public class AggregateComponent extends ControlScroller ControlRowVector.add(oControlRow); } + @Override protected void setControlGroupVisible(int _index, boolean _bIsVisible) { ControlRow oControlRow = ControlRowVector.get(_index); @@ -434,6 +436,7 @@ public class AggregateComponent extends ControlScroller CurUnoDialog.repaintDialogStep(); } + @Override protected void initializeScrollFields() { ControlRow curControlRow; diff --git a/wizards/com/sun/star/wizards/ui/TitlesComponent.java b/wizards/com/sun/star/wizards/ui/TitlesComponent.java index 6a0d9573aea4..03e3c5339974 100644 --- a/wizards/com/sun/star/wizards/ui/TitlesComponent.java +++ b/wizards/com/sun/star/wizards/ui/TitlesComponent.java @@ -57,6 +57,7 @@ public class TitlesComponent extends ControlScroller }); } + @Override protected void insertControlGroup(int i, int ypos) { iLabelPosX = iCompPosX + iRelLabelPosXDist; @@ -65,6 +66,7 @@ public class TitlesComponent extends ControlScroller } + @Override protected void setControlGroupVisible(int _index, boolean _bIsVisible) { CurUnoDialog.setControlVisible(getColumnName(_index), _bIsVisible); @@ -127,6 +129,7 @@ public class TitlesComponent extends ControlScroller return SOTITLEPREFIX + Integer.toString(_index + 1); } + @Override protected void initializeScrollFields() { for (int i = 0; i < fieldnames.length; i++) diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java index 6ed54d9f2e4c..1f5454c93cce 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.java +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java @@ -91,6 +91,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL * * @return */ + @Override public Resource getResource() { return oWizardResource; diff --git a/wizards/com/sun/star/wizards/ui/event/RadioDataAware.java b/wizards/com/sun/star/wizards/ui/event/RadioDataAware.java index 35505ad3ed14..583ff5b8c8d5 100644 --- a/wizards/com/sun/star/wizards/ui/event/RadioDataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/RadioDataAware.java @@ -39,6 +39,7 @@ public class RadioDataAware extends DataAware /* (non-Javadoc) * @see com.sun.star.wizards.ui.DataAware#setToUI(java.lang.Object) */ + @Override protected void setToUI(Object value) { int selected = ((Number) value).intValue(); @@ -58,6 +59,7 @@ public class RadioDataAware extends DataAware /* (non-Javadoc) * @see com.sun.star.wizards.ui.DataAware#getFromUI() */ + @Override protected Object getFromUI() { for (int i = 0; i < radioButtons.length; i++) diff --git a/wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java b/wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java index 96d8451de81b..6767682a176d 100644 --- a/wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java @@ -38,6 +38,7 @@ public class SimpleDataAware extends DataAware UIHelper.setEnabled(disableObjects[i],b); } */ + @Override protected void setToUI(Object value) { controlValue.set(value, control); @@ -68,6 +69,7 @@ public class SimpleDataAware extends DataAware disableObjects = controls; } */ + @Override protected Object getFromUI() { return controlValue.get(control); diff --git a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java index bf0be61d806b..f1c176fdb751 100644 --- a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java @@ -54,6 +54,7 @@ public class UnoDataAware extends DataAware inverse = i; } + @Override protected void enableControls(Object value) { Boolean b = getBoolean(value); @@ -67,6 +68,7 @@ public class UnoDataAware extends DataAware } } + @Override protected void setToUI(Object value) { Helper.setUnoPropertyValue(unoModel, unoPropName, value); @@ -115,6 +117,7 @@ public class UnoDataAware extends DataAware disableObjects = controls; } + @Override protected Object getFromUI() { return Helper.getUnoPropertyValue(unoModel, unoPropName); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java index 5a24b43c4426..18356e0fe1fc 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java @@ -402,6 +402,7 @@ public final class PalmDB { * @return true if <code>obj</code> is equal to this, otherwise * false. */ + @Override public boolean equals(Object obj) { boolean bool = false; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java index d3f68bd47ee1..b66d1cab6303 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java @@ -172,6 +172,7 @@ public final class Record { * * @return true if obj is equal, otherwise false. */ + @Override public boolean equals(Object obj) { boolean bool = false; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java index 95e4a6f272d5..18635b275814 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java @@ -92,6 +92,7 @@ public class EmbeddedBinaryObject extends EmbeddedObject { * @param zip An <code>OfficeZip</code> instance representing the file * the data is to be written to. */ + @Override void write(OfficeZip zip) { if (hasChanged) { zip.setNamedBytes(objName, objData); @@ -103,6 +104,7 @@ public class EmbeddedBinaryObject extends EmbeddedObject { * Package private method that constructs the manifest.xml entries for this * embedded object. */ + @Override void writeManifestData(Document manifestDoc) throws DOMException { Element objNode = manifestDoc.createElement(OfficeConstants.TAG_MANIFEST_FILE); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java index f0c3a728ef5b..7711879006cb 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java @@ -219,6 +219,7 @@ public class EmbeddedXMLObject extends EmbeddedObject { * @param zip An <code>OfficeZip</code> instance representing the file * the data is to be written to. */ + @Override void write(OfficeZip zip) throws IOException { if (hasChanged == true) { if (contentDOM != null) { @@ -242,6 +243,7 @@ public class EmbeddedXMLObject extends EmbeddedObject { * * @param manifestDoc <code>Document</code> containing the manifest entries. */ + @Override void writeManifestData(Document manifestDoc) throws DOMException { Node root = manifestDoc.getDocumentElement(); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java index ba409f6cb40d..53d5202a7c5b 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java @@ -34,6 +34,7 @@ abstract class conversionAlgorithm { * This algorithm expects only values in millimeters, e.g. "20.3mm". */ class horizSize extends conversionAlgorithm { + @Override int I(String value) { if (value.endsWith("mm")) { float size = (float)0.0; @@ -59,6 +60,7 @@ class horizSize extends conversionAlgorithm { * a percentage. */ class lineHeight extends conversionAlgorithm { + @Override int I(String value) { if (value.endsWith("mm")) { float size = (float)0.0; @@ -91,6 +93,7 @@ class lineHeight extends conversionAlgorithm { * This class converts alignment values. */ class alignment extends conversionAlgorithm { + @Override int I(String value) { if (value.equals("end")) return ParaStyle.ALIGN_RIGHT; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java index 4a8d87c11b1b..8122562932c2 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java @@ -165,6 +165,7 @@ public class ColumnStyle extends Style implements Cloneable { * @return The <code>Style</code> in which to look up * ancestors. */ + @Override public Style getResolved() { // Create a new object to return, which is a clone of this one. ColumnStyle resolved = null; @@ -215,6 +216,7 @@ public class ColumnStyle extends Style implements Cloneable { * * @return Created <code>Node</code>. */ + @Override public Node createNode(org.w3c.dom.Document parentDoc, String name) { Element node = parentDoc.createElement(name); writeAttributes(node); @@ -231,6 +233,7 @@ public class ColumnStyle extends Style implements Cloneable { * @return true if <code>style</code> is a subset, false * otherwise. */ + @Override public boolean isSubset(Style style) { if (style.getClass() != this.getClass()) return false; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java index d39a4d9f1da5..44e025204485 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java @@ -380,7 +380,8 @@ public class Format implements Cloneable { * * @return A string indicating the value and category. */ - public String toString() { + @Override + public String toString() { return new String("Value : " + getValue() + " Category : " + getCategory()); } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java index 4d0d2f091317..1e4ca4cd375d 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java @@ -165,6 +165,7 @@ public class RowStyle extends Style implements Cloneable { * @return The <code>StyleCatalog</code> in which to look up * ancestors. */ + @Override public Style getResolved() { // Create a new object to return, which is a clone of this one. RowStyle resolved = null; @@ -215,6 +216,7 @@ public class RowStyle extends Style implements Cloneable { * * @return Created <code>Node</code>. */ + @Override public Node createNode(org.w3c.dom.Document parentDoc, String name) { Element node = parentDoc.createElement(name); writeAttributes(node); @@ -231,6 +233,7 @@ public class RowStyle extends Style implements Cloneable { * @return true if <code>style</code> is a subset, false * otherwise. */ + @Override public boolean isSubset(Style style) { if (style.getClass() != this.getClass()) return false; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocument.java index e41a2f4df724..fe977d8fa482 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocument.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocument.java @@ -57,6 +57,7 @@ public class SxcDocument extends OfficeDocument { * * @return The Office file extension for the SXC format. */ + @Override protected String getFileExtension() { return OfficeConstants.SXC_FILE_EXTENSION; } @@ -66,6 +67,7 @@ public class SxcDocument extends OfficeDocument { * * @return The Office attribute for the SXC format. */ + @Override protected String getOfficeClassAttribute() { return OfficeConstants.SXC_TYPE; } @@ -75,6 +77,7 @@ public class SxcDocument extends OfficeDocument { * * @return String The document's MIME type. */ + @Override protected final String getDocumentMimeType() { return OfficeConstants.SXC_MIME_TYPE; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcPluginFactory.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcPluginFactory.java index 39ec87bfdf0a..b034dcab2dda 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcPluginFactory.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcPluginFactory.java @@ -50,6 +50,7 @@ public abstract class SxcPluginFactory } + @Override public Document createOfficeDocument(String name, InputStream is) throws IOException { @@ -60,7 +61,8 @@ public abstract class SxcPluginFactory return doc; } - public Document createOfficeDocument(String name, InputStream is,boolean isZip) + @Override + public Document createOfficeDocument(String name, InputStream is,boolean isZip) throws IOException { // read zipped XML stream diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwDocument.java index a0a269fa2d3e..8728319d953e 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwDocument.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwDocument.java @@ -58,6 +58,7 @@ public class SxwDocument extends OfficeDocument { * * @return The Office file extension for the SXW format. */ + @Override protected String getFileExtension() { return OfficeConstants.SXW_FILE_EXTENSION; } @@ -68,6 +69,7 @@ public class SxwDocument extends OfficeDocument { * * @return The Office attribute for the SXW format. */ + @Override protected String getOfficeClassAttribute() { return OfficeConstants.SXW_TYPE; } @@ -77,6 +79,7 @@ public class SxwDocument extends OfficeDocument { * * @return String The document's MIME type. */ + @Override protected final String getDocumentMimeType() { return OfficeConstants.SXW_MIME_TYPE; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwPluginFactory.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwPluginFactory.java index 7eb3585cfc2d..c0cb42d1a122 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwPluginFactory.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwPluginFactory.java @@ -46,6 +46,7 @@ public abstract class SxwPluginFactory extends PluginFactory { } + @Override public Document createOfficeDocument(String name, InputStream is) throws IOException { @@ -55,7 +56,8 @@ public abstract class SxwPluginFactory extends PluginFactory { return doc; } - public Document createOfficeDocument(String name, InputStream is,boolean isZip) + @Override + public Document createOfficeDocument(String name, InputStream is,boolean isZip) throws IOException { // read XML stream diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/GenericOfficeDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/GenericOfficeDocument.java index 1cbe6e52b237..f06f90ec4c32 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/GenericOfficeDocument.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/GenericOfficeDocument.java @@ -56,6 +56,7 @@ public class GenericOfficeDocument extends OfficeDocument { * * @return The Office file extension for the generic format. */ + @Override protected String getFileExtension() { return ""; } @@ -65,6 +66,7 @@ public class GenericOfficeDocument extends OfficeDocument { * * @return The Office attribute for the generic format. */ + @Override protected String getOfficeClassAttribute() { return ""; @@ -75,6 +77,7 @@ public class GenericOfficeDocument extends OfficeDocument { * * @return String The document's MIME type. */ + @Override protected String getDocumentMimeType() { /* TODO: Determine the MIME-type from the input. */ return ""; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java index 39aa2b3a9c63..11c29459a2e2 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java @@ -95,7 +95,8 @@ public final class PluginFactoryImpl extends PluginFactory return new DocumentDeserializerImpl(this,cd); } - public org.openoffice.xmerge.Document createDeviceDocument(java.lang.String str, java.io.InputStream inputStream) throws java.io.IOException { + @Override + public org.openoffice.xmerge.Document createDeviceDocument(java.lang.String str, java.io.InputStream inputStream) throws java.io.IOException { String ext = this.getDeviceFileExtension(); DOMDocument domDoc = new DOMDocument(str,ext); domDoc.read(inputStream); @@ -103,7 +104,8 @@ public final class PluginFactoryImpl extends PluginFactory } - public Document createOfficeDocument(String name, InputStream is) + @Override + public Document createOfficeDocument(String name, InputStream is) throws IOException { // read zipped XML stream @@ -112,7 +114,8 @@ public final class PluginFactoryImpl extends PluginFactory return doc; } - public Document createOfficeDocument(String name, InputStream is,boolean isZip) + @Override + public Document createOfficeDocument(String name, InputStream is,boolean isZip) throws IOException { // read zipped XML stream diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java index 7378f5b1be98..feccb757a085 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java @@ -176,6 +176,7 @@ public final class Difference { * * @return true if equal, false otherwise. */ + @Override public boolean equals(Object obj) { if (obj instanceof Difference) { Difference diff = (Difference) obj; @@ -223,6 +224,7 @@ public final class Difference { * * @return orgPosition, modPosition and operation as a single string. */ + @Override public String toString() { return orgPosition + " " + modPosition + " " + operation; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java index c2cad735c5f9..9e7eb332d6a5 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java @@ -61,6 +61,7 @@ public final class CellNodeIterator extends NodeIterator { * * @return true if the <code>Node</code> is supported, false otherwise. */ + @Override protected boolean nodeSupported(Node node) { // can use an array later to check all possible tags for @@ -70,6 +71,7 @@ public final class CellNodeIterator extends NodeIterator { } + @Override protected boolean childrenEqual(Node node1, Node node2) { boolean equal = false; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java index 48d63474f648..a5e8b9e6ff7e 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java @@ -63,6 +63,7 @@ public final class ParaNodeIterator extends NodeIterator { * @return true if the <code>Node</code> is supported, false * otherwise. */ + @Override protected boolean nodeSupported(Node node) { // can use an array later to check all possible tags for diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java index 02ac53f37a4c..9425d4c1bb70 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java @@ -52,6 +52,7 @@ public final class RowIterator extends NodeIterator { * * @return true if the <code>Node</code> is supported, false otherwise. */ + @Override protected boolean nodeSupported(Node node) { // can use an array later to check all possible tags for diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java index 61b886b99aa1..791122c398dc 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java @@ -56,6 +56,7 @@ public final class TextNodeIterator extends NodeIterator { * @return true if the <code>Node</code> is supported, false * otherwise. */ + @Override protected boolean nodeSupported(Node node) { // can use an array later to check all possible tags for diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java index 0af951fe0337..60e19e3d6712 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java @@ -51,6 +51,7 @@ public final class SheetMerge extends DocumentMerge { * * @param node <code>Node</code> to remove. */ + @Override protected void removeNode(Node node) { clearRow(node); |