Java5 update - convert more code to use generics:wq

Change-Id: I7ea32cad40a6657e4e5886d04af008cb6d67ac6e

25 files changed, 55 insertions, 59 deletions

diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
index f12e2c73e399..595de1cba38e 100644
--- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
+++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
@@ -388,7 +388,7 @@ public class GenericModelTest extends TestCase {
 
         }
 
-        WriterTools.getDrawPage(m_xTextDoc).add((XShape) aShape);
+        WriterTools.getDrawPage(m_xTextDoc).add(aShape);
         oObj = aShape.getControl();
 
         log.println("Implementation name: " + util.utils.getImplName(oObj));
@@ -428,16 +428,16 @@ public class GenericModelTest extends TestCase {
         log.println("adding shape '" + m_LCShape_Type +"' for DataAwareControlModel test");
         aShape = FormTools.createControlShape(m_xTextDoc, 6000, 4500, 15000,
                                               10000, m_LCShape_Type);
-        WriterTools.getDrawPage(m_xTextDoc).add((XShape) aShape);
+        WriterTools.getDrawPage(m_xTextDoc).add(aShape);
 
-        m_XPS = (XPropertySet) UnoRuntime.queryInterface(
+        m_XPS = UnoRuntime.queryInterface(
                                         XPropertySet.class, oObj);
 
         int i = 0;
         NamedValue prop = null;
         try {
             for (i = 0; i < m_propertiesToSet.size(); i++){
-                prop = (NamedValue) m_propertiesToSet.get(i);
+                prop = m_propertiesToSet.get(i);
 
                 log.println("setting property: '"+prop.Name+"' to value '"+prop.Value.toString()+"'");
 
@@ -480,7 +480,7 @@ public class GenericModelTest extends TestCase {
         tEnv.addObjRelation("PSEUDOPERSISTENT", new Boolean(true));
 
         // adding relation for XFastPropertySet
-        java.util.HashSet exclude = new java.util.HashSet();
+        java.util.HashSet<String> exclude = new java.util.HashSet<String>();
         exclude.add("FormatKey");
         tEnv.addObjRelation("XFastPropertySet.ExcludeProps", exclude);
 
diff --git a/qadevOOo/tests/java/mod/_forms/OButtonControl.java b/qadevOOo/tests/java/mod/_forms/OButtonControl.java
index 323dfc372f70..53dcd6e4d853 100644
--- a/qadevOOo/tests/java/mod/_forms/OButtonControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OButtonControl.java
@@ -157,7 +157,7 @@ public class OButtonControl extends TestCase {
                                                             4500, 15000, 10000,
                                                             "CommandButton");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape);
+        WriterTools.getDrawPage(xTextDoc).add(aShape);
 
         XControlModel the_Model = aShape.getControl();
 
@@ -165,7 +165,7 @@ public class OButtonControl extends TestCase {
                                                              4500, 5000, 10000,
                                                              "TextField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2);
+        WriterTools.getDrawPage(xTextDoc).add(aShape2);
 
         XControlModel the_Model2 = aShape2.getControl();
 
diff --git a/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java b/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java
index 93a57f04d484..a4434dc88edc 100644
--- a/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java
@@ -165,14 +165,14 @@ public class OCheckBoxControl extends TestCase {
         XControlShape aShape = FormTools.createControlShape(
                                 xTextDoc,3000,4500,15000,10000,"CheckBox");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape);
+        WriterTools.getDrawPage(xTextDoc).add(aShape);
 
         XControlModel the_Model = aShape.getControl();
 
         XControlShape aShape2 = FormTools.createControlShape(
                                 xTextDoc,3000,4500,5000,10000,"TextField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2);
+        WriterTools.getDrawPage(xTextDoc).add(aShape2);
 
         XControlModel the_Model2 = aShape2.getControl();
 
diff --git a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java
index abd7dcede6de..e602e5577034 100644
--- a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java
@@ -169,7 +169,7 @@ public class OComboBoxControl extends TestCase {
                                                             4500, 15000, 10000,
                                                             "ComboBox");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape);
+        WriterTools.getDrawPage(xTextDoc).add(aShape);
 
         XControlModel the_Model = aShape.getControl();
 
@@ -177,7 +177,7 @@ public class OComboBoxControl extends TestCase {
                                                              4500, 5000, 10000,
                                                              "TextField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2);
+        WriterTools.getDrawPage(xTextDoc).add(aShape2);
 
         XControlModel the_Model2 = aShape2.getControl();
 
diff --git a/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java b/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java
index 14b23c1621b0..58c16c5963a6 100644
--- a/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java
@@ -172,7 +172,7 @@ public class OCurrencyControl extends TestCase {
                                                             4500, 15000, 10000,
                                                             "CurrencyField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape);
+        WriterTools.getDrawPage(xTextDoc).add(aShape);
 
         XControlModel the_Model = aShape.getControl();
 
@@ -180,7 +180,7 @@ public class OCurrencyControl extends TestCase {
                                                              4500, 5000, 10000,
                                                              "TextField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2);
+        WriterTools.getDrawPage(xTextDoc).add(aShape2);
 
         XControlModel the_Model2 = aShape2.getControl();
 
diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
index 7f3fa6568af9..896c590af483 100644
--- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
+++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
@@ -426,8 +426,8 @@ public class ODatabaseForm extends TestCase {
                                                                 1500, 1000,
                                                                 1000,
                                                                 "CheckBox");
-            oShapes.add((XShape) shape1);
-            oShapes.add((XShape) shape2);
+            oShapes.add(shape1);
+            oShapes.add(shape2);
             oShapes.add(shape3);
         } catch (Exception e) {
             e.printStackTrace(log);
@@ -466,7 +466,7 @@ public class ODatabaseForm extends TestCase {
                                                                  xTextDoc)))
                                                      .getByName("MyForm"));
 
-            XPropertySet xSetProp = (XPropertySet) UnoRuntime.queryInterface(
+            XPropertySet xSetProp = UnoRuntime.queryInterface(
                                             XPropertySet.class, oObj);
             connection = (XConnection) AnyConverter.toObject(
                                  new Type(XConnection.class),
@@ -656,7 +656,7 @@ public class ODatabaseForm extends TestCase {
 
         // Adding relation for XDatabaseParameterBroadcaster
         tEnv.addObjRelation("ParameterListenerChecker", new ODatabaseForm.ParameterListenerImpl());
-        XPropertySet xSetProp = (XPropertySet) UnoRuntime.queryInterface
+        XPropertySet xSetProp = UnoRuntime.queryInterface
             (XPropertySet.class, oObj) ;
         try {
             xSetProp.setPropertyValue("DataSourceName", dbSourceName) ;
@@ -815,7 +815,7 @@ public class ODatabaseForm extends TestCase {
             try {
                 for(int i=0; i<count; i++) {
                     log.println("### _XDatabaseParameterBroadcaster.ParameterListenerImpl: Parameter "+i+": "+params.getByIndex(i));
-                    XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, params.getByIndex(i));
+                    XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, params.getByIndex(i));
                     log.println("### _XDatabaseParameterBroadcaster.ParameterListenerImpl: Parameter Name: '"+xProp.getPropertyValue("Name") + "' is set to Value '1'");
                     xProp.setPropertyValue("Value", new Integer(1));
                     listenerWasCalled = true;
@@ -874,7 +874,7 @@ public class ODatabaseForm extends TestCase {
                     Object aObject = params.getByIndex(i);
                     Any any = (Any)aObject;
                     log.println("### _XCompletedExecution.InteractionHandlerImpl: Parameter "+i+": "+params.getByIndex(i));
-                    XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, params.getByIndex(i));
+                    XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, params.getByIndex(i));
                     log.println("### _XCompletedExecution.InteractionHandlerImpl: Parameter Name: '"+xProp.getPropertyValue("Name") + "' is set to Value '1'");
                     xProp.setPropertyValue("Value", new Integer(1));
                     handlerWasUsed = true;
diff --git a/qadevOOo/tests/java/mod/_forms/ODateControl.java b/qadevOOo/tests/java/mod/_forms/ODateControl.java
index b8a146ccf1bf..4f05c4b93e87 100644
--- a/qadevOOo/tests/java/mod/_forms/ODateControl.java
+++ b/qadevOOo/tests/java/mod/_forms/ODateControl.java
@@ -168,7 +168,7 @@ public class ODateControl extends TestCase {
                                                             4500, 15000, 10000,
                                                             "DateField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape);
+        WriterTools.getDrawPage(xTextDoc).add(aShape);
 
         XControlModel the_Model = aShape.getControl();
 
@@ -176,7 +176,7 @@ public class ODateControl extends TestCase {
                                                              4500, 5000, 10000,
                                                              "TextField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2);
+        WriterTools.getDrawPage(xTextDoc).add(aShape2);
 
         XControlModel the_Model2 = aShape2.getControl();
 
diff --git a/qadevOOo/tests/java/mod/_forms/OEditControl.java b/qadevOOo/tests/java/mod/_forms/OEditControl.java
index fcf64d281c98..e7f84e055794 100644
--- a/qadevOOo/tests/java/mod/_forms/OEditControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OEditControl.java
@@ -178,7 +178,7 @@ public class OEditControl extends TestCase {
                                                             4500, 15000, 10000,
                                                             "TextField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape);
+        WriterTools.getDrawPage(xTextDoc).add(aShape);
 
         XControlModel the_Model = aShape.getControl();
 
@@ -186,7 +186,7 @@ public class OEditControl extends TestCase {
                                                              4500, 5000, 10000,
                                                              "TextField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2);
+        WriterTools.getDrawPage(xTextDoc).add(aShape2);
 
         XControlModel the_Model2 = aShape2.getControl();
 
diff --git a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java b/qadevOOo/tests/java/mod/_forms/OFileControlModel.java
index 509d22fd0821..748ef1c56e65 100644
--- a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OFileControlModel.java
@@ -181,7 +181,7 @@ public class OFileControlModel extends TestCase {
 
         aShape.setControl(aControl);
 
-        DrawTools.getDrawPage(xDrawDoc, 0).add((XShape) aShape);
+        DrawTools.getDrawPage(xDrawDoc, 0).add(aShape);
         oObj = aShape.getControl();
 
         log.println("creating a new environment for drawpage object");
diff --git a/qadevOOo/tests/java/mod/_forms/OFormattedControl.java b/qadevOOo/tests/java/mod/_forms/OFormattedControl.java
index 04f3d4353480..ebeb6ac91dd1 100644
--- a/qadevOOo/tests/java/mod/_forms/OFormattedControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OFormattedControl.java
@@ -165,7 +165,7 @@ public class OFormattedControl extends TestCase {
                                                             4500, 15000, 10000,
                                                             "FormattedField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape);
+        WriterTools.getDrawPage(xTextDoc).add(aShape);
 
         XControlModel the_Model = aShape.getControl();
 
@@ -173,7 +173,7 @@ public class OFormattedControl extends TestCase {
                                                              4500, 5000, 10000,
                                                              "TextField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2);
+        WriterTools.getDrawPage(xTextDoc).add(aShape2);
 
         XControlModel the_Model2 = aShape2.getControl();
 
diff --git a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java
index 7fe48a4d8c27..84680fa1878a 100644
--- a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java
@@ -193,7 +193,7 @@ public class OGridControlModel extends GenericModelTest {
             throw new StatusException("Can't create column instances.", e);
         }
 
-        XNameContainer aContainer = (XNameContainer) UnoRuntime.queryInterface(
+        XNameContainer aContainer = UnoRuntime.queryInterface(
                                             XNameContainer.class, oObj);
 
         try {
@@ -227,7 +227,7 @@ public class OGridControlModel extends GenericModelTest {
 
 
         tEnv.addObjRelation("Comparer",
-                            new Comparator() {
+                            new Comparator<Object>() {
             public int compare(Object o1, Object o2) {
                 XNamed named1 = UnoRuntime.queryInterface(
                                         XNamed.class, o1);
@@ -240,10 +240,6 @@ public class OGridControlModel extends GenericModelTest {
 
                 return -1;
             }
-
-            public boolean equals(Object obj) {
-                return compare(this, obj) == 0;
-            }
         });
 
 
@@ -356,7 +352,7 @@ class OGridControlModelold extends TestCase {
             throw new StatusException("Can't create column instances.", e);
         }
 
-        XNameContainer aContainer = (XNameContainer) UnoRuntime.queryInterface(
+        XNameContainer aContainer = UnoRuntime.queryInterface(
                                             XNameContainer.class, oObj);
 
         try {
diff --git a/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java b/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java
index 483360dc1703..3c04ab70ceec 100644
--- a/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java
@@ -147,7 +147,7 @@ public class OGroupBoxControl extends TestCase {
                                                             7000, 2000, 2000,
                                                             "GroupBox");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape);
+        WriterTools.getDrawPage(xTextDoc).add(aShape);
 
         XControlModel the_Model = aShape.getControl();
 
@@ -155,7 +155,7 @@ public class OGroupBoxControl extends TestCase {
                                                              4500, 5000, 10000,
                                                              "TextField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2);
+        WriterTools.getDrawPage(xTextDoc).add(aShape2);
 
         XControlModel the_Model2 = aShape2.getControl();
 
diff --git a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java
index c5c63f71d67a..e59d6acd74ba 100644
--- a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java
@@ -153,7 +153,7 @@ public class OHiddenModel extends TestCase {
 
             Object frm = nc.getByName("OHiddenModelForm");
 
-            XNameContainer frmNC = (XNameContainer) UnoRuntime.queryInterface(
+            XNameContainer frmNC = UnoRuntime.queryInterface(
                     XNameContainer.class, frm);
 
             frmNC.insertByName("OHiddenModel", ctrl);
diff --git a/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java b/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java
index 158e20908bbb..48e05ee3a60f 100644
--- a/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java
@@ -152,7 +152,7 @@ public class OImageButtonControl extends TestCase {
                                                             4500, 15000, 10000,
                                                             "ImageButton");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape);
+        WriterTools.getDrawPage(xTextDoc).add(aShape);
 
         XControlModel the_Model = aShape.getControl();
 
@@ -160,7 +160,7 @@ public class OImageButtonControl extends TestCase {
                                                              4500, 5000, 10000,
                                                              "TextField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2);
+        WriterTools.getDrawPage(xTextDoc).add(aShape2);
 
         XControlModel the_Model2 = aShape2.getControl();
 
diff --git a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java b/qadevOOo/tests/java/mod/_forms/OImageControlControl.java
index 8d44556e4788..6f0db7c3119e 100644
--- a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OImageControlControl.java
@@ -153,7 +153,7 @@ public class OImageControlControl extends TestCase {
                                        xTextDoc, 3000, 4500, 15000, 10000,
                                        "DatabaseImageControl");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape);
+        WriterTools.getDrawPage(xTextDoc).add(aShape);
 
         XControlModel the_Model = aShape.getControl();
 
@@ -161,7 +161,7 @@ public class OImageControlControl extends TestCase {
                                                              4500, 5000, 10000,
                                                              "TextField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2);
+        WriterTools.getDrawPage(xTextDoc).add(aShape2);
 
         XControlModel the_Model2 = aShape2.getControl();
 
diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java b/qadevOOo/tests/java/mod/_forms/OListBoxControl.java
index 97dcd97a1f64..bdf3cddf71cb 100644
--- a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OListBoxControl.java
@@ -86,14 +86,14 @@ public class OListBoxControl extends TestCase {
         XControlShape aShape = FormTools.createControlShape(
                                 xTextDoc,3000,4500,15000,10000,"ListBox");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape);
+        WriterTools.getDrawPage(xTextDoc).add(aShape);
 
         XControlModel the_Model = aShape.getControl();
 
         XControlShape aShape2 = FormTools.createControlShape(
                                 xTextDoc,3000,4500,5000,10000,"TextField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2);
+        WriterTools.getDrawPage(xTextDoc).add(aShape2);
 
         XControlModel the_Model2 = aShape2.getControl();
 
diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java
index e564e48a888c..c97868f7fb8c 100644
--- a/qadevOOo/tests/java/mod/_forms/OListBoxModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OListBoxModel.java
@@ -205,9 +205,9 @@ public class OListBoxModel extends GenericModelTest {
             }
 
             public void commit() throws SQLException {
-                XBoundComponent bound = (XBoundComponent) UnoRuntime.queryInterface(
+                XBoundComponent bound = UnoRuntime.queryInterface(
                                                 XBoundComponent.class, ctrl);
-                XResultSetUpdate update = (XResultSetUpdate) UnoRuntime.queryInterface(
+                XResultSetUpdate update = UnoRuntime.queryInterface(
                                                   XResultSetUpdate.class,
                                                   formLoaderF);
 
diff --git a/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java b/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java
index e3e1fd35e71b..a1b2aa6696dd 100644
--- a/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java
+++ b/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java
@@ -114,7 +114,7 @@ public class ONavigationBarControl extends TestCase {
                                                             4500, 15000, 10000,
                                                             "NavigationToolBar");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape);
+        WriterTools.getDrawPage(xTextDoc).add(aShape);
 
         XControlModel the_Model = aShape.getControl();
 
@@ -122,7 +122,7 @@ public class ONavigationBarControl extends TestCase {
                                                              4500, 5000, 10000,
                                                              "TextField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2);
+        WriterTools.getDrawPage(xTextDoc).add(aShape2);
 
         XControlModel the_Model2 = aShape2.getControl();
 
diff --git a/qadevOOo/tests/java/mod/_forms/ONumericControl.java b/qadevOOo/tests/java/mod/_forms/ONumericControl.java
index bb5e52d8b7de..10a95a87d9a8 100644
--- a/qadevOOo/tests/java/mod/_forms/ONumericControl.java
+++ b/qadevOOo/tests/java/mod/_forms/ONumericControl.java
@@ -168,7 +168,7 @@ public class ONumericControl extends TestCase {
                                                             4500, 15000, 10000,
                                                             "NumericField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape);
+        WriterTools.getDrawPage(xTextDoc).add(aShape);
 
         XControlModel the_Model = aShape.getControl();
 
@@ -176,7 +176,7 @@ public class ONumericControl extends TestCase {
                                                              4500, 5000, 10000,
                                                              "TextField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2);
+        WriterTools.getDrawPage(xTextDoc).add(aShape2);
 
         XControlModel the_Model2 = aShape2.getControl();
 
diff --git a/qadevOOo/tests/java/mod/_forms/OPatternControl.java b/qadevOOo/tests/java/mod/_forms/OPatternControl.java
index bb1037225417..e50c347eeecf 100644
--- a/qadevOOo/tests/java/mod/_forms/OPatternControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OPatternControl.java
@@ -168,7 +168,7 @@ public class OPatternControl extends TestCase {
                                                             4500, 15000, 10000,
                                                             "PatternField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape);
+        WriterTools.getDrawPage(xTextDoc).add(aShape);
 
         XControlModel the_Model = aShape.getControl();
 
@@ -176,7 +176,7 @@ public class OPatternControl extends TestCase {
                                                              4500, 5000, 10000,
                                                              "TextField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2);
+        WriterTools.getDrawPage(xTextDoc).add(aShape2);
 
         XControlModel the_Model2 = aShape2.getControl();
 
diff --git a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java
index 30da3081489f..1c7c90d92e6f 100644
--- a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java
+++ b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java
@@ -156,7 +156,7 @@ public class ORadioButtonControl extends TestCase {
                                                             4500, 15000, 10000,
                                                             "RadioButton");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape);
+        WriterTools.getDrawPage(xTextDoc).add(aShape);
 
         XControlModel the_Model = aShape.getControl();
 
@@ -164,7 +164,7 @@ public class ORadioButtonControl extends TestCase {
                                                              4500, 5000, 10000,
                                                              "TextField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2);
+        WriterTools.getDrawPage(xTextDoc).add(aShape2);
 
         XControlModel the_Model2 = aShape2.getControl();
 
diff --git a/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java b/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java
index 8d014b7ee3b6..6eb3f162375f 100644
--- a/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java
@@ -70,7 +70,7 @@ public class OScrollBarModel extends TestCase {
         XControlShape aShape = FormTools.createControlShape(
                                 xTextDoc,3000,4500,15000,10000,"ScrollBar");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape);
+        WriterTools.getDrawPage(xTextDoc).add(aShape);
         oObj = aShape.getControl();
         log.println( "creating a new environment for OScrollBarModel object" );
         TestEnvironment tEnv = new TestEnvironment( oObj );
diff --git a/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java b/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java
index ec51dbfa0f2b..74060abc606e 100644
--- a/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java
@@ -75,7 +75,7 @@ public class OSpinButtonModel extends TestCase {
         XControlShape aShape = FormTools.createControlShape(
             xTextDoc,3000,4500,15000,10000,"SpinButton");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape);
+        WriterTools.getDrawPage(xTextDoc).add(aShape);
         oObj = aShape.getControl();
         log.println( "creating a new environment for OButtonModel object" );
         TestEnvironment tEnv = new TestEnvironment( oObj );
diff --git a/qadevOOo/tests/java/mod/_forms/OTimeControl.java b/qadevOOo/tests/java/mod/_forms/OTimeControl.java
index a48259feb66c..3104e741e98e 100644
--- a/qadevOOo/tests/java/mod/_forms/OTimeControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OTimeControl.java
@@ -169,7 +169,7 @@ public class OTimeControl extends TestCase {
                                                             4500, 15000, 10000,
                                                             "TimeField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape);
+        WriterTools.getDrawPage(xTextDoc).add(aShape);
 
         XControlModel the_Model = aShape.getControl();
 
@@ -177,7 +177,7 @@ public class OTimeControl extends TestCase {
                                                              4500, 5000, 10000,
                                                              "TextField");
 
-        WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2);
+        WriterTools.getDrawPage(xTextDoc).add(aShape2);
 
         XControlModel the_Model2 = aShape2.getControl();
 
diff --git a/qadevOOo/tests/java/mod/_forms/OTimeModel.java b/qadevOOo/tests/java/mod/_forms/OTimeModel.java
index f5b6b1b36a0b..b5689275dd8d 100644
--- a/qadevOOo/tests/java/mod/_forms/OTimeModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OTimeModel.java
@@ -164,7 +164,7 @@ public class OTimeModel extends GenericModelTest {
                                                                  PrintWriter log) {
         TestEnvironment tEnv = super.createTestEnvironment(Param, log);
 
-        HashSet exclude = new HashSet();
+        HashSet<String> exclude = new HashSet<String>();
 
         exclude.add("FormatKey");
 
@@ -206,9 +206,9 @@ public class OTimeModel extends GenericModelTest {
             }
 
             public void commit() throws com.sun.star.sdbc.SQLException {
-                XBoundComponent bound = (XBoundComponent) UnoRuntime.queryInterface(
+                XBoundComponent bound = UnoRuntime.queryInterface(
                                                 XBoundComponent.class, ctrl);
-                XResultSetUpdate update = (XResultSetUpdate) UnoRuntime.queryInterface(
+                XResultSetUpdate update = UnoRuntime.queryInterface(
                                                   XResultSetUpdate.class,
                                                   formLoaderF);