diff options
author | Noel Grandin <noel@peralex.com> | 2012-06-29 10:08:15 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-06-29 22:03:05 +0200 |
commit | f9fa0dd66b830ff21c4a2dcd201151a4e9ca2de8 (patch) | |
tree | 1c1a421028cbef391af4f2886eac2677f75c5ee7 /qadevOOo | |
parent | Java5 update - convert to use generics (diff) | |
download | core-f9fa0dd66b830ff21c4a2dcd201151a4e9ca2de8.tar.gz core-f9fa0dd66b830ff21c4a2dcd201151a4e9ca2de8.zip |
Java5 updates - update code to use generics
This is all of the code I missed in my first set of patches.
Change-Id: I8c7c9e5ac28dc3c2f3ac062c806fbf0787c997bd
Diffstat (limited to 'qadevOOo')
16 files changed, 21 insertions, 10 deletions
diff --git a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java index 6ee8c0c611c9..2ba20762d538 100644 --- a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java @@ -62,6 +62,7 @@ public class _XFastPropertySet extends MultiMethodTest { /** * Retrieves relation. */ + @SuppressWarnings("unchecked") protected void before() { exclude = (Set<String>) tEnv.getObjRelation("XFastPropertySet.ExcludeProps") ; if (exclude == null) { diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java index 128e5e255fc0..e6eee001a116 100644 --- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java @@ -77,6 +77,7 @@ public class _XMultiPropertySet extends MultiMethodTest { /** * Initializes some fields. */ + @SuppressWarnings("unchecked") public void before() { exclProps = (Set<String>) tEnv.getObjRelation("XMultiPropertySet.ExcludeProps"); if (exclProps == null) exclProps = new HashSet<String>(0); diff --git a/qadevOOo/tests/java/ifc/io/_XDataInputStream.java b/qadevOOo/tests/java/ifc/io/_XDataInputStream.java index 2671b4baf620..e912334252eb 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. */ + @SuppressWarnings("unchecked") public void before(){ XInterface x = (XInterface)tEnv.getObjRelation("StreamWriter") ; diff --git a/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java b/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java index 90d049cbd05f..c66c8bea3da5 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. */ + @SuppressWarnings("unchecked") public void before() throws RuntimeException { List<Object> data = (List<Object>) tEnv.getObjRelation("StreamData") ; diff --git a/qadevOOo/tests/java/ifc/io/_XOutputStream.java b/qadevOOo/tests/java/ifc/io/_XOutputStream.java index 8e53c67def0b..9945437a6f7c 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(); } + @SuppressWarnings("unchecked") protected void before() { checker = (StreamChecker) tEnv.getObjRelation("XOutputStream.StreamChecker"); diff --git a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java index e9d9774c0688..fd3dd2bafcb2 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java @@ -100,6 +100,7 @@ public class _XParameters extends MultiMethodTest { /** * Gets object relation */ + @SuppressWarnings("unchecked") public void before() { data = (List<Object>) tEnv.getObjRelation("XParameters.ParamValues") ; if (data == null) { diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRow.java b/qadevOOo/tests/java/ifc/sdbc/_XRow.java index a707bbe34cb2..c92f23af064a 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XRow.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XRow.java @@ -101,6 +101,7 @@ public class _XRow extends MultiMethodTest { /** * Retrieves object relation first. */ + @SuppressWarnings("unchecked") public void before() { data = (List<Object>) tEnv.getObjRelation("CurrentRowData") ; } diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java index 53cd93d9fa5b..0ae50bd300bc 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java @@ -99,6 +99,7 @@ public class _XRowUpdate extends MultiMethodTest { /** * Gets relations. */ + @SuppressWarnings("unchecked") public void before() { rowData = (List<Object>) tEnv.getObjRelation("CurrentRowData") ; if (rowData == null) { diff --git a/qadevOOo/tests/java/ifc/system/_XProxySettings.java b/qadevOOo/tests/java/ifc/system/_XProxySettings.java index 06b18d1a2269..b11e10282a97 100644 --- a/qadevOOo/tests/java/ifc/system/_XProxySettings.java +++ b/qadevOOo/tests/java/ifc/system/_XProxySettings.java @@ -67,6 +67,7 @@ public class _XProxySettings extends MultiMethodTest { * * @see #expectedProxies */ + @SuppressWarnings("unchecked") public void before() { expectedProxies = (Map<String,String>)tEnv.getObjRelation( "XProxySettings.proxySettings"); diff --git a/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java b/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java index 3ca7861c0db0..3d81a16cecba 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; + @SuppressWarnings("unchecked") protected void before() { selections = (Object[])tEnv.getObjRelation("Selections"); if (selections == null) { diff --git a/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java b/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java index 37fce51db73d..40f1b55c4a8d 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; + @SuppressWarnings("unchecked") protected void before() { selections = (Object[])tEnv.getObjRelation("Selections"); if (selections == null) { diff --git a/qadevOOo/tests/java/mod/_streams.uno/DataInputStream.java b/qadevOOo/tests/java/mod/_streams.uno/DataInputStream.java index c54f7a0068f2..34de36f1b952 100644 --- a/qadevOOo/tests/java/mod/_streams.uno/DataInputStream.java +++ b/qadevOOo/tests/java/mod/_streams.uno/DataInputStream.java @@ -27,7 +27,7 @@ import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; import java.io.PrintWriter; -import java.util.Vector; +import java.util.ArrayList; import lib.StatusException; import lib.TestCase; import lib.TestEnvironment; @@ -128,7 +128,7 @@ public class DataInputStream extends TestCase { xDataSink.setInputStream(xPipeInput) ; // all data types for writing to an XDataInputStream - Vector data = new Vector() ; + ArrayList<Object> data = new ArrayList<Object>() ; data.add(new Boolean(true)) ; data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; diff --git a/qadevOOo/tests/java/mod/_streams.uno/DataOutputStream.java b/qadevOOo/tests/java/mod/_streams.uno/DataOutputStream.java index 1ac01fba0f18..177ce4bd0001 100644 --- a/qadevOOo/tests/java/mod/_streams.uno/DataOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams.uno/DataOutputStream.java @@ -26,7 +26,7 @@ import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; import java.io.PrintWriter; -import java.util.Vector; +import java.util.ArrayList; import lib.StatusException; import lib.TestCase; import lib.TestEnvironment; @@ -102,7 +102,7 @@ public class DataOutputStream extends TestCase { xDataSource.setOutputStream(xPipeOutput); // all data types for writing to an XDataInputStream - Vector data = new Vector() ; + ArrayList<Object> data = new ArrayList<Object>() ; data.add(new Boolean(true)) ; data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; diff --git a/qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java index 98d1efcff355..dd3666207da0 100644 --- a/qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java @@ -26,7 +26,7 @@ import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; import java.io.PrintWriter; -import java.util.Vector; +import java.util.ArrayList; import lib.StatusException; import lib.TestCase; import lib.TestEnvironment; @@ -127,7 +127,7 @@ public class MarkableOutputStream extends TestCase { oObj = (XInterface) mostream; // all data types for writing to an XDataInputStream - Vector data = new Vector() ; + ArrayList<Object> data = new ArrayList<Object>() ; data.add(new Boolean(true)) ; data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; diff --git a/qadevOOo/tests/java/mod/_streams.uno/ObjectInputStream.java b/qadevOOo/tests/java/mod/_streams.uno/ObjectInputStream.java index de3dac06889b..576076f87f2f 100644 --- a/qadevOOo/tests/java/mod/_streams.uno/ObjectInputStream.java +++ b/qadevOOo/tests/java/mod/_streams.uno/ObjectInputStream.java @@ -32,7 +32,7 @@ import com.sun.star.registry.XSimpleRegistry; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; import java.io.PrintWriter; -import java.util.Vector; +import java.util.ArrayList; import lib.StatusException; import lib.TestCase; import lib.TestEnvironment; @@ -247,7 +247,7 @@ public class ObjectInputStream extends TestCase { // all data types for writing to an XDataInputStream - Vector data = new Vector() ; + ArrayList<Object> data = new ArrayList<Object>() ; data.add(new Boolean(true)) ; data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; diff --git a/qadevOOo/tests/java/mod/_streams.uno/ObjectOutputStream.java b/qadevOOo/tests/java/mod/_streams.uno/ObjectOutputStream.java index e07dcfce4e1d..f30870ec2d24 100644 --- a/qadevOOo/tests/java/mod/_streams.uno/ObjectOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams.uno/ObjectOutputStream.java @@ -32,7 +32,7 @@ import com.sun.star.registry.XSimpleRegistry; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; import java.io.PrintWriter; -import java.util.Vector; +import java.util.ArrayList; import lib.StatusException; import lib.TestCase; import lib.TestEnvironment; @@ -237,7 +237,7 @@ public class ObjectOutputStream extends TestCase { oObj = oStream; // all data types for writing to an XDataInputStream - Vector data = new Vector() ; + ArrayList<Object> data = new ArrayList<Object>() ; data.add(new Boolean(true)) ; data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; |