Java5 update - convert more code to use generics:wq

Change-Id: I7ea32cad40a6657e4e5886d04af008cb6d67ac6e

7 files changed, 9 insertions, 14 deletions

diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java
index 70835e11bf40..115ed47238b0 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java
@@ -155,8 +155,7 @@ public class XMLImporter extends TestCase {
         //get draw pages
         XDrawPagesSupplier drawPagesSupplier = UnoRuntime.queryInterface(XDrawPagesSupplier.class, xImpressDoc);
         XDrawPages drawPages = drawPagesSupplier.getDrawPages();
-        final XNameAccess xNamePages = (XNameAccess)
-            UnoRuntime.queryInterface(XNameAccess.class, drawPages);
+        final XNameAccess xNamePages = UnoRuntime.queryInterface(XNameAccess.class, drawPages);
 
         tEnv.addObjRelation("XDocumentHandler.ImportChecker",
             new ifc.xml.sax._XDocumentHandler.ImportChecker() {
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java
index 569a91dfaee4..2829fdfee796 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java
@@ -131,7 +131,7 @@ public class XMLMetaExporter extends TestCase {
         //change title name
             XDocumentInfoSupplier infoSup = UnoRuntime.queryInterface
             (XDocumentInfoSupplier.class, xImpressDoc) ;
-            XPropertySet docInfo = (XPropertySet) UnoRuntime.queryInterface
+            XPropertySet docInfo = UnoRuntime.queryInterface
                 (XPropertySet.class, infoSup.getDocumentInfo()) ;
             docInfo.setPropertyValue("Title", NAME);
 
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java
index 8330a9396847..4c725fab6164 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java
@@ -153,7 +153,7 @@ public class XMLMetaImporter extends TestCase {
 
         XDocumentInfoSupplier infoSup = UnoRuntime.queryInterface
         (XDocumentInfoSupplier.class, xImpressDoc) ;
-        final XPropertySet docInfo = (XPropertySet) UnoRuntime.queryInterface
+        final XPropertySet docInfo = UnoRuntime.queryInterface
             (XPropertySet.class, infoSup.getDocumentInfo()) ;
         final PrintWriter logF = log ;
 
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java
index 21d4493480f6..424460e5398e 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java
@@ -128,8 +128,7 @@ public class XMLSettingsExporter extends TestCase {
             //set some settings
             XModel xImpressModel = UnoRuntime.queryInterface(XModel.class, xImpressDoc);
             XController xController = xImpressModel.getCurrentController();
-            XPropertySet xPropSet = (XPropertySet)
-                UnoRuntime.queryInterface(XPropertySet.class, xController);
+            XPropertySet xPropSet = UnoRuntime.queryInterface(XPropertySet.class, xController);
             NewDataValue = ! ((Boolean) xPropSet.getPropertyValue
                 ("IsLayerMode")).booleanValue();
             xPropSet.setPropertyValue("IsLayerMode",
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java
index 95707e671239..75b306624f92 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java
@@ -165,8 +165,7 @@ public class XMLSettingsImporter extends TestCase {
         // get property before import
         XModel xImpressModel = UnoRuntime.queryInterface(XModel.class, xImpressDoc);
         XController xController = xImpressModel.getCurrentController();
-        final XPropertySet xPropSet = (XPropertySet)
-            UnoRuntime.queryInterface(XPropertySet.class, xController);
+        final XPropertySet xPropSet = UnoRuntime.queryInterface(XPropertySet.class, xController);
         try {
             log.println("Property \"IsLayerMode\" before import is " +
                 xPropSet.getPropertyValue("IsLayerMode"));
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java
index 8affc0d2ae4d..8a11242abace 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java
@@ -141,13 +141,11 @@ public class XMLStylesExporter extends TestCase {
             (XStyleFamiliesSupplier.class, xImpressDoc) ;
             XNameAccess styleFamilies = styleSup.getStyleFamilies();
             String[] styleFamiliesNames = styleFamilies.getElementNames();
-            XNameContainer StyleFamilyName = (XNameContainer)
-                UnoRuntime.queryInterface(XNameContainer.class,
-                styleFamilies.getByName(styleFamiliesNames[0]));
+            XNameContainer StyleFamilyName = UnoRuntime.queryInterface(XNameContainer.class,
+            styleFamilies.getByName(styleFamiliesNames[0]));
             Object SC = SOF.createInstance
                 (xImpressDoc, "com.sun.star.style.Style");
-            XStyle StylePage = (XStyle)
-                UnoRuntime.queryInterface(XStyle.class,SC);
+            XStyle StylePage = UnoRuntime.queryInterface(XStyle.class,SC);
             StyleFamilyName.insertByName(newName, StylePage);
 
         } catch (com.sun.star.uno.Exception e) {
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java
index c96ba75498d0..5a4aa2ca795f 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java
@@ -161,7 +161,7 @@ public class XMLStylesImporter extends TestCase {
             xImpressDoc);
             XNameAccess oStyleFamilies = sup.getStyleFamilies();
             Object family = oStyleFamilies.getByName("graphics") ;
-            styles = (XNameAccess) UnoRuntime.queryInterface
+            styles = UnoRuntime.queryInterface
                 (XNameAccess.class, family) ;
             log.println("Styles before:") ;
             String[] names = styles.getElementNames() ;