diff options
| author | Noel Grandin <noel@peralex.com> | 2012-06-27 16:08:28 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-06-29 22:03:01 +0200 |
| commit | 453d7edc424d6652e209ace4915d96193a79be71 (patch) | |
| tree | 0a6af928cf7d1fd90ec995ae7d114f08eaf617fd /qadevOOo | |
| parent | b65017a2a7af290f6681da7b197a52efe83d5185 (diff) | |
Java5 update - convert more code to use generics:wq
Change-Id: I7ea32cad40a6657e4e5886d04af008cb6d67ac6e
Diffstat (limited to 'qadevOOo')
432 files changed, 932 insertions, 1191 deletions
diff --git a/qadevOOo/runner/complexlib/ShowTargets.java b/qadevOOo/runner/complexlib/ShowTargets.java index 3835fc44031d..478d565afc54 100644 --- a/qadevOOo/runner/complexlib/ShowTargets.java +++ b/qadevOOo/runner/complexlib/ShowTargets.java @@ -82,13 +82,13 @@ public class ShowTargets for ( int i=0; i<targets.size(); ++i ) { // target - String target = (String)targets.get(i); + String target = targets.get(i); // 'tab' System.out.print( " " + target ); for ( int s = maxTargetLength - target.length(); s>0; --s ) System.out.print( " " ); // description - System.out.println( " (" + (String)descs.get(i) + ")" ); + System.out.println( " (" + descs.get(i) + ")" ); } } diff --git a/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java b/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java index 0aea19d337b4..64d5fa244acf 100644 --- a/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java +++ b/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java @@ -306,7 +306,7 @@ public class GraphicalDifferenceCheck private static String getXMLOutputFilterforXComponent(XComponent xComponent, StringBuffer suffix){ - XServiceInfo xSI = (XServiceInfo) UnoRuntime.queryInterface(XServiceInfo.class, xComponent); + XServiceInfo xSI = UnoRuntime.queryInterface(XServiceInfo.class, xComponent); if (xSI.supportsService("com.sun.star.text.TextDocument")){ resetBuffer(suffix, ".sxw"); return "swriter: StarOffice XML (Writer)"; diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java index 9f7fde65c437..be1ce9415714 100644 --- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java +++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java @@ -343,7 +343,7 @@ public class GraphicalTestArguments } if (aObj != null) { - XNameAccess aNameAccess = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, aObj); + XNameAccess aNameAccess = UnoRuntime.queryInterface(XNameAccess.class, aObj); if (aNameAccess != null) { diff --git a/qadevOOo/runner/convwatch/IniFile.java b/qadevOOo/runner/convwatch/IniFile.java index d7a831413b50..8b08c8e21601 100644 --- a/qadevOOo/runner/convwatch/IniFile.java +++ b/qadevOOo/runner/convwatch/IniFile.java @@ -308,7 +308,7 @@ class IniFile { String sLine = getItem(i); aWriter.writeBytes(sLine); - aWriter.writeByte((int)'\n'); + aWriter.writeByte('\n'); } aWriter.close(); } diff --git a/qadevOOo/runner/convwatch/MSOfficePrint.java b/qadevOOo/runner/convwatch/MSOfficePrint.java index e9dafbdd4bb3..87fbdd4136c8 100644 --- a/qadevOOo/runner/convwatch/MSOfficePrint.java +++ b/qadevOOo/runner/convwatch/MSOfficePrint.java @@ -249,7 +249,7 @@ public class MSOfficePrint String[] aList = new String[nValues]; for (int i=0;i<nValues;i++) { - String aStr = (String) _aStartCommand.get(i); + String aStr = _aStartCommand.get(i); if (aStr == null) { aStr = ""; diff --git a/qadevOOo/runner/convwatch/ReportDesignerTest.java b/qadevOOo/runner/convwatch/ReportDesignerTest.java index 14a75a91965a..3220fc95004d 100644 --- a/qadevOOo/runner/convwatch/ReportDesignerTest.java +++ b/qadevOOo/runner/convwatch/ReportDesignerTest.java @@ -75,7 +75,7 @@ class PropertySetHelper XPropertySet m_xPropertySet; public PropertySetHelper(Object _aObj) { - m_xPropertySet = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, _aObj); + m_xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, _aObj); } /** @@ -382,7 +382,7 @@ public class ReportDesignerTest extends ComplexTestCase { assure("can't create instance of com.sun.star.sdb.DatabaseContext", x != null); log.println("createInstance com.sun.star.sdb.DatabaseContext done"); - XNameAccess xNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, x); + XNameAccess xNameAccess = UnoRuntime.queryInterface(XNameAccess.class, x); showElements(xNameAccess); Object aObj = xNameAccess.getByName(sFileURL); // log.println("1"); @@ -513,7 +513,7 @@ public class ReportDesignerTest extends ComplexTestCase { private String getFormatExtension(Object _xComponent /* int _nType*/ ) { String sExtension; - XServiceInfo xServiceInfo = (XServiceInfo) UnoRuntime.queryInterface( XServiceInfo.class, _xComponent ); + XServiceInfo xServiceInfo = UnoRuntime.queryInterface( XServiceInfo.class, _xComponent ); if ( xServiceInfo.supportsService( "com.sun.star.sheet.SpreadsheetDocument" ) ) { // calc diff --git a/qadevOOo/runner/convwatch/SimpleFileSemaphore.java b/qadevOOo/runner/convwatch/SimpleFileSemaphore.java index 7d62627064b3..3abb3a1e21e3 100644 --- a/qadevOOo/runner/convwatch/SimpleFileSemaphore.java +++ b/qadevOOo/runner/convwatch/SimpleFileSemaphore.java @@ -100,7 +100,7 @@ public class SimpleFileSemaphore /* extends *//* implements */ try { RandomAccessFile aWriter = new RandomAccessFile(_aSemaphore, "rw"); - aWriter.writeByte((int)1); + aWriter.writeByte(1); aWriter.close(); } diff --git a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java index f3564d3c9473..52c09e7ffb5c 100644 --- a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java +++ b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java @@ -155,7 +155,7 @@ private void callEntry(String _sEntry, ParameterHelper _aParam) IniFile aIniFile = new IniFile(_aParam.getInputPath()); while (aIniFile.hasMoreElements()) { - String sKey = (String)aIniFile.nextElement(); + String sKey = aIniFile.nextElement(); String sPath = FileHelper.getPath(_aParam.getInputPath()); String sEntry = FileHelper.appendPath(sPath, sKey); File aFile = new File(sEntry); @@ -348,7 +348,7 @@ private void callEntry(String _sEntry, ParameterHelper _aParam) IniFile aIniFile = new IniFile(_aParam.getInputPath()); while (aIniFile.hasMoreElements()) { - String sSection = (String)aIniFile.nextElement(); + String sSection = aIniFile.nextElement(); // TODO: not supported yet. // callEveryPictureInIniFile(aIniFile, sSection, _aParam); } diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java index 65303c876f8f..46173e4fb4ed 100644 --- a/qadevOOo/runner/graphical/IniFile.java +++ b/qadevOOo/runner/graphical/IniFile.java @@ -27,7 +27,7 @@ import java.util.Enumeration; Helper class to give a simple API to read/write windows like ini files */ /* public */ // is only need, if we need this class outside package convwatch -public class IniFile implements Enumeration +public class IniFile implements Enumeration<String> { /** @@ -423,10 +423,10 @@ public class IniFile implements Enumeration if (sLine.startsWith("[")) { // write an extra empty line before next section. - aWriter.writeByte((int) '\n'); + aWriter.writeByte('\n'); } aWriter.writeBytes(sLine); - aWriter.writeByte((int) '\n'); + aWriter.writeByte('\n'); } aWriter.close(); } @@ -648,7 +648,7 @@ public class IniFile implements Enumeration * Enumeration Interface * @return a key without the enveloped '[' ']' */ - public Object nextElement() + public String nextElement() { int nLineWithSection = findNextSection(m_aEnumerationPos); if (nLineWithSection != -1) diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java index f4180560855f..bbd73f7eca4c 100644 --- a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java @@ -332,7 +332,7 @@ public class MSOfficePostscriptCreator implements IOffice String[] aList = new String[nValues]; for (int i=0;i<nValues;i++) { - String aStr = (String) _aStartCommand.get(i); + String aStr = _aStartCommand.get(i); if (aStr == null) { aStr = ""; diff --git a/qadevOOo/runner/graphical/Office.java b/qadevOOo/runner/graphical/Office.java index 33470cb35ab3..e88ca3498c5f 100644 --- a/qadevOOo/runner/graphical/Office.java +++ b/qadevOOo/runner/graphical/Office.java @@ -93,7 +93,7 @@ public class Office implements IOffice for (int i=0; i<aList.size();i++) { - String sDocumentName = (String)aList.get(i); + String sDocumentName = aList.get(i); m_aOffice.load(sDocumentName); m_aOffice.storeAsPostscript(); diff --git a/qadevOOo/runner/helper/APIDescGetter.java b/qadevOOo/runner/helper/APIDescGetter.java index 7dad332e2908..fb7a12a188c6 100644 --- a/qadevOOo/runner/helper/APIDescGetter.java +++ b/qadevOOo/runner/helper/APIDescGetter.java @@ -22,10 +22,10 @@ import java.io.File; import java.io.FileReader; import java.io.InputStream; import java.io.InputStreamReader; - import java.util.ArrayList; import java.util.Collections; import java.util.StringTokenizer; +import java.util.jar.JarEntry; import share.DescEntry; import share.DescGetter; @@ -576,7 +576,7 @@ public class APIDescGetter extends DescGetter java.util.jar.JarFile f = ((java.net.JarURLConnection) con).getJarFile(); // Enumerate over all entries - java.util.Enumeration e = f.entries(); + java.util.Enumeration<JarEntry> e = f.entries(); String sStartModule = "/" + module + "/"; while (e.hasMoreElements()) @@ -876,7 +876,7 @@ public class APIDescGetter extends DescGetter java.util.jar.JarFile f = ((java.net.JarURLConnection) con).getJarFile(); // Enumerate over all entries - java.util.Enumeration e = f.entries(); + java.util.Enumeration<JarEntry> e = f.entries(); while (e.hasMoreElements()) { @@ -913,7 +913,7 @@ public class APIDescGetter extends DescGetter for (int i = 0; i < scenarioList.size(); i++) { - scenario[i] = (String) scenarioList.get(i); + scenario[i] = scenarioList.get(i); } return scenario; diff --git a/qadevOOo/runner/helper/CfgParser.java b/qadevOOo/runner/helper/CfgParser.java index 880bf737e2d5..f34b4e6fb0a5 100644 --- a/qadevOOo/runner/helper/CfgParser.java +++ b/qadevOOo/runner/helper/CfgParser.java @@ -65,7 +65,7 @@ public class CfgParser if (cfg != null) { - Enumeration cfgEnum = cfg.keys(); + Enumeration<Object> cfgEnum = cfg.keys(); while (cfgEnum.hasMoreElements()) { String pName = (String) cfgEnum.nextElement(); @@ -81,7 +81,7 @@ public class CfgParser if (pName.equals(PropertyName.TEST_DOCUMENT_PATH)) { - param.put("DOCPTH", (String) pValue); + param.put("DOCPTH", pValue); System.setProperty("DOCPTH", (String) pValue); } @@ -104,10 +104,10 @@ public class CfgParser //found something that could be a prefix //check all parameters for this - Iterator keys = param.keySet().iterator(); + Iterator<String> keys = param.keySet().iterator(); while (keys.hasNext()) { - String key = (String) keys.next(); + String key = keys.next(); if (key.startsWith(os)) { Object oldValue = param.get(key); diff --git a/qadevOOo/runner/helper/ConfigHelper.java b/qadevOOo/runner/helper/ConfigHelper.java index b65056ef229a..36c80db2cead 100644 --- a/qadevOOo/runner/helper/ConfigHelper.java +++ b/qadevOOo/runner/helper/ConfigHelper.java @@ -131,7 +131,7 @@ public class ConfigHelper { try { - XPropertySet xPath = (XPropertySet)UnoRuntime.queryInterface( + XPropertySet xPath = UnoRuntime.queryInterface( XPropertySet.class, m_xConfig.getByHierarchicalName(sRelPath)); return xPath.getPropertyValue(sKey); @@ -150,7 +150,7 @@ public class ConfigHelper { try { - XPropertySet xPath = (XPropertySet)UnoRuntime.queryInterface( + XPropertySet xPath = UnoRuntime.queryInterface( XPropertySet.class, m_xConfig.getByHierarchicalName(sRelPath)); xPath.setPropertyValue(sKey, aValue); @@ -234,15 +234,13 @@ public class ConfigHelper } if (xChildAccess == null) { - XSingleServiceFactory xChildfactory = (XSingleServiceFactory) - UnoRuntime.queryInterface(XSingleServiceFactory.class,xSetCont); + XSingleServiceFactory xChildfactory = UnoRuntime.queryInterface(XSingleServiceFactory.class,xSetCont); Object xNewChild = xChildfactory.createInstance(); xSetCont.insertByName(groupName, xNewChild); - xChildAccess = (XNameReplace) - UnoRuntime.queryInterface(XNameContainer.class,xNewChild); + xChildAccess = UnoRuntime.queryInterface(XNameContainer.class,xNewChild); } return xChildAccess; @@ -266,7 +264,7 @@ public class ConfigHelper XPropertySet xProp = null; try { - xProp = (XPropertySet)UnoRuntime.queryInterface( + xProp = UnoRuntime.queryInterface( XPropertySet.class, xSetCont.getByName(groupName)); } catch (com.sun.star.container.NoSuchElementException e){ @@ -320,7 +318,7 @@ public class ConfigHelper try { Object xGroup=xGroupAccess.getByName(extGroup); - xExtGroupCont = (XNameContainer) UnoRuntime.queryInterface( + xExtGroupCont = UnoRuntime.queryInterface( XNameContainer.class,xGroup); } catch(com.sun.star.container.NoSuchElementException e) { throw new com.sun.star.uno.Exception( @@ -357,7 +355,7 @@ public class ConfigHelper throw new com.sun.star.uno.Exception( "could not get set '" + setName + ": null"); - return (XNameContainer) UnoRuntime.queryInterface( + return UnoRuntime.queryInterface( XNameContainer.class, oSet); } diff --git a/qadevOOo/runner/helper/ConfigurationRead.java b/qadevOOo/runner/helper/ConfigurationRead.java index 3940edc5e361..557e1199ff45 100644 --- a/qadevOOo/runner/helper/ConfigurationRead.java +++ b/qadevOOo/runner/helper/ConfigurationRead.java @@ -90,8 +90,7 @@ public class ConfigurationRead { */ public String[] getRootNodeNames() { - XNameAccess xName = (XNameAccess) - UnoRuntime.queryInterface(XNameAccess.class, root); + XNameAccess xName = UnoRuntime.queryInterface(XNameAccess.class, root); String[]names = xName.getElementNames(); return names; } @@ -106,7 +105,7 @@ public class ConfigurationRead { try { Object next = root.getByHierarchicalName(name); - XNameAccess x = (XNameAccess)UnoRuntime.queryInterface( + XNameAccess x = UnoRuntime.queryInterface( XNameAccess.class, next); names = x.getElementNames(); for (int i=0; i< names.length; i++) { diff --git a/qadevOOo/runner/helper/ContextMenuInterceptor.java b/qadevOOo/runner/helper/ContextMenuInterceptor.java index 6d80e1fdbbaf..9f1b250f8878 100644 --- a/qadevOOo/runner/helper/ContextMenuInterceptor.java +++ b/qadevOOo/runner/helper/ContextMenuInterceptor.java @@ -44,17 +44,17 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor { // create root menu entry for sub menu and sub menu XPropertySet xRootMenuEntry = - (XPropertySet)UnoRuntime.queryInterface( - XPropertySet.class, - xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger" )); + UnoRuntime.queryInterface( + XPropertySet.class, + xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger" )); // create a line separator for our new help sub menu XPropertySet xSeparator = - (XPropertySet)UnoRuntime.queryInterface( - XPropertySet.class, - xMenuElementFactory.createInstance("com.sun.star.ui.ActionTriggerSeparator" ) ); + UnoRuntime.queryInterface( + XPropertySet.class, + xMenuElementFactory.createInstance("com.sun.star.ui.ActionTriggerSeparator" ) ); Short aSeparatorType = new Short( ActionTriggerSeparatorType.LINE ); - xSeparator.setPropertyValue( "SeparatorType", (Object)aSeparatorType ); + xSeparator.setPropertyValue( "SeparatorType", aSeparatorType ); // query sub menu for index container to get access XIndexContainer xSubMenuContainer = @@ -66,12 +66,12 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor { xRootMenuEntry.setPropertyValue( "Text", new String( "Help" )); xRootMenuEntry.setPropertyValue( "CommandURL", new String( "slot:5410" )); xRootMenuEntry.setPropertyValue( "HelpURL", new String( "5410" )); - xRootMenuEntry.setPropertyValue( "SubContainer", (Object)xSubMenuContainer ); + xRootMenuEntry.setPropertyValue( "SubContainer", xSubMenuContainer ); // create menu entries for the new sub menu // intialize help/content menu entry // entry "Content" - XPropertySet xMenuEntry = (XPropertySet)UnoRuntime.queryInterface( + XPropertySet xMenuEntry = UnoRuntime.queryInterface( XPropertySet.class, xMenuElementFactory.createInstance( "com.sun.star.ui.ActionTrigger" )); xMenuEntry.setPropertyValue( "Text", new String( "Content" )); @@ -79,11 +79,11 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor { xMenuEntry.setPropertyValue( "HelpURL", new String( "5401" )); // insert menu entry to sub menu - xSubMenuContainer.insertByIndex( 0, (Object)xMenuEntry ); + xSubMenuContainer.insertByIndex( 0, xMenuEntry ); // intialize help/help agent // entry "Help Agent" - xMenuEntry = (XPropertySet)UnoRuntime.queryInterface( + xMenuEntry = UnoRuntime.queryInterface( XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger" )); xMenuEntry.setPropertyValue( "Text", new String( "Help Agent" )); @@ -91,10 +91,10 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor { xMenuEntry.setPropertyValue( "HelpURL", new String( "5962" )); // insert menu entry to sub menu - xSubMenuContainer.insertByIndex( 1, (Object)xMenuEntry ); + xSubMenuContainer.insertByIndex( 1, xMenuEntry ); // intialize help/tips // entry "Tips" - xMenuEntry = (XPropertySet)UnoRuntime.queryInterface( + xMenuEntry = UnoRuntime.queryInterface( XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger" )); xMenuEntry.setPropertyValue( "Text", new String( "Tips" )); @@ -102,13 +102,13 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor { xMenuEntry.setPropertyValue( "HelpURL", new String( "5404" )); // insert menu entry to sub menu - xSubMenuContainer.insertByIndex( 2, (Object)xMenuEntry ); + xSubMenuContainer.insertByIndex( 2, xMenuEntry ); // add separator into the given context menu - xContextMenu.insertByIndex( 1, (Object)xSeparator ); + xContextMenu.insertByIndex( 1, xSeparator ); // add new sub menu into the given context menu - xContextMenu.insertByIndex( 1, (Object)xRootMenuEntry ); + xContextMenu.insertByIndex( 1, xRootMenuEntry ); // The controller should execute the modified context menu and stop notifying other // interceptors. diff --git a/qadevOOo/runner/helper/InetTools.java b/qadevOOo/runner/helper/InetTools.java index b4c5a8443239..1ee6622d8281 100644 --- a/qadevOOo/runner/helper/InetTools.java +++ b/qadevOOo/runner/helper/InetTools.java @@ -53,7 +53,7 @@ public class InetTools { "com.sun.star.configuration.ConfigurationUpdateAccess", ProvArgs); - XPropertySet oInetProps = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet oInetProps = UnoRuntime.queryInterface( XPropertySet.class, oInet); String HTTPProxyName = (String)param.get("HTTPProxyName"); diff --git a/qadevOOo/runner/helper/UnoProvider.java b/qadevOOo/runner/helper/UnoProvider.java index e8b444cb9ef3..59ac51edd880 100644 --- a/qadevOOo/runner/helper/UnoProvider.java +++ b/qadevOOo/runner/helper/UnoProvider.java @@ -91,7 +91,7 @@ public class UnoProvider implements AppProvider { if (xMSF == null) { // bootstrap UNO. String unorcName = getUnorcName(param); - Hashtable env = new Hashtable(); + Hashtable<String,String> env = new Hashtable<String,String>(); env.put("SYSBINDIR", getSysBinDir(param)); XComponentContext xContext = null; diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java index 03f51fe5e6ce..403f9cb4037f 100644 --- a/qadevOOo/runner/lib/MultiPropertyTest.java +++ b/qadevOOo/runner/lib/MultiPropertyTest.java @@ -74,7 +74,7 @@ public class MultiPropertyTest extends MultiMethodTest */ protected void before() { - XServiceInfo xInfo = (XServiceInfo) UnoRuntime.queryInterface( + XServiceInfo xInfo = UnoRuntime.queryInterface( XServiceInfo.class, oObj); optionalService = entry.isOptional; diff --git a/qadevOOo/runner/lib/Parameters.java b/qadevOOo/runner/lib/Parameters.java index bd24289ded5a..2db421c1142f 100644 --- a/qadevOOo/runner/lib/Parameters.java +++ b/qadevOOo/runner/lib/Parameters.java @@ -45,7 +45,7 @@ public class Parameters implements XPropertySet { final Parameters defaults; Property[] props; - public Parameters(Map params) { + public Parameters(Map<String, Object> params) { this (params, null); } @@ -57,7 +57,7 @@ public class Parameters implements XPropertySet { Set<String> paramSet = new HashSet<String>(parameters.keySet()); if (defaults != null) { - Set defSet = defaults.toMap().keySet(); + Set<String> defSet = defaults.toMap().keySet(); paramSet.addAll(defSet); } @@ -148,14 +148,10 @@ public class Parameters implements XPropertySet { }; } - public Map toMap() { - return new HashMap(parameters) { - public Object get(Object obj) { - if (obj instanceof String) { - return Parameters.this.get((String) obj); - } else { - return null; - } + public Map<String,Object> toMap() { + return new HashMap<String,Object>(parameters) { + public String get(String obj) { + return Parameters.this.get(obj); } }; } diff --git a/qadevOOo/runner/lib/TestParameters.java b/qadevOOo/runner/lib/TestParameters.java index 8849e2816474..3a01fd251794 100644 --- a/qadevOOo/runner/lib/TestParameters.java +++ b/qadevOOo/runner/lib/TestParameters.java @@ -31,7 +31,7 @@ import com.sun.star.uno.XComponentContext; * for example, standard paths, connection strings, etc. The TestParameters * also provides XMultiServiceFactory for the test (tests). */ -public class TestParameters extends HashMap { +public class TestParameters extends HashMap<String,Object> { /** * The ConnectionString for Office Connection<br> @@ -230,13 +230,13 @@ public class TestParameters extends HashMap { /** - * Wraper around "put()" + * Wrapper around "put()" * @param key A key of this table. * @param val The value of the key. * @return The value of this key. * @see java.util.HashMap */ - public Object put(Object key, Object val) { + public Object put(String key, Object val) { return super.put(key,val); } @@ -289,7 +289,7 @@ public class TestParameters extends HashMap { Object context = get( "ComponentContext" ); if ( context == null ) { - XPropertySet factoryProps = (XPropertySet)com.sun.star.uno.UnoRuntime.queryInterface( + XPropertySet factoryProps = com.sun.star.uno.UnoRuntime.queryInterface( XPropertySet.class, getMSF() ); try { diff --git a/qadevOOo/runner/org/openoffice/Runner.java b/qadevOOo/runner/org/openoffice/Runner.java index 17a5e209d2af..7ee8404f2355 100644 --- a/qadevOOo/runner/org/openoffice/Runner.java +++ b/qadevOOo/runner/org/openoffice/Runner.java @@ -131,7 +131,7 @@ public class Runner } Properties aProps = System.getProperties(); - Enumeration aEnum = aProps.propertyNames(); + Enumeration<?> aEnum = aProps.propertyNames(); // Enumeration aEnum = aProps.elements(); // these are only the values boolean bEmergencyStop = false; @@ -154,10 +154,10 @@ public class Runner bEmergencyStop |= checkPathVariable("sun.boot.class.path", sDelim); // ----- check all TestParameters ----- - Iterator aIter = _aParams.keySet().iterator(); + Iterator<String> aIter = _aParams.keySet().iterator(); while (aIter.hasNext()) { - String sKey = (String) aIter.next(); + String sKey = aIter.next(); if (_aParams.get(sKey) instanceof String) { String sValue = (String) _aParams.get(sKey); diff --git a/qadevOOo/runner/org/openoffice/RunnerService.java b/qadevOOo/runner/org/openoffice/RunnerService.java index 8b7489ec50eb..521dff7a30bc 100644 --- a/qadevOOo/runner/org/openoffice/RunnerService.java +++ b/qadevOOo/runner/org/openoffice/RunnerService.java @@ -22,6 +22,7 @@ import helper.CfgParser; import helper.ClParser; import java.util.ArrayList; +import java.util.jar.JarEntry; import lib.TestParameters; import share.LogWriter; @@ -221,7 +222,7 @@ public class RunnerService implements XJob, XServiceInfo, // get Jar file from connection java.util.jar.JarFile f = con.getJarFile(); // Enumerate over all entries - java.util.Enumeration aEnum = f.entries(); + java.util.Enumeration<JarEntry> aEnum = f.entries(); while (aEnum.hasMoreElements()) { String entry = aEnum.nextElement().toString(); diff --git a/qadevOOo/runner/share/DescEntry.java b/qadevOOo/runner/share/DescEntry.java index 12ef1c35dbfd..927715342ad5 100644 --- a/qadevOOo/runner/share/DescEntry.java +++ b/qadevOOo/runner/share/DescEntry.java @@ -83,6 +83,6 @@ public class DescEntry { * Contains an arbitrary set of parameters */ - public java.util.HashMap UserDefinedParams = new java.util.HashMap(); + public java.util.HashMap<String,Object> UserDefinedParams = new java.util.HashMap<String,Object>(); } diff --git a/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java b/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java index a64e6f3cbc35..386ec11ca844 100644 --- a/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java +++ b/qadevOOo/runner/stats/ComplexDataBaseOutProducer.java @@ -30,7 +30,7 @@ import java.util.GregorianCalendar; public class ComplexDataBaseOutProducer extends DataBaseOutProducer { /** Creates a new instance of ComplexDataBaseOutProducer */ - public ComplexDataBaseOutProducer(HashMap param) { + public ComplexDataBaseOutProducer(HashMap<String,String> param) { super(param); // do we have to write debug output? Object o = param.get("DebugIsActive"); diff --git a/qadevOOo/runner/stats/DataBaseOutProducer.java b/qadevOOo/runner/stats/DataBaseOutProducer.java index 08e44d369b66..046440465196 100644 --- a/qadevOOo/runner/stats/DataBaseOutProducer.java +++ b/qadevOOo/runner/stats/DataBaseOutProducer.java @@ -27,7 +27,7 @@ import java.util.HashMap; * @author sg128468 */ public abstract class DataBaseOutProducer implements LogWriter { - protected HashMap mSqlInput = null; + protected HashMap<String,Object> mSqlInput = null; protected HashMap<String, String[]> mSqlOutput = null; protected String[] mWriteableEntryTypes = null; protected SQLExecution mSqlExec; @@ -37,8 +37,8 @@ public abstract class DataBaseOutProducer implements LogWriter { /** Creates a new instance of DataBaseOutProducer * @param param The HashMap with test parameters */ - public DataBaseOutProducer(HashMap param) { - mSqlInput = new HashMap(); + public DataBaseOutProducer(HashMap<String,String> param) { + mSqlInput = new HashMap<String,Object>(); mSqlInput.putAll(param); Object o = param.get("DebugIsActive"); @@ -119,7 +119,7 @@ public abstract class DataBaseOutProducer implements LogWriter { */ protected boolean insertEntry(DescEntry entry, LogWriter log) { // copy the swlInput HashMap, so it can be reset easily for the next run - HashMap copySqlInput = new HashMap(); + HashMap<String,Object> copySqlInput = new HashMap<String,Object>(); copySqlInput.putAll(mSqlInput); // put some stuff from entry in the HashMap mSqlInput.put("EntryLongName", entry.longName); diff --git a/qadevOOo/runner/stats/FatDataBaseOutProducer.java b/qadevOOo/runner/stats/FatDataBaseOutProducer.java index 88981f738247..baa6bb4a4e7a 100644 --- a/qadevOOo/runner/stats/FatDataBaseOutProducer.java +++ b/qadevOOo/runner/stats/FatDataBaseOutProducer.java @@ -31,7 +31,7 @@ public class FatDataBaseOutProducer extends DataBaseOutProducer { /** Creates a new instance of APIDataBaseOutProducer */ - public FatDataBaseOutProducer(HashMap param) { + public FatDataBaseOutProducer(HashMap<String,String> param) { super(param); String testBase = (String)mSqlInput.get("TestBase"); int sep = testBase.indexOf('_'); diff --git a/qadevOOo/runner/stats/FileLogWriter.java b/qadevOOo/runner/stats/FileLogWriter.java index b8e545351ce6..953814f16687 100644 --- a/qadevOOo/runner/stats/FileLogWriter.java +++ b/qadevOOo/runner/stats/FileLogWriter.java @@ -126,7 +126,7 @@ public class FileLogWriter extends PrintWriter implements LogWriter { } public void setWatcher(Object watcher) { - entry.UserDefinedParams.put("Watcher", (share.Watcher) watcher); + entry.UserDefinedParams.put("Watcher", watcher); } } diff --git a/qadevOOo/runner/stats/OutProducerFactory.java b/qadevOOo/runner/stats/OutProducerFactory.java index ffdac13b37a6..b5c95da36b66 100644 --- a/qadevOOo/runner/stats/OutProducerFactory.java +++ b/qadevOOo/runner/stats/OutProducerFactory.java @@ -36,7 +36,7 @@ public class OutProducerFactory { * @param Parameters of the test. * @return The created out producer. */ - public static LogWriter createOutProducer(HashMap param) { + public static LogWriter createOutProducer(HashMap<String,Object> param) { LogWriter dbOut = null; boolean getDatabase = convertToBool(param.get("DataBaseOut")); if (getDatabase) { @@ -65,7 +65,7 @@ public class OutProducerFactory { * @param The test parameters * @return The database out producer, or null if it couldn't be created. */ - public static LogWriter createDataBaseOutProducer(HashMap param) { + public static LogWriter createDataBaseOutProducer(HashMap<String,Object> param) { String dataProducerName = (String)param.get("DataBaseOutProducer"); if (dataProducerName == null) { String testBaseName = (String)param.get("TestBase"); @@ -77,7 +77,7 @@ public class OutProducerFactory { LogWriter dbOut = null; try { dbOut = (LogWriter)dcl.getInstance(dataProducerName, - new Class[]{new HashMap().getClass()}, new Object[]{param}); + new Class[]{HashMap.class}, new Object[]{param}); } catch(IllegalArgumentException e) { e.printStackTrace(); diff --git a/qadevOOo/runner/stats/SQLExecution.java b/qadevOOo/runner/stats/SQLExecution.java index 21d0cbeecf86..3253415bd490 100644 --- a/qadevOOo/runner/stats/SQLExecution.java +++ b/qadevOOo/runner/stats/SQLExecution.java @@ -125,7 +125,7 @@ public class SQLExecution { * @param sqlOutput The results of the command are put in this HashMap. * @return True, if no error occurred. */ - public boolean executeSQLCommand(String command, HashMap sqlInput, HashMap<String, String[]> sqlOutput) + public boolean executeSQLCommand(String command, HashMap<String,Object> sqlInput, HashMap<String, String[]> sqlOutput) throws IllegalArgumentException { return executeSQLCommand(command, sqlInput, sqlOutput, false); } @@ -139,7 +139,7 @@ public class SQLExecution { * sqlInput HashMap. * @return True, if no error occurred. */ - public boolean executeSQLCommand(String command, HashMap sqlInput, HashMap<String, String[]> sqlOutput, boolean mergeOutputIntoInput) + public boolean executeSQLCommand(String command, HashMap<String,Object> sqlInput, HashMap<String, String[]> sqlOutput, boolean mergeOutputIntoInput) throws IllegalArgumentException { if (sqlOutput == null) { sqlOutput = new HashMap<String, String[]>(); @@ -193,11 +193,11 @@ public class SQLExecution { // add the values if (addNewVals && i!=0) { // all values until now were of type String, not String[], so now new values have to be added. - sqlCommand.add(i, (String)sqlCommand.get(0) + " " + pre + value + post); + sqlCommand.add(i, sqlCommand.get(0) + " " + pre + value + post); } else { // we already have vals.length commands (or are at the first command), so just add. - sqlCommand.set(i, (String)sqlCommand.get(i) + " " + pre + value + post); + sqlCommand.set(i, sqlCommand.get(i) + " " + pre + value + post); } } } @@ -205,7 +205,7 @@ public class SQLExecution { // value is a String: no other possibility String value = checkForQuotationMarks((String)sqlInput.get(key)); for (int i=0; i<sqlCommand.size(); i++) { - sqlCommand.set(i, (String)sqlCommand.get(i) + " " + pre + value + post); + sqlCommand.set(i, sqlCommand.get(i) + " " + pre + value + post); } } } @@ -218,7 +218,7 @@ public class SQLExecution { else { // token is not a key, just add it for (int i=0; i<sqlCommand.size(); i++) - sqlCommand.set(i, (String)sqlCommand.get(i) + " " + originalKey); + sqlCommand.set(i, sqlCommand.get(i) + " " + originalKey); if (originalKey.equalsIgnoreCase("update") || originalKey.equalsIgnoreCase("delete") || originalKey.equalsIgnoreCase("insert")) { @@ -228,7 +228,7 @@ public class SQLExecution { } } for (int i=0;i<sqlCommand.size(); i++) { - execute((String)sqlCommand.get(i), sqlOutput, update); + execute(sqlCommand.get(i), sqlOutput, update); // merge output with input if (!update && mergeOutputIntoInput) { Iterator<String> keys = sqlOutput.keySet().iterator(); diff --git a/qadevOOo/runner/stats/SimpleLogWriter.java b/qadevOOo/runner/stats/SimpleLogWriter.java index 043cf342cb54..3d3164373fbf 100644 --- a/qadevOOo/runner/stats/SimpleLogWriter.java +++ b/qadevOOo/runner/stats/SimpleLogWriter.java @@ -96,7 +96,7 @@ public class SimpleLogWriter extends PrintWriter implements LogWriter { { if (watcher != null) { - entry.UserDefinedParams.put("Watcher", (share.Watcher) watcher); + entry.UserDefinedParams.put("Watcher", watcher); } } } diff --git a/qadevOOo/runner/util/BasicMacroTools.java b/qadevOOo/runner/util/BasicMacroTools.java index 313ed1b0f565..ffb4538254d6 100644 --- a/qadevOOo/runner/util/BasicMacroTools.java +++ b/qadevOOo/runner/util/BasicMacroTools.java @@ -55,7 +55,7 @@ public class BasicMacroTools { Object DocLibCont = null; try { - XPropertySet xDocProps = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet xDocProps = UnoRuntime.queryInterface( XPropertySet.class, xDoc); DocLibCont = xDocProps.getPropertyValue("BasicLibraries"); } catch (com.sun.star.uno.Exception e) { @@ -63,7 +63,7 @@ public class BasicMacroTools { "Couldn't get BasicLibraries-Container from document: " + e.toString()); } - mLCxNA = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, + mLCxNA = UnoRuntime.queryInterface(XNameAccess.class, DocLibCont); mLCxLC = UnoRuntime.queryInterface( @@ -95,7 +95,7 @@ public class BasicMacroTools { "Couldn't create ApplicationScriptLibraryContainer" + e.toString()); } - mLCxNA = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, + mLCxNA = UnoRuntime.queryInterface(XNameAccess.class, ASLC); mLCxLC = UnoRuntime.queryInterface( @@ -237,10 +237,10 @@ public class BasicMacroTools { "com.sun.star.configuration.ConfigurationUpdateAccess", ProvArgs); - XPropertySet oSecureProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, oSecure); + XPropertySet oSecureProps = UnoRuntime.queryInterface(XPropertySet.class, oSecure); Object oScripting = oSecureProps.getPropertyValue("Scripting"); - XPropertySet oScriptingSettings = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, oScripting); + XPropertySet oScriptingSettings = UnoRuntime.queryInterface(XPropertySet.class, oScripting); oScriptingSettings.setPropertyValue("SecureURL", new String[]{secureURL}); oScriptingSettings.setPropertyValue("OfficeBasic", new Integer(2)); diff --git a/qadevOOo/runner/util/DBTools.java b/qadevOOo/runner/util/DBTools.java index 30c1b230548f..98e699cef28b 100644 --- a/qadevOOo/runner/util/DBTools.java +++ b/qadevOOo/runner/util/DBTools.java @@ -166,8 +166,7 @@ public class DBTools { * class fields. */ public DataSourceInfo(Object dataSource) { - XPropertySet xProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, dataSource) ; + XPropertySet xProps = UnoRuntime.queryInterface(XPropertySet.class, dataSource) ; try { Name = (String)xProps.getPropertyValue("Name") ; @@ -244,7 +243,7 @@ public class DBTools { { Object src = src = xMSF.createInstance("com.sun.star.sdb.DataSource") ; - XPropertySet props = (XPropertySet) UnoRuntime.queryInterface + XPropertySet props = UnoRuntime.queryInterface (XPropertySet.class, src) ; if (Name != null) props.setPropertyValue("Name", Name) ; @@ -340,8 +339,7 @@ public class DBTools { XInterface newSource = (XInterface) xMSF.createInstance ("com.sun.star.sdb.DataSource") ; - XPropertySet xSrcProp = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, newSource); + XPropertySet xSrcProp = UnoRuntime.queryInterface(XPropertySet.class, newSource); xSrcProp.setPropertyValue("URL", "sdbc:text:" + dirToUrl(dbDir)); @@ -383,8 +381,7 @@ public class DBTools { XInterface newSource = (XInterface) xMSF.createInstance ("com.sun.star.sdb.DataSource") ; - XPropertySet xSrcProp = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, newSource); + XPropertySet xSrcProp = UnoRuntime.queryInterface(XPropertySet.class, newSource); xSrcProp.setPropertyValue("URL", "sdbc:dbase:" + dirToUrl(dbDir)); dbContext.registerObject(contextName, newSource) ; @@ -444,14 +441,14 @@ public class DBTools { String existURL = null ; - XNameAccess na = (XNameAccess) UnoRuntime.queryInterface + XNameAccess na = UnoRuntime.queryInterface (XNameAccess.class, dbContext) ; Object src = null ; if (na.hasByName("APITestDatabase")) { src = dbContext.getRegisteredObject("APITestDatabase") ; - XPropertySet srcPs = (XPropertySet) UnoRuntime.queryInterface + XPropertySet srcPs = UnoRuntime.queryInterface (XPropertySet.class, src) ; existURL = (String) srcPs.getPropertyValue("URL") ; diff --git a/qadevOOo/runner/util/DesktopTools.java b/qadevOOo/runner/util/DesktopTools.java index e24037f6c622..791052ffa768 100644 --- a/qadevOOo/runner/util/DesktopTools.java +++ b/qadevOOo/runner/util/DesktopTools.java @@ -181,7 +181,7 @@ public class DesktopTools */ public static String getDocumentType(XComponent xComponent) { - XServiceInfo sInfo = (XServiceInfo) UnoRuntime.queryInterface( + XServiceInfo sInfo = UnoRuntime.queryInterface( XServiceInfo.class, xComponent); if (sInfo == null) @@ -413,7 +413,7 @@ public class DesktopTools XViewSettingsSupplier oVSSupp = UnoRuntime.queryInterface(XViewSettingsSupplier.class, oCont); XInterface oViewSettings = oVSSupp.getViewSettings(); - XPropertySet oViewProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, oViewSettings); + XPropertySet oViewProp = UnoRuntime.queryInterface(XPropertySet.class, oViewSettings); oViewProp.setPropertyValue("ZoomType", new Short(com.sun.star.view.DocumentZoomType.ENTIRE_PAGE)); diff --git a/qadevOOo/runner/util/FormTools.java b/qadevOOo/runner/util/FormTools.java index 7bafd75047df..032fe7eff2b0 100644 --- a/qadevOOo/runner/util/FormTools.java +++ b/qadevOOo/runner/util/FormTools.java @@ -70,8 +70,7 @@ public class FormTools { try{ Object oInt = oDocMSF.createInstance("com.sun.star.drawing.ControlShape"); Object aCon = oDocMSF.createInstance("com.sun.star.form.component."+kind); - XPropertySet model_props = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,aCon); + XPropertySet model_props = UnoRuntime.queryInterface(XPropertySet.class,aCon); model_props.setPropertyValue("DefaultControl","com.sun.star.form.control."+kind); aControl = UnoRuntime.queryInterface( XControlModel.class, aCon ); oCShape = UnoRuntime.queryInterface( XControlShape.class, oInt ); @@ -105,8 +104,7 @@ public class FormTools { try{ Object oInt = oDocMSF.createInstance("com.sun.star.drawing.ControlShape"); Object aCon = oDocMSF.createInstance("com.sun.star.form.component."+kind); - XPropertySet model_props = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,aCon); + XPropertySet model_props = UnoRuntime.queryInterface(XPropertySet.class,aCon); model_props.setPropertyValue("DefaultControl","com.sun.star.awt."+defControl); aControl = UnoRuntime.queryInterface( XControlModel.class, aCon ); oCShape = UnoRuntime.queryInterface( XControlShape.class, oInt ); @@ -198,7 +196,7 @@ public class FormTools { String aName ) { try { XInterface oControl = createControl(aDoc, "Form"); - XForm oForm = (XForm) UnoRuntime.queryInterface(XForm.class, oControl); + XForm oForm = UnoRuntime.queryInterface(XForm.class, oControl); Forms.insertByName(aName,oForm); } catch ( Exception e ) { throw new IllegalArgumentException( "Couldn't insert Form" ); @@ -225,7 +223,7 @@ public class FormTools { } catch (com.sun.star.lang.IllegalArgumentException iae) { System.out.println("### Couldn't convert Any"); } - XPropertySet formProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, the_form); + XPropertySet formProps = UnoRuntime.queryInterface(XPropertySet.class, the_form); formProps.setPropertyValue("DataSourceName","Bibliography"); formProps.setPropertyValue("Command","biblio"); formProps.setPropertyValue("CommandType",new Integer(com.sun.star.sdb.CommandType.TABLE)); @@ -254,7 +252,7 @@ public class FormTools { XForm the_form = (XForm) AnyConverter.toObject(new Type(XForm.class), FormTools.getIndexedForms(WriterTools.getDrawPage(aDoc)).getByIndex(0)); - XPropertySet formProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, the_form); + XPropertySet formProps = UnoRuntime.queryInterface(XPropertySet.class, the_form); formProps.setPropertyValue("DataSourceName",sourceName); formProps.setPropertyValue("Command",tableName); formProps.setPropertyValue("CommandType",new Integer(com.sun.star.sdb.CommandType.TABLE)); @@ -267,7 +265,7 @@ public class FormTools { try { XForm the_form = (XForm) FormTools.getForms(WriterTools.getDrawPage(aDoc)).getByName(formName); - XPropertySet formProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, the_form); + XPropertySet formProps = UnoRuntime.queryInterface(XPropertySet.class, the_form); formProps.setPropertyValue("DataSourceName","Bibliography"); formProps.setPropertyValue("Command","biblio"); formProps.setPropertyValue("CommandType",new Integer(com.sun.star.sdb.CommandType.TABLE)); @@ -297,7 +295,7 @@ public class FormTools { XForm the_form = (XForm) AnyConverter.toObject(new Type(XForm.class), FormTools.getForms(WriterTools.getDrawPage(aDoc)).getByName(formName)); - XPropertySet formProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, the_form); + XPropertySet formProps = UnoRuntime.queryInterface(XPropertySet.class, the_form); formProps.setPropertyValue("DataSourceName",sourceName); formProps.setPropertyValue("Command",tableName); formProps.setPropertyValue("CommandType",new Integer(com.sun.star.sdb.CommandType.TABLE)); @@ -322,7 +320,7 @@ public class FormTools { atrans.parseStrict(aURLA); aURL = aURLA[0]; - com.sun.star.frame.XDispatch aDisp = (com.sun.star.frame.XDispatch)aDispProv.queryDispatch(aURL, "", + com.sun.star.frame.XDispatch aDisp = aDispProv.queryDispatch(aURL, "", com.sun.star.frame.FrameSearchFlag.SELF | com.sun.star.frame.FrameSearchFlag.CHILDREN); diff --git a/qadevOOo/runner/util/FrameDsc.java b/qadevOOo/runner/util/FrameDsc.java index e5448afa651c..e1c8fc7b0dd4 100644 --- a/qadevOOo/runner/util/FrameDsc.java +++ b/qadevOOo/runner/util/FrameDsc.java @@ -94,8 +94,7 @@ public class FrameDsc extends InstDescr { XTextFrame TF = (XTextFrame)UnoRuntime.queryInterface( ifcClass, SrvObj ); - XPropertySet oPropSet = (XPropertySet) - UnoRuntime.queryInterface( XPropertySet.class, SrvObj ); + XPropertySet oPropSet = UnoRuntime.queryInterface( XPropertySet.class, SrvObj ); try { diff --git a/qadevOOo/runner/util/SOfficeFactory.java b/qadevOOo/runner/util/SOfficeFactory.java index 327b271c946c..df8b0ddfcf64 100644 --- a/qadevOOo/runner/util/SOfficeFactory.java +++ b/qadevOOo/runner/util/SOfficeFactory.java @@ -386,7 +386,7 @@ public class SOfficeFactory { Object oInt = oDocMSF.createInstance( "com.sun.star.sheet.Spreadsheet"); - XSpreadsheet oSpreadsheet = (XSpreadsheet) UnoRuntime.queryInterface(XSpreadsheet.class, oInt); + XSpreadsheet oSpreadsheet = UnoRuntime.queryInterface(XSpreadsheet.class, oInt); return oSpreadsheet; } @@ -402,7 +402,7 @@ public class SOfficeFactory { } public static String getUniqueName(XInterface oInterface, String prefix) { - XNameAccess oNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, oInterface); + XNameAccess oNameAccess = UnoRuntime.queryInterface(XNameAccess.class, oInterface); if (oNameAccess == null) { return null; } @@ -473,7 +473,7 @@ public class SOfficeFactory { XMultiServiceFactory oDocMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, oDoc); try { - oInstance = (Object) oDocMSF.createInstance(kind); + oInstance = oDocMSF.createInstance(kind); } catch (Exception e) { // Some exception occures.FAILED System.out.println("Couldn't create instance " + kind + ": " + e); @@ -609,7 +609,7 @@ public class SOfficeFactory { // query for XServiceInfo public Object queryXServiceInfo(Object oObj) { if (oObj != null) { - XServiceInfo oInfo = (XServiceInfo) UnoRuntime.queryInterface( + XServiceInfo oInfo = UnoRuntime.queryInterface( XServiceInfo.class, oObj); System.out.println("!!!! XServiceInfo n.a. !!!! "); } else { diff --git a/qadevOOo/runner/util/SysUtils.java b/qadevOOo/runner/util/SysUtils.java index 78abc9502883..68166bb3e3bf 100644 --- a/qadevOOo/runner/util/SysUtils.java +++ b/qadevOOo/runner/util/SysUtils.java @@ -33,9 +33,9 @@ import com.sun.star.datatransfer.*; public class SysUtils { public static String getJavaPath() { - String cp = (String) System.getProperty("java.class.path"); - String jh = (String) System.getProperty("java.home"); - String fs = (String) System.getProperty("file.separator"); + String cp = System.getProperty("java.class.path"); + String jh = System.getProperty("java.home"); + String fs = System.getProperty("file.separator"); jh = jh + fs + "bin" + fs; jh = jh + "java -classpath "+cp; return jh; diff --git a/qadevOOo/runner/util/UITools.java b/qadevOOo/runner/util/UITools.java index bb35f80fd87e..779d1a861831 100644 --- a/qadevOOo/runner/util/UITools.java +++ b/qadevOOo/runner/util/UITools.java @@ -353,8 +353,7 @@ public class UITools { XAccessible xChild = xList.getAccessibleChild(i); XAccessibleContext xChildCont = xChild.getAccessibleContext(); - XInterface xChildInterface = (XInterface) - UnoRuntime.queryInterface(XInterface.class, xChildCont); + XInterface xChildInterface = UnoRuntime.queryInterface(XInterface.class, xChildCont); Items.add(xChildInterface); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { @@ -416,8 +415,7 @@ public class UITools { XAccessible xChild = xList.getAccessibleChild(i); XAccessibleContext xChildCont = xChild.getAccessibleContext(); - XInterface xChildInterface = (XInterface) - UnoRuntime.queryInterface(XInterface.class, xChildCont); + XInterface xChildInterface = UnoRuntime.queryInterface(XInterface.class, xChildCont); Items.add(getString(xChildInterface)); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { @@ -468,7 +466,7 @@ public class UITools { try{ XInterface xNumericField =mAT.getAccessibleObjectForRole( mXRoot, AccessibleRole.TEXT, NumericFieldName); - return (String) getString(xNumericField); + return getString(xNumericField); } catch (Exception e) { throw new Exception("Could get value from NumericField '" @@ -563,8 +561,7 @@ public class UITools { XAccessible xChild = xFrame.getAccessibleChild(i); XAccessibleContext xChildCont = xChild.getAccessibleContext(); - XInterface xChildInterface = (XInterface) - UnoRuntime.queryInterface(XInterface.class, xChildCont); + XInterface xChildInterface = UnoRuntime.queryInterface(XInterface.class, xChildCont); TextFieldText += (getString(xChildInterface)); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { @@ -639,8 +636,7 @@ public class UITools { XAccessibleContext xMessage =mAT.getAccessibleObjectForRole(mXRoot, AccessibleRole.LABEL); - XInterface xMessageInterface = (XInterface) - UnoRuntime.queryInterface(XInterface.class, xMessage); + XInterface xMessageInterface = UnoRuntime.queryInterface(XInterface.class, xMessage); cMessage += (getString(xMessageInterface)); diff --git a/qadevOOo/runner/util/ValueChanger.java b/qadevOOo/runner/util/ValueChanger.java index 00c86ff4138e..6e18ee84c4a5 100644 --- a/qadevOOo/runner/util/ValueChanger.java +++ b/qadevOOo/runner/util/ValueChanger.java @@ -965,7 +965,7 @@ public class ValueChanger { private static boolean isStructure(Object val) { boolean result = true ; - Class clazz = val.getClass() ; + Class<?> clazz = val.getClass() ; Method[] meth = clazz.getDeclaredMethods() ; for (int i = 0; i < meth.length; i++) { diff --git a/qadevOOo/runner/util/ValueComparer.java b/qadevOOo/runner/util/ValueComparer.java index 3ce1719156d5..d4535bc6fde7 100644 --- a/qadevOOo/runner/util/ValueComparer.java +++ b/qadevOOo/runner/util/ValueComparer.java @@ -98,7 +98,7 @@ public class ValueComparer { if((op1.getClass().getComponentType() == op2.getClass().getComponentType()) && (Array.getLength(op1) == Array.getLength(op2))) { - Class zClass = op1.getClass().getComponentType(); + Class<?> zClass = op1.getClass().getComponentType(); for(int i = 0; i < Array.getLength(op1); ++ i) result = result & compareObjects(Array.get(op1, i), Array.get(op2, i)); @@ -113,11 +113,11 @@ public class ValueComparer { return op1 == op2; } - static boolean compareUntil(Class zClass, Class untilClass, Object op1, Object op2) throws Exception { + static boolean compareUntil(Class<?> zClass, Class<?> untilClass, Object op1, Object op2) throws Exception { boolean result = true; // write inherited members first - Class superClass = zClass.getSuperclass(); + Class<?> superClass = zClass.getSuperclass(); if(superClass != null && superClass != untilClass) result = result & compareUntil(superClass, untilClass, op1, op2); @@ -245,7 +245,7 @@ public class ValueComparer { compareEnums((Enum)op1, (Enum)op2); else if(op1.getClass() == String.class && op2.getClass() == String.class) // is it a String ? - result = ((String)op1).equals((String)op2); + result = ((String)op1).equals(op2); else // otherwise it must be a struct result = compareStructs(op1, op2); diff --git a/qadevOOo/runner/util/WaitUnreachable.java b/qadevOOo/runner/util/WaitUnreachable.java index 33e383be95de..56046397e123 100644 --- a/qadevOOo/runner/util/WaitUnreachable.java +++ b/qadevOOo/runner/util/WaitUnreachable.java @@ -47,7 +47,7 @@ public final class WaitUnreachable { */ public WaitUnreachable(Object obj) { this.obj = obj; - queue = new ReferenceQueue(); + queue = new ReferenceQueue<Object>(); ref = new PhantomReference<Object>(obj, queue); } @@ -113,6 +113,6 @@ public final class WaitUnreachable { } private Object obj; - private final ReferenceQueue queue; + private final ReferenceQueue<Object> queue; private final PhantomReference<Object> ref; } diff --git a/qadevOOo/runner/util/WriterTools.java b/qadevOOo/runner/util/WriterTools.java index 7b6b0cc8d18b..164bdf52e4c9 100644 --- a/qadevOOo/runner/util/WriterTools.java +++ b/qadevOOo/runner/util/WriterTools.java @@ -69,7 +69,7 @@ public class WriterTools { try { XDrawPageSupplier oDPS = UnoRuntime.queryInterface( XDrawPageSupplier.class, aDoc); - oDP = (XDrawPage) oDPS.getDrawPage(); + oDP = oDPS.getDrawPage(); } catch (Exception e) { throw new IllegalArgumentException("Couldn't get drawpage"); } @@ -82,7 +82,7 @@ public class WriterTools { int vpos, int width, int height, String pic, String name) { try { - Object oGObject = (XInterface) xMSF.createInstance( + Object oGObject = xMSF.createInstance( "com.sun.star.text.GraphicObject"); XText the_text = aDoc.getText(); @@ -91,7 +91,7 @@ public class WriterTools { XTextContent.class, oGObject); the_text.insertTextContent(the_cursor, the_content, true); - XPropertySet oProps = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet oProps = UnoRuntime.queryInterface( XPropertySet.class, oGObject); String fullURL = util.utils.getFullTestURL(pic); diff --git a/qadevOOo/runner/util/XMLTools.java b/qadevOOo/runner/util/XMLTools.java index bfaa6b53f405..2e53cc993be6 100644 --- a/qadevOOo/runner/util/XMLTools.java +++ b/qadevOOo/runner/util/XMLTools.java @@ -20,10 +20,10 @@ package util; import java.io.PrintWriter; import java.util.ArrayList; -import java.util.Enumeration; +import java.util.HashMap; import java.util.HashSet; import java.util.Hashtable; -import java.util.Vector; +import java.util.Iterator; import com.sun.star.beans.PropertyValue; import com.sun.star.document.XExporter; @@ -369,8 +369,8 @@ public class XMLTools { * appropriate message is output. */ public static class XMLTagsChecker extends XMLWellFormChecker { - protected Hashtable tags = new Hashtable() ; - protected Hashtable chars = new Hashtable() ; + protected HashMap<String,String> tags = new HashMap<String,String>() ; + protected HashMap<String,String> chars = new HashMap<String,String>() ; protected boolean allOK = true ; public XMLTagsChecker(PrintWriter log) { @@ -407,7 +407,7 @@ public class XMLTools { public void startElement(String name, XAttributeList attrs) { super.startElement(name, attrs) ; if (tags.containsKey(name)) { - String outerTag = (String) tags.get(name); + String outerTag = tags.get(name); if (!outerTag.equals("")) { boolean isInTag = false ; for (int i = 0; i < tagStack.size(); i++) { @@ -430,7 +430,7 @@ public class XMLTools { super.characters(ch) ; if (chars.containsKey(ch)) { - String outerTag = (String) chars.get(ch); + String outerTag = chars.get(ch); if (!outerTag.equals("")) { boolean isInTag = false ; for (int i = 0; i < tagStack.size(); i++) { @@ -456,21 +456,21 @@ public class XMLTools { public boolean checkTags() { allOK &= isWellFormed() ; - Enumeration<String> badTags = tags.keys() ; - Enumeration<String> badChars = chars.keys() ; + Iterator<String> badTags = tags.keySet().iterator() ; + Iterator<String> badChars = chars.keySet().iterator() ; - if (badTags.hasMoreElements()) { + if (badTags.hasNext()) { allOK = false ; log.println("Required tags were not found in export :") ; - while(badTags.hasMoreElements()) { - log.println(" <" + badTags.nextElement() + ">") ; + while(badTags.hasNext()) { + log.println(" <" + badTags.next() + ">") ; } } - if (badChars.hasMoreElements()) { + if (badChars.hasNext()) { allOK = false ; log.println("Required characters were not found in export :") ; - while(badChars.hasMoreElements()) { - log.println(" <" + badChars.nextElement() + ">") ; + while(badChars.hasNext()) { + log.println(" <" + badChars.next() + ">") ; } } reset(); @@ -772,8 +772,7 @@ public class XMLTools { XActiveDataSource xADS = UnoRuntime.queryInterface(XActiveDataSource.class,Writer); xADS.setOutputStream(xPipeOutput); - XDocumentHandler handler = (XDocumentHandler) - UnoRuntime.queryInterface(XDocumentHandler.class,Writer); + XDocumentHandler handler = UnoRuntime.queryInterface(XDocumentHandler.class,Writer); Any arg = new Any(new Type(XDocumentHandler.class),handler); @@ -817,7 +816,7 @@ public class XMLTools { XInterface oWriter = (XInterface)xMSF.createInstance( "com.sun.star.xml.sax.Writer"); XActiveDataSource xWriterDS = UnoRuntime.queryInterface(XActiveDataSource.class, oWriter); - XDocumentHandler xDocHandWriter = (XDocumentHandler) UnoRuntime.queryInterface + XDocumentHandler xDocHandWriter = UnoRuntime.queryInterface (XDocumentHandler.class, oWriter) ; if (xFacc.exists(fileURL)) @@ -919,7 +918,7 @@ public class XMLTools { "com.sun.star.comp." + docType + ".XML" + importType + "Importer"); XImporter xImp = UnoRuntime.queryInterface (XImporter.class, oImp) ; - XDocumentHandler xDocHandImp = (XDocumentHandler) UnoRuntime.queryInterface + XDocumentHandler xDocHandImp = UnoRuntime.queryInterface (XDocumentHandler.class, oImp) ; xImp.setTargetDocument(xDoc) ; diff --git a/qadevOOo/runner/util/db/DataSource.java b/qadevOOo/runner/util/db/DataSource.java index 4c612fb08969..e92f81a19168 100644 --- a/qadevOOo/runner/util/db/DataSource.java +++ b/qadevOOo/runner/util/db/DataSource.java @@ -47,7 +47,7 @@ public class DataSource { m_dataSource = UnoRuntime.queryInterface( XDataSource.class, m_orb.createInstance( "com.sun.star.sdb.DataSource" ) ); - m_properties = (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class, + m_properties = UnoRuntime.queryInterface( XPropertySet.class, m_dataSource ); Object[] descriptorProperties = new Object[] { diff --git a/qadevOOo/runner/util/dbg.java b/qadevOOo/runner/util/dbg.java index 95abe526a9a3..a97d6b12b4c2 100644 --- a/qadevOOo/runner/util/dbg.java +++ b/qadevOOo/runner/util/dbg.java @@ -77,8 +77,7 @@ public class dbg { */ public static Type[] getInterfaceTypes(XInterface xTarget) { Type[] types = null; - XTypeProvider xTypeProvider = (XTypeProvider) - UnoRuntime.queryInterface( XTypeProvider.class, xTarget); + XTypeProvider xTypeProvider = UnoRuntime.queryInterface( XTypeProvider.class, xTarget); if( xTypeProvider != null ) types = xTypeProvider.getTypes(); return types; @@ -116,7 +115,7 @@ public class dbg { */ public static void printInterfaceInfo(Type aType) { try { - Class zClass = aType.getZClass(); + Class<?> zClass = aType.getZClass(); Method[] methods = zClass.getDeclaredMethods(); for (int i=0; i<methods.length; i++) { System.out.println("\t" + methods[i].getReturnType().getName() @@ -297,8 +296,7 @@ public class dbg { * @param aObject A UNO object. */ public static void getSuppServices (Object aObject) { - XServiceInfo xSI = (XServiceInfo) - UnoRuntime.queryInterface(XServiceInfo.class,aObject); + XServiceInfo xSI = UnoRuntime.queryInterface(XServiceInfo.class,aObject); printArray(xSI.getSupportedServiceNames()); String str="Therein not Supported Service"; boolean notSupportedServices = false; @@ -319,8 +317,7 @@ public class dbg { */ public static String getImplID( XInterface xTarget ) { String str = ""; - XTypeProvider xTypeProvider = (XTypeProvider) - UnoRuntime.queryInterface( XTypeProvider.class, xTarget); + XTypeProvider xTypeProvider = UnoRuntime.queryInterface( XTypeProvider.class, xTarget); if( xTypeProvider != null ) { byte[] id = xTypeProvider.getImplementationId(); str = "ImplementationID: "; diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java index 65c2f8da97cc..c584db16eaa0 100644 --- a/qadevOOo/runner/util/utils.java +++ b/qadevOOo/runner/util/utils.java @@ -262,7 +262,7 @@ public class utils { // get a folder wich is located in the user dir try { - userPath = (String) getOfficeSettingsValue(msf, "UserConfig"); + userPath = getOfficeSettingsValue(msf, "UserConfig"); } catch (Exception e) { System.out.println("Couldn't get Office User Path"); e.printStackTrace(); @@ -605,7 +605,7 @@ public class utils { public static String getImplName(Object aObject) { String res = "Error getting Implementation name"; try { - XServiceInfo xSI = (XServiceInfo) UnoRuntime.queryInterface(XServiceInfo.class, aObject); + XServiceInfo xSI = UnoRuntime.queryInterface(XServiceInfo.class, aObject); res = xSI.getImplementationName(); } catch (Exception e) { res = "Error getting Implementation name ( " + e + " )"; @@ -693,7 +693,7 @@ public class utils { public static String getOfficeURL(XMultiServiceFactory msf) { try { Object settings = msf.createInstance("com.sun.star.util.PathSettings"); - XPropertySet settingProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, settings); + XPropertySet settingProps = UnoRuntime.queryInterface(XPropertySet.class, settings); String path = (String) settingProps.getPropertyValue("Module"); return path; } catch (Exception e) { @@ -896,8 +896,8 @@ public class utils { */ public static String expandMacro(XMultiServiceFactory xMSF, String expand) throws java.lang.Exception { try { - XPropertySet xPS = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xMSF); - XComponentContext xContext = (XComponentContext) UnoRuntime.queryInterface(XComponentContext.class, + XPropertySet xPS = UnoRuntime.queryInterface(XPropertySet.class, xMSF); + XComponentContext xContext = UnoRuntime.queryInterface(XComponentContext.class, xPS.getPropertyValue("DefaultContext")); XMacroExpander xME = UnoRuntime.queryInterface(XMacroExpander.class, xContext.getValueByName("/singletons/com.sun.star.util.theMacroExpander")); diff --git a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java index 98fbbc7c1427..8b1092149182 100644 --- a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java +++ b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java @@ -309,10 +309,10 @@ public class CheckModuleAPI extends ComplexTestCase final ArrayList<String> addedModules = cde.getModules(); final ArrayList<String> moduleNames = new ArrayList<String>(); - Iterator iterator = addedModules.iterator(); + Iterator<String> iterator = addedModules.iterator(); while (iterator.hasNext()) { - String sModuleName = (String) iterator.next(); + String sModuleName = iterator.next(); // String sFilename = mSRC_ROOT; // + File.separator + sModuleName; // final File sourceRoot = new File(sFilename); if (doesQaUnoApiFolderExist(mSRC_ROOT, sModuleName)) @@ -421,7 +421,7 @@ public class CheckModuleAPI extends ComplexTestCase private String getTranslatedNames(String module) { - final HashMap aModuleHashMap = new HashMap(); + final HashMap<String,String> aModuleHashMap = new HashMap<String,String>(); aModuleHashMap.put("fwk", "framework"); aModuleHashMap.put("fwl", "framework"); @@ -434,13 +434,13 @@ public class CheckModuleAPI extends ComplexTestCase // it could the that the parameter looks like "fwk,fwl". This results in double "famework,framework". // The following loop correct this to only one "framework" - final Set keys = aModuleHashMap.keySet(); - final Iterator iterator = keys.iterator(); + final Set<String> keys = aModuleHashMap.keySet(); + final Iterator<String> iterator = keys.iterator(); while (iterator.hasNext()) { - final String key = (String) iterator.next(); - final String value = (String) aModuleHashMap.get(key); + final String key = iterator.next(); + final String value = aModuleHashMap.get(key); module = module.replaceAll(key, value); diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java index 22c8cea37406..9116fb3fc030 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java @@ -314,7 +314,7 @@ public class _XAccessibleValue extends MultiMethodTest { } } - private Object getObjectValue(double val, Class clazz) { + private Object getObjectValue(double val, Class<?> clazz) { if (clazz.equals(Integer.class)) { return new Integer((int)val); } diff --git a/qadevOOo/tests/java/ifc/awt/_XCurrencyField.java b/qadevOOo/tests/java/ifc/awt/_XCurrencyField.java index 8a11d4ac501b..d01afc0b3051 100644 --- a/qadevOOo/tests/java/ifc/awt/_XCurrencyField.java +++ b/qadevOOo/tests/java/ifc/awt/_XCurrencyField.java @@ -250,7 +250,7 @@ public class _XCurrencyField extends MultiMethodTest { oObj.setDecimalDigits((short) (digits + 1)); short res = oObj.getDecimalDigits(); - result = res == ((short) digits + 1); + result = res == (digits + 1); tRes.tested("setDecimalDigits()", result); } diff --git a/qadevOOo/tests/java/ifc/awt/_XNumericField.java b/qadevOOo/tests/java/ifc/awt/_XNumericField.java index 9aa17dad308c..abe98def21b6 100644 --- a/qadevOOo/tests/java/ifc/awt/_XNumericField.java +++ b/qadevOOo/tests/java/ifc/awt/_XNumericField.java @@ -251,7 +251,7 @@ public class _XNumericField extends MultiMethodTest { oObj.setDecimalDigits((short)(digits + 1)) ; short res = oObj.getDecimalDigits() ; - result = res == ((short)digits + 1) ; + result = res == (digits + 1) ; tRes.tested("setDecimalDigits()", result) ; } diff --git a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java index 8b35f7cf6217..6ee8c0c611c9 100644 --- a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java @@ -57,15 +57,15 @@ public class _XFastPropertySet extends MultiMethodTest { public XFastPropertySet oObj = null; private List<Integer> handles = new ArrayList<Integer>(); private int handle = -1; - private Set exclude = null ; + private Set<String> exclude = null ; /** * Retrieves relation. */ protected void before() { - exclude = (Set) tEnv.getObjRelation("XFastPropertySet.ExcludeProps") ; + exclude = (Set<String>) tEnv.getObjRelation("XFastPropertySet.ExcludeProps") ; if (exclude == null) { - exclude = new java.util.HashSet() ; + exclude = new java.util.HashSet<String>() ; } } @@ -77,7 +77,7 @@ public class _XFastPropertySet extends MultiMethodTest { * before and no exceptions were thrown. <p> */ public void _setFastPropertyValue() { - XPropertySet PS = (XPropertySet)UnoRuntime.queryInterface + XPropertySet PS = UnoRuntime.queryInterface (XPropertySet.class, oObj); XPropertySetInfo propertySetInfo = PS.getPropertySetInfo(); @@ -124,7 +124,7 @@ public class _XFastPropertySet extends MultiMethodTest { * Has <b> OK </b> status if exceptions were thrown. <p> */ public void _getFastPropertyValue() { - XPropertySet PS = (XPropertySet)UnoRuntime.queryInterface + XPropertySet PS = UnoRuntime.queryInterface (XPropertySet.class, oObj); XPropertySetInfo propertySetInfo = PS.getPropertySetInfo(); diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java index 93fe3e598fd3..49c4c9d6d12d 100644 --- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java @@ -74,7 +74,7 @@ public class _XMultiPropertySet extends MultiMethodTest { private Object[] values = null; - private Set exclProps = null; + private Set<String> exclProps = null; /** * Initializes some fields. @@ -82,8 +82,8 @@ public class _XMultiPropertySet extends MultiMethodTest { public void before() { _log = log; - exclProps = (Set) tEnv.getObjRelation("XMultiPropertySet.ExcludeProps"); - if (exclProps == null) exclProps = new HashSet(0); + exclProps = (Set<String>) tEnv.getObjRelation("XMultiPropertySet.ExcludeProps"); + if (exclProps == null) exclProps = new HashSet<String>(0); } /** diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java b/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java index 18efd978b8d0..bbe5fa1916ba 100644 --- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java +++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java @@ -125,8 +125,7 @@ public class _XMultiPropertyStates extends MultiMethodTest { for(int i = 0; i < names.length; i++) { if (!mayBeDef && states[i] != PropertyState.DEFAULT_VALUE ) { propName = names[i]; - XPropertySet xPropSet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oObj); + XPropertySet xPropSet = UnoRuntime.queryInterface(XPropertySet.class, oObj); XPropertySetInfo xPropSetInfo = xPropSet.getPropertySetInfo(); Property prop = null; try { @@ -196,8 +195,7 @@ public class _XMultiPropertyStates extends MultiMethodTest { if (!part_result) { log.println("Property '" + names[i] + "' wasn't set to default"); - XPropertySet xPropSet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oObj); + XPropertySet xPropSet = UnoRuntime.queryInterface(XPropertySet.class, oObj); XPropertySetInfo xPropSetInfo = xPropSet.getPropertySetInfo(); Property prop = xPropSetInfo.getPropertyByName(names[i]); diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyState.java b/qadevOOo/tests/java/ifc/beans/_XPropertyState.java index f3c35f79606e..3ca5e376d778 100644 --- a/qadevOOo/tests/java/ifc/beans/_XPropertyState.java +++ b/qadevOOo/tests/java/ifc/beans/_XPropertyState.java @@ -70,8 +70,7 @@ public class _XPropertyState extends MultiMethodTest { * implemented by object. */ public void before() throws StatusException { - oPS = (XPropertySet) - UnoRuntime.queryInterface( XPropertySet.class, oObj ); + oPS = UnoRuntime.queryInterface( XPropertySet.class, oObj ); if (oPS == null) throw new StatusException ("XPropertySet interface isn't implemented.", diff --git a/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java index 06d32c933e83..5d38019a41d6 100644 --- a/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java @@ -57,7 +57,7 @@ public class _XTolerantMultiPropertySet extends MultiMethodTest { * Throws a lib StatusException if the Component doesn't support XPropertySet or XPropertyState */ public void before() { - PS = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, + PS = UnoRuntime.queryInterface(XPropertySet.class, tEnv.getTestObject()); if (PS == null) { diff --git a/qadevOOo/tests/java/ifc/chart/_BarDiagram.java b/qadevOOo/tests/java/ifc/chart/_BarDiagram.java index f188abe5896a..601b6e0e570a 100644 --- a/qadevOOo/tests/java/ifc/chart/_BarDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_BarDiagram.java @@ -72,8 +72,7 @@ public class _BarDiagram extends MultiPropertyTest { oldDiagram = doc.getDiagram(); doc.setDiagram(bar); - oObj = (XPropertySet) - UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); + oObj = UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); log.println("Set it to 3D"); try { oObj.setPropertyValue("Dim3D", new Boolean(true)); diff --git a/qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java b/qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java index 1bb49c0558c0..99bb00065ddb 100644 --- a/qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java +++ b/qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java @@ -62,8 +62,7 @@ public class _Chart3DBarProperties extends MultiPropertyTest { doc.setDiagram(bar); log.println("Change Diagram to 3D"); - oObj = (XPropertySet) - UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); + oObj = UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); try { oObj.setPropertyValue("Dim3D", new Boolean(true)); } catch(com.sun.star.lang.WrappedTargetException e) { @@ -95,8 +94,7 @@ public class _Chart3DBarProperties extends MultiPropertyTest { ("Relation 'CHARTDOC' not found")); log.println("Change Diagram to 3D"); - oObj = (XPropertySet) - UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); + oObj = UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); try { oObj.setPropertyValue("Dim3D", new Boolean(false)); } catch(com.sun.star.lang.WrappedTargetException e) { diff --git a/qadevOOo/tests/java/ifc/chart/_ChartAxisYSupplier.java b/qadevOOo/tests/java/ifc/chart/_ChartAxisYSupplier.java index 92bdde4b284b..0253e8c34cfe 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartAxisYSupplier.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartAxisYSupplier.java @@ -54,8 +54,7 @@ public class _ChartAxisYSupplier extends MultiPropertyTest { if (doc == null) throw new StatusException(Status.failed ("Relation 'CHARTDOC' not found")); - oObj = (XPropertySet) - UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); + oObj = UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); } public void _HasYAxis() { diff --git a/qadevOOo/tests/java/ifc/chart/_ChartAxisZSupplier.java b/qadevOOo/tests/java/ifc/chart/_ChartAxisZSupplier.java index c0debc4a6be7..42ba8b17af78 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartAxisZSupplier.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartAxisZSupplier.java @@ -64,8 +64,7 @@ public class _ChartAxisZSupplier extends MultiPropertyTest { doc.setDiagram(bar); log.println("Set it to 3D"); - oObj = (XPropertySet) - UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); + oObj = UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); try { oObj.setPropertyValue("Dim3D", new Boolean(true)); } catch(com.sun.star.lang.WrappedTargetException e) { diff --git a/qadevOOo/tests/java/ifc/chart/_ChartStatistics.java b/qadevOOo/tests/java/ifc/chart/_ChartStatistics.java index 54852ff7f9d1..d7f3be6cf9e4 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartStatistics.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartStatistics.java @@ -58,8 +58,7 @@ public class _ChartStatistics extends MultiPropertyTest { if (doc == null) throw new StatusException(Status.failed ("Relation 'CHARTDOC' not found")); - oObj = (XPropertySet) - UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); + oObj = UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); } } diff --git a/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisXSupplier.java b/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisXSupplier.java index 814be9287f3a..10b1345a6248 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisXSupplier.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisXSupplier.java @@ -66,8 +66,7 @@ public class _ChartTwoAxisXSupplier extends MultiPropertyTest { doc.setDiagram(bar); log.println("Set it to 3D"); - oObj = (XPropertySet) - UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); + oObj = UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); try { oObj.setPropertyValue("Dim3D", new Boolean(true)); } catch(com.sun.star.lang.WrappedTargetException e) { diff --git a/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisYSupplier.java b/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisYSupplier.java index 50cef10c98cd..1333c6011b89 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisYSupplier.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisYSupplier.java @@ -66,8 +66,7 @@ public class _ChartTwoAxisYSupplier extends MultiPropertyTest { doc.setDiagram(bar); log.println("Set it to 3D"); - oObj = (XPropertySet) - UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); + oObj = UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); try { oObj.setPropertyValue("Dim3D", new Boolean(true)); } catch(com.sun.star.lang.WrappedTargetException e) { diff --git a/qadevOOo/tests/java/ifc/chart/_Diagram.java b/qadevOOo/tests/java/ifc/chart/_Diagram.java index 277c69ef3f3e..3ab90b84784c 100644 --- a/qadevOOo/tests/java/ifc/chart/_Diagram.java +++ b/qadevOOo/tests/java/ifc/chart/_Diagram.java @@ -52,8 +52,7 @@ public class _Diagram extends MultiPropertyTest { if (doc == null) throw new StatusException(Status.failed ("Relation 'CHARTDOC' not found")); - oObj = (XPropertySet) - UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); + oObj = UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); } } diff --git a/qadevOOo/tests/java/ifc/chart/_Dim3DDiagram.java b/qadevOOo/tests/java/ifc/chart/_Dim3DDiagram.java index 4dfaf4feee6e..0288aeb6cbf5 100644 --- a/qadevOOo/tests/java/ifc/chart/_Dim3DDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_Dim3DDiagram.java @@ -51,8 +51,7 @@ public class _Dim3DDiagram extends MultiPropertyTest { if (doc == null) throw new StatusException(Status.failed ("Relation 'CHARTDOC' not found")); - oObj = (XPropertySet) - UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); + oObj = UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); } } // EOF Dim3DDiagram diff --git a/qadevOOo/tests/java/ifc/chart/_LineDiagram.java b/qadevOOo/tests/java/ifc/chart/_LineDiagram.java index f5e5436dd74a..4632bc8f9e66 100644 --- a/qadevOOo/tests/java/ifc/chart/_LineDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_LineDiagram.java @@ -74,8 +74,7 @@ public class _LineDiagram extends MultiPropertyTest { oldDiagram = doc.getDiagram(); doc.setDiagram(Line); - oObj = (XPropertySet) - UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); + oObj = UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); } /** diff --git a/qadevOOo/tests/java/ifc/chart/_StackableDiagram.java b/qadevOOo/tests/java/ifc/chart/_StackableDiagram.java index 4d6b07dbf1fd..bb7a36080197 100644 --- a/qadevOOo/tests/java/ifc/chart/_StackableDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_StackableDiagram.java @@ -65,8 +65,7 @@ public class _StackableDiagram extends MultiPropertyTest { oldDiagram = doc.getDiagram(); doc.setDiagram(stack); - oObj = (XPropertySet) - UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); + oObj = UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); } /** diff --git a/qadevOOo/tests/java/ifc/chart/_StockDiagram.java b/qadevOOo/tests/java/ifc/chart/_StockDiagram.java index 013edc6da8a9..d54a0e7aab44 100644 --- a/qadevOOo/tests/java/ifc/chart/_StockDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_StockDiagram.java @@ -64,8 +64,7 @@ public class _StockDiagram extends MultiPropertyTest { oldDiagram = doc.getDiagram(); doc.setDiagram(stock); - oObj = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, doc.getDiagram()); + oObj = UnoRuntime.queryInterface(XPropertySet.class, doc.getDiagram()); } /** diff --git a/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java b/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java index d8fa658111bd..5233db64848d 100644 --- a/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java +++ b/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java @@ -56,7 +56,7 @@ public class _XChartDataArray extends MultiMethodTest { msExcludeMessage = (String)o; } if (!mbExcludeSetRowAndSetColumn) { - XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, oObj); + XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, oObj); if(xProp != null) { try { boolean columnAsLabel = ((Boolean)xProp.getPropertyValue("ChartColumnAsLabel")).booleanValue(); diff --git a/qadevOOo/tests/java/ifc/container/_XContainer.java b/qadevOOo/tests/java/ifc/container/_XContainer.java index aa1fbcfb8090..dd69bbdc0b99 100644 --- a/qadevOOo/tests/java/ifc/container/_XContainer.java +++ b/qadevOOo/tests/java/ifc/container/_XContainer.java @@ -92,7 +92,7 @@ public class _XContainer extends MultiMethodTest { oObj = UnoRuntime.queryInterface(XContainer.class, altObj); } - NC = (XNameContainer) UnoRuntime.queryInterface + NC = UnoRuntime.queryInterface (XNameContainer.class, oObj) ; Object container = null; diff --git a/qadevOOo/tests/java/ifc/container/_XIndexReplace.java b/qadevOOo/tests/java/ifc/container/_XIndexReplace.java index e634a2b6b02d..411b7e8ac43e 100644 --- a/qadevOOo/tests/java/ifc/container/_XIndexReplace.java +++ b/qadevOOo/tests/java/ifc/container/_XIndexReplace.java @@ -137,8 +137,7 @@ public class _XIndexReplace extends MultiMethodTest { log.println("1. replaceByIndex(): Exception expected! - FAILED"); - XNameContainer xNC = (XNameContainer) - UnoRuntime.queryInterface(XNameContainer.class, oObj) ; + XNameContainer xNC = UnoRuntime.queryInterface(XNameContainer.class, oObj) ; String[] names = xNC.getElementNames() ; log.println("Element names :") ; for (int i = 0; i<names.length; i++) { @@ -164,8 +163,7 @@ public class _XIndexReplace extends MultiMethodTest { log.println("2. replaceByIndex(): Exception expected! - FAILED"); - XNameContainer xNC = (XNameContainer) - UnoRuntime.queryInterface(XNameContainer.class, oObj) ; + XNameContainer xNC = UnoRuntime.queryInterface(XNameContainer.class, oObj) ; String[] names = xNC.getElementNames() ; log.println("Element names :") ; for (int i = 0; i<names.length; i++) { diff --git a/qadevOOo/tests/java/ifc/container/_XNameReplace.java b/qadevOOo/tests/java/ifc/container/_XNameReplace.java index 0c040344797c..c2b9c62fdf32 100644 --- a/qadevOOo/tests/java/ifc/container/_XNameReplace.java +++ b/qadevOOo/tests/java/ifc/container/_XNameReplace.java @@ -106,7 +106,7 @@ public class _XNameReplace extends MultiMethodTest { } log.println("getting the existant object's name"); - XNameAccess oNameAccess = (XNameAccess)UnoRuntime.queryInterface( + XNameAccess oNameAccess = UnoRuntime.queryInterface( XNameAccess.class, oObj); oNames = oNameAccess.getElementNames(); /* Some Objects can't replace the firsr that comes along, i.e. diff --git a/qadevOOo/tests/java/ifc/document/_Settings.java b/qadevOOo/tests/java/ifc/document/_Settings.java index 4a8dde8fb10e..7d6c3937a7d4 100644 --- a/qadevOOo/tests/java/ifc/document/_Settings.java +++ b/qadevOOo/tests/java/ifc/document/_Settings.java @@ -61,7 +61,7 @@ public class _Settings extends MultiPropertyTest { Exception ex = null; try { - Class cPrinterJob = Class.forName("java.awt.print.PrinterJob"); + Class<?> cPrinterJob = Class.forName("java.awt.print.PrinterJob"); Method lookupMethod = cPrinterJob.getDeclaredMethod("lookupPrintServices", new Class[0]); Object retValue = lookupMethod.invoke(cPrinterJob, new Object[0]); oServices = (Object[])retValue; @@ -146,12 +146,12 @@ public class _Settings extends MultiPropertyTest { private String getPrinterNameWithReflection(Object pService) { String pName = null; try { - Class cPrintService = Class.forName("javax.print.PrintService"); + Class<?> cPrintService = Class.forName("javax.print.PrintService"); Method getNameMethod = cPrintService.getDeclaredMethod("getName", new Class[0]); Object retValue = getNameMethod.invoke(pService, new Object[0]); pName = (String)retValue; } - // ignore all excptions: we already ran into one of these if Java is too old + // ignore all exceptions: we already ran into one of these if Java is too old catch(java.lang.ClassNotFoundException e) { } catch(java.lang.NoSuchMethodException e) { diff --git a/qadevOOo/tests/java/ifc/document/_XDocumentInfoSupplier.java b/qadevOOo/tests/java/ifc/document/_XDocumentInfoSupplier.java index b92d50eef7cf..5810ae83dabf 100644 --- a/qadevOOo/tests/java/ifc/document/_XDocumentInfoSupplier.java +++ b/qadevOOo/tests/java/ifc/document/_XDocumentInfoSupplier.java @@ -32,13 +32,13 @@ public class _XDocumentInfoSupplier extends MultiMethodTest { public void _getDocumentInfo() { // returns a com.sun.star.document.DocumentInfo XDocumentInfo info = oObj.getDocumentInfo(); - XPropertySet xPropertySet = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, info); + XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, info); String title = null; try { title = (String)xPropertySet.getPropertyValue("Title"); } catch(Exception e) { - e.printStackTrace((java.io.PrintWriter)log); + e.printStackTrace(log); title = null; } log.println("Got document title: " + title); diff --git a/qadevOOo/tests/java/ifc/document/_XStandaloneDocumentInfo.java b/qadevOOo/tests/java/ifc/document/_XStandaloneDocumentInfo.java index d07f60b0a190..88f60d43573a 100644 --- a/qadevOOo/tests/java/ifc/document/_XStandaloneDocumentInfo.java +++ b/qadevOOo/tests/java/ifc/document/_XStandaloneDocumentInfo.java @@ -60,8 +60,7 @@ public class _XStandaloneDocumentInfo extends MultiMethodTest { public void _storeIntoURL() { try { oObj.loadFromURL(url); - XPropertySet propSet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oObj); + XPropertySet propSet = UnoRuntime.queryInterface(XPropertySet.class, oObj); oldProp = (String)propSet.getPropertyValue("Author"); newProp = oldProp + "_"; propSet.setPropertyValue("Author", newProp); @@ -98,8 +97,7 @@ public class _XStandaloneDocumentInfo extends MultiMethodTest { requiredMethod("storeIntoURL()"); try { oObj.loadFromURL(url); - XPropertySet propSet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oObj); + XPropertySet propSet = UnoRuntime.queryInterface(XPropertySet.class, oObj); String resProp = (String)propSet.getPropertyValue("Author"); log.println("Was: '" + oldProp + "',Set: '" + newProp + "', New: " + resProp + "'"); diff --git a/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java b/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java index e5966fbd189b..62a56e1d1a56 100644 --- a/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java +++ b/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java @@ -86,7 +86,7 @@ public class _XViewDataSupplier extends MultiMethodTest { } } catch(Exception e) { - e.printStackTrace((java.io.PrintWriter)log); + e.printStackTrace(log); } } @@ -107,7 +107,7 @@ public class _XViewDataSupplier extends MultiMethodTest { } } catch(Exception e) { - e.printStackTrace((java.io.PrintWriter)log); + e.printStackTrace(log); } return retValue; } diff --git a/qadevOOo/tests/java/ifc/drawing/_LineShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_LineShapeDescriptor.java index a44cd890f18b..feb8a8d8847a 100644 --- a/qadevOOo/tests/java/ifc/drawing/_LineShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_LineShapeDescriptor.java @@ -33,8 +33,7 @@ public class _LineShapeDescriptor extends MultiMethodTest { public void _LineColor() { - XServiceInfo xInfo = (XServiceInfo) - UnoRuntime.queryInterface(XServiceInfo.class, oObj); + XServiceInfo xInfo = UnoRuntime.queryInterface(XServiceInfo.class, oObj); if ( ! xInfo.supportsService ("com.sun.star.drawing.LineShapeDescriptor")) { log.println("Service not available !!!!!!!!!!!!!"); diff --git a/qadevOOo/tests/java/ifc/drawing/_ShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_ShapeDescriptor.java index 083b6e5707c2..5e3049c73495 100644 --- a/qadevOOo/tests/java/ifc/drawing/_ShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_ShapeDescriptor.java @@ -32,9 +32,8 @@ public class _ShapeDescriptor extends MultiMethodTest { public boolean ro = false; public void _LayerID() { - com.sun.star.lang.XServiceInfo xInfo = (com.sun.star.lang.XServiceInfo) - UnoRuntime.queryInterface - (com.sun.star.lang.XServiceInfo.class, oObj); + com.sun.star.lang.XServiceInfo xInfo = UnoRuntime.queryInterface + (com.sun.star.lang.XServiceInfo.class, oObj); if ( ! xInfo.supportsService("com.sun.star.drawing.ShapeDescriptor")) { log.println("Service not available !!!!!!!!!!!!!"); tRes.tested("Supported", false); diff --git a/qadevOOo/tests/java/ifc/drawing/_XShape.java b/qadevOOo/tests/java/ifc/drawing/_XShape.java index d0dd93675654..cff0c553e414 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XShape.java +++ b/qadevOOo/tests/java/ifc/drawing/_XShape.java @@ -63,7 +63,7 @@ public class _XShape extends MultiMethodTest { log.println("get the size"); - sOld = (Size) oObj.getSize(); + sOld = oObj.getSize(); result = true; tRes.tested("getSize()", result); @@ -88,7 +88,7 @@ public class _XShape extends MultiMethodTest { } log.println("get the position"); - pOld = (Point) oObj.getPosition(); + pOld = oObj.getPosition(); result = true; tRes.tested("getPosition()", result); diff --git a/qadevOOo/tests/java/ifc/drawing/_XShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_XShapeDescriptor.java index 515cdeee06d6..0356d53c2636 100644 --- a/qadevOOo/tests/java/ifc/drawing/_XShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_XShapeDescriptor.java @@ -53,8 +53,7 @@ public class _XShapeDescriptor extends MultiMethodTest { String stype = oObj.getShapeType(); log.println("Current Shape Type is " + stype); - XServiceInfo SI = (XServiceInfo) - UnoRuntime.queryInterface(XServiceInfo.class, oObj); + XServiceInfo SI = UnoRuntime.queryInterface(XServiceInfo.class, oObj); String[] serviceNames = SI.getSupportedServiceNames(); diff --git a/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java index 80e888516d99..4868f75f29e5 100644 --- a/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java +++ b/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java @@ -55,7 +55,7 @@ public class _XDatabaseParameterBroadcaster extends MultiMethodTest { protected void before() { listenerChecker = (CheckParameterListener) tEnv.getObjRelation("ParameterListenerChecker"); - listenerChecker.setLog((PrintWriter)log); + listenerChecker.setLog(log); } /** @@ -78,7 +78,7 @@ public class _XDatabaseParameterBroadcaster extends MultiMethodTest { catch(com.sun.star.sdbc.SQLException e) { log.println("Exception in XDatabaseParameterBroadcaster test."); log.println("This does not let the test fail, but should be inquired."); - e.printStackTrace((PrintWriter)log); + e.printStackTrace(log); } // was the listener called? oObj.removeParameterListener(listenerChecker); diff --git a/qadevOOo/tests/java/ifc/form/_XSubmit.java b/qadevOOo/tests/java/ifc/form/_XSubmit.java index 337582e0d593..899155c2a808 100644 --- a/qadevOOo/tests/java/ifc/form/_XSubmit.java +++ b/qadevOOo/tests/java/ifc/form/_XSubmit.java @@ -114,7 +114,7 @@ public class _XSubmit extends MultiMethodTest { log.println("Testing submit() ..."); XControl cntrl = (XControl) tEnv.getObjRelation("XSubmit.Control") ; - XPropertySet xPS = (XPropertySet) UnoRuntime.queryInterface + XPropertySet xPS = UnoRuntime.queryInterface (XPropertySet.class, oObj) ; if (xPS != null) { diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java index 57d7cb756dcf..4b30bce6ebfc 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java @@ -81,7 +81,7 @@ public class _XDispatchRecorderSupplier extends MultiMethodTest { log.println( "creating a text document" ); xTextDoc = SOF.createTextDoc(null); - Object inst = (XInterface)((XMultiServiceFactory)tParam.getMSF()).createInstance + Object inst = ((XMultiServiceFactory)tParam.getMSF()).createInstance ("com.sun.star.frame.Desktop"); desktop = UnoRuntime.queryInterface (XDesktop.class, inst); diff --git a/qadevOOo/tests/java/ifc/frame/_XStorable.java b/qadevOOo/tests/java/ifc/frame/_XStorable.java index b5ea65c4ab15..86a4eabc11f2 100644 --- a/qadevOOo/tests/java/ifc/frame/_XStorable.java +++ b/qadevOOo/tests/java/ifc/frame/_XStorable.java @@ -129,7 +129,7 @@ public class _XStorable extends MultiMethodTest { */ public void _storeAsURL() { // getting an url to store - String url = (String) utils.getOfficeTemp( + String url = utils.getOfficeTemp( (XMultiServiceFactory)tParam.getMSF()); if (url != null) { @@ -157,7 +157,7 @@ public class _XStorable extends MultiMethodTest { */ public void _storeToURL() { // getting an url to store - String url = (String) utils.getOfficeTemp( + String url = utils.getOfficeTemp( (XMultiServiceFactory)tParam.getMSF()); if (url != null) { diff --git a/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java b/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java index 333838d3ec72..3422d06d4e54 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java +++ b/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java @@ -49,7 +49,7 @@ public class _XExtendedTransliteration extends MultiMethodTest { result &= out == '$'; } catch(com.sun.star.i18n.MultipleCharsOutputException e) { - e.printStackTrace((java.io.PrintWriter)log); + e.printStackTrace(log); } tRes.tested("transliterateChar2Char()", result); } diff --git a/qadevOOo/tests/java/ifc/io/_XActiveDataSink.java b/qadevOOo/tests/java/ifc/io/_XActiveDataSink.java index 975f55d64254..10a503780514 100644 --- a/qadevOOo/tests/java/ifc/io/_XActiveDataSink.java +++ b/qadevOOo/tests/java/ifc/io/_XActiveDataSink.java @@ -55,7 +55,7 @@ public class _XActiveDataSink extends MultiMethodTest { */ public void before() { XInterface x = (XInterface)tEnv.getObjRelation("InputStream"); - iStream = (XInputStream) UnoRuntime.queryInterface + iStream = UnoRuntime.queryInterface (XInputStream.class, x) ; } diff --git a/qadevOOo/tests/java/ifc/io/_XDataInputStream.java b/qadevOOo/tests/java/ifc/io/_XDataInputStream.java index cb96c3ca11a6..2671b4baf620 100644 --- a/qadevOOo/tests/java/ifc/io/_XDataInputStream.java +++ b/qadevOOo/tests/java/ifc/io/_XDataInputStream.java @@ -81,7 +81,7 @@ public class _XDataInputStream extends MultiMethodTest { XInterface x = (XInterface)tEnv.getObjRelation("StreamWriter") ; oStream = UnoRuntime.queryInterface( XDataOutputStream.class, x); - List data = (List) tEnv.getObjRelation("StreamData") ; + List<Object> data = (List<Object>) tEnv.getObjRelation("StreamData") ; if (data == null || oStream == null) { throw new StatusException(Status.failed("Object relation not found.")); } diff --git a/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java b/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java index 293c872d43e0..bb8db3113690 100644 --- a/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java +++ b/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java @@ -70,7 +70,7 @@ public class _XDataOutputStream extends MultiMethodTest { */ public void before() throws RuntimeException { - List data = (List) tEnv.getObjRelation("StreamData") ; + List<Object> data = (List<Object>) tEnv.getObjRelation("StreamData") ; if (data == null) { throw new RuntimeException("Object relation 'StreamData' not found."); } diff --git a/qadevOOo/tests/java/ifc/io/_XObjectInputStream.java b/qadevOOo/tests/java/ifc/io/_XObjectInputStream.java index 04858de3093c..01235e3d39d8 100644 --- a/qadevOOo/tests/java/ifc/io/_XObjectInputStream.java +++ b/qadevOOo/tests/java/ifc/io/_XObjectInputStream.java @@ -95,10 +95,10 @@ public class _XObjectInputStream extends MultiMethodTest { XPropertySet props1 = null ; XPropertySet props2 = null ; - props1 = (XPropertySet) UnoRuntime.queryInterface + props1 = UnoRuntime.queryInterface (XPropertySet.class, objRead) ; - props2 = (XPropertySet) UnoRuntime.queryInterface + props2 = UnoRuntime.queryInterface (XPropertySet.class, objWrite) ; if (props1 == null) { diff --git a/qadevOOo/tests/java/ifc/io/_XObjectOutputStream.java b/qadevOOo/tests/java/ifc/io/_XObjectOutputStream.java index 1215a7331508..86efebe52c66 100644 --- a/qadevOOo/tests/java/ifc/io/_XObjectOutputStream.java +++ b/qadevOOo/tests/java/ifc/io/_XObjectOutputStream.java @@ -66,8 +66,7 @@ public class _XObjectOutputStream extends MultiMethodTest { if (objWrite == null) throw new StatusException(Status.failed("Relation 'PersistObject' failed")); - XPropertySet propObjWrite = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, objWrite); + XPropertySet propObjWrite = UnoRuntime.queryInterface(XPropertySet.class, objWrite); // This XPersistObject has a property called 'String' propObjWrite.setPropertyValue("String", "XObjectOutputStream"); @@ -75,8 +74,7 @@ public class _XObjectOutputStream extends MultiMethodTest { log.println("Writing object with label 'XObjectOutputStream'"); oObj.writeObject(objWrite); XPersistObject readObj = oInStream.readObject(); - XPropertySet propSet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, readObj); + XPropertySet propSet = UnoRuntime.queryInterface(XPropertySet.class, readObj); String label = (String)propSet.getPropertyValue("String"); log.println("Object with label '" + label + "' was read"); diff --git a/qadevOOo/tests/java/ifc/io/_XPersistObject.java b/qadevOOo/tests/java/ifc/io/_XPersistObject.java index fe8f9c162fd9..a21da9bd32e4 100644 --- a/qadevOOo/tests/java/ifc/io/_XPersistObject.java +++ b/qadevOOo/tests/java/ifc/io/_XPersistObject.java @@ -111,19 +111,18 @@ public class _XPersistObject extends MultiMethodTest { try { Object noPS = tEnv.getObjRelation("noPS"); if ( noPS == null) { - XPropertySet objps = (XPropertySet)UnoRuntime.queryInterface( + XPropertySet objps = UnoRuntime.queryInterface( XPropertySet.class, oObj); XPropertySetInfo objpsi = objps.getPropertySetInfo(); Property[] objprops = objpsi.getProperties(); Object oCopy = ((XMultiServiceFactory)tParam.getMSF()).createInstance(sname); - XPersistObject persCopy = (XPersistObject) - UnoRuntime.queryInterface(XPersistObject.class, oCopy); + XPersistObject persCopy = UnoRuntime.queryInterface(XPersistObject.class, oCopy); persCopy.read(iStream); - XPropertySet copyps = (XPropertySet)UnoRuntime.queryInterface( + XPropertySet copyps = UnoRuntime.queryInterface( XPropertySet.class, oCopy); XPropertySetInfo copypsi = copyps.getPropertySetInfo(); @@ -158,8 +157,7 @@ public class _XPersistObject extends MultiMethodTest { } } else { Object oCopy = ((XMultiServiceFactory)tParam.getMSF()).createInstance(sname); - XPersistObject persCopy = (XPersistObject) - UnoRuntime.queryInterface(XPersistObject.class, oCopy); + XPersistObject persCopy = UnoRuntime.queryInterface(XPersistObject.class, oCopy); persCopy.read(iStream); @@ -219,11 +217,9 @@ public class _XPersistObject extends MultiMethodTest { XActiveDataSink xdSmi = UnoRuntime.queryInterface(XActiveDataSink.class, mistream); XActiveDataSource xdSmo = UnoRuntime.queryInterface(XActiveDataSource.class, mostream); - XInputStream miStream = (XInputStream) - UnoRuntime.queryInterface(XInputStream.class, mistream); + XInputStream miStream = UnoRuntime.queryInterface(XInputStream.class, mistream); XOutputStream moStream = UnoRuntime.queryInterface(XOutputStream.class, mostream); - XInputStream PipeIn = (XInputStream) - UnoRuntime.queryInterface(XInputStream.class, aPipe); + XInputStream PipeIn = UnoRuntime.queryInterface(XInputStream.class, aPipe); XOutputStream PipeOut = UnoRuntime.queryInterface(XOutputStream.class,aPipe); xdSi.setInputStream(miStream); diff --git a/qadevOOo/tests/java/ifc/lang/_XSingleServiceFactory.java b/qadevOOo/tests/java/ifc/lang/_XSingleServiceFactory.java index 6fde194d8298..208e91c1b0d8 100644 --- a/qadevOOo/tests/java/ifc/lang/_XSingleServiceFactory.java +++ b/qadevOOo/tests/java/ifc/lang/_XSingleServiceFactory.java @@ -55,7 +55,7 @@ import com.sun.star.uno.UnoRuntime; public class _XSingleServiceFactory extends MultiMethodTest { public XSingleServiceFactory oObj = null; - private Class[] mustSupport = null ; + private Class<?>[] mustSupport = null ; public void before() { mustSupport = (Class[]) tEnv.getObjRelation diff --git a/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java b/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java index 9135865fc5a7..91557d92a6a5 100644 --- a/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java +++ b/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java @@ -145,7 +145,7 @@ public class _XImplementationLoader extends MultiMethodTest { throw new StatusException("Can not activate factory", e) ; } - XServiceInfo xServInf = (XServiceInfo) UnoRuntime.queryInterface + XServiceInfo xServInf = UnoRuntime.queryInterface (XServiceInfo.class, factory) ; if (xServInf == null) { diff --git a/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory.java b/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory.java index c3b6b7ca4a0f..0eab955df86b 100644 --- a/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory.java +++ b/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory.java @@ -70,7 +70,7 @@ public class _XInvocationAdapterFactory extends MultiMethodTest { Object oInvFac = xMSF.createInstance ("com.sun.star.script.Invocation") ; - XSingleServiceFactory xInvFac = (XSingleServiceFactory) UnoRuntime. + XSingleServiceFactory xInvFac = UnoRuntime. queryInterface(XSingleServiceFactory.class, oInvFac) ; Object oInv = xInvFac.createInstanceWithArguments(args) ; @@ -88,7 +88,7 @@ public class _XInvocationAdapterFactory extends MultiMethodTest { Object adp = oObj.createAdapter(xInv, new Type(XInputStream.class)) ; - xInStr = (XInterface) UnoRuntime.queryInterface + xInStr = UnoRuntime.queryInterface (XInputStream.class, adp) ; diff --git a/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory2.java b/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory2.java index 4f739caebf3f..c9a381aa2587 100644 --- a/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory2.java +++ b/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory2.java @@ -70,7 +70,7 @@ public class _XInvocationAdapterFactory2 extends MultiMethodTest { Object oInvFac = xMSF.createInstance ("com.sun.star.script.Invocation") ; - XSingleServiceFactory xInvFac = (XSingleServiceFactory) UnoRuntime. + XSingleServiceFactory xInvFac = UnoRuntime. queryInterface(XSingleServiceFactory.class, oInvFac) ; Object oInv = xInvFac.createInstanceWithArguments(args) ; @@ -90,7 +90,7 @@ public class _XInvocationAdapterFactory2 extends MultiMethodTest { Object adp = oObj.createAdapter(xInv,types); - xInStr = (XInterface) UnoRuntime.queryInterface + xInStr = UnoRuntime.queryInterface (XInputStream.class, adp) ; diff --git a/qadevOOo/tests/java/ifc/sdb/_DataAccessDescriptor.java b/qadevOOo/tests/java/ifc/sdb/_DataAccessDescriptor.java index 450b4b5af02d..f8f2d94a5b43 100644 --- a/qadevOOo/tests/java/ifc/sdb/_DataAccessDescriptor.java +++ b/qadevOOo/tests/java/ifc/sdb/_DataAccessDescriptor.java @@ -76,16 +76,16 @@ public class _DataAccessDescriptor extends MultiPropertyTest { try{ log.println("try to get value from property..."); - XConnection oldValue = (XConnection) UnoRuntime.queryInterface(XConnection.class,oObj.getPropertyValue(propName)); + XConnection oldValue = UnoRuntime.queryInterface(XConnection.class,oObj.getPropertyValue(propName)); log.println("try to get value from object relation..."); - XConnection newValue = (XConnection) UnoRuntime.queryInterface(XConnection.class,tEnv.getObjRelation("DataAccessDescriptor.XConnection")); + XConnection newValue = UnoRuntime.queryInterface(XConnection.class,tEnv.getObjRelation("DataAccessDescriptor.XConnection")); log.println("set property to a new value..."); oObj.setPropertyValue(propName, newValue); log.println("get the new value..."); - XConnection getValue = (XConnection) UnoRuntime.queryInterface(XConnection.class,oObj.getPropertyValue(propName)); + XConnection getValue = UnoRuntime.queryInterface(XConnection.class,oObj.getPropertyValue(propName)); tRes.tested(propName, this.compare(newValue, getValue)); } catch (com.sun.star.beans.PropertyVetoException e){ diff --git a/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java b/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java index 177f38be86fb..28c03caf8618 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java +++ b/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java @@ -52,7 +52,7 @@ public class _XCompletedExecution extends MultiMethodTest { tEnv.getObjRelation("InteractionHandlerChecker"); if (checkHandler == null) throw new StatusException("Missing object relation 'InteractionHandlerChecker'", new Exception()); - checkHandler.setLog((PrintWriter)log); + checkHandler.setLog(log); } @@ -61,7 +61,7 @@ public class _XCompletedExecution extends MultiMethodTest { oObj.executeWithCompletion(checkHandler); } catch(com.sun.star.sdbc.SQLException e) { - e.printStackTrace((PrintWriter)log); + e.printStackTrace(log); tRes.tested("executeWithCompletion()", false); return; } diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java index e5c901cb56c2..8ba1702e3b44 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java +++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java @@ -81,9 +81,8 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { } - xProp = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, - tEnv.getObjRelation("xProp")); + xProp = UnoRuntime.queryInterface(XPropertySet.class, + tEnv.getObjRelation("xProp")); if (xProp == null) { throw new StatusException(Status.failed( diff --git a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java index 06b50e2ccb38..e9d9774c0688 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java @@ -95,13 +95,13 @@ public class _XParameters extends MultiMethodTest { // oObj filled by MultiMethodTest public XParameters oObj = null ; - private List data = null ; + private List<Object> data = null ; /** * Gets object relation */ public void before() { - data = (List) tEnv.getObjRelation("XParameters.ParamValues") ; + data = (List<Object>) tEnv.getObjRelation("XParameters.ParamValues") ; if (data == null) { log.println("!!! Relation not found !!!") ; } @@ -402,7 +402,7 @@ public class _XParameters extends MultiMethodTest { try { Object oStream = ((XMultiServiceFactory)tParam.getMSF()). createInstance("com.sun.star.io.DataInputStream") ; - XInputStream xStream = (XInputStream)UnoRuntime.queryInterface + XInputStream xStream = UnoRuntime.queryInterface (XInputStream.class, oStream); oObj.setBinaryStream(idx, xStream, 2) ; @@ -432,7 +432,7 @@ public class _XParameters extends MultiMethodTest { try { Object oStream = ((XMultiServiceFactory)tParam.getMSF()) .createInstance("com.sun.star.io.TextInputStream") ; - XInputStream xStream = (XInputStream)UnoRuntime.queryInterface + XInputStream xStream = UnoRuntime.queryInterface (XInputStream.class, oStream); oObj.setCharacterStream(idx, xStream, 2) ; @@ -553,8 +553,7 @@ public class _XParameters extends MultiMethodTest { * Finds in relation vector index of parameter of the appropriate * type. */ - private int findParamOfType(Class clz) { - + private int findParamOfType(Class<?> clz) { for (int i = 0; i < data.size(); i++) if (clz.isInstance(data.get(i))) return i + 1 ; return -1 ; diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRow.java b/qadevOOo/tests/java/ifc/sdbc/_XRow.java index 12f4f22fca55..fa1d1b89fda0 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XRow.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XRow.java @@ -95,14 +95,14 @@ public class _XRow extends MultiMethodTest { // oObj filled by MultiMethodTest public XRow oObj = null ; - private List data = null ; + private List<Object> data = null ; private boolean notNullRes = true ; /** * Retrieves object relation first. */ public void before() { - data = (List) tEnv.getObjRelation("CurrentRowData") ; + data = (List<Object>) tEnv.getObjRelation("CurrentRowData") ; } /** @@ -524,7 +524,7 @@ public class _XRow extends MultiMethodTest { * Finds in relation vector index of column of the appropriate * type. */ - protected int findColumnOfType(Class clz) { + protected int findColumnOfType(Class<?> clz) { for (int i = 0; i < data.size(); i++) if (clz.isInstance(data.get(i))) return i + 1 ; diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java index b08cd9256ebb..53cd93d9fa5b 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java @@ -93,14 +93,14 @@ public class _XRowUpdate extends MultiMethodTest { // oObj filled by MultiMethodTest public XRowUpdate oObj = null ; - private List rowData = null ; + private List<Object> rowData = null ; private XRow row = null ; /** * Gets relations. */ public void before() { - rowData = (List) tEnv.getObjRelation("CurrentRowData") ; + rowData = (List<Object>) tEnv.getObjRelation("CurrentRowData") ; if (rowData == null) { log.println("!!! 'CurrentRowData' relation not found !!!") ; } @@ -538,7 +538,7 @@ public class _XRowUpdate extends MultiMethodTest { try { Object oStream = ((XMultiServiceFactory)tParam.getMSF()). createInstance("com.sun.star.io.DataInputStream") ; - XInputStream newVal = (XInputStream) UnoRuntime.queryInterface + XInputStream newVal = UnoRuntime.queryInterface (XInputStream.class, oStream); oObj.updateBinaryStream(idx, newVal, 0) ; @@ -575,7 +575,7 @@ public class _XRowUpdate extends MultiMethodTest { try { Object oStream = ((XMultiServiceFactory)tParam.getMSF()). createInstance("com.sun.star.io.TextInputStream") ; - XInputStream newVal = (XInputStream) UnoRuntime.queryInterface + XInputStream newVal = UnoRuntime.queryInterface (XInputStream.class, oStream); oObj.updateCharacterStream(idx, newVal, 0) ; @@ -667,7 +667,7 @@ public class _XRowUpdate extends MultiMethodTest { * Finds in relation vector index of column of the appropriate * type. */ - protected int findColumnOfType(Class clz) { + protected int findColumnOfType(Class<?> clz) { for (int i = 0; i < rowData.size(); i++) if (clz.isInstance(rowData.get(i))) return i + 1 ; diff --git a/qadevOOo/tests/java/ifc/sdbcx/_XTablesSupplier.java b/qadevOOo/tests/java/ifc/sdbcx/_XTablesSupplier.java index eec83adea83b..ca61c91d2977 100644 --- a/qadevOOo/tests/java/ifc/sdbcx/_XTablesSupplier.java +++ b/qadevOOo/tests/java/ifc/sdbcx/_XTablesSupplier.java @@ -56,7 +56,7 @@ public class _XTablesSupplier extends MultiMethodTest { XServiceInfo info = null ; try { - info = (XServiceInfo) UnoRuntime.queryInterface + info = UnoRuntime.queryInterface (XServiceInfo.class, tabs.getByName(tabNames[0])) ; } catch (com.sun.star.uno.Exception e) {} diff --git a/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java b/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java index e70f92d49c9a..8787a2844d40 100644 --- a/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java +++ b/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java @@ -50,8 +50,7 @@ public class _FunctionDescription extends MultiMethodTest { public void _Arguments() { // check if Service is available - XServiceInfo xInfo = (XServiceInfo) - UnoRuntime.queryInterface(XServiceInfo.class, oObj ); + XServiceInfo xInfo = UnoRuntime.queryInterface(XServiceInfo.class, oObj ); if ( ! xInfo.supportsService ( "com.sun.star.sheet.FunctionDescription" ) ) { diff --git a/qadevOOo/tests/java/ifc/sheet/_Scenario.java b/qadevOOo/tests/java/ifc/sheet/_Scenario.java index 8d67c1455c34..ce01ebf4d91d 100644 --- a/qadevOOo/tests/java/ifc/sheet/_Scenario.java +++ b/qadevOOo/tests/java/ifc/sheet/_Scenario.java @@ -25,7 +25,7 @@ import lib.MultiPropertyTest; public class _Scenario extends MultiPropertyTest { public void before() { - oObj = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, + oObj = UnoRuntime.queryInterface(XPropertySet.class, tEnv.getObjRelation( "ScenarioSheet")); } diff --git a/qadevOOo/tests/java/ifc/sheet/_Shape.java b/qadevOOo/tests/java/ifc/sheet/_Shape.java index beed8da55061..c5def63c4379 100644 --- a/qadevOOo/tests/java/ifc/sheet/_Shape.java +++ b/qadevOOo/tests/java/ifc/sheet/_Shape.java @@ -36,7 +36,7 @@ public class _Shape extends MultiPropertyTest { XCell xCell = null; try { - xSheet = (XSpreadsheet) UnoRuntime.queryInterface( + xSheet = UnoRuntime.queryInterface( XSpreadsheet.class, xSheetDoc.getSheets().getByName(sheetNames[0])); xCell = xSheet.getCellByPosition(0, 0); diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellRangeMovement.java b/qadevOOo/tests/java/ifc/sheet/_XCellRangeMovement.java index 837b2ecea427..3bb40649889b 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XCellRangeMovement.java +++ b/qadevOOo/tests/java/ifc/sheet/_XCellRangeMovement.java @@ -58,8 +58,7 @@ public class _XCellRangeMovement extends MultiMethodTest { */ public void _copyRange(){ log.println("Prepare cells before test methods."); - XSpreadsheet oSheet = (XSpreadsheet) - UnoRuntime.queryInterface(XSpreadsheet.class, oObj); + XSpreadsheet oSheet = UnoRuntime.queryInterface(XSpreadsheet.class, oObj); try { oSheet.getCellByPosition(1,1).setValue(100); oSheet.getCellByPosition(1,2).setValue(200); @@ -106,8 +105,7 @@ public class _XCellRangeMovement extends MultiMethodTest { public void _insertCells(){ boolean result = false; - XSpreadsheet oSheet = (XSpreadsheet) - UnoRuntime.queryInterface(XSpreadsheet.class, oObj); + XSpreadsheet oSheet = UnoRuntime.queryInterface(XSpreadsheet.class, oObj); XCellRangeAddressable oAddr = UnoRuntime.queryInterface (XCellRangeAddressable.class, oObj); short iSheet = oAddr.getRangeAddress().Sheet; try { @@ -129,7 +127,7 @@ public class _XCellRangeMovement extends MultiMethodTest { "Delete old cells now"); XColumnRowRange oColumnRowRange = UnoRuntime.queryInterface(XColumnRowRange.class, oSheet); - XTableRows oRows = (XTableRows) oColumnRowRange.getRows(); + XTableRows oRows = oColumnRowRange.getRows(); oRows.removeByIndex(21,1); } CellRangeAddress sSrc = new CellRangeAddress(iSheet, 0, 21, 5, 21); @@ -157,8 +155,7 @@ public class _XCellRangeMovement extends MultiMethodTest { public void _moveRange(){ boolean result = false; - XSpreadsheet oSheet = (XSpreadsheet) - UnoRuntime.queryInterface(XSpreadsheet.class, oObj); + XSpreadsheet oSheet = UnoRuntime.queryInterface(XSpreadsheet.class, oObj); XCellRangeAddressable oAddr = UnoRuntime.queryInterface (XCellRangeAddressable.class, oObj); @@ -199,8 +196,7 @@ public class _XCellRangeMovement extends MultiMethodTest { public void _removeRange(){ boolean result = false; - XSpreadsheet oSheet = (XSpreadsheet) - UnoRuntime.queryInterface(XSpreadsheet.class, oObj); + XSpreadsheet oSheet = UnoRuntime.queryInterface(XSpreadsheet.class, oObj); XCellRangeAddressable oAddr = UnoRuntime.queryInterface (XCellRangeAddressable.class, oObj); short iSheet = oAddr.getRangeAddress().Sheet; try { diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery.java b/qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery.java index 0a9636a680c3..225e0f97766f 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery.java +++ b/qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery.java @@ -71,7 +71,7 @@ public class _XCellRangesQuery extends MultiMethodTest { if (oSheet == null) { log.println("Object relation oSheet is missing"); log.println("Trying to query the needed Interface"); - oSheet = (XSpreadsheet) UnoRuntime.queryInterface( + oSheet = UnoRuntime.queryInterface( XSpreadsheet.class, tEnv.getTestObject()); if (oSheet == null) { @@ -87,8 +87,8 @@ public class _XCellRangesQuery extends MultiMethodTest { XColumnRowRange oColumnRowRange = UnoRuntime.queryInterface( XColumnRowRange.class, oSheet); - oRows = (XTableRows)oColumnRowRange.getRows(); - oColumns = (XTableColumns) oColumnRowRange.getColumns(); + oRows = oColumnRowRange.getRows(); + oColumns = oColumnRowRange.getColumns(); // set this in object if the interface has to make its own settings // and the environment has to be disposed: this is necessary for objects @@ -266,7 +266,7 @@ public class _XCellRangesQuery extends MultiMethodTest { protected void setRowVisible(boolean vis) { try { - XPropertySet rowProp = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet rowProp = UnoRuntime.queryInterface( XPropertySet.class, oRows.getByIndex(0)); rowProp.setPropertyValue("IsVisible", new Boolean(vis)); diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellSeries.java b/qadevOOo/tests/java/ifc/sheet/_XCellSeries.java index fcc8d72c1889..6152d2c243ee 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XCellSeries.java +++ b/qadevOOo/tests/java/ifc/sheet/_XCellSeries.java @@ -42,7 +42,7 @@ public class _XCellSeries extends MultiMethodTest { if (oSheet == null) { log.println("Object relation oSheet is missing"); log.println("Trying to query the needed Interface"); - oSheet = (XSpreadsheet) UnoRuntime.queryInterface( + oSheet = UnoRuntime.queryInterface( XSpreadsheet.class, tEnv.getTestObject()); if (oSheet == null) { diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java index 92c50495e3d9..99d4856903cf 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java @@ -204,8 +204,7 @@ public class _XDataPilotDescriptor extends MultiMethodTest { fieldsNames[cnt] = name ; - XPropertySet props = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, field); + XPropertySet props = UnoRuntime.queryInterface(XPropertySet.class, field); try { switch (cnt % 5) { diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotFieldGrouping.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotFieldGrouping.java index c08960529c73..be4fb06fecaf 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotFieldGrouping.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotFieldGrouping.java @@ -38,7 +38,7 @@ public class _XDataPilotFieldGrouping extends MultiMethodTest boolean result = true; try { XDataPilotField xDataPilotField = UnoRuntime.queryInterface(XDataPilotField.class, oObj); - XNameAccess xNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, xDataPilotField.getItems ()); + XNameAccess xNameAccess = UnoRuntime.queryInterface(XNameAccess.class, xDataPilotField.getItems ()); String[] elements = xNameAccess.getElementNames (); oObj.createNameGroup(elements); } catch (com.sun.star.lang.IllegalArgumentException e) { diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java index 18d33a96334b..da56fbb3071c 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java @@ -217,7 +217,7 @@ public class _XDataPilotTable2 extends MultiMethodTest XSpreadsheet xSheet = null; try { - xSheet = (XSpreadsheet)UnoRuntime.queryInterface( + xSheet = UnoRuntime.queryInterface( XSpreadsheet.class, xIA.getByIndex(addr.Sheet)); } catch (com.sun.star.uno.Exception e) @@ -425,7 +425,7 @@ public class _XDataPilotTable2 extends MultiMethodTest try { Object field = xFields.getByIndex(i); - XPropertySet propSet = (XPropertySet)UnoRuntime.queryInterface( + XPropertySet propSet = UnoRuntime.queryInterface( XPropertySet.class, field); DataPilotFieldOrientation orient = (DataPilotFieldOrientation)propSet.getPropertyValue("Orientation"); diff --git a/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java b/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java index 936351a30353..6f9da14a34ec 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java @@ -59,10 +59,10 @@ public class _XDocumentAuditing extends MultiMethodTest { XSpreadsheets oSheets = xSpreadsheetDocument.getSheets(); XIndexAccess oIndexSheets = UnoRuntime.queryInterface( XIndexAccess.class, oSheets); - XSpreadsheet oSheet = (XSpreadsheet) UnoRuntime.queryInterface( + XSpreadsheet oSheet = UnoRuntime.queryInterface( XSpreadsheet.class, oIndexSheets.getByIndex(0)); xSheet[0] = oSheet; - oSheet = (XSpreadsheet) UnoRuntime.queryInterface( + oSheet = UnoRuntime.queryInterface( XSpreadsheet.class, oIndexSheets.getByIndex(1)); xSheet[1] = oSheet; } @@ -85,7 +85,7 @@ public class _XDocumentAuditing extends MultiMethodTest { try { XDrawPagesSupplier oDPS = UnoRuntime.queryInterface(XDrawPagesSupplier.class, oObj); Object o = oDPS.getDrawPages().getByIndex(1); - xDrawPage = (XDrawPage)UnoRuntime.queryInterface(XDrawPage.class, o); + xDrawPage = UnoRuntime.queryInterface(XDrawPage.class, o); } catch(com.sun.star.lang.IndexOutOfBoundsException e) { } // ignore exceptions, we'll run into next if statement anyway diff --git a/qadevOOo/tests/java/ifc/sheet/_XFormulaQuery.java b/qadevOOo/tests/java/ifc/sheet/_XFormulaQuery.java index 989e3e3cdce3..5a9d5bd53b72 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XFormulaQuery.java +++ b/qadevOOo/tests/java/ifc/sheet/_XFormulaQuery.java @@ -50,7 +50,7 @@ public class _XFormulaQuery extends MultiMethodTest { if (oSheet == null) { log.println("Object relation oSheet is missing"); log.println("Trying to query the needed Interface"); - oSheet = (XSpreadsheet) UnoRuntime.queryInterface( + oSheet = UnoRuntime.queryInterface( XSpreadsheet.class, tEnv.getTestObject()); if (oSheet == null) { diff --git a/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java b/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java index 6b7ddd18b203..d19a94cb85e5 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java +++ b/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java @@ -45,7 +45,7 @@ public class _XGoalSeek extends MultiMethodTest { XSpreadsheets oSheets = xSpreadsheetDocument.getSheets(); XIndexAccess oIndexSheets = UnoRuntime.queryInterface( XIndexAccess.class, oSheets); - xSheet = (XSpreadsheet) UnoRuntime.queryInterface( + xSheet = UnoRuntime.queryInterface( XSpreadsheet.class, oIndexSheets.getByIndex(1)); } catch(com.sun.star.lang.IndexOutOfBoundsException e) { diff --git a/qadevOOo/tests/java/ifc/sheet/_XRecentFunctions.java b/qadevOOo/tests/java/ifc/sheet/_XRecentFunctions.java index 7fbad5549625..856cb61d8668 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XRecentFunctions.java +++ b/qadevOOo/tests/java/ifc/sheet/_XRecentFunctions.java @@ -133,7 +133,7 @@ public class _XRecentFunctions extends MultiMethodTest { PropertyValue[] propVals = (PropertyValue[]) functionList.getByName(names[i]); for (int j = 0; j < propVals.length; j++) { - String propName = (String)propVals[j].Name; + String propName = propVals[j].Name; if (propName.equals("Id")) { IDs[i - startIdx] = ((Integer)propVals[j].Value).intValue(); diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java b/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java index f2f943a7069d..345e07cdfe8d 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java @@ -58,7 +58,7 @@ public class _XSheetAuditing extends MultiMethodTest { xDrawPage = (XDrawPage)tEnv.getObjRelation("XSheetAuditing.DrawPage"); if (xDrawPage == null) { // get from object XDrawPageSupplier oDPS = UnoRuntime.queryInterface(XDrawPageSupplier.class, oObj); - xDrawPage = (XDrawPage) oDPS.getDrawPage(); + xDrawPage = oDPS.getDrawPage(); } if (xDrawPage == null) { throw new StatusException(Status.failed("'XSheetAuditing.DrawPage' object relation not found.")); @@ -70,7 +70,7 @@ public class _XSheetAuditing extends MultiMethodTest { // get a sheet for changing the cells XSpreadsheet xSheet = (XSpreadsheet)tEnv.getObjRelation("XSheetAuditing.Spreadsheet"); if (xSheet == null) // query on ther object - xSheet = (XSpreadsheet)UnoRuntime.queryInterface(XSpreadsheet.class, oObj); + xSheet = UnoRuntime.queryInterface(XSpreadsheet.class, oObj); if (xSheet == null) throw new StatusException(Status.failed("'XSheetAuditing.Spreadsheet' object relation not found.")); try { @@ -136,9 +136,9 @@ public class _XSheetAuditing extends MultiMethodTest { xAddress.setValue(2.5); try { // add a validitation to a cell: only whole numbers are allowed - XPropertySet xPropertySet = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xAddress); + XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xAddress); Object o = xPropertySet.getPropertyValue("Validation"); - XPropertySet xValidation = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, o); + XPropertySet xValidation = UnoRuntime.queryInterface(XPropertySet.class, o); xValidation.setPropertyValue("Type", ValidationType.WHOLE); xPropertySet.setPropertyValue("Validation", xValidation); // test @@ -154,7 +154,7 @@ public class _XSheetAuditing extends MultiMethodTest { result &= hasRightAmountOfShapes(0); } catch(com.sun.star.uno.Exception e) { - e.printStackTrace((java.io.PrintWriter)log); + e.printStackTrace(log); result = false; } diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetFilterable.java b/qadevOOo/tests/java/ifc/sheet/_XSheetFilterable.java index 892fadee5961..b230bd0b866d 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetFilterable.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetFilterable.java @@ -42,7 +42,7 @@ public class _XSheetFilterable extends MultiMethodTest { if (oSheet == null) { log.println("Object relation oSheet is missing"); log.println("Trying to query the needed Interface"); - oSheet = (XSpreadsheet) UnoRuntime.queryInterface( + oSheet = UnoRuntime.queryInterface( XSpreadsheet.class, tEnv.getTestObject()); if (oSheet == null) { @@ -85,8 +85,8 @@ public class _XSheetFilterable extends MultiMethodTest { XColumnRowRange oColumnRowRange = UnoRuntime.queryInterface( XColumnRowRange.class, oSheet); - XTableRows oRows = (XTableRows) oColumnRowRange.getRows(); - XPropertySet rowProp = (XPropertySet) UnoRuntime.queryInterface( + XTableRows oRows = oColumnRowRange.getRows(); + XPropertySet rowProp = UnoRuntime.queryInterface( XPropertySet.class, oRows.getByIndex(0)); boolean locRes = ((Boolean) rowProp.getPropertyValue("IsVisible")).booleanValue(); @@ -98,7 +98,7 @@ public class _XSheetFilterable extends MultiMethodTest { res &= true; } - rowProp = (XPropertySet) UnoRuntime.queryInterface( + rowProp = UnoRuntime.queryInterface( XPropertySet.class, oRows.getByIndex(1)); locRes = ((Boolean) rowProp.getPropertyValue("IsVisible")).booleanValue(); diff --git a/qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable.java b/qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable.java index 875e73e1d241..d34f89f4403f 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable.java @@ -39,7 +39,7 @@ public class _XSubTotalCalculatable extends MultiMethodTest { if (oSheet == null) { log.println("Object relation oSheet is missing"); log.println("Trying to query the needed Interface"); - oSheet = (XSpreadsheet) UnoRuntime.queryInterface( + oSheet = UnoRuntime.queryInterface( XSpreadsheet.class, tEnv.getTestObject()); if (oSheet == null) { diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java index c009b351229d..4abf8c93c95d 100644 --- a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java +++ b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java @@ -183,10 +183,10 @@ public class _ParagraphProperties extends MultiPropertyTest { protected PropertyTester BooleanTester = new PropertyTester() { protected Object getNewValue(String propName, Object oldValue) { if ((oldValue != null) && - (oldValue.equals(new Boolean((boolean) false)))) { - return new Boolean((boolean) true); + (oldValue.equals(new Boolean(false)))) { + return new Boolean(true); } else { - return new Boolean((boolean) false); + return new Boolean(false); } } }; diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesAsian.java b/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesAsian.java index 100c4e1f6f6a..c82b8e0f0d32 100644 --- a/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesAsian.java +++ b/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesAsian.java @@ -40,10 +40,10 @@ public class _ParagraphPropertiesAsian extends MultiPropertyTest { protected PropertyTester BooleanTester = new PropertyTester() { protected Object getNewValue(String propName, Object oldValue) { if ((oldValue != null) && - (oldValue.equals(new Boolean((boolean) false)))) { - return new Boolean((boolean) true); + (oldValue.equals(new Boolean(false)))) { + return new Boolean(true); } else { - return new Boolean((boolean) false); + return new Boolean(false); } } }; diff --git a/qadevOOo/tests/java/ifc/system/_XProxySettings.java b/qadevOOo/tests/java/ifc/system/_XProxySettings.java index dd08f4cfec96..06b18d1a2269 100644 --- a/qadevOOo/tests/java/ifc/system/_XProxySettings.java +++ b/qadevOOo/tests/java/ifc/system/_XProxySettings.java @@ -57,7 +57,7 @@ public class _XProxySettings extends MultiMethodTest { * Contains a HashMap with correct results of the tested methods. See * the class description. */ - Map expectedProxies; + Map<String,String> expectedProxies; /** * Checks that the "XProxySettings.proxySettings" object relation is @@ -68,7 +68,7 @@ public class _XProxySettings extends MultiMethodTest { * @see #expectedProxies */ public void before() { - expectedProxies = (Map)tEnv.getObjRelation( + expectedProxies = (Map<String,String>)tEnv.getObjRelation( "XProxySettings.proxySettings"); if (expectedProxies == null) { @@ -85,8 +85,7 @@ public class _XProxySettings extends MultiMethodTest { */ public void _getFtpProxyAddress() { String ftpProxyAddress = oObj.getFtpProxyAddress(); - String expectedFtpProxyAddress = (String) - expectedProxies.get("ftpProxyAddress"); + String expectedFtpProxyAddress = expectedProxies.get("ftpProxyAddress"); log.println("getFtpProxyAddress"); log.println("getting: "+ftpProxyAddress); @@ -104,8 +103,7 @@ public class _XProxySettings extends MultiMethodTest { */ public void _getFtpProxyPort() { String ftpProxyPort = oObj.getFtpProxyPort(); - String expectedFtpProxyPort = (String) - expectedProxies.get("ftpProxyPort"); + String expectedFtpProxyPort = expectedProxies.get("ftpProxyPort"); log.println("getFtpProxyPort"); log.println("getting: "+ftpProxyPort); @@ -123,8 +121,7 @@ public class _XProxySettings extends MultiMethodTest { */ public void _getGopherProxyAddress() { String gopherProxyAddress = oObj.getGopherProxyAddress(); - String expectedGopherProxyAddress = (String) - expectedProxies.get("gopherProxyAddress"); + String expectedGopherProxyAddress = expectedProxies.get("gopherProxyAddress"); tRes.tested("getGopherProxyAddress()", gopherProxyAddress.equals(expectedGopherProxyAddress)); @@ -138,8 +135,7 @@ public class _XProxySettings extends MultiMethodTest { */ public void _getGopherProxyPort() { String gopherProxyPort = oObj.getGopherProxyPort(); - String expectedGopherProxyPort = (String) - expectedProxies.get("gopherProxyPort"); + String expectedGopherProxyPort = expectedProxies.get("gopherProxyPort"); tRes.tested("getGopherProxyPort()", gopherProxyPort.equals(expectedGopherProxyPort)); @@ -153,8 +149,7 @@ public class _XProxySettings extends MultiMethodTest { */ public void _getHttpProxyAddress() { String httpProxyAddress = oObj.getHttpProxyAddress(); - String expectedHttpProxyAddress = (String) - expectedProxies.get("httpProxyAddress"); + String expectedHttpProxyAddress = expectedProxies.get("httpProxyAddress"); log.println("getHttpProxyAddress"); log.println("getting: "+httpProxyAddress); @@ -172,8 +167,7 @@ public class _XProxySettings extends MultiMethodTest { */ public void _getHttpProxyPort() { String httpProxyPort = oObj.getHttpProxyPort(); - String expectedHttpProxyPort = (String) - expectedProxies.get("httpProxyPort"); + String expectedHttpProxyPort = expectedProxies.get("httpProxyPort"); log.println("getHttpProxyPort"); log.println("getting: "+httpProxyPort); @@ -191,8 +185,7 @@ public class _XProxySettings extends MultiMethodTest { */ public void _getHttpsProxyAddress() { String httpsProxyAddress = oObj.getHttpsProxyAddress(); - String expectedHttpsProxyAddress = (String) - expectedProxies.get("httpsProxyAddress"); + String expectedHttpsProxyAddress = expectedProxies.get("httpsProxyAddress"); log.println("getHttpsProxyAddress"); log.println("getting: "+httpsProxyAddress); @@ -210,8 +203,7 @@ public class _XProxySettings extends MultiMethodTest { */ public void _getHttpsProxyPort() { String httpsProxyPort = oObj.getHttpsProxyPort(); - String expectedHttpsProxyPort = (String) - expectedProxies.get("httpsProxyPort"); + String expectedHttpsProxyPort = expectedProxies.get("httpsProxyPort"); log.println("getHttpsProxyPort"); log.println("getting: "+httpsProxyPort); @@ -229,8 +221,7 @@ public class _XProxySettings extends MultiMethodTest { */ public void _getProxyBypassAddress() { String proxyBypassAddress = oObj.getProxyBypassAddress(); - String expectedProxyBypassAddress = (String) - expectedProxies.get("proxyBypassAddress"); + String expectedProxyBypassAddress = expectedProxies.get("proxyBypassAddress"); log.println("getProxyBypassAddress"); log.println("getting: "+proxyBypassAddress); @@ -248,8 +239,7 @@ public class _XProxySettings extends MultiMethodTest { */ public void _getSocksProxyAddress() { String socksProxyAddress = oObj.getSocksProxyAddress(); - String expectedSocksProxyAddress = (String) - expectedProxies.get("socksProxyAddress"); + String expectedSocksProxyAddress = expectedProxies.get("socksProxyAddress"); log.println("getSocksProxyAddress"); log.println("getting: "+socksProxyAddress); @@ -267,8 +257,7 @@ public class _XProxySettings extends MultiMethodTest { */ public void _getSocksProxyPort() { String socksProxyPort = oObj.getSocksProxyPort(); - String expectedSocksProxyPort = (String) - expectedProxies.get("socksProxyPort"); + String expectedSocksProxyPort = expectedProxies.get("socksProxyPort"); log.println("getSocksProxyPort"); log.println("getting: "+socksProxyPort); @@ -287,7 +276,7 @@ public class _XProxySettings extends MultiMethodTest { public void _isProxyEnabled() { boolean proxyEnabled = oObj.isProxyEnabled(); - String proxyEnabledStr = (String)expectedProxies.get("proxyEnabled"); + String proxyEnabledStr = expectedProxies.get("proxyEnabled"); boolean expected = proxyEnabledStr != null && proxyEnabledStr.equalsIgnoreCase("true"); diff --git a/qadevOOo/tests/java/ifc/system/_XSimpleMailClientSupplier.java b/qadevOOo/tests/java/ifc/system/_XSimpleMailClientSupplier.java index 0f04e36fe9d4..58b4d343c1a6 100644 --- a/qadevOOo/tests/java/ifc/system/_XSimpleMailClientSupplier.java +++ b/qadevOOo/tests/java/ifc/system/_XSimpleMailClientSupplier.java @@ -52,7 +52,7 @@ public class _XSimpleMailClientSupplier extends MultiMethodTest { */ public void _querySimpleMailClient() { if (Boolean.TRUE.equals - ((Boolean)tEnv.getObjRelation("SystemMailExist"))) { + (tEnv.getObjRelation("SystemMailExist"))) { XSimpleMailClient aClient = oObj.querySimpleMailClient(); tRes.tested("querySimpleMailClient()",aClient != null); diff --git a/qadevOOo/tests/java/ifc/table/_TableColumn.java b/qadevOOo/tests/java/ifc/table/_TableColumn.java index e69ed634be73..05b39cea1b88 100644 --- a/qadevOOo/tests/java/ifc/table/_TableColumn.java +++ b/qadevOOo/tests/java/ifc/table/_TableColumn.java @@ -43,8 +43,7 @@ public class _TableColumn extends MultiPropertyTest { boolean res = false; try { XInterface tObject = tEnv.getTestObject(); - XCellRange aRange = (XCellRange) - UnoRuntime.queryInterface(XCellRange.class, tObject); + XCellRange aRange = UnoRuntime.queryInterface(XCellRange.class, tObject); aRange.getCellByPosition(0,0).setFormula("Thats a pretty long text"); Object width_before = oObj.getPropertyValue("Width"); log.println("Before setting to optimal width: "+width_before); diff --git a/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java b/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java index eed30301a723..87d729bc962b 100644 --- a/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java +++ b/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java @@ -61,10 +61,10 @@ public class _XAutoFormattable extends MultiMethodTest { oObj.autoFormat(name); // applying default format // getting current background of the cell - XCellRange cellRange = (XCellRange) UnoRuntime.queryInterface( + XCellRange cellRange = UnoRuntime.queryInterface( XCellRange.class, oObj); XCell oCell = cellRange.getCellByPosition(0, 0); - XPropertySet PS = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet PS = UnoRuntime.queryInterface( XPropertySet.class, oCell); Integer bkgrnd1; @@ -77,7 +77,7 @@ public class _XAutoFormattable extends MultiMethodTest { // getting formats names. XInterface iFormats = (XInterface) oMSF.createInstance( "com.sun.star.sheet.TableAutoFormats"); - XNameAccess formats = (XNameAccess) UnoRuntime.queryInterface( + XNameAccess formats = UnoRuntime.queryInterface( XNameAccess.class, iFormats); String[] names = formats.getElementNames(); diff --git a/qadevOOo/tests/java/ifc/table/_XCell.java b/qadevOOo/tests/java/ifc/table/_XCell.java index 6620b24b10b3..a5ad522cbe60 100644 --- a/qadevOOo/tests/java/ifc/table/_XCell.java +++ b/qadevOOo/tests/java/ifc/table/_XCell.java @@ -83,7 +83,7 @@ public class _XCell extends MultiMethodTest { log.println("getFormula()"); oObj.setFormula("=2+2"); - formula = (String) oObj.getFormula(); + formula = oObj.getFormula(); result &= formula.endsWith("2+2"); tRes.tested("getFormula()", result); @@ -117,7 +117,7 @@ public class _XCell extends MultiMethodTest { double value = 0; log.println("getValue() ..."); - value = (double) oObj.getValue(); + value = oObj.getValue(); tRes.tested("getValue()",result); } // end getValue() @@ -133,7 +133,7 @@ public class _XCell extends MultiMethodTest { oObj.setFormula("=2/6") ; - formula = (String) oObj.getFormula(); + formula = oObj.getFormula(); result &= formula.endsWith("2/6"); tRes.tested ("setFormula()", result) ; @@ -149,7 +149,7 @@ public class _XCell extends MultiMethodTest { log.println("setValue() ..."); oObj.setValue(222.333) ; - cellValue = (double) oObj.getValue() ; + cellValue = oObj.getValue() ; result &= (cellValue == 222.333); tRes.tested("setValue()", result); diff --git a/qadevOOo/tests/java/ifc/text/_BaseIndex.java b/qadevOOo/tests/java/ifc/text/_BaseIndex.java index 2176db890b24..c0a3863a7383 100644 --- a/qadevOOo/tests/java/ifc/text/_BaseIndex.java +++ b/qadevOOo/tests/java/ifc/text/_BaseIndex.java @@ -61,7 +61,7 @@ public class _BaseIndex extends MultiPropertyTest { */ protected PropertyTester CustomTester = new PropertyTester() { protected Object getNewValue(String propName, Object oldValue) { - XTextColumns TC = (XTextColumns) UnoRuntime.queryInterface( + XTextColumns TC = UnoRuntime.queryInterface( XTextColumns.class, oldValue); TC.setColumnCount((short) (TC.getColumnCount() + (short) 1)); @@ -103,7 +103,7 @@ public class _BaseIndex extends MultiPropertyTest { PropertyValue[][] oldVal = null; protected Object getNewValue(String propName, Object oldValue) { - XIndexReplace indProp = (XIndexReplace) UnoRuntime.queryInterface( + XIndexReplace indProp = UnoRuntime.queryInterface( XIndexReplace.class, oldValue); try { @@ -162,7 +162,7 @@ public class _BaseIndex extends MultiPropertyTest { * value into <code>log</code>. */ private void printLevelFormatProperty(Object value) { - XIndexReplace indProp = (XIndexReplace) UnoRuntime.queryInterface( + XIndexReplace indProp = UnoRuntime.queryInterface( XIndexReplace.class, value); PropertyValue[][] val = null; diff --git a/qadevOOo/tests/java/ifc/text/_MailMerge.java b/qadevOOo/tests/java/ifc/text/_MailMerge.java index 5e03ae64986e..f9d4c8d6b741 100644 --- a/qadevOOo/tests/java/ifc/text/_MailMerge.java +++ b/qadevOOo/tests/java/ifc/text/_MailMerge.java @@ -102,16 +102,16 @@ public class _MailMerge extends MultiPropertyTest { try{ log.println("try to get value from property..."); - XConnection oldValue = (XConnection) UnoRuntime.queryInterface(XConnection.class,oObj.getPropertyValue(propName)); + XConnection oldValue = UnoRuntime.queryInterface(XConnection.class,oObj.getPropertyValue(propName)); log.println("try to get value from object relation..."); - XConnection newValue = (XConnection) UnoRuntime.queryInterface(XConnection.class,tEnv.getObjRelation("MailMerge.XConnection")); + XConnection newValue = UnoRuntime.queryInterface(XConnection.class,tEnv.getObjRelation("MailMerge.XConnection")); log.println("set property to a new value..."); oObj.setPropertyValue(propName, newValue); log.println("get the new value..."); - XConnection getValue = (XConnection) UnoRuntime.queryInterface(XConnection.class,oObj.getPropertyValue(propName)); + XConnection getValue = UnoRuntime.queryInterface(XConnection.class,oObj.getPropertyValue(propName)); tRes.tested(propName, this.compare(newValue, getValue)); } catch (com.sun.star.beans.PropertyVetoException e){ diff --git a/qadevOOo/tests/java/ifc/text/_NumberingLevel.java b/qadevOOo/tests/java/ifc/text/_NumberingLevel.java index 3d8428434620..2355bdc90994 100644 --- a/qadevOOo/tests/java/ifc/text/_NumberingLevel.java +++ b/qadevOOo/tests/java/ifc/text/_NumberingLevel.java @@ -139,8 +139,8 @@ public class _NumberingLevel { // get rest of properties and check if they are optional if (! NumberingLevel.isEmpty()){ - for (Iterator e = NumberingLevel.keySet().iterator() ; e.hasNext() ;) { - String property = (String) e.next(); + for (Iterator<String> e = NumberingLevel.keySet().iterator() ; e.hasNext() ;) { + String property = e.next(); // if some elements are not optional -> failed if ( ! NumberingLevel.get(property).booleanValue() ){ diff --git a/qadevOOo/tests/java/ifc/text/_TextColumns.java b/qadevOOo/tests/java/ifc/text/_TextColumns.java index 716471624d90..a1cafda4f456 100644 --- a/qadevOOo/tests/java/ifc/text/_TextColumns.java +++ b/qadevOOo/tests/java/ifc/text/_TextColumns.java @@ -49,9 +49,8 @@ public class _TextColumns extends MultiPropertyTest { log.println("Testing with custom Property tester") ; testProperty("AutomaticDistance", new PropertyTester() { protected Object getNewValue(String propName, Object oldValue) { - XTextColumns xTC = (XTextColumns) - UnoRuntime.queryInterface - (XTextColumns.class,tEnv.getTestObject()); + XTextColumns xTC = UnoRuntime.queryInterface + (XTextColumns.class,tEnv.getTestObject()); int ref = xTC.getReferenceValue(); int setting = ( ( (Integer) oldValue).intValue() + ref) / 2; return new Integer(setting); diff --git a/qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java b/qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java index e23ef8d94d3e..e8fe1dc78e61 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java +++ b/qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java @@ -93,8 +93,8 @@ public class _XTextFieldsSupplier extends MultiMethodTest { if (mbCreateFieldMaster) { Object FieldMaster = _oMSF.createInstance("com.sun.star.text.FieldMaster.User"); - XPropertySet PFieldMaster = (XPropertySet) UnoRuntime.queryInterface - (XPropertySet.class,(XInterface) FieldMaster); + XPropertySet PFieldMaster = UnoRuntime.queryInterface + (XPropertySet.class,FieldMaster); XDependentTextField xTF = UnoRuntime.queryInterface(XDependentTextField.class,aField); @@ -166,7 +166,7 @@ public class _XTextFieldsSupplier extends MultiMethodTest { */ private void setMethodFalse(String method, Exception e) { log.println("Exception while executing '" + method + "'"); - e.printStackTrace((PrintWriter)log); + e.printStackTrace(log); tRes.tested(method, false); } diff --git a/qadevOOo/tests/java/ifc/ui/_XModuleUIConfigurationManagerSupplier.java b/qadevOOo/tests/java/ifc/ui/_XModuleUIConfigurationManagerSupplier.java index cdb39ce6037f..8a9dfe7b3b15 100644 --- a/qadevOOo/tests/java/ifc/ui/_XModuleUIConfigurationManagerSupplier.java +++ b/qadevOOo/tests/java/ifc/ui/_XModuleUIConfigurationManagerSupplier.java @@ -36,7 +36,7 @@ public class _XModuleUIConfigurationManagerSupplier extends MultiMethodTest { // get a config manager for the StartModule Object o = oObj.getUIConfigurationManager(configManagerName); - XServiceInfo xServiceInfo = (XServiceInfo)UnoRuntime.queryInterface(XServiceInfo.class, o); + XServiceInfo xServiceInfo = UnoRuntime.queryInterface(XServiceInfo.class, o); String impName = xServiceInfo.getImplementationName(); boolean result = impName.equals(implementationName); if (!result) { diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java index c21bb0182792..3cb5616d6675 100644 --- a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java +++ b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java @@ -266,7 +266,7 @@ public class _XUIConfigurationManager extends MultiMethodTest { */ public void _getShortCutManager() { Object o = oObj.getShortCutManager(); - XServiceInfo xSI = (XServiceInfo)UnoRuntime.queryInterface(XServiceInfo.class,o); + XServiceInfo xSI = UnoRuntime.queryInterface(XServiceInfo.class,o); String[] serviceNames = xSI.getSupportedServiceNames(); boolean bSupportedServiceFound = false; for (int i=0; i<serviceNames.length; i++) { @@ -306,8 +306,8 @@ public class _XUIConfigurationManager extends MultiMethodTest { XSingleComponentFactory xFactory = UnoRuntime.queryInterface( XSingleComponentFactory.class, xMenuBarSettings); try { - XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xMSF); - XComponentContext xContext = (XComponentContext)UnoRuntime.queryInterface( + XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, xMSF); + XComponentContext xContext = UnoRuntime.queryInterface( XComponentContext.class, xProp.getPropertyValue("DefaultContext")); prop[3].Value = xFactory.createInstanceWithContext(xContext); } diff --git a/qadevOOo/tests/java/ifc/util/_XChangesNotifier.java b/qadevOOo/tests/java/ifc/util/_XChangesNotifier.java index ae479891bb27..03cd68b8b35b 100644 --- a/qadevOOo/tests/java/ifc/util/_XChangesNotifier.java +++ b/qadevOOo/tests/java/ifc/util/_XChangesNotifier.java @@ -161,7 +161,7 @@ public class _XChangesNotifier extends MultiMethodTest { xBatch.commitChanges(); } catch(com.sun.star.lang.WrappedTargetException e) { - e.printStackTrace((PrintWriter)log); + e.printStackTrace(log); return false; } return true; @@ -178,7 +178,7 @@ public class _XChangesNotifier extends MultiMethodTest { xBatch.commitChanges(); } catch(com.sun.star.lang.WrappedTargetException e) { - e.printStackTrace((PrintWriter)log); + e.printStackTrace(log); return false; } return true; @@ -194,7 +194,7 @@ public class _XChangesNotifier extends MultiMethodTest { xProp.setPropertyValue(elementName, element); } catch(com.sun.star.uno.Exception e) { - e.printStackTrace((PrintWriter)log); + e.printStackTrace(log); return false; } } @@ -203,7 +203,7 @@ public class _XChangesNotifier extends MultiMethodTest { xNameReplace.replaceByName(elementName, element); } catch(com.sun.star.uno.Exception e) { - e.printStackTrace((PrintWriter)log); + e.printStackTrace(log); return false; } } diff --git a/qadevOOo/tests/java/ifc/util/_XCloneable.java b/qadevOOo/tests/java/ifc/util/_XCloneable.java index 3be749df54c5..f08d593cae98 100644 --- a/qadevOOo/tests/java/ifc/util/_XCloneable.java +++ b/qadevOOo/tests/java/ifc/util/_XCloneable.java @@ -59,8 +59,7 @@ public class _XCloneable extends MultiMethodTest { protected byte[] getImplementationID(XInterface ifc) { byte[] res = new byte[0]; - XTypeProvider provider = (XTypeProvider) - UnoRuntime.queryInterface(XTypeProvider.class, ifc); + XTypeProvider provider = UnoRuntime.queryInterface(XTypeProvider.class, ifc); if (provider != null) { res = provider.getImplementationId(); } @@ -79,8 +78,7 @@ public class _XCloneable extends MultiMethodTest { protected String getImplementationName(XInterface ifc) { String res = ""; - XServiceInfo info = (XServiceInfo) - UnoRuntime.queryInterface(XServiceInfo.class, ifc); + XServiceInfo info = UnoRuntime.queryInterface(XServiceInfo.class, ifc); if (info != null) { res = info.getImplementationName(); } diff --git a/qadevOOo/tests/java/ifc/util/_XImportable.java b/qadevOOo/tests/java/ifc/util/_XImportable.java index f3c08a4364d5..5224cee08a1d 100644 --- a/qadevOOo/tests/java/ifc/util/_XImportable.java +++ b/qadevOOo/tests/java/ifc/util/_XImportable.java @@ -165,7 +165,7 @@ public class _XImportable extends MultiMethodTest { } protected boolean checkA1(String expected) { - XCellRange range = (XCellRange) UnoRuntime.queryInterface(XCellRange.class, tEnv.getTestObject()); + XCellRange range = UnoRuntime.queryInterface(XCellRange.class, tEnv.getTestObject()); boolean res = false; try{ String a1 = range.getCellByPosition(0,0).getFormula(); diff --git a/qadevOOo/tests/java/ifc/view/_XControlAccess.java b/qadevOOo/tests/java/ifc/view/_XControlAccess.java index 68a43c1633a9..1a23d3fd8dae 100644 --- a/qadevOOo/tests/java/ifc/view/_XControlAccess.java +++ b/qadevOOo/tests/java/ifc/view/_XControlAccess.java @@ -76,7 +76,7 @@ public class _XControlAccess extends MultiMethodTest { XDrawPage oDP = null; if (isSheet != null) { XDrawPagesSupplier oDPS = UnoRuntime.queryInterface(XDrawPagesSupplier.class, oDoc); - oDP = (XDrawPage) UnoRuntime.queryInterface(XDrawPage.class, oDPS.getDrawPages().getByIndex(0)); + oDP = UnoRuntime.queryInterface(XDrawPage.class, oDPS.getDrawPages().getByIndex(0)); } else { diff --git a/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java index 3a9bc8e19979..ec2bcc3ed056 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java @@ -145,7 +145,7 @@ public class ConnectionLineAccessibility extends TestCase info[1].Name = "password"; info[1].Value = password; - XPropertySet propSetDBSource = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet propSetDBSource = UnoRuntime.queryInterface( XPropertySet.class, oDBSource); try @@ -248,7 +248,7 @@ public class ConnectionLineAccessibility extends TestCase XNameAccess defContainer = querySuppl.getQueryDefinitions(); - XPropertySet queryProp = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet queryProp = UnoRuntime.queryInterface( XPropertySet.class, newQuery); try @@ -284,7 +284,7 @@ public class ConnectionLineAccessibility extends TestCase "Couldn't set property value")); } - XNameContainer queryContainer = (XNameContainer) UnoRuntime.queryInterface( + XNameContainer queryContainer = UnoRuntime.queryInterface( XNameContainer.class, defContainer); diff --git a/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java index 4b5f2f24f414..911abfa5db15 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java +++ b/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java @@ -143,7 +143,7 @@ public class JoinViewAccessibility extends TestCase { info[1].Name = "password"; info[1].Value = password; - XPropertySet propSetDBSource = (XPropertySet) UnoRuntime.queryInterface ( + XPropertySet propSetDBSource = UnoRuntime.queryInterface ( XPropertySet.class, oDBSource); try @@ -238,7 +238,7 @@ public class JoinViewAccessibility extends TestCase { XNameAccess defContainer = querySuppl.getQueryDefinitions (); - XPropertySet queryProp = (XPropertySet) UnoRuntime.queryInterface ( + XPropertySet queryProp = UnoRuntime.queryInterface ( XPropertySet.class, newQuery); try @@ -270,7 +270,7 @@ public class JoinViewAccessibility extends TestCase { "Couldn't set property value")); } - XNameContainer queryContainer = (XNameContainer) UnoRuntime.queryInterface ( + XNameContainer queryContainer = UnoRuntime.queryInterface ( XNameContainer.class, defContainer); diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseContext.java b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseContext.java index 4809692ace7d..a44b25bac07b 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseContext.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseContext.java @@ -107,8 +107,7 @@ public class ODatabaseContext extends TestCase { xMSF = (XMultiServiceFactory)Param.getMSF(); oInterface = xMSF.createInstance( "com.sun.star.sdb.DataSource" ); - XPropertySet xDSProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oInterface) ; + XPropertySet xDSProps = UnoRuntime.queryInterface(XPropertySet.class, oInterface) ; xDSProps.setPropertyValue("URL", "sdbc:dbase:file:///.") ; diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java index ee06840e1d0c..aa4232abffce 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java @@ -157,13 +157,12 @@ public class ODatabaseSource extends TestCase { throw new StatusException("Service not available", e) ; } - oObj = (XInterface) xDBDoc.getDataSource(); + oObj = xDBDoc.getDataSource(); log.println("ImplementationName: " + utils.getImplName(oObj)); // Creating new DBase data source in the TEMP directory - XPropertySet xSrcProp = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oObj); + XPropertySet xSrcProp = UnoRuntime.queryInterface(XPropertySet.class, oObj); try{ xSrcProp.setPropertyValue("URL", tmpDatabaseUrl) ; diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java index c55c1571faee..4dff12a7ab9c 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java @@ -267,7 +267,7 @@ public class ODatasourceBrowser extends TestCase { XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000, 4500, 15000, 10000, "CommandButton"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XControlModel shapeModel = aShape.getControl(); diff --git a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java index ab89d5d64d93..2ba6a2cd94a9 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java @@ -83,7 +83,7 @@ public class OQueryDesign extends TestCase { // we use the first datasource XDataSource xDS = null; try { - xNameAccess = (XNameAccess) UnoRuntime.queryInterface( + xNameAccess = UnoRuntime.queryInterface( XNameAccess.class, xMSF.createInstance("com.sun.star.sdb.DatabaseContext")); } catch (Exception ex) { @@ -101,7 +101,7 @@ public class OQueryDesign extends TestCase { throw new StatusException( "Could not get XDataSource", ex ); } try { - xNameAccess = (XNameAccess) UnoRuntime.queryInterface( + xNameAccess = UnoRuntime.queryInterface( XNameAccess.class, xMSF.createInstance("com.sun.star.sdb.DatabaseContext")); } catch (Exception ex) { @@ -149,7 +149,7 @@ public class OQueryDesign extends TestCase { Object oDataSource = null; try{ - XNameAccess xNA = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, oDBC); + XNameAccess xNA = UnoRuntime.queryInterface(XNameAccess.class, oDBC); oDataSource = xNA.getByName(sDataSourceName); } catch ( com.sun.star.container.NoSuchElementException e){ throw new StatusException("could not get '" + sDataSourceName + "'" , e) ; @@ -248,7 +248,7 @@ public class OQueryDesign extends TestCase { Object oDataSource = null; try{ - XNameAccess xNA = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, oDBC); + XNameAccess xNA = UnoRuntime.queryInterface(XNameAccess.class, oDBC); oDataSource = xNA.getByName(sDataSourceName); } catch ( com.sun.star.container.NoSuchElementException e){ throw new StatusException("could not get '" + sDataSourceName + "'" , e) ; diff --git a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java index 592bf708d63b..ef07416e243d 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java @@ -178,7 +178,7 @@ public class OSingleSelectQueryComposer extends TestCase { try { xMSF = (XMultiServiceFactory)Param.getMSF(); - XNameAccess xNameAccess = (XNameAccess)UnoRuntime.queryInterface( + XNameAccess xNameAccess = UnoRuntime.queryInterface( XNameAccess.class, xMSF.createInstance("com.sun.star.sdb.DatabaseContext")); // we use the first datasource @@ -196,7 +196,7 @@ public class OSingleSelectQueryComposer extends TestCase { log.println("Service 'SingleSelectQueryComposer' not supported"); } - oInterface = (XInterface) xConn.createInstance( sServiceNames[0]); + oInterface = xConn.createInstance( sServiceNames[0]); if (oInterface == null) { log.println("Service wasn't created") ; @@ -206,7 +206,7 @@ public class OSingleSelectQueryComposer extends TestCase { Object oRowSet = xMSF.createInstance("com.sun.star.sdb.RowSet") ; - XPropertySet xSetProp = (XPropertySet) UnoRuntime.queryInterface + XPropertySet xSetProp = UnoRuntime.queryInterface (XPropertySet.class, oRowSet) ; xSetProp.setPropertyValue("DataSourceName", "Bibliography") ; diff --git a/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java b/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java index 80b47938362f..c3af86806e0c 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java +++ b/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java @@ -243,7 +243,7 @@ public class SbaXGridControl extends TestCase { XControlModel the_Model = aShape.getControl(); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XLoadable formLoader = FormTools.bindForm(xTextDoc); @@ -285,7 +285,7 @@ public class SbaXGridControl extends TestCase { throw new StatusException("Can't create column instances.", e); } - XNameContainer aContainer = (XNameContainer) UnoRuntime.queryInterface( + XNameContainer aContainer = UnoRuntime.queryInterface( XNameContainer.class, the_Model); try { @@ -315,7 +315,7 @@ public class SbaXGridControl extends TestCase { aShape = FormTools.createControlShape(xTextDoc, 3000, 4500, 15000, 10000, "TextField"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); the_Model = aShape.getControl(); @@ -349,13 +349,9 @@ public class SbaXGridControl extends TestCase { new Object[] { new Integer(0) }, new Object[] { new Integer(1) } }); tEnv.addObjRelation("Comparer", - new Comparator() { - public int compare(Object o1, Object o2) { - return ((Integer) o1).compareTo((Integer)o2); - } - - public boolean equals(Object obj) { - return compare(this, obj) == 0; + new Comparator<Integer>() { + public int compare(Integer o1, Integer o2) { + return o1.compareTo(o2); } }); @@ -396,7 +392,7 @@ public class SbaXGridControl extends TestCase { // adding relation for XUpdateBroadcaster final XInterface ctrl = oObj; final XLoadable formLoaderF = formLoader; - final XPropertySet ps = (XPropertySet) UnoRuntime.queryInterface( + final XPropertySet ps = UnoRuntime.queryInterface( XPropertySet.class, aControl2); tEnv.addObjRelation("XUpdateBroadcaster.Checker", new ifc.form._XUpdateBroadcaster.UpdateChecker() { @@ -449,7 +445,7 @@ public class SbaXGridControl extends TestCase { "com.sun.star.drawing.ControlShape"); Object aCon = oDocMSF.createInstance( "com.sun.star.form.component.GridControl"); - XPropertySet model_props = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet model_props = UnoRuntime.queryInterface( XPropertySet.class, aCon); model_props.setPropertyValue("DefaultControl", "com.sun.star.form.control.InteractionGridControl"); diff --git a/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java index b5e8af28f601..4ea9fe8610db 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java +++ b/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java @@ -140,7 +140,7 @@ public class TableWindowAccessibility extends TestCase { info[1].Name = "password"; info[1].Value = password; - XPropertySet propSetDBSource = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet propSetDBSource = UnoRuntime.queryInterface( XPropertySet.class, oDBSource); try { @@ -223,7 +223,7 @@ public class TableWindowAccessibility extends TestCase { XNameAccess defContainer = querySuppl.getQueryDefinitions(); - XPropertySet queryProp = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet queryProp = UnoRuntime.queryInterface( XPropertySet.class, newQuery); try { @@ -250,7 +250,7 @@ public class TableWindowAccessibility extends TestCase { "Couldn't set property value")); } - XNameContainer queryContainer = (XNameContainer) UnoRuntime.queryInterface( + XNameContainer queryContainer = UnoRuntime.queryInterface( XNameContainer.class, defContainer); 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); diff --git a/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java b/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java index a73b632b0084..2873cb192291 100644 --- a/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java +++ b/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java @@ -85,7 +85,7 @@ public class DispatchRecorder extends TestCase { XModel model = UnoRuntime.queryInterface(XModel.class, oDoc); xFrame = model.getCurrentController().getFrame(); - XPropertySet xFramePS = (XPropertySet) UnoRuntime.queryInterface + XPropertySet xFramePS = UnoRuntime.queryInterface (XPropertySet.class, xFrame); XDispatchRecorderSupplier xDRS = null; xDRS = (XDispatchRecorderSupplier) AnyConverter.toObject( @@ -96,8 +96,7 @@ public class DispatchRecorder extends TestCase { Object oDRS = ((XMultiServiceFactory)Param.getMSF()).createInstance( "com.sun.star.comp.framework.DispatchRecorderSupplier"); xFramePS.setPropertyValue("DispatchRecorderSupplier", oDRS); - xDRS = (XDispatchRecorderSupplier) - UnoRuntime.queryInterface(XDispatchRecorderSupplier.class,oDRS); + xDRS = UnoRuntime.queryInterface(XDispatchRecorderSupplier.class,oDRS); } xDR = xDRS.getDispatchRecorder(); diff --git a/qadevOOo/tests/java/mod/_fwk/Frame.java b/qadevOOo/tests/java/mod/_fwk/Frame.java index a8c9251af74c..570b2063424c 100644 --- a/qadevOOo/tests/java/mod/_fwk/Frame.java +++ b/qadevOOo/tests/java/mod/_fwk/Frame.java @@ -82,7 +82,7 @@ public class Frame extends TestCase { } frame = xTextDoc.getCurrentController().getFrame(); - oObj = (XInterface)UnoRuntime.queryInterface(XInterface.class, frame); + oObj = UnoRuntime.queryInterface(XInterface.class, frame); log.println(util.utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_fwk/JobExecutor.java b/qadevOOo/tests/java/mod/_fwk/JobExecutor.java index 003dad6e389c..5a4444a6220b 100644 --- a/qadevOOo/tests/java/mod/_fwk/JobExecutor.java +++ b/qadevOOo/tests/java/mod/_fwk/JobExecutor.java @@ -133,10 +133,10 @@ public class JobExecutor extends TestCase { "com.sun.star.configuration.ConfigurationUpdateAccess", args); XHierarchicalNameAccess xHNA = UnoRuntime.queryInterface(XHierarchicalNameAccess.class, oRootCfg); obj = xHNA.getByHierarchicalName("Jobs"); - jobs = (XNameAccess) UnoRuntime.queryInterface + jobs = UnoRuntime.queryInterface (XNameAccess.class, obj); obj = xHNA.getByHierarchicalName("Events"); - events = (XNameAccess) UnoRuntime.queryInterface + events = UnoRuntime.queryInterface (XNameAccess.class, obj); } catch (Exception e) { throw new StatusException("Couldn't get configuration", e); @@ -150,22 +150,18 @@ public class JobExecutor extends TestCase { if (!configured) { try { log.println("Adding configuration to Jobs ..."); - XSingleServiceFactory jobsFac = (XSingleServiceFactory) - UnoRuntime.queryInterface(XSingleServiceFactory.class, jobs); + XSingleServiceFactory jobsFac = UnoRuntime.queryInterface(XSingleServiceFactory.class, jobs); Object oNewJob = jobsFac.createInstance(); XNameReplace xNewJobNR = UnoRuntime.queryInterface(XNameReplace.class, oNewJob); xNewJobNR.replaceByName("Service", "test.Job"); - XNameContainer xJobsNC = (XNameContainer) - UnoRuntime.queryInterface(XNameContainer.class, jobs); + XNameContainer xJobsNC = UnoRuntime.queryInterface(XNameContainer.class, jobs); xJobsNC.insertByName("TestJob", oNewJob); log.println("Adding configuration to Events ..."); - XSingleServiceFactory eventsFac = (XSingleServiceFactory) - UnoRuntime.queryInterface(XSingleServiceFactory.class, events); + XSingleServiceFactory eventsFac = UnoRuntime.queryInterface(XSingleServiceFactory.class, events); Object oNewEvent = eventsFac.createInstance(); - XNameAccess xNewEventNA = (XNameAccess) - UnoRuntime.queryInterface(XNameAccess.class, oNewEvent); + XNameAccess xNewEventNA = UnoRuntime.queryInterface(XNameAccess.class, oNewEvent); Object oJobList = xNewEventNA.getByName("JobList"); XSingleServiceFactory jobListFac = (XSingleServiceFactory) AnyConverter.toObject(new Type(XSingleServiceFactory.class), @@ -179,8 +175,7 @@ public class JobExecutor extends TestCase { jobListNC.insertByName("TestJob", oNewJobTimeStamps); - XNameContainer xEventsNC = (XNameContainer) - UnoRuntime.queryInterface(XNameContainer.class, events); + XNameContainer xEventsNC = UnoRuntime.queryInterface(XNameContainer.class, events); xEventsNC.insertByName("TestEvent", oNewEvent); XChangesBatch xCB = UnoRuntime.queryInterface(XChangesBatch.class, oRootCfg); @@ -212,7 +207,7 @@ public class JobExecutor extends TestCase { try { oObj = (XInterface)((XMultiServiceFactory)Param.getMSF()).createInstance( "com.sun.star.comp.framework.JobExecutor"); - job = (XInterface)((XMultiServiceFactory)Param.getMSF()).createInstance("test.Job"); + job = ((XMultiServiceFactory)Param.getMSF()).createInstance("test.Job"); } catch(com.sun.star.uno.Exception e) { e.printStackTrace(log); throw new StatusException( diff --git a/qadevOOo/tests/java/mod/_fwk/LayoutManager.java b/qadevOOo/tests/java/mod/_fwk/LayoutManager.java index b4b49a37b855..f383d1334723 100644 --- a/qadevOOo/tests/java/mod/_fwk/LayoutManager.java +++ b/qadevOOo/tests/java/mod/_fwk/LayoutManager.java @@ -87,10 +87,10 @@ public class LayoutManager extends TestCase { } XFrame xFrame = xTextDoc.getCurrentController().getFrame(); - XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xFrame); + XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, xFrame); try { Object any = xProp.getPropertyValue("LayoutManager"); - xManager = (XInterface)UnoRuntime.queryInterface(XInterface.class, any); + xManager = UnoRuntime.queryInterface(XInterface.class, any); } catch(com.sun.star.beans.UnknownPropertyException e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java index c46f356d0429..9f4362a89bd2 100644 --- a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java +++ b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java @@ -90,7 +90,7 @@ public class ModuleUIConfigurationManager extends TestCase { log.println("Creating instance..."); xTextDoc = WriterTools.createTextDoc(xMSF); - Object o = (XInterface)xMSF.createInstance("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"); + Object o = xMSF.createInstance("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"); XModuleUIConfigurationManagerSupplier xMUICMS = UnoRuntime.queryInterface(XModuleUIConfigurationManagerSupplier.class, o); util.dbg.printInterfaces(xMUICMS); @@ -99,12 +99,11 @@ public class ModuleUIConfigurationManager extends TestCase { log.println("TestObject: " + utils.getImplName(oObj)); tEnv = new TestEnvironment(oObj); - XNameAccess xMM = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, xMSF.createInstance("com.sun.star.comp.framework.ModuleManager")); + XNameAccess xMM = UnoRuntime.queryInterface(XNameAccess.class, xMSF.createInstance("com.sun.star.comp.framework.ModuleManager")); String[] names = xMM.getElementNames(); o = xMSF.createInstance("com.sun.star.embed.StorageFactory"); - XSingleServiceFactory xStorageService = (XSingleServiceFactory) - UnoRuntime.queryInterface(XSingleServiceFactory.class, o); + XSingleServiceFactory xStorageService = UnoRuntime.queryInterface(XSingleServiceFactory.class, o); Object[]props = new Object[2]; String aFile = util.utils.getOfficeTempDir(xMSF) + "dummyFile.dat"; diff --git a/qadevOOo/tests/java/mod/_fwk/PopupMenuControllerFactory.java b/qadevOOo/tests/java/mod/_fwk/PopupMenuControllerFactory.java index 322091d923d1..cdaf982f72fe 100644 --- a/qadevOOo/tests/java/mod/_fwk/PopupMenuControllerFactory.java +++ b/qadevOOo/tests/java/mod/_fwk/PopupMenuControllerFactory.java @@ -85,10 +85,10 @@ public class PopupMenuControllerFactory extends TestCase { log.println("TestObject: " + util.utils.getImplName(xInst)); tEnv = new TestEnvironment(xInst); - XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xMSF); + XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, xMSF); try { Object o = xProp.getPropertyValue("DefaultContext"); - XComponentContext xContext = (XComponentContext)UnoRuntime.queryInterface(XComponentContext.class, o); + XComponentContext xContext = UnoRuntime.queryInterface(XComponentContext.class, o); tEnv.addObjRelation("DC", xContext); } catch(com.sun.star.beans.UnknownPropertyException e) { diff --git a/qadevOOo/tests/java/mod/_fwk/StatusBarControllerFactory.java b/qadevOOo/tests/java/mod/_fwk/StatusBarControllerFactory.java index d206d80e167d..1cda12f51897 100644 --- a/qadevOOo/tests/java/mod/_fwk/StatusBarControllerFactory.java +++ b/qadevOOo/tests/java/mod/_fwk/StatusBarControllerFactory.java @@ -44,10 +44,10 @@ public class StatusBarControllerFactory extends TestCase { catch(com.sun.star.uno.Exception e) { throw new StatusException("Cannot create test object 'StatusBarControllerFactory'", e); } - XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xMSF); + XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, xMSF); try { Object o = xProp.getPropertyValue("DefaultContext"); - XComponentContext xContext = (XComponentContext)UnoRuntime.queryInterface(XComponentContext.class, o); + XComponentContext xContext = UnoRuntime.queryInterface(XComponentContext.class, o); tEnv.addObjRelation("DC", xContext); } catch(com.sun.star.beans.UnknownPropertyException e) { diff --git a/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java b/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java index 4e41c5a345ca..a53c46374db0 100644 --- a/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java +++ b/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java @@ -81,8 +81,8 @@ public class UIConfigurationManager extends TestCase { String deleteCfg = util.utils.getFullURL(util.utils.getOfficeTemp(xMSF) + "delete.cfg"); util.utils.copyFile(xMSF, sourceDeleteCfg, deleteCfg); XStorage xSubStorage = null; - Object o = (XInterface)xMSF.createInstance("com.sun.star.embed.StorageFactory"); - XSingleServiceFactory xSSF = (XSingleServiceFactory)UnoRuntime.queryInterface( + Object o = xMSF.createInstance("com.sun.star.embed.StorageFactory"); + XSingleServiceFactory xSSF = UnoRuntime.queryInterface( XSingleServiceFactory.class, o); Object[] props = new Object[2]; props[0] = deleteCfg; diff --git a/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java b/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java index 0e6604ed3a4a..9b17a34042c2 100644 --- a/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java +++ b/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java @@ -84,7 +84,7 @@ public class ContentHandlerFactory extends TestCase { log.println( "creating a new environment for object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); - XNameAccess xNA = (XNameAccess) UnoRuntime.queryInterface + XNameAccess xNA = UnoRuntime.queryInterface (XNameAccess.class, oObj); tEnv.addObjRelation("XMSF.serviceNames", xNA.getElementNames()); String[] dummy = xNA.getElementNames(); diff --git a/qadevOOo/tests/java/mod/_fwl/FilterFactory.java b/qadevOOo/tests/java/mod/_fwl/FilterFactory.java index bedbb6a9e4c3..0e105af4b6a1 100644 --- a/qadevOOo/tests/java/mod/_fwl/FilterFactory.java +++ b/qadevOOo/tests/java/mod/_fwl/FilterFactory.java @@ -90,7 +90,7 @@ public class FilterFactory extends TestCase { log.println( "creating a new environment for object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); - XNameAccess xNA = (XNameAccess) UnoRuntime.queryInterface + XNameAccess xNA = UnoRuntime.queryInterface (XNameAccess.class, oObj); String[] filterNames = xNA.getElementNames(); @@ -101,7 +101,7 @@ public class FilterFactory extends TestCase { try{ instance = (Object[]) xNA.getByName(filterName); PropertyValue[] props = (PropertyValue[]) instance; - instanceProp = (PropertyValue) getPropertyValue + instanceProp = getPropertyValue (((PropertyValue[]) instance), "FilterService"); //instance[9]; } catch (com.sun.star.container.NoSuchElementException e){ throw new StatusException( diff --git a/qadevOOo/tests/java/mod/_fwl/FrameLoaderFactory.java b/qadevOOo/tests/java/mod/_fwl/FrameLoaderFactory.java index 85f33899d2c0..4260ac315676 100644 --- a/qadevOOo/tests/java/mod/_fwl/FrameLoaderFactory.java +++ b/qadevOOo/tests/java/mod/_fwl/FrameLoaderFactory.java @@ -83,7 +83,7 @@ public class FrameLoaderFactory extends TestCase { log.println( "creating a new environment for object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); - XNameAccess xNA = (XNameAccess) UnoRuntime.queryInterface + XNameAccess xNA = UnoRuntime.queryInterface (XNameAccess.class, oObj); tEnv.addObjRelation("XMSF.serviceNames", xNA.getElementNames()); diff --git a/qadevOOo/tests/java/mod/_fwl/PathSettings.java b/qadevOOo/tests/java/mod/_fwl/PathSettings.java index ad9e5ecc2161..6e91ee8363fc 100644 --- a/qadevOOo/tests/java/mod/_fwl/PathSettings.java +++ b/qadevOOo/tests/java/mod/_fwl/PathSettings.java @@ -117,7 +117,7 @@ public class PathSettings extends TestCase { log.println( "creating a new environment for object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); - Set exclProps = new HashSet(); + Set<String> exclProps = new HashSet<String>(); exclProps.add("UIConfig"); tEnv.addObjRelation("XFastPropertySet.ExcludeProps", exclProps); tEnv.addObjRelation("XMultiPropertySet.ExcludeProps", exclProps); @@ -129,7 +129,7 @@ public class PathSettings extends TestCase { private void saveAllPropertyValues(XInterface oObj){ - xPS = (XPropertySet) UnoRuntime.queryInterface( + xPS = UnoRuntime.queryInterface( XPropertySet.class, oObj); XPropertySetInfo xPSI = xPS.getPropertySetInfo(); diff --git a/qadevOOo/tests/java/mod/_fwl/TypeDetection.java b/qadevOOo/tests/java/mod/_fwl/TypeDetection.java index 4f5ad37b75aa..c67e6cef1b12 100644 --- a/qadevOOo/tests/java/mod/_fwl/TypeDetection.java +++ b/qadevOOo/tests/java/mod/_fwl/TypeDetection.java @@ -110,7 +110,7 @@ public class TypeDetection extends TestCase { log.println( "creating a new environment for object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); - XNameAccess xNA = (XNameAccess) UnoRuntime.queryInterface + XNameAccess xNA = UnoRuntime.queryInterface (XNameAccess.class, oObj); String[] elementNames = xNA.getElementNames(); String elementName = elementNames[0]; diff --git a/qadevOOo/tests/java/mod/_i18n/BreakIterator.java b/qadevOOo/tests/java/mod/_i18n/BreakIterator.java index 07a3dab8d988..f11572ed809a 100644 --- a/qadevOOo/tests/java/mod/_i18n/BreakIterator.java +++ b/qadevOOo/tests/java/mod/_i18n/BreakIterator.java @@ -96,7 +96,7 @@ public class BreakIterator extends TestCase { XTextDocument xDoc = UnoRuntime.queryInterface (XTextDocument.class, xTextDoc); - XTextRange xTextRange = (XTextRange)xDoc.getText(); + XTextRange xTextRange = xDoc.getText(); tEnv.addObjRelation("UnicodeString", xTextRange.getString()); return tEnv; diff --git a/qadevOOo/tests/java/mod/_lnn/Hyphenator.java b/qadevOOo/tests/java/mod/_lnn/Hyphenator.java index 096c0cfd2cf5..0d89efa13059 100644 --- a/qadevOOo/tests/java/mod/_lnn/Hyphenator.java +++ b/qadevOOo/tests/java/mod/_lnn/Hyphenator.java @@ -82,8 +82,7 @@ public class Hyphenator extends TestCase { ("com.sun.star.linguistic2.Hyphenator"); Object LP = xMSF.createInstance ("com.sun.star.linguistic2.LinguProperties"); - XPropertySet LProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,LP); + XPropertySet LProps = UnoRuntime.queryInterface(XPropertySet.class,LP); LProps.setPropertyValue("IsGermanPreReform",new Boolean(true)); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_pcr/ObjectInspector.java b/qadevOOo/tests/java/mod/_pcr/ObjectInspector.java index 0697b99e2d59..9717505efffe 100644 --- a/qadevOOo/tests/java/mod/_pcr/ObjectInspector.java +++ b/qadevOOo/tests/java/mod/_pcr/ObjectInspector.java @@ -132,7 +132,7 @@ public class ObjectInspector extends TestCase { XInterface oFrame = (XInterface) xMSF.createInstance("com.sun.star.frame.Frame"); - XFrame xFrame = (XFrame) UnoRuntime.queryInterface(XFrame.class, oFrame); + XFrame xFrame = UnoRuntime.queryInterface(XFrame.class, oFrame); xFrame.setName("ObjectInspector"); xFrame.initialize(xWindow); @@ -187,7 +187,7 @@ public class ObjectInspector extends TestCase { XFrame existentInspector = null; - XFrame xFrame = (XFrame) UnoRuntime.queryInterface(XFrame.class, StarDesktop); + XFrame xFrame = UnoRuntime.queryInterface(XFrame.class, StarDesktop); existentInspector = xFrame.findFrame( "ObjectInspector", 255 ); diff --git a/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java b/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java index 84718294f536..92c2ef81e579 100644 --- a/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java +++ b/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java @@ -91,14 +91,14 @@ public class ObjectInspectorModel extends TestCase { XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); - XPropertySet xMSFProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xMSF); + XPropertySet xMSFProp = UnoRuntime.queryInterface(XPropertySet.class, xMSF); XComponentContext xDefaultContext = null; try{ // Get the default context from the office server. Object oDefaultContext = xMSFProp.getPropertyValue("DefaultContext"); // Query for the interface XComponentContext. - xDefaultContext = (XComponentContext) UnoRuntime.queryInterface( + xDefaultContext = UnoRuntime.queryInterface( XComponentContext.class, oDefaultContext); } catch (UnknownPropertyException e){ @@ -148,7 +148,7 @@ public class ObjectInspectorModel extends TestCase { XFrame existentInspector = null; - XFrame xFrame = (XFrame) UnoRuntime.queryInterface(XFrame.class, StarDesktop); + XFrame xFrame = UnoRuntime.queryInterface(XFrame.class, StarDesktop); existentInspector = xFrame.findFrame( "ObjectInspector", 255 ); diff --git a/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java b/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java index 443bc69957b2..19c33c8f4273 100644 --- a/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java +++ b/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java @@ -78,12 +78,11 @@ public class RegistryTypeDescriptionProvider extends TestCase { try { XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); - XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface( + XPropertySet xProp = UnoRuntime.queryInterface( XPropertySet.class, xMSF); // get context - XComponentContext xContext = (XComponentContext) - UnoRuntime.queryInterface(XComponentContext.class, - xProp.getPropertyValue("DefaultContext")); + XComponentContext xContext = UnoRuntime.queryInterface(XComponentContext.class, + xProp.getPropertyValue("DefaultContext")); // get the type description manager Object o = xContext.getValueByName("/singletons/" + "com.sun.star.reflection.theTypeDescriptionManager"); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java index 743e8388cee6..64f34d4acc41 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java @@ -130,9 +130,9 @@ public class ScAccessibleCell extends TestCase { xCell = oSheet.getCellByPosition(1, 0) ; xCell.setFormula(text); XColumnRowRange oColumnRowRange = UnoRuntime.queryInterface(XColumnRowRange.class, oSheet); - XTableColumns oColumns = (XTableColumns) oColumnRowRange.getColumns(); + XTableColumns oColumns = oColumnRowRange.getColumns(); XIndexAccess oIndexAccess = UnoRuntime.queryInterface(XIndexAccess.class, oColumns); - XPropertySet column = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet column = UnoRuntime.queryInterface( XPropertySet.class,oIndexAccess.getByIndex(1)); column.setPropertyValue("OptimalWidth", new Boolean(true)); } catch(com.sun.star.lang.WrappedTargetException e) { diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java index 548b7b94e72e..d3842c014c03 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java @@ -177,8 +177,7 @@ public class ScAccessiblePageHeader extends TestCase { } //get the property-set - final XPropertySet PropSet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, StdStyle); + final XPropertySet PropSet = UnoRuntime.queryInterface(XPropertySet.class, StdStyle); XHeaderFooterContent RPHC = null; // creation of testobject here diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java index 34f86a372354..d7d18f8e2914 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java @@ -182,11 +182,11 @@ public class ScAccessiblePreviewHeaderCell extends TestCase { try { Object oPageStyles = xNA.getByName("PageStyles"); - xNA = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, + xNA = UnoRuntime.queryInterface(XNameAccess.class, oPageStyles); Object oDefStyle = xNA.getByName("Default"); - xPropSet = (XPropertySet) UnoRuntime.queryInterface( + xPropSet = UnoRuntime.queryInterface( XPropertySet.class, oDefStyle); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java index 2cc6362caf6b..fb61f60d32b6 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java @@ -123,15 +123,14 @@ public class ScAnnotationObj extends TestCase { log.println("Getting test object ") ; XSpreadsheetDocument xArea = UnoRuntime.queryInterface(XSpreadsheetDocument.class, xSheetDoc); - XSpreadsheets oSheets = (XSpreadsheets) xArea.getSheets(); + XSpreadsheets oSheets = xArea.getSheets(); XIndexAccess XAccess = UnoRuntime.queryInterface(XIndexAccess.class, oSheets); XCell oCell = null; try { XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject( new Type(XSpreadsheet.class),XAccess.getByIndex(cellPos.Sheet)); - XCellRange oCRange = (XCellRange) - UnoRuntime.queryInterface(XCellRange.class, oSheet); + XCellRange oCRange = UnoRuntime.queryInterface(XCellRange.class, oSheet); oCell = oCRange.getCellByPosition(cellPos.Column, cellPos.Row); } catch(com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java index c3f8ba5e1ba7..4daf692d73e2 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java @@ -135,7 +135,7 @@ public class ScAnnotationShapeObj extends TestCase { XSpreadsheetDocument xArea = UnoRuntime.queryInterface(XSpreadsheetDocument.class, xSheetDoc); - XSpreadsheets oSheets = (XSpreadsheets) xArea.getSheets(); + XSpreadsheets oSheets = xArea.getSheets(); XIndexAccess XAccess = UnoRuntime.queryInterface(XIndexAccess.class, @@ -148,8 +148,8 @@ public class ScAnnotationShapeObj extends TestCase { XSpreadsheet.class), XAccess.getByIndex(cellPos.Sheet)); XCellRange oCRange = - (XCellRange) UnoRuntime.queryInterface(XCellRange.class, - oSheet); + UnoRuntime.queryInterface(XCellRange.class, + oSheet); oCell = oCRange.getCellByPosition(cellPos.Column, cellPos.Row); } catch (com.sun.star.lang.WrappedTargetException e) { diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java index bbb2f12bc65b..11171c8f9e4a 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java +++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java @@ -104,14 +104,13 @@ public class ScAnnotationTextCursor extends TestCase { XSpreadsheetDocument xArea = UnoRuntime.queryInterface(XSpreadsheetDocument.class, xSheetDoc); - XSpreadsheets oSheets = (XSpreadsheets) xArea.getSheets(); + XSpreadsheets oSheets = xArea.getSheets(); XIndexAccess XAccess = UnoRuntime.queryInterface(XIndexAccess.class, oSheets); XSpreadsheet oSheet = (XSpreadsheet)XAccess.getByIndex(cellPos.Sheet); - XCellRange oCRange = (XCellRange) - UnoRuntime.queryInterface(XCellRange.class, oSheet); + XCellRange oCRange = UnoRuntime.queryInterface(XCellRange.class, oSheet); XCell oCell = oCRange.getCellByPosition(cellPos.Column, cellPos.Row); diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java index c341d016c67e..17cfffccb73f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java @@ -110,10 +110,9 @@ public class ScAnnotationsObj extends TestCase { log.println("Getting test object ") ; XSpreadsheetDocument xSpreadsheetDoc = UnoRuntime.queryInterface(XSpreadsheetDocument.class, xSheetDoc); - XSpreadsheets sheets = (XSpreadsheets) xSpreadsheetDoc.getSheets(); + XSpreadsheets sheets = xSpreadsheetDoc.getSheets(); - XNameAccess oNames = (XNameAccess) - UnoRuntime.queryInterface( XNameAccess.class, sheets ); + XNameAccess oNames = UnoRuntime.queryInterface( XNameAccess.class, sheets ); XCell oCell = null; XSpreadsheet oSheet = null; try { @@ -121,8 +120,7 @@ public class ScAnnotationsObj extends TestCase { new Type(XSpreadsheet.class), oNames.getByName(oNames.getElementNames()[0])); // adding an annotation... - XCellRange oCRange = (XCellRange) - UnoRuntime.queryInterface(XCellRange.class, oSheet); + XCellRange oCRange = UnoRuntime.queryInterface(XCellRange.class, oSheet); oCell = oCRange.getCellByPosition(10,10); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java b/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java index 002ca496ccac..563bd6b4942a 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java @@ -108,7 +108,7 @@ public class ScAreaLinkObj extends TestCase { try { // creation of testobject here - XPropertySet props = (XPropertySet) UnoRuntime.queryInterface + XPropertySet props = UnoRuntime.queryInterface (XPropertySet.class, xSheetDoc); XAreaLinks links = (XAreaLinks) AnyConverter.toObject( new Type(XAreaLinks.class),props.getPropertyValue("AreaLinks")) ; diff --git a/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java b/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java index 45bae04e30f0..74f02ca75aae 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java @@ -105,14 +105,14 @@ public class ScAreaLinksObj extends TestCase { try { // creation of testobject here - XPropertySet props = (XPropertySet)UnoRuntime.queryInterface + XPropertySet props = UnoRuntime.queryInterface (XPropertySet.class, xSheetDoc); oObj = (XInterface) AnyConverter.toObject( new Type(XInterface.class),props.getPropertyValue("AreaLinks")) ; XAreaLinks links = null ; // adding one link into collection (for best testing) - links = (XAreaLinks) UnoRuntime.queryInterface(XAreaLinks.class, oObj) ; + links = UnoRuntime.queryInterface(XAreaLinks.class, oObj) ; CellAddress addr = new CellAddress ((short) 1,2,3) ; String aSourceArea = util.utils.getFullTestURL("calcshapes.sxc"); links.insertAtPosition (addr, aSourceArea, "a2:b5", "", "") ; diff --git a/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java b/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java index 411334cf5e2f..0a012a181672 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java @@ -74,7 +74,7 @@ public class ScAutoFormatObj extends TestCase { PrintWriter log) { XInterface oObj = null; - XMultiServiceFactory oMSF = (XMultiServiceFactory)(XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory oMSF = (XMultiServiceFactory)tParam.getMSF(); try { XInterface formats = (XInterface)oMSF.createInstance ("com.sun.star.sheet.TableAutoFormats"); diff --git a/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java b/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java index a9a732ac16dd..be5780cd0461 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java @@ -222,7 +222,7 @@ public class ScCellCursorObj extends TestCase { { "", "2", "3", "4" } }); - XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet PropSet = UnoRuntime.queryInterface( XPropertySet.class, oObj); tEnv.addObjRelation("PropSet", PropSet); diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java index 8aa19354cff7..17a60dcd8640 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java @@ -103,7 +103,7 @@ public class ScCellFormatsEnumeration extends TestCase { XInterface oObj = null; log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java b/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java index c6ffccbd1160..37df8a1405f6 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java @@ -95,7 +95,7 @@ public class ScCellFormatsObj extends TestCase { XInterface oObj = null; log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScCellObj.java b/qadevOOo/tests/java/mod/_sc/ScCellObj.java index 51e85aa9006e..c29dbc3e42a1 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellObj.java @@ -194,8 +194,7 @@ public class ScCellObj extends TestCase { // XTextFieldsSupplier tEnv.addObjRelation("SPREADSHEET", xSheetDoc); - XPropertySet PropSet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oObj); + XPropertySet PropSet = UnoRuntime.queryInterface(XPropertySet.class, oObj); tEnv.addObjRelation("PropSet",PropSet); return tEnv; diff --git a/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java index c16d4fff4761..ce8154207489 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java @@ -142,7 +142,7 @@ public class ScCellRangeObj extends TestCase { XSpreadsheets oSpreadsheets = UnoRuntime.queryInterface( XSpreadsheetDocument.class, xSheetDoc).getSheets(); - XNameAccess oNames = (XNameAccess) UnoRuntime.queryInterface( + XNameAccess oNames = UnoRuntime.queryInterface( XNameAccess.class, oSpreadsheets); XSpreadsheet oSheet = null; @@ -153,7 +153,7 @@ public class ScCellRangeObj extends TestCase { oNames.getByName(oNames.getElementNames()[0])); oObj = oSheet.getCellRangeByPosition(0, 0, 3, 4); - testRange = (XCellRange) UnoRuntime.queryInterface( + testRange = UnoRuntime.queryInterface( XCellRange.class, oObj); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(log); @@ -189,7 +189,7 @@ public class ScCellRangeObj extends TestCase { tEnv.addObjRelation("XCellRangesQuery.EXPECTEDRESULTS", expectedResults); tEnv.addObjRelation("XCellRangesQuery.CREATEENTRIES", Boolean.TRUE); - XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet PropSet = UnoRuntime.queryInterface( XPropertySet.class, oObj); tEnv.addObjRelation("PropSet", PropSet); @@ -199,7 +199,7 @@ public class ScCellRangeObj extends TestCase { testRange.getCellByPosition(0,0), testRange.getCellByPosition(0,1)}); } catch(com.sun.star.lang.IndexOutOfBoundsException e){ - e.printStackTrace((PrintWriter)log); + e.printStackTrace(log); log.println("Cannot make required object relation 'XSearchable.MAKEENTRYINCELL'."); } diff --git a/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java index e50a26489464..dc8136008ff5 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java @@ -156,8 +156,7 @@ public class ScCellRangesObj extends TestCase { try { oSheet = (XSpreadsheet) AnyConverter.toObject( new Type(XSpreadsheet.class), oIndSheets.getByIndex(0)); - XNameContainer oRanges = (XNameContainer) - UnoRuntime.queryInterface(XNameContainer.class, oObj); + XNameContainer oRanges = UnoRuntime.queryInterface(XNameContainer.class, oObj); oRange = oSheet.getCellRangeByName("C1:D4"); oRanges.insertByName("Range1", oRange); @@ -225,8 +224,7 @@ public class ScCellRangesObj extends TestCase { tEnv.addObjRelation("INSTANCE" + n, oRange); } - XPropertySet PropSet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oObj); + XPropertySet PropSet = UnoRuntime.queryInterface(XPropertySet.class, oObj); tEnv.addObjRelation("PropSet",PropSet); tEnv.addObjRelation("SHEET", oSheet); // add expected results for the XCellRangesQuery interface test diff --git a/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java b/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java index 1708d297bced..cff9e9b9bc6f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java @@ -106,7 +106,7 @@ public class ScCellSearchObj extends TestCase { log.println( "creating a test environment" ); log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java index 7547e35cb464..6bc31581fbe2 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java @@ -107,21 +107,21 @@ public class ScCellsEnumeration extends TestCase { XEnumerationAccess oEnum = null; // creation of testobject here - XSpreadsheets oSheets = (XSpreadsheets)xSheetDoc.getSheets(); + XSpreadsheets oSheets = xSheetDoc.getSheets(); XIndexAccess oIndexAccess = UnoRuntime.queryInterface(XIndexAccess.class, oSheets); XCellRange oSheet = null; try { oSheet = (XCellRange) AnyConverter.toObject( new Type(XCellRange.class),oIndexAccess.getByIndex(0)); - XCell oCell_1 = (XCell)oSheet.getCellByPosition(0, 0); + XCell oCell_1 = oSheet.getCellByPosition(0, 0); XTextRange oTextRange = UnoRuntime.queryInterface(XTextRange.class, oCell_1); oTextRange.setString("Test string 1"); - XCell oCell_2 = (XCell)oSheet.getCellByPosition(5, 1); + XCell oCell_2 = oSheet.getCellByPosition(5, 1); oCell_2.setValue(15); - XCell oCell_3 = (XCell)oSheet.getCellByPosition(3, 9); + XCell oCell_3 = oSheet.getCellByPosition(3, 9); oTextRange = UnoRuntime.queryInterface(XTextRange.class, oCell_3); oTextRange.setString("test 2"); cellArr[0] = oCell_1; @@ -143,7 +143,7 @@ public class ScCellsEnumeration extends TestCase { XCellRangesQuery oCellRangesQuery = UnoRuntime.queryInterface(XCellRangesQuery.class, oSheet); XSheetCellRanges oSheetCellRanges = oCellRangesQuery.queryVisibleCells(); - oEnum = (XEnumerationAccess) oSheetCellRanges.getCells(); + oEnum = oSheetCellRanges.getCells(); oObj = oSheetCellRanges.getCells().createEnumeration(); TestEnvironment tEnv = new TestEnvironment(oObj); diff --git a/qadevOOo/tests/java/mod/_sc/ScCellsObj.java b/qadevOOo/tests/java/mod/_sc/ScCellsObj.java index 33efd3dd4916..ac4a5700ddc3 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellsObj.java @@ -101,22 +101,22 @@ public class ScCellsObj extends TestCase { Object cellArr[] = new Object[3]; // creation of testobject here - XSpreadsheets oSheets = (XSpreadsheets)xSheetDoc.getSheets(); + XSpreadsheets oSheets = xSheetDoc.getSheets(); XIndexAccess oIndexAccess = UnoRuntime.queryInterface(XIndexAccess.class, oSheets); XCellRange oSheet = null; try { oSheet = (XCellRange) AnyConverter.toObject( new Type(XCellRange.class),oIndexAccess.getByIndex(0)); - XCell oCell_1 = (XCell)oSheet.getCellByPosition(0, 0); + XCell oCell_1 = oSheet.getCellByPosition(0, 0); XTextRange oTextRange = UnoRuntime.queryInterface(XTextRange.class, oCell_1); oTextRange.setString("ScCellsObj test 1"); - XCell oCell_2 = (XCell)oSheet.getCellByPosition(5, 1); + XCell oCell_2 = oSheet.getCellByPosition(5, 1); oCell_2.setValue(15); - XCell oCell_3 = (XCell)oSheet.getCellByPosition(3, 9); + XCell oCell_3 = oSheet.getCellByPosition(3, 9); oTextRange = UnoRuntime.queryInterface(XTextRange.class, oCell_3); oTextRange.setString("ScCellsObj test 2"); diff --git a/qadevOOo/tests/java/mod/_sc/ScChartObj.java b/qadevOOo/tests/java/mod/_sc/ScChartObj.java index a68749b44f9e..0b84c746b0c5 100644 --- a/qadevOOo/tests/java/mod/_sc/ScChartObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScChartObj.java @@ -197,8 +197,7 @@ public class ScChartObj extends TestCase { Rectangle oRect = new Rectangle(500, 3000, 25000, 11000); - XCellRange oRange = (XCellRange) - UnoRuntime.queryInterface(XCellRange.class, oSheet); + XCellRange oRange = UnoRuntime.queryInterface(XCellRange.class, oSheet); XCellRange myRange = oRange.getCellRangeByName("A1:N4"); XCellRangeAddressable oRangeAddr = UnoRuntime.queryInterface(XCellRangeAddressable.class, myRange); CellRangeAddress myAddr = oRangeAddr.getRangeAddress(); diff --git a/qadevOOo/tests/java/mod/_sc/ScChartsObj.java b/qadevOOo/tests/java/mod/_sc/ScChartsObj.java index baf429e8ef3f..b7b900b0bc65 100644 --- a/qadevOOo/tests/java/mod/_sc/ScChartsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScChartsObj.java @@ -204,8 +204,7 @@ public class ScChartsObj extends TestCase { // insert a chart Rectangle oRect = new Rectangle(500, 3000, 25000, 11000); - XCellRange oRange = (XCellRange) - UnoRuntime.queryInterface(XCellRange.class, oSheet); + XCellRange oRange = UnoRuntime.queryInterface(XCellRange.class, oSheet); XCellRange myRange = oRange.getCellRangeByName("A1:N4"); XCellRangeAddressable oRangeAddr = UnoRuntime.queryInterface(XCellRangeAddressable.class, myRange); CellRangeAddress myAddr = oRangeAddr.getRangeAddress(); diff --git a/qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java b/qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java index 5c7767ece6d3..6e693850e5ae 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java @@ -150,7 +150,7 @@ public class ScDDELinkObj extends TestCase { } log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; @@ -188,8 +188,7 @@ public class ScDDELinkObj extends TestCase { log.println("Getting test object ") ; // Getting named ranges. - XPropertySet docProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); + XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); XNameAccess links = (XNameAccess) AnyConverter.toObject( new Type(XNameAccess.class), UnoRuntime.queryInterface( XNameAccess.class, docProps.getPropertyValue("DDELinks"))); diff --git a/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java b/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java index f2490f3f2bd8..58c2bd061bb6 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java @@ -130,7 +130,7 @@ public class ScDDELinksObj extends TestCase { } log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; @@ -168,8 +168,7 @@ public class ScDDELinksObj extends TestCase { log.println("Getting test object ") ; // Getting named ranges. - XPropertySet docProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); + XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); oObj = (XInterface)AnyConverter.toObject( new Type(XInterface.class),docProps.getPropertyValue("DDELinks")); log.println("Creating object - " + diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java index df2b4a5cc841..2b7714422ff1 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java @@ -119,7 +119,7 @@ public class ScDataPilotFieldGroupItemObj extends TestCase log.println ("Getting a sheet"); - XSpreadsheets xSpreadsheets = (XSpreadsheets) xSheetDoc.getSheets (); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets (); XSpreadsheet oSheet = null; XSpreadsheet oSheet2 = null; XIndexAccess oIndexAccess = UnoRuntime.queryInterface ( @@ -227,19 +227,19 @@ public class ScDataPilotFieldGroupItemObj extends TestCase try { Object oDataPilotField = DPDsc.getDataPilotFields ().getByIndex (0); - fieldPropSet = (XPropertySet) UnoRuntime.queryInterface ( + fieldPropSet = UnoRuntime.queryInterface ( XPropertySet.class, oDataPilotField); fieldPropSet.setPropertyValue ("Orientation", com.sun.star.sheet.DataPilotFieldOrientation.ROW); oDataPilotField = DPDsc.getDataPilotFields ().getByIndex (1); - fieldPropSet = (XPropertySet) UnoRuntime.queryInterface ( + fieldPropSet = UnoRuntime.queryInterface ( XPropertySet.class, oDataPilotField); fieldPropSet.setPropertyValue ("Function", com.sun.star.sheet.GeneralFunction.SUM); fieldPropSet.setPropertyValue ("Orientation", com.sun.star.sheet.DataPilotFieldOrientation.DATA); oDataPilotField = DPDsc.getDataPilotFields ().getByIndex (2); - fieldPropSet = (XPropertySet) UnoRuntime.queryInterface ( + fieldPropSet = UnoRuntime.queryInterface ( XPropertySet.class, oDataPilotField); fieldPropSet.setPropertyValue ("Orientation", com.sun.star.sheet.DataPilotFieldOrientation.COLUMN); @@ -331,10 +331,10 @@ public class ScDataPilotFieldGroupItemObj extends TestCase { datapilotfield = (XInterface) AnyConverter.toObject ( new Type (XInterface.class), IA.getByIndex (i)); - XPropertySet xPropertySet = (XPropertySet) UnoRuntime.queryInterface (XPropertySet.class, IA.getByIndex (i)); + XPropertySet xPropertySet = UnoRuntime.queryInterface (XPropertySet.class, IA.getByIndex (i)); if (((Boolean)xPropertySet.getPropertyValue ("IsGroupField")).booleanValue ()) { - xPropertySet = (XPropertySet) UnoRuntime.queryInterface (XPropertySet.class, datapilotfield); + xPropertySet = UnoRuntime.queryInterface (XPropertySet.class, datapilotfield); XNamed xNamed = UnoRuntime.queryInterface (XNamed.class, IA.getByIndex (i)); System.out.println ("name: "+xNamed.getName ()); dpgi = (DataPilotFieldGroupInfo) xPropertySet.getPropertyValue ("GroupInfo"); @@ -342,8 +342,8 @@ public class ScDataPilotFieldGroupItemObj extends TestCase } groups = dpgi.Groups; XIndexAccess groupAccess = UnoRuntime.queryInterface(XIndexAccess.class, groups); - XNameAccess groupNames = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, groupAccess.getByIndex(0)); - oObj = (XInterface) UnoRuntime.queryInterface(XInterface.class, groupNames.getByName("aName")); + XNameAccess groupNames = UnoRuntime.queryInterface(XNameAccess.class, groupAccess.getByIndex(0)); + oObj = UnoRuntime.queryInterface(XInterface.class, groupNames.getByName("aName")); } catch (Exception e) { diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java index 7f650e391669..2fc1fa4f5bda 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java @@ -118,7 +118,7 @@ public class ScDataPilotFieldGroupObj extends TestCase log.println ("Getting a sheet"); - XSpreadsheets xSpreadsheets = (XSpreadsheets) xSheetDoc.getSheets (); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets (); XSpreadsheet oSheet = null; XSpreadsheet oSheet2 = null; XIndexAccess oIndexAccess = UnoRuntime.queryInterface ( @@ -226,19 +226,19 @@ public class ScDataPilotFieldGroupObj extends TestCase try { Object oDataPilotField = DPDsc.getDataPilotFields ().getByIndex (0); - fieldPropSet = (XPropertySet) UnoRuntime.queryInterface ( + fieldPropSet = UnoRuntime.queryInterface ( XPropertySet.class, oDataPilotField); fieldPropSet.setPropertyValue ("Orientation", com.sun.star.sheet.DataPilotFieldOrientation.ROW); oDataPilotField = DPDsc.getDataPilotFields ().getByIndex (1); - fieldPropSet = (XPropertySet) UnoRuntime.queryInterface ( + fieldPropSet = UnoRuntime.queryInterface ( XPropertySet.class, oDataPilotField); fieldPropSet.setPropertyValue ("Function", com.sun.star.sheet.GeneralFunction.SUM); fieldPropSet.setPropertyValue ("Orientation", com.sun.star.sheet.DataPilotFieldOrientation.DATA); oDataPilotField = DPDsc.getDataPilotFields ().getByIndex (2); - fieldPropSet = (XPropertySet) UnoRuntime.queryInterface ( + fieldPropSet = UnoRuntime.queryInterface ( XPropertySet.class, oDataPilotField); fieldPropSet.setPropertyValue ("Orientation", com.sun.star.sheet.DataPilotFieldOrientation.COLUMN); @@ -330,10 +330,10 @@ public class ScDataPilotFieldGroupObj extends TestCase { datapilotfield = (XInterface) AnyConverter.toObject ( new Type (XInterface.class), IA.getByIndex (i)); - XPropertySet xPropertySet = (XPropertySet) UnoRuntime.queryInterface (XPropertySet.class, IA.getByIndex (i)); + XPropertySet xPropertySet = UnoRuntime.queryInterface (XPropertySet.class, IA.getByIndex (i)); if (((Boolean)xPropertySet.getPropertyValue ("IsGroupField")).booleanValue ()) { - xPropertySet = (XPropertySet) UnoRuntime.queryInterface (XPropertySet.class, datapilotfield); + xPropertySet = UnoRuntime.queryInterface (XPropertySet.class, datapilotfield); XNamed xNamed = UnoRuntime.queryInterface (XNamed.class, IA.getByIndex (i)); System.out.println ("name: "+xNamed.getName ()); dpgi = (DataPilotFieldGroupInfo) xPropertySet.getPropertyValue ("GroupInfo"); @@ -341,7 +341,7 @@ public class ScDataPilotFieldGroupObj extends TestCase } groups = dpgi.Groups; XIndexAccess groupAccess = UnoRuntime.queryInterface(XIndexAccess.class, groups); - oObj = (XInterface) UnoRuntime.queryInterface(XInterface.class, groupAccess.getByIndex(0)); + oObj = UnoRuntime.queryInterface(XInterface.class, groupAccess.getByIndex(0)); } catch (Exception e) { diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java index 7805d7d9ed70..7899d586b068 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java @@ -118,7 +118,7 @@ public class ScDataPilotFieldGroupsObj extends TestCase log.println ("Getting a sheet"); - XSpreadsheets xSpreadsheets = (XSpreadsheets) xSheetDoc.getSheets (); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets (); XSpreadsheet oSheet = null; XSpreadsheet oSheet2 = null; XIndexAccess oIndexAccess = UnoRuntime.queryInterface ( @@ -226,19 +226,19 @@ public class ScDataPilotFieldGroupsObj extends TestCase try { Object oDataPilotField = DPDsc.getDataPilotFields ().getByIndex (0); - fieldPropSet = (XPropertySet) UnoRuntime.queryInterface ( + fieldPropSet = UnoRuntime.queryInterface ( XPropertySet.class, oDataPilotField); fieldPropSet.setPropertyValue ("Orientation", com.sun.star.sheet.DataPilotFieldOrientation.ROW); oDataPilotField = DPDsc.getDataPilotFields ().getByIndex (1); - fieldPropSet = (XPropertySet) UnoRuntime.queryInterface ( + fieldPropSet = UnoRuntime.queryInterface ( XPropertySet.class, oDataPilotField); fieldPropSet.setPropertyValue ("Function", com.sun.star.sheet.GeneralFunction.SUM); fieldPropSet.setPropertyValue ("Orientation", com.sun.star.sheet.DataPilotFieldOrientation.DATA); oDataPilotField = DPDsc.getDataPilotFields ().getByIndex (2); - fieldPropSet = (XPropertySet) UnoRuntime.queryInterface ( + fieldPropSet = UnoRuntime.queryInterface ( XPropertySet.class, oDataPilotField); fieldPropSet.setPropertyValue ("Orientation", com.sun.star.sheet.DataPilotFieldOrientation.COLUMN); @@ -330,10 +330,10 @@ public class ScDataPilotFieldGroupsObj extends TestCase { datapilotfield = (XInterface) AnyConverter.toObject ( new Type (XInterface.class), IA.getByIndex (i)); - XPropertySet xPropertySet = (XPropertySet) UnoRuntime.queryInterface (XPropertySet.class, IA.getByIndex (i)); + XPropertySet xPropertySet = UnoRuntime.queryInterface (XPropertySet.class, IA.getByIndex (i)); if (((Boolean)xPropertySet.getPropertyValue ("IsGroupField")).booleanValue ()) { - xPropertySet = (XPropertySet) UnoRuntime.queryInterface (XPropertySet.class, datapilotfield); + xPropertySet = UnoRuntime.queryInterface (XPropertySet.class, datapilotfield); XNamed xNamed = UnoRuntime.queryInterface (XNamed.class, IA.getByIndex (i)); System.out.println ("name: "+xNamed.getName ()); dpgi = (DataPilotFieldGroupInfo) xPropertySet.getPropertyValue ("GroupInfo"); diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java index 0e07ddfb1e4f..862cd89cf96a 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java @@ -140,7 +140,7 @@ public class ScDataPilotFieldObj extends TestCase { log.println("Getting a sheet"); - XSpreadsheets xSpreadsheets = (XSpreadsheets) xSheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); XSpreadsheet oSheet = null; XSpreadsheet oSheet2 = null; XIndexAccess oIndexAccess = UnoRuntime.queryInterface( @@ -223,7 +223,7 @@ public class ScDataPilotFieldObj extends TestCase { try { Object oDataPilotField = DPDsc.getDataPilotFields().getByIndex(0); - fieldPropSet = (XPropertySet) UnoRuntime.queryInterface( + fieldPropSet = UnoRuntime.queryInterface( XPropertySet.class, oDataPilotField); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(); @@ -320,7 +320,7 @@ public class ScDataPilotFieldObj extends TestCase { if (!name.equals("Data")) { fieldsNames[cnt] = name; - XPropertySet props = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet props = UnoRuntime.queryInterface( XPropertySet.class, field); try { diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java index dd91506fc6fe..2b5573ee41db 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java @@ -110,7 +110,7 @@ public class ScDataPilotFieldsObj extends TestCase { // create testobject here log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java index eec1c97364ff..7bb82070f96c 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java @@ -141,7 +141,7 @@ public class ScDataPilotItemObj extends TestCase { log.println("Getting a sheet"); - XSpreadsheets xSpreadsheets = (XSpreadsheets) xSheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); XSpreadsheet oSheet = null; XSpreadsheet oSheet2 = null; XIndexAccess oIndexAccess = UnoRuntime.queryInterface( @@ -224,7 +224,7 @@ public class ScDataPilotItemObj extends TestCase { try { Object oDataPilotField = DPDsc.getDataPilotFields().getByIndex(0); - fieldPropSet = (XPropertySet) UnoRuntime.queryInterface( + fieldPropSet = UnoRuntime.queryInterface( XPropertySet.class, oDataPilotField); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(); @@ -287,7 +287,7 @@ public class ScDataPilotItemObj extends TestCase { XIndexAccess xIA = xDataPilotField.getItems(); try { - oObj = (XInterface) UnoRuntime.queryInterface(XInterface.class, + oObj = UnoRuntime.queryInterface(XInterface.class, xIA.getByIndex(0)); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { log.println("Couldn't get DataPilotItemObj"); @@ -338,7 +338,7 @@ public class ScDataPilotItemObj extends TestCase { if (!name.equals("Data")) { fieldsNames[cnt] = name; - XPropertySet props = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet props = UnoRuntime.queryInterface( XPropertySet.class, field); try { diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java index 60f40eefa7b8..804c3a255fe2 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java @@ -141,7 +141,7 @@ public class ScDataPilotItemsObj extends TestCase { log.println("Getting a sheet"); - XSpreadsheets xSpreadsheets = (XSpreadsheets) xSheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); XSpreadsheet oSheet = null; XSpreadsheet oSheet2 = null; XIndexAccess oIndexAccess = UnoRuntime.queryInterface( @@ -224,7 +224,7 @@ public class ScDataPilotItemsObj extends TestCase { try { Object oDataPilotField = DPDsc.getDataPilotFields().getByIndex(0); - fieldPropSet = (XPropertySet) UnoRuntime.queryInterface( + fieldPropSet = UnoRuntime.queryInterface( XPropertySet.class, oDataPilotField); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(); @@ -326,7 +326,7 @@ public class ScDataPilotItemsObj extends TestCase { if (!name.equals("Data")) { fieldsNames[cnt] = name; - XPropertySet props = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet props = UnoRuntime.queryInterface( XPropertySet.class, field); try { diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java index e5301fe94080..19ee1dcc47ea 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java @@ -206,8 +206,7 @@ public class ScDataPilotTableObj extends TestCase { XPropertySet fieldPropSet = null; try { Object oDataPilotField = DPDsc.getDataPilotFields().getByIndex(0); - fieldPropSet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oDataPilotField); + fieldPropSet = UnoRuntime.queryInterface(XPropertySet.class, oDataPilotField); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(log); throw new StatusException("Couldn't create a test environment", e); @@ -293,7 +292,7 @@ public class ScDataPilotTableObj extends TestCase { for (int i = 0; i < fieldCount; ++i) { Object o = xIA.getByIndex(i); - XPropertySet fieldPropSet = (XPropertySet)UnoRuntime.queryInterface( + XPropertySet fieldPropSet = UnoRuntime.queryInterface( XPropertySet.class, o); if (i == fieldCount - 1) diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java index a4afcd727729..9ff3ebbf1fa7 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java @@ -117,7 +117,7 @@ public class ScDataPilotTablesObj extends TestCase { // create testobject here log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java index 80a614fb7e4e..a63d9222a512 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java @@ -130,7 +130,7 @@ public class ScDatabaseRangeObj extends TestCase { log.println("Getting test object "); - XPropertySet docProps = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet docProps = UnoRuntime.queryInterface( XPropertySet.class, xSheetDoc); XSpreadsheets sheets = xSheetDoc.getSheets(); @@ -172,7 +172,7 @@ public class ScDatabaseRangeObj extends TestCase { CellRangeAddress aRange = null; //dbRanges.addNewByName("dbRange", aRange); - XNameAccess dbrNA = (XNameAccess) UnoRuntime.queryInterface( + XNameAccess dbrNA = UnoRuntime.queryInterface( XNameAccess.class, dbRanges); XNamed xNamed = null; @@ -218,7 +218,7 @@ public class ScDatabaseRangeObj extends TestCase { try { Object sheet = sheets.getByName(names[0]); - xCellRange = (XCellRange) UnoRuntime.queryInterface( + xCellRange = UnoRuntime.queryInterface( XCellRange.class, sheet); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java index 915579e496f4..f60cd1638de7 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java @@ -104,8 +104,7 @@ public class ScDatabaseRangesObj extends TestCase { log.println( "Creating a test environment" ); log.println("Getting test object ") ; - XPropertySet docProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); + XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); XDatabaseRanges dbRanges = null; try { diff --git a/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java b/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java index ea4bf9c9b0ef..77692adb089f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java @@ -104,7 +104,7 @@ public class ScDrawPageObj extends TestCase { try { log.println( "getting Drawpages" ); XDrawPagesSupplier oDPS = UnoRuntime.queryInterface(XDrawPagesSupplier.class,xDoc); - oDP = (XDrawPages) oDPS.getDrawPages(); + oDP = oDPS.getDrawPages(); oDP.insertNewByIndex(1); oDP.insertNewByIndex(2); oObj = (XDrawPage) AnyConverter.toObject( diff --git a/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java b/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java index f2ae638a3fb8..f25557e5209a 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java @@ -109,7 +109,7 @@ public class ScDrawPagesObj extends TestCase { // get the drawpage of drawing here log.println( "getting Drawpages" ); XDrawPagesSupplier oDPS = UnoRuntime.queryInterface(XDrawPagesSupplier.class, xSheetDoc); - oDP = (XDrawPages) oDPS.getDrawPages(); + oDP = oDPS.getDrawPages(); oDP.insertNewByIndex(1); oDP.insertNewByIndex(2); oObj = oDP; diff --git a/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java index 8b8daaab782b..4849bfb02e93 100644 --- a/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java +++ b/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java @@ -101,7 +101,7 @@ public class ScFilterDescriptorBase extends TestCase { XSheetFilterable SF = null; log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java b/qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java index 85cfc2bad05e..7fdf6c586803 100644 --- a/qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java @@ -79,7 +79,7 @@ public class ScFunctionDescriptionObj extends TestCase { XInterface FDs = (XInterface)oDocMSF. createInstance("com.sun.star.sheet.FunctionDescriptions"); - XNameAccess NA = (XNameAccess)UnoRuntime.queryInterface + XNameAccess NA = UnoRuntime.queryInterface (XNameAccess.class, FDs); String names[] = NA.getElementNames(); diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java index af8b1d08cbca..799088ea8c49 100644 --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java @@ -151,8 +151,7 @@ public class ScHeaderFieldObj extends TestCase { } //get the property-set - PropSet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, StdStyle); + PropSet = UnoRuntime.queryInterface(XPropertySet.class, StdStyle); XHeaderFooterContent RPHC = null; // creation of testobject here diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java index b87925cdfabb..6d2c59aed099 100644 --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java @@ -136,8 +136,7 @@ public class ScHeaderFieldsObj extends TestCase { } //get the property-set - PropSet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, StdStyle); + PropSet = UnoRuntime.queryInterface(XPropertySet.class, StdStyle); XHeaderFooterContent RPHC = null; // creation of testobject here diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java index bbadda64e346..88e01a43d616 100644 --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java @@ -122,8 +122,7 @@ public class ScHeaderFooterContentObj extends TestCase { } //get the property-set - PropSet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, StdStyle); + PropSet = UnoRuntime.queryInterface(XPropertySet.class, StdStyle); XHeaderFooterContent RPHC = null; // creation of testobject here diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java index 15be879ddf39..007855f82735 100644 --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java +++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java @@ -161,8 +161,7 @@ public class ScHeaderFooterTextCursor extends TestCase { } //get the property-set - PropSet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, StdStyle); + PropSet = UnoRuntime.queryInterface(XPropertySet.class, StdStyle); XHeaderFooterContent RPHC = null; // creation of testobject here diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java index 530f54120ed1..a937eadd85ff 100644 --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java @@ -165,8 +165,7 @@ public class ScHeaderFooterTextObj extends TestCase { } //get the property-set - PropSet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, StdStyle); + PropSet = UnoRuntime.queryInterface(XPropertySet.class, StdStyle); XHeaderFooterContent RPHC = null; // creation of testobject here diff --git a/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java index edd2911df097..3d3f6bbf4736 100644 --- a/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java +++ b/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java @@ -115,14 +115,14 @@ public class ScImportDescriptorBase extends TestCase { // create testobject here log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSpreadsheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets(); if (xSpreadsheets == null) log.println("FAILED"); else log.println("OK"); log.println("getting a sheet"); XIndexAccess oIndexAccess = UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets); try { - oObj = (XInterface) UnoRuntime.queryInterface(XInterface.class,oIndexAccess.getByIndex(0)); + oObj = UnoRuntime.queryInterface(XInterface.class,oIndexAccess.getByIndex(0)); } catch (Exception e) { throw new StatusException( "Couldn't get a spreadsheet", e); } diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java index dbf755481643..ee7b609377fb 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java @@ -75,7 +75,7 @@ public class ScIndexEnumeration_CellAnnotationsEnumeration extends TestCase { XInterface oObj = null; log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java index d63546f09d10..96df8bc1f105 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java @@ -78,14 +78,14 @@ public class ScIndexEnumeration_CellAreaLinksEnumeration extends TestCase { try { // creation of testobject here - XPropertySet props = (XPropertySet)UnoRuntime.queryInterface + XPropertySet props = UnoRuntime.queryInterface (XPropertySet.class, xSheetDoc); oObj = (XInterface) AnyConverter.toObject( new Type(XInterface.class),props.getPropertyValue("AreaLinks")) ; XAreaLinks links = null ; // adding one link into collection (for best testing) - links = (XAreaLinks) UnoRuntime.queryInterface(XAreaLinks.class, oObj) ; + links = UnoRuntime.queryInterface(XAreaLinks.class, oObj) ; CellAddress addr = new CellAddress ((short) 1,2,3) ; String aSourceArea = util.utils.getFullTestURL("calcshapes.sxc"); links.insertAtPosition (addr, aSourceArea, "a2:b5", "", "") ; diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java index 66cb82de4e63..0abfc03285e0 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java @@ -100,7 +100,7 @@ public class ScIndexEnumeration_DDELinksEnumeration extends TestCase { } log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; @@ -138,8 +138,7 @@ public class ScIndexEnumeration_DDELinksEnumeration extends TestCase { log.println("Getting test object ") ; // Getting named ranges. - XPropertySet docProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); + XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); oObj = (XInterface)AnyConverter.toObject( new Type(XInterface.class),docProps.getPropertyValue("DDELinks")); log.println("Creating object - " + diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java index 734c735f0e61..dfdd517536d9 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java @@ -83,7 +83,7 @@ public class ScIndexEnumeration_DataPilotFieldsEnumeration extends TestCase { // create testobject here log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java index 3c2e8d8c5707..e8e5a7b097fd 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java @@ -143,7 +143,7 @@ public class ScIndexEnumeration_DataPilotItemsEnumeration log.println("Getting a sheet"); - XSpreadsheets xSpreadsheets = (XSpreadsheets) xSheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); XSpreadsheet oSheet = null; XSpreadsheet oSheet2 = null; XIndexAccess oIndexAccess = UnoRuntime.queryInterface( @@ -226,7 +226,7 @@ public class ScIndexEnumeration_DataPilotItemsEnumeration try { Object oDataPilotField = DPDsc.getDataPilotFields().getByIndex(0); - fieldPropSet = (XPropertySet) UnoRuntime.queryInterface( + fieldPropSet = UnoRuntime.queryInterface( XPropertySet.class, oDataPilotField); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(); @@ -332,7 +332,7 @@ public class ScIndexEnumeration_DataPilotItemsEnumeration if (!name.equals("Data")) { fieldsNames[cnt] = name; - XPropertySet props = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet props = UnoRuntime.queryInterface( XPropertySet.class, field); try { diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java index be0ae0c276ef..eedc7b1c54f7 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java @@ -83,7 +83,7 @@ public class ScIndexEnumeration_DataPilotTablesEnumeration extends TestCase { // create testobject here log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java index 0f0b2854ae0b..900c520bd839 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java @@ -77,8 +77,7 @@ public class ScIndexEnumeration_DatabaseRangesEnumeration extends TestCase { log.println( "Creating a test environment" ); log.println("Getting test object ") ; - XPropertySet docProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); + XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); XDatabaseRanges dbRanges = null; try { diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java index 207a7c427a19..c074fd4e15da 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java @@ -75,8 +75,7 @@ public class ScIndexEnumeration_LabelRangesEnumeration extends TestCase { try { log.println("Getting test object ") ; - XPropertySet docProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); + XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); Object ranges = docProps.getPropertyValue("ColumnLabelRanges"); XLabelRanges lRanges = UnoRuntime.queryInterface(XLabelRanges.class, ranges); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java index 1b3165192202..9d9e2cd83590 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java @@ -76,8 +76,7 @@ public class ScIndexEnumeration_NamedRangesEnumeration extends TestCase { log.println("Getting test object "); // Getting named ranges. - XPropertySet docProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); + XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); Object ranges = null; try { ranges = docProps.getPropertyValue("NamedRanges"); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java index a8bd4f0ab663..4b4960e946b8 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java @@ -73,7 +73,7 @@ public class ScIndexEnumeration_ScenariosEnumeration extends TestCase { protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSpreadsheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; XIndexAccess oIndexAccess = UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets); @@ -102,8 +102,7 @@ public class ScIndexEnumeration_ScenariosEnumeration extends TestCase { } XScenariosSupplier xSupp = UnoRuntime.queryInterface(XScenariosSupplier.class, oSheet); - XCellRange oRange = (XCellRange) - UnoRuntime.queryInterface(XCellRange.class, oSheet); + XCellRange oRange = UnoRuntime.queryInterface(XCellRange.class, oSheet); XCellRange myRange = oRange.getCellRangeByName("A1:N4"); XCellRangeAddressable oRangeAddr = UnoRuntime.queryInterface(XCellRangeAddressable.class, myRange); CellRangeAddress myAddr = oRangeAddr.getRangeAddress(); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java index 0cdbf4821317..865ed59b8fd3 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java @@ -95,8 +95,7 @@ public class ScIndexEnumeration_SheetCellRangesEnumeration extends TestCase { try { oSheet = (XSpreadsheet) AnyConverter.toObject( new Type(XSpreadsheet.class),oIndSheets.getByIndex(0)); - XNameContainer oRanges = (XNameContainer) - UnoRuntime.queryInterface(XNameContainer.class, oObj); + XNameContainer oRanges = UnoRuntime.queryInterface(XNameContainer.class, oObj); oRange = oSheet.getCellRangeByName("C1:D4"); oRanges.insertByName("Range1", oRange); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java index 823825791feb..261739ad7ed9 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java @@ -102,8 +102,7 @@ public class ScIndexEnumeration_SheetLinksEnumeration extends TestCase { com.sun.star.sheet.SheetLinkMode.VALUE); // Getting links. - XPropertySet docProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); + XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); Object links = null; try { @@ -116,7 +115,7 @@ public class ScIndexEnumeration_SheetLinksEnumeration extends TestCase { throw new StatusException("Couldn't get SheetLinks", e); } - oObj = (XInterface)UnoRuntime.queryInterface(XInterface.class, links); + oObj = UnoRuntime.queryInterface(XInterface.class, links); XEnumerationAccess ea = UnoRuntime.queryInterface(XEnumerationAccess.class,oObj); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java index ec6601197b1b..88d9d2c5bb53 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java @@ -65,10 +65,9 @@ public class ScIndexEnumeration_SpreadsheetsEnumeration extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSpreadsheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets(); - XInterface oObj = (XInterface) - UnoRuntime.queryInterface(XInterface.class, xSpreadsheets); + XInterface oObj = UnoRuntime.queryInterface(XInterface.class, xSpreadsheets); log.println("creating a new environment for object"); XEnumerationAccess ea = UnoRuntime.queryInterface(XEnumerationAccess.class,oObj); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java index 28e3faef0325..dd7dd1bff5a8 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java @@ -77,7 +77,7 @@ public class ScIndexEnumeration_SubTotalFieldsEnumeration extends TestCase { protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSpreadsheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java index dad41188204c..478b4a6c9a9b 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java @@ -164,8 +164,7 @@ public class ScIndexEnumeration_TableChartsEnumeration extends TestCase { // insert a chart Rectangle oRect = new Rectangle(500, 3000, 25000, 11000); - XCellRange oRange = (XCellRange) - UnoRuntime.queryInterface(XCellRange.class, oSheet); + XCellRange oRange = UnoRuntime.queryInterface(XCellRange.class, oSheet); XCellRange myRange = oRange.getCellRangeByName("A1:N4"); XCellRangeAddressable oRangeAddr = UnoRuntime.queryInterface(XCellRangeAddressable.class, myRange); CellRangeAddress myAddr = oRangeAddr.getRangeAddress(); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java index a907f195f65b..f1d2617f8169 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java @@ -78,9 +78,8 @@ public class ScIndexEnumeration_TableColumnsEnumeration extends TestCase { log.println("craeting a test environment"); log.println("getting column"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSheetDoc.getSheets(); - XNameAccess oNames = (XNameAccess) - UnoRuntime.queryInterface( XNameAccess.class, xSpreadsheets ); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); + XNameAccess oNames = UnoRuntime.queryInterface( XNameAccess.class, xSpreadsheets ); XSpreadsheet xSpreadsheet = null; try { xSpreadsheet = (XSpreadsheet) AnyConverter.toObject( @@ -98,7 +97,7 @@ public class ScIndexEnumeration_TableColumnsEnumeration extends TestCase { } XColumnRowRange oColumnRowRange = UnoRuntime.queryInterface(XColumnRowRange.class, xSpreadsheet); - XTableColumns oColumns = (XTableColumns) oColumnRowRange.getColumns(); + XTableColumns oColumns = oColumnRowRange.getColumns(); oObj = oColumns; log.println("creating a new environment for object"); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java index c457d7ef77eb..841490a987f6 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java @@ -77,7 +77,7 @@ public class ScIndexEnumeration_TableConditionalEntryEnumeration extends TestCas XInterface oObj = null; log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSpreadsheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; @@ -111,8 +111,7 @@ public class ScIndexEnumeration_TableConditionalEntryEnumeration extends TestCas XPropertySet Props = null; try { - Props = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oSheet); + Props = UnoRuntime.queryInterface(XPropertySet.class, oSheet); CFormat = Props.getPropertyValue("ConditionalFormat"); if (utils.isVoid(CFormat)) { log.println("Property 'ConditionalFormat' is void"); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java index 2c12cd2dc40c..c5f310654bdf 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java @@ -75,9 +75,8 @@ public class ScIndexEnumeration_TableRowsEnumeration extends TestCase { log.println("getting row"); XSpreadsheet xSpreadsheet = null; - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSheetDoc.getSheets(); - XNameAccess oNames = (XNameAccess) - UnoRuntime.queryInterface( XNameAccess.class, xSpreadsheets ); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); + XNameAccess oNames = UnoRuntime.queryInterface( XNameAccess.class, xSpreadsheets ); try { xSpreadsheet = (XSpreadsheet) AnyConverter.toObject( new Type(XSpreadsheet.class), @@ -95,7 +94,7 @@ public class ScIndexEnumeration_TableRowsEnumeration extends TestCase { XColumnRowRange oColumnRowRange = UnoRuntime.queryInterface(XColumnRowRange.class, xSpreadsheet); - XTableRows oRows = (XTableRows) oColumnRowRange.getRows(); + XTableRows oRows = oColumnRowRange.getRows(); oObj = oRows; log.println("creating a new environment for object"); diff --git a/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java index babd30b14efe..706caacf8370 100644 --- a/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java @@ -100,8 +100,7 @@ public class ScLabelRangeObj extends TestCase { try { log.println("Getting test object ") ; - XPropertySet docProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); + XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); Object ranges = docProps.getPropertyValue("ColumnLabelRanges"); XLabelRanges lRanges = UnoRuntime.queryInterface(XLabelRanges.class, ranges); diff --git a/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java index d9db0e49d36d..3fd45f0c6d27 100644 --- a/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java @@ -103,8 +103,7 @@ public class ScLabelRangesObj extends TestCase { try { log.println("Getting test object ") ; - XPropertySet docProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); + XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); Object ranges = docProps.getPropertyValue("ColumnLabelRanges"); XLabelRanges lRanges = UnoRuntime.queryInterface(XLabelRanges.class, ranges); diff --git a/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java index a4dd4a158b7f..4de0b49f3300 100644 --- a/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java @@ -109,8 +109,7 @@ public class ScNamedRangeObj extends TestCase { log.println("Getting test object ") ; // Getting named ranges. - XPropertySet docProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); + XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); Object ranges = null; try { diff --git a/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java index 20e24abd113a..f56e6f3b974d 100644 --- a/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java @@ -128,8 +128,7 @@ public class ScNamedRangesObj extends TestCase { } // Getting named ranges. - XPropertySet docProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); + XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); Object ranges = null; try { ranges = docProps.getPropertyValue("NamedRanges"); diff --git a/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java b/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java index 4e89e744c1dc..f8ebe1b279d9 100644 --- a/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java @@ -111,8 +111,7 @@ public class ScRecentFunctionsObj extends TestCase { TestEnvironment tEnv = new TestEnvironment( oObj ); // Other parameters required for interface tests - XNameAccess NA = (XNameAccess) - UnoRuntime.queryInterface(XNameAccess.class, allFunctions); + XNameAccess NA = UnoRuntime.queryInterface(XNameAccess.class, allFunctions); tEnv.addObjRelation("FUNCTIONLIST", NA); return tEnv; diff --git a/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java b/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java index 6d8668237226..cb1d42219370 100644 --- a/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java @@ -106,7 +106,7 @@ public class ScScenariosObj extends TestCase { protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSpreadsheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; XIndexAccess oIndexAccess = UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets); @@ -135,8 +135,7 @@ public class ScScenariosObj extends TestCase { } XScenariosSupplier xSupp = UnoRuntime.queryInterface(XScenariosSupplier.class, oSheet); - XCellRange oRange = (XCellRange) - UnoRuntime.queryInterface(XCellRange.class, oSheet); + XCellRange oRange = UnoRuntime.queryInterface(XCellRange.class, oSheet); XCellRange myRange = oRange.getCellRangeByName("A1:N4"); XCellRangeAddressable oRangeAddr = UnoRuntime.queryInterface(XCellRangeAddressable.class, myRange); CellRangeAddress myAddr = oRangeAddr.getRangeAddress(); diff --git a/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java b/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java index 9658c523cc7c..94cd1fc0a0d6 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java @@ -138,8 +138,7 @@ public class ScSheetLinkObj extends TestCase { SL.link(sURL, "Sheet1", "", "", com.sun.star.sheet.SheetLinkMode.VALUE); // Getting links. - XPropertySet docProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); + XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); Object oLinks = null; try { oLinks = docProps.getPropertyValue("SheetLinks"); @@ -151,8 +150,7 @@ public class ScSheetLinkObj extends TestCase { throw new StatusException("Couldn't get SheetLinks", e); } - XNameAccess links = (XNameAccess) - UnoRuntime.queryInterface(XNameAccess.class, oLinks); + XNameAccess links = UnoRuntime.queryInterface(XNameAccess.class, oLinks); String[] names = links.getElementNames(); diff --git a/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java b/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java index 6ff3902346f1..d069c9f42b56 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java @@ -127,8 +127,7 @@ public class ScSheetLinksObj extends TestCase { com.sun.star.sheet.SheetLinkMode.VALUE); // Getting links. - XPropertySet docProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); + XPropertySet docProps = UnoRuntime.queryInterface(XPropertySet.class, xSheetDoc); Object links = null; try { @@ -141,7 +140,7 @@ public class ScSheetLinksObj extends TestCase { throw new StatusException("Couldn't get SheetLinks", e); } - oObj = (XInterface)UnoRuntime.queryInterface(XInterface.class, links); + oObj = UnoRuntime.queryInterface(XInterface.class, links); log.println("Creating object - " + ((oObj == null) ? "FAILED" : "OK")); diff --git a/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java index 936bb8c5ffd9..128aba4a14b1 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java +++ b/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java @@ -117,14 +117,14 @@ public class ScSortDescriptorBase extends TestCase { // create testobject here log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSpreadsheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets(); if (xSpreadsheets == null) log.println("FAILED"); else log.println("OK"); log.println("getting a sheet"); XIndexAccess oIndexAccess = UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets); try { - oObj = (XInterface) UnoRuntime.queryInterface(XInterface.class,oIndexAccess.getByIndex(0)); + oObj = UnoRuntime.queryInterface(XInterface.class,oIndexAccess.getByIndex(0)); } catch (Exception e) { throw new StatusException( "Couldn't get a spreadsheet", e); } diff --git a/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java b/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java index 410535d129db..9e97bd766ceb 100644 --- a/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java @@ -151,9 +151,8 @@ public class ScStyleFamilyObj extends TestCase { SOF.createInstance(xComp,"com.sun.star.style.CellStyle"); // insert a Style which can be replaced by name - XNameContainer oContainer = (XNameContainer) - UnoRuntime.queryInterface( - XNameContainer.class, oStyleFamilyNameAccess); + XNameContainer oContainer = UnoRuntime.queryInterface( + XNameContainer.class, oStyleFamilyNameAccess); try { oContainer.insertByName("ScStyleFamilyObj", oInstance); } catch (com.sun.star.lang.WrappedTargetException e) { diff --git a/qadevOOo/tests/java/mod/_sc/ScStyleObj.java b/qadevOOo/tests/java/mod/_sc/ScStyleObj.java index e5d782628a06..9707e0e567f2 100644 --- a/qadevOOo/tests/java/mod/_sc/ScStyleObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScStyleObj.java @@ -160,9 +160,9 @@ public class ScStyleObj extends TestCase { e.printStackTrace(log); throw new StatusException("Couldn't create instance", e); } - XStyle oMyStyle = (XStyle)UnoRuntime.queryInterface(XStyle.class, oInt); + XStyle oMyStyle = UnoRuntime.queryInterface(XStyle.class, oInt); - XNameContainer oStyleFamilyNameContainer = (XNameContainer)UnoRuntime. + XNameContainer oStyleFamilyNameContainer = UnoRuntime. queryInterface(XNameContainer.class, oStyleFamilyNameAccess); try { @@ -208,8 +208,7 @@ public class ScStyleObj extends TestCase { throw new StatusException("Couldn't get spreadsheet by index", e); } - XPropertySet xProp = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, aCell); + XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, aCell); try { xProp.setPropertyValue("CellStyle", oMyStyle.getName()); @@ -233,7 +232,7 @@ public class ScStyleObj extends TestCase { tEnv.addObjRelation("PoolStyle", oStyle); tEnv.addObjRelation("PropertyNames", getPropertyNames - ((XPropertySet) UnoRuntime.queryInterface + (UnoRuntime.queryInterface (XPropertySet.class, oMyStyle))); return tEnv; diff --git a/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java index 091d68ad3d80..5139fa458dda 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java +++ b/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java @@ -102,7 +102,7 @@ public class ScSubTotalDescriptorBase extends TestCase { protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSpreadsheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java index 1f5416ab8d99..c6af56ca9ebf 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java @@ -99,7 +99,7 @@ public class ScSubTotalFieldObj extends TestCase { protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSpreadsheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; diff --git a/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java b/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java index f7fd3415bff5..05d2a2abe717 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java @@ -144,7 +144,7 @@ public class ScTabViewObj extends TestCase { XInterface oObj = aModel.getCurrentController(); log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSpreadsheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; @@ -181,7 +181,7 @@ public class ScTabViewObj extends TestCase { XCell cell_2 = null; Object cellRange = null; try { - cellRange = (Object)oSheet.getCellRangeByPosition(0, 0, 3, 3); + cellRange = oSheet.getCellRangeByPosition(0, 0, 3, 3); cell_1 = oSheet.getCellByPosition(5,5); cell_2 = oSheet.getCellByPosition(7,7); cell_2.setValue(17.5); @@ -194,7 +194,7 @@ public class ScTabViewObj extends TestCase { Object[] selections = {oSheet, cellRange, cell_1, cell_2}; tEnv.addObjRelation("Selections", selections); - tEnv.addObjRelation("Comparer", new Comparator() { + tEnv.addObjRelation("Comparer", new Comparator<Object>() { public int compare(Object o1, Object o2) { XCellRangeAddressable adr1 = UnoRuntime.queryInterface(XCellRangeAddressable.class, o1); XCellRangeAddressable adr2 = UnoRuntime.queryInterface(XCellRangeAddressable.class, o2); @@ -202,10 +202,7 @@ public class ScTabViewObj extends TestCase { CellRangeAddress range1 = adr1.getRangeAddress(); CellRangeAddress range2 = adr2.getRangeAddress(); return ValueComparer.equalValue(range1, range2) ? 0 : 1 ; - } - public boolean equals(Object obj) { - return compare(this, obj) == 0; - } }); + }}); tEnv.addObjRelation("XUserInputInterception.XModel", aModel); @@ -230,7 +227,7 @@ public class ScTabViewObj extends TestCase { try { log.println( "getting Drawpages" ); XDrawPagesSupplier oDPS = UnoRuntime.queryInterface(XDrawPagesSupplier.class,xSpreadsheetDoc); - XDrawPages oDP = (XDrawPages) oDPS.getDrawPages(); + XDrawPages oDP = oDPS.getDrawPages(); oDP.insertNewByIndex(1); oDP.insertNewByIndex(2); oDrawPage = (XDrawPage) AnyConverter.toObject( diff --git a/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java b/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java index fd674b3da5ab..68de00f3db29 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java @@ -114,9 +114,8 @@ public class ScTableColumnObj extends TestCase { XSpreadsheet xSpreadsheet = null; - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSheetDoc.getSheets(); - XNameAccess oNames = (XNameAccess) - UnoRuntime.queryInterface( XNameAccess.class, xSpreadsheets ); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); + XNameAccess oNames = UnoRuntime.queryInterface( XNameAccess.class, xSpreadsheets ); try { xSpreadsheet = (XSpreadsheet) AnyConverter.toObject( new Type(XSpreadsheet.class), @@ -133,7 +132,7 @@ public class ScTableColumnObj extends TestCase { } XColumnRowRange oColumnRowRange = UnoRuntime.queryInterface(XColumnRowRange.class, xSpreadsheet); - XTableColumns oColumns = (XTableColumns) oColumnRowRange.getColumns(); + XTableColumns oColumns = oColumnRowRange.getColumns(); XIndexAccess oIndexAccess = UnoRuntime.queryInterface(XIndexAccess.class, oColumns); try { oObj = (XInterface) AnyConverter.toObject( diff --git a/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java b/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java index bdaa454deff5..6f9b9621c9b7 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java @@ -107,9 +107,8 @@ public class ScTableColumnsObj extends TestCase { log.println("craeting a test environment"); log.println("getting column"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSheetDoc.getSheets(); - XNameAccess oNames = (XNameAccess) - UnoRuntime.queryInterface( XNameAccess.class, xSpreadsheets ); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); + XNameAccess oNames = UnoRuntime.queryInterface( XNameAccess.class, xSpreadsheets ); XSpreadsheet xSpreadsheet = null; try { xSpreadsheet = (XSpreadsheet) AnyConverter.toObject( @@ -127,7 +126,7 @@ public class ScTableColumnsObj extends TestCase { } XColumnRowRange oColumnRowRange = UnoRuntime.queryInterface(XColumnRowRange.class, xSpreadsheet); - XTableColumns oColumns = (XTableColumns) oColumnRowRange.getColumns(); + XTableColumns oColumns = oColumnRowRange.getColumns(); oObj = oColumns; log.println("creating a new environment for object"); diff --git a/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java b/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java index 5ee191eba153..dbe3d5cca1fc 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java @@ -104,7 +104,7 @@ public class ScTableConditionalEntry extends TestCase { XInterface oObj = null; log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSpreadsheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; @@ -138,8 +138,7 @@ public class ScTableConditionalEntry extends TestCase { XPropertySet Props = null; try { - Props = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oSheet); + Props = UnoRuntime.queryInterface(XPropertySet.class, oSheet); CFormat = Props.getPropertyValue("ConditionalFormat"); if (utils.isVoid(CFormat)) { log.println("Property 'ConditionalFormat' is void"); diff --git a/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java b/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java index 47b893ad0814..ee764f24f3ef 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java @@ -108,7 +108,7 @@ public class ScTableConditionalFormat extends TestCase { XInterface oObj = null; log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSpreadsheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; @@ -137,8 +137,7 @@ public class ScTableConditionalFormat extends TestCase { e.printStackTrace(log); } - XPropertySet Props = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oSheet); + XPropertySet Props = UnoRuntime.queryInterface(XPropertySet.class, oSheet); try { oObj = (XInterface) AnyConverter.toObject( new Type(XInterface.class), diff --git a/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java b/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java index 91609c52a7f4..9148f1344173 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java @@ -109,16 +109,15 @@ public class ScTableRowObj extends TestCase { log.println("creating a test environment"); XSpreadsheet xSpreadsheet = null; - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSheetDoc.getSheets(); - XNameAccess oNames = (XNameAccess) - UnoRuntime.queryInterface( XNameAccess.class, xSpreadsheets ); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); + XNameAccess oNames = UnoRuntime.queryInterface( XNameAccess.class, xSpreadsheets ); try { xSpreadsheet = (XSpreadsheet) AnyConverter.toObject( new Type(XSpreadsheet.class), oNames.getByName(oNames.getElementNames()[0])); XColumnRowRange oColumnRowRange = UnoRuntime.queryInterface(XColumnRowRange.class, xSpreadsheet); - XTableRows oRows = (XTableRows) oColumnRowRange.getRows(); + XTableRows oRows = oColumnRowRange.getRows(); XIndexAccess oIndexAccess = UnoRuntime.queryInterface(XIndexAccess.class, oRows); oObj = (XInterface) AnyConverter.toObject( new Type(XInterface.class),oIndexAccess.getByIndex(6)); diff --git a/qadevOOo/tests/java/mod/_sc/ScTableRowsObj.java b/qadevOOo/tests/java/mod/_sc/ScTableRowsObj.java index 4e4f9276b063..15dadb824487 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableRowsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableRowsObj.java @@ -101,9 +101,8 @@ public class ScTableRowsObj extends TestCase { log.println("getting row"); XSpreadsheet xSpreadsheet = null; - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSheetDoc.getSheets(); - XNameAccess oNames = (XNameAccess) - UnoRuntime.queryInterface( XNameAccess.class, xSpreadsheets ); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); + XNameAccess oNames = UnoRuntime.queryInterface( XNameAccess.class, xSpreadsheets ); try { xSpreadsheet = (XSpreadsheet) AnyConverter.toObject( new Type(XSpreadsheet.class), @@ -121,7 +120,7 @@ public class ScTableRowsObj extends TestCase { XColumnRowRange oColumnRowRange = UnoRuntime.queryInterface(XColumnRowRange.class, xSpreadsheet); - XTableRows oRows = (XTableRows) oColumnRowRange.getRows(); + XTableRows oRows = oColumnRowRange.getRows(); oObj = oRows; log.println("creating a new environment for object"); diff --git a/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java b/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java index 2b053a5c3e8c..0983a263c7b3 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java @@ -187,7 +187,7 @@ public class ScTableSheetObj extends TestCase { log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets) xSheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSheetDoc.getSheets(); log.println("getting a sheet"); @@ -227,7 +227,7 @@ public class ScTableSheetObj extends TestCase { throw new StatusException("Exception occurred while filling cells", e); } - oObj = (XInterface) UnoRuntime.queryInterface(XInterface.class, oSheet); + oObj = UnoRuntime.queryInterface(XInterface.class, oSheet); log.println("creating a new environment for object"); @@ -262,7 +262,7 @@ public class ScTableSheetObj extends TestCase { XSpreadsheet sSheet = null; try { - sSheet = (XSpreadsheet) UnoRuntime.queryInterface( + sSheet = UnoRuntime.queryInterface( XSpreadsheet.class, xSpreadsheets.getByName("Scenario")); } catch (com.sun.star.container.NoSuchElementException e) { @@ -277,7 +277,7 @@ public class ScTableSheetObj extends TestCase { " 'XArrayFormulaRange'"); tEnv.addObjRelation("noArray", "ScTableSheetObj"); - XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet PropSet = UnoRuntime.queryInterface( XPropertySet.class, oObj); tEnv.addObjRelation("PropSet", PropSet); tEnv.addObjRelation("SHEET", oSheet); @@ -316,7 +316,7 @@ public class ScTableSheetObj extends TestCase { oSheet.getCellByPosition(15, 16) }); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - e.printStackTrace((PrintWriter) log); + e.printStackTrace(log); log.println( "Cannot make required object relation 'XSearchable.MAKEENTRYINCELL'."); } diff --git a/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java b/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java index fd2e151c0a73..61b7b72d6b89 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java @@ -112,10 +112,9 @@ public class ScTableSheetsObj extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSpreadsheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets(); - XInterface oObj = (XInterface) - UnoRuntime.queryInterface(XInterface.class, xSpreadsheets); + XInterface oObj = UnoRuntime.queryInterface(XInterface.class, xSpreadsheets); log.println("creating a new environment for object"); TestEnvironment tEnv = new TestEnvironment(oObj); diff --git a/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java b/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java index 8c0c1d6ca6ce..ac071b3c2dd2 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java @@ -96,7 +96,7 @@ public class ScTableValidationObj extends TestCase { XInterface oObj = null; log.println("getting sheets"); - XSpreadsheets xSpreadsheets = (XSpreadsheets)xSpreadsheetDoc.getSheets(); + XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets(); log.println("getting a sheet"); XSpreadsheet oSheet = null; @@ -129,8 +129,7 @@ public class ScTableValidationObj extends TestCase { XPropertySet Props = null; try { - Props = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oSheet); + Props = UnoRuntime.queryInterface(XPropertySet.class, oSheet); oObj = (XInterface) AnyConverter.toObject( new Type(XInterface.class),Props.getPropertyValue("Validation")); } catch (com.sun.star.lang.WrappedTargetException e){ diff --git a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java index f2a37f9fb723..4206440fcaf5 100644 --- a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java @@ -77,7 +77,7 @@ public class ScUniqueCellFormatsEnumeration extends TestCase { XIndexAccess.class, xSheetDoc.getSheets()); try { - oSheet = (XSpreadsheet) UnoRuntime.queryInterface( + oSheet = UnoRuntime.queryInterface( XSpreadsheet.class, xIA.getByIndex(0)); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(log); @@ -114,7 +114,7 @@ public class ScUniqueCellFormatsEnumeration extends TestCase { protected void changeColor(String RangeName, int r, int g, int b) { XCellRange xRange = oSheet.getCellRangeByName(RangeName); - XPropertySet xPropertySet = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet xPropertySet = UnoRuntime.queryInterface( XPropertySet.class, xRange); Color c = new Color(r, g, b); int c2int = 16777216 + c.hashCode(); diff --git a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java index 9d7b706668e9..03e46718d24e 100644 --- a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java @@ -76,7 +76,7 @@ public class ScUniqueCellFormatsObj extends TestCase { XIndexAccess.class, xSheetDoc.getSheets()); try { - oSheet = (XSpreadsheet) UnoRuntime.queryInterface( + oSheet = UnoRuntime.queryInterface( XSpreadsheet.class, xIA.getByIndex(0)); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(log); @@ -108,7 +108,7 @@ public class ScUniqueCellFormatsObj extends TestCase { protected void changeColor(String RangeName, int r, int g, int b) { XCellRange xRange = oSheet.getCellRangeByName(RangeName); - XPropertySet xPropertySet = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet xPropertySet = UnoRuntime.queryInterface( XPropertySet.class, xRange); Color c = new Color(r, g, b); int c2int = 16777216 + c.hashCode(); diff --git a/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java b/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java index bdda48d7ad76..b96da0233a79 100644 --- a/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java @@ -158,7 +158,7 @@ public class ScViewPaneObj extends TestCase { try { log.println( "getting Drawpages" ); XDrawPagesSupplier oDPS = UnoRuntime.queryInterface(XDrawPagesSupplier.class,xSpreadsheetDoc); - XDrawPages oDP = (XDrawPages) oDPS.getDrawPages(); + XDrawPages oDP = oDPS.getDrawPages(); oDP.insertNewByIndex(1); oDP.insertNewByIndex(2); oDrawPage = (XDrawPage) AnyConverter.toObject( diff --git a/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java index 7793b5d07673..2fde6b2a544d 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java @@ -135,7 +135,7 @@ public class XMLMetaExporter extends TestCase { // Obtaining and changing property values XDocumentInfoSupplier infoSup = UnoRuntime.queryInterface (XDocumentInfoSupplier.class, xSheetDoc) ; - XPropertySet docInfo = (XPropertySet) UnoRuntime.queryInterface + XPropertySet docInfo = UnoRuntime.queryInterface (XPropertySet.class, infoSup.getDocumentInfo()) ; docInfo.setPropertyValue("Title", "TestDocument"); diff --git a/qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java index 30875b90af74..f5df59c92d24 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java @@ -161,7 +161,7 @@ public class XMLMetaImporter extends TestCase { tEnv.addObjRelation("XDocumentHandler.XMLData", xml) ; XDocumentInfoSupplier infoSup = UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xSheetDoc) ; - 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/_sc/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java index a8fba99670ec..599d0f5ec653 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java @@ -128,8 +128,7 @@ public class XMLSettingsExporter extends TestCase { //set some settings XModel xSheetModel = UnoRuntime.queryInterface(XModel.class, xSheetDoc); XController xController = xSheetModel.getCurrentController(); - XPropertySet xPropSet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xController); + XPropertySet xPropSet = UnoRuntime.queryInterface(XPropertySet.class, xController); xPropSet.setPropertyValue("ShowGrid", "false"); util.CalcTools.fillCalcSheetWithContent(xSheetDoc, 0, 3, 3, 50, 50); diff --git a/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java index 72218cfb741e..5fadc74e608c 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java @@ -135,8 +135,7 @@ public class XMLSettingsImporter extends TestCase { XModel xSheetModel = UnoRuntime.queryInterface(XModel.class, xSheetDoc); XController xController = xSheetModel.getCurrentController(); - xPropSet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xController); + xPropSet = UnoRuntime.queryInterface(XPropertySet.class, xController); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log) ; throw new StatusException("Can't create component.", e) ; diff --git a/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java index ff310e27d168..ea1c7773a4ad 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java @@ -141,8 +141,7 @@ public class XMLStylesExporter extends TestCase { StyleFamilies.getByName(styleFamiliesNames[0])); Object SC = SOF.createInstance( xSheetDoc, "com.sun.star.style.CellStyle"); - XStyle StyleCell = (XStyle) - UnoRuntime.queryInterface(XStyle.class,SC); + XStyle StyleCell = UnoRuntime.queryInterface(XStyle.class,SC); StyleFamilyName.insertByName(newName, StyleCell); log.println("fill sheet 1 with content..."); diff --git a/qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java index a83e770ac51b..0d6ab7d9ae7b 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java @@ -174,7 +174,7 @@ public class XMLStylesImporter extends TestCase { (XStyleFamiliesSupplier.class, xSheetDoc); XNameAccess oStyleFamilies = sup.getStyleFamilies(); Object family = oStyleFamilies.getByName("CellStyles") ; - styles = (XNameAccess) UnoRuntime.queryInterface + styles = UnoRuntime.queryInterface (XNameAccess.class, family) ; log.println("Styles before:") ; String[] names = styles.getElementNames() ; diff --git a/qadevOOo/tests/java/mod/_sch/AccFloor.java b/qadevOOo/tests/java/mod/_sch/AccFloor.java index ea2c3138b9d1..7e11514800ae 100644 --- a/qadevOOo/tests/java/mod/_sch/AccFloor.java +++ b/qadevOOo/tests/java/mod/_sch/AccFloor.java @@ -59,8 +59,7 @@ public class AccFloor extends TestCase { } log.println("Change Diagram to 3D"); - XPropertySet ChartProps = (XPropertySet) - UnoRuntime.queryInterface( XPropertySet.class, xChartDoc.getDiagram() ); + XPropertySet ChartProps = UnoRuntime.queryInterface( XPropertySet.class, xChartDoc.getDiagram() ); try { ChartProps.setPropertyValue("Dim3D", new Boolean(true)); } catch(com.sun.star.lang.WrappedTargetException e) { diff --git a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java index e895caf34aa0..830d5ebf6196 100644 --- a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java +++ b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java @@ -53,8 +53,7 @@ public class AccStatisticsObject extends TestCase { log.println( "creating a chartdocument" ); xChartDoc = SOF.createChartDoc(null); log.println("Display MeanValue"); - XPropertySet diagProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xChartDoc.getDiagram()); + XPropertySet diagProps = UnoRuntime.queryInterface(XPropertySet.class, xChartDoc.getDiagram()); diagProps.setPropertyValue("MeanValue",new Boolean(true)); } catch (com.sun.star.uno.Exception e) { // Some exception occures.FAILED diff --git a/qadevOOo/tests/java/mod/_sch/AccWall.java b/qadevOOo/tests/java/mod/_sch/AccWall.java index e33ffdfb10e4..566646e26a4e 100644 --- a/qadevOOo/tests/java/mod/_sch/AccWall.java +++ b/qadevOOo/tests/java/mod/_sch/AccWall.java @@ -59,8 +59,7 @@ public class AccWall extends TestCase { } log.println("Change Diagram to 3D"); - XPropertySet ChartProps = (XPropertySet) - UnoRuntime.queryInterface( XPropertySet.class, xChartDoc.getDiagram() ); + XPropertySet ChartProps = UnoRuntime.queryInterface( XPropertySet.class, xChartDoc.getDiagram() ); try { ChartProps.setPropertyValue("Dim3D", new Boolean(true)); } catch(com.sun.star.lang.WrappedTargetException e) { diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java b/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java index 55e831e12da2..c4ce2deda85b 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java @@ -101,12 +101,12 @@ public class ChXChartAxis extends TestCase { // create testobject here // get the Diagram log.println( "getting Diagram" ); - oDiagram = (XDiagram) xChartDoc.getDiagram(); + oDiagram = xChartDoc.getDiagram(); // get the Axis log.println( "getting ChartAxis" ); XAxisYSupplier oAxisSup = UnoRuntime.queryInterface(XAxisYSupplier.class,oDiagram); - oObj = (XPropertySet) oAxisSup.getYAxis(); + oObj = oAxisSup.getYAxis(); log.println( "creating a new environment for chartdocument object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartData.java b/qadevOOo/tests/java/mod/_sch/ChXChartData.java index 2795f88b4043..7016bde6e293 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartData.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartData.java @@ -81,7 +81,7 @@ public class ChXChartData extends TestCase { // get the Data log.println( "getting Data" ); - XChartData oObj = (XChartData) xChartDoc.getData(); + XChartData oObj = xChartDoc.getData(); log.println( "creating a new environment for chartdocument object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java b/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java index 5d65c922261f..ab5c292000a9 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java @@ -85,7 +85,7 @@ public class ChXChartDataArray extends TestCase { // get the Data log.println( "getting Data" ); - XChartData oObj = (XChartData) xChartDoc.getData(); + XChartData oObj = xChartDoc.getData(); log.println( "creating a new environment for chartdocument object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java b/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java index e492aafe68df..629d61dbf304 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java @@ -127,7 +127,7 @@ public class ChXChartDocument extends TestCase { // get the chartdocument log.println("getting ChartDocument"); - XInterface oObj = (XChartDocument) xChartDoc; + XInterface oObj = xChartDoc; XController cont1 = xChartDoc.getCurrentController(); XController cont2 = doc2.getCurrentController(); diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartView.java b/qadevOOo/tests/java/mod/_sch/ChXChartView.java index 7938637108ea..b94a3431aac4 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartView.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartView.java @@ -102,7 +102,7 @@ public class ChXChartView extends TestCase { // get the ChartView log.println( "getting ChartView" ); oModel = UnoRuntime.queryInterface(XModel.class, xChartDoc); - oObj = (XController)oModel.getCurrentController(); + oObj = oModel.getCurrentController(); log.println( "creating a new environment for chartdocument object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); @@ -111,7 +111,7 @@ public class ChXChartView extends TestCase { {xChartDoc.getArea(), xChartDoc.getDiagram(), xChartDoc.getTitle(), xChartDoc.getLegend()} ); - tEnv.addObjRelation("Comparer", new Comparator() { + tEnv.addObjRelation("Comparer", new Comparator<Object>() { public int compare(Object o1, Object o2) { XShapeDescriptor descr1 = UnoRuntime.queryInterface(XShapeDescriptor.class, o1); XShapeDescriptor descr2 = UnoRuntime.queryInterface(XShapeDescriptor.class, o2); diff --git a/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java b/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java index ff65263bf7b4..6aacd1434f59 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java +++ b/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java @@ -125,8 +125,8 @@ public class ChXDataPoint extends TestCase { // get the DataRowPoint_Point try { log.println( "getting ChXDataRowPoint_Point" ); - oDiagram = (XDiagram) xChartDoc.getDiagram(); - oObj = (XPropertySet) oDiagram.getDataPointProperties(1,1); + oDiagram = xChartDoc.getDiagram(); + oObj = oDiagram.getDataPointProperties(1,1); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { // Some exception occures.FAILED e.printStackTrace( log ); diff --git a/qadevOOo/tests/java/mod/_sch/ChXDataRow.java b/qadevOOo/tests/java/mod/_sch/ChXDataRow.java index 325328b07493..e5b1c2e1a89f 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXDataRow.java +++ b/qadevOOo/tests/java/mod/_sch/ChXDataRow.java @@ -129,8 +129,8 @@ public class ChXDataRow extends TestCase { // get the ChXDataRowPoint_Row try { log.println( "getting ChXDataRowPoint_Row" ); - oDiagram = (XDiagram) xChartDoc.getDiagram(); - oObj = (XPropertySet) oDiagram.getDataRowProperties(1); + oDiagram = xChartDoc.getDiagram(); + oObj = oDiagram.getDataRowProperties(1); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { // Some exception occures.FAILED e.printStackTrace( log ); diff --git a/qadevOOo/tests/java/mod/_sch/ChXDiagram.java b/qadevOOo/tests/java/mod/_sch/ChXDiagram.java index 7df995ee5bc3..e2811fad2e75 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXDiagram.java +++ b/qadevOOo/tests/java/mod/_sch/ChXDiagram.java @@ -298,8 +298,7 @@ public class ChXDiagram extends TestCase { // insert a chart Rectangle oRect = new Rectangle(500, 3000, 25000, 11000); - XCellRange oRange = (XCellRange) - UnoRuntime.queryInterface(XCellRange.class, oSheet); + XCellRange oRange = UnoRuntime.queryInterface(XCellRange.class, oSheet); XCellRange myRange = oRange.getCellRangeByName("A1:N4"); XCellRangeAddressable oRangeAddr = UnoRuntime.queryInterface(XCellRangeAddressable.class, myRange); CellRangeAddress myAddr = oRangeAddr.getRangeAddress(); @@ -320,9 +319,8 @@ public class ChXDiagram extends TestCase { XTableChart oChart = null; try { oChart = (XTableChart) AnyConverter.toObject( - new Type(XTableChart.class),((XNameAccess) - UnoRuntime.queryInterface( - XNameAccess.class, oCharts)).getByName("ChXDiagram")); + new Type(XTableChart.class),UnoRuntime.queryInterface( + XNameAccess.class, oCharts).getByName("ChXDiagram")); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(log); throw new StatusException("Couldn't get TableChart", e); @@ -337,7 +335,7 @@ public class ChXDiagram extends TestCase { XEmbeddedObjectSupplier oEOS = UnoRuntime.queryInterface(XEmbeddedObjectSupplier.class, oChart); XInterface oInt = oEOS.getEmbeddedObject(); xChartDoc = UnoRuntime.queryInterface(XChartDocument.class,oInt); - oObj = (XDiagram) xChartDoc.getDiagram(); + oObj = xChartDoc.getDiagram(); log.println( "creating a new environment for chartdocument object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_sch/ChartArea.java b/qadevOOo/tests/java/mod/_sch/ChartArea.java index 8609c5757547..659c397d85a1 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartArea.java +++ b/qadevOOo/tests/java/mod/_sch/ChartArea.java @@ -100,7 +100,7 @@ public class ChartArea extends TestCase { // get the Area log.println( "getting Area" ); - XPropertySet oObj = (XPropertySet) xChartDoc.getArea(); + XPropertySet oObj = xChartDoc.getArea(); log.println( "creating a new environment for chartdocument object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_sch/ChartGrid.java b/qadevOOo/tests/java/mod/_sch/ChartGrid.java index 97d2de65e797..4609a538d438 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartGrid.java +++ b/qadevOOo/tests/java/mod/_sch/ChartGrid.java @@ -94,12 +94,12 @@ public class ChartGrid extends TestCase { // get the Diagram log.println( "getting Diagram" ); - oDiagram = (XDiagram) xChartDoc.getDiagram(); + oDiagram = xChartDoc.getDiagram(); // get the Grid log.println( "getting ChartGrid" ); XAxisXSupplier oAxisSup = UnoRuntime.queryInterface(XAxisXSupplier.class,oDiagram); - oObj = (XPropertySet) oAxisSup.getXMainGrid(); + oObj = oAxisSup.getXMainGrid(); log.println( "creating a new environment for chartdocument object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_sch/ChartLegend.java b/qadevOOo/tests/java/mod/_sch/ChartLegend.java index f54ae9ee14a2..67841c7fd28d 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartLegend.java +++ b/qadevOOo/tests/java/mod/_sch/ChartLegend.java @@ -118,7 +118,7 @@ public class ChartLegend extends TestCase { // get the Legend log.println( "getting Legend" ); - oObj = (XShape) xChartDoc.getLegend(); + oObj = xChartDoc.getLegend(); log.println( "creating a new environment for chartdocument object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_sch/ChartTitle.java b/qadevOOo/tests/java/mod/_sch/ChartTitle.java index 64a64304b98e..cdfbb7cae6ca 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartTitle.java +++ b/qadevOOo/tests/java/mod/_sch/ChartTitle.java @@ -99,7 +99,7 @@ public class ChartTitle extends TestCase { // get the Title log.println( "getting Title" ); - XShape oObj = (XShape) xChartDoc.getTitle(); + XShape oObj = xChartDoc.getTitle(); log.println( "creating a new environment for chartdocument object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java b/qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java index eee7fd14cc05..166d3b2ce141 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java @@ -222,7 +222,7 @@ public class DrawController_DrawView extends TestCase { tEnv.addObjRelation("Selections", new Object[] { oDrawPage, oShapeCol1, oShapeCol2}); - tEnv.addObjRelation("Comparer", new Comparator() { + tEnv.addObjRelation("Comparer", new Comparator<Object>() { public int compare(Object o1, Object o2) { XIndexAccess indAc1 = UnoRuntime.queryInterface(XIndexAccess.class, o1); XIndexAccess indAc2 = UnoRuntime.queryInterface(XIndexAccess.class, o2); diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java b/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java index fbe9eea1f4f1..f7d28e007b4b 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java @@ -251,7 +251,7 @@ public class DrawController_HandoutView extends TestCase { tEnv.addObjRelation("Selections", new Object[] { oDrawPage, oShapeCol1, oShapeCol2}); - tEnv.addObjRelation("Comparer", new Comparator() { + tEnv.addObjRelation("Comparer", new Comparator<Object>() { public int compare(Object o1, Object o2) { XIndexAccess indAc1 = UnoRuntime.queryInterface(XIndexAccess.class, o1); XIndexAccess indAc2 = UnoRuntime.queryInterface(XIndexAccess.class, o2); diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java b/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java index 70a1c5aa4df2..f82f7f32c54b 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java @@ -248,7 +248,7 @@ public class DrawController_NotesView extends TestCase { tEnv.addObjRelation("Selections", new Object[] { oDrawPage, oShapeCol1, oShapeCol2}); - tEnv.addObjRelation("Comparer", new Comparator() { + tEnv.addObjRelation("Comparer", new Comparator<Object>() { public int compare(Object o1, Object o2) { XIndexAccess indAc1 = UnoRuntime.queryInterface(XIndexAccess.class, o1); XIndexAccess indAc2 = UnoRuntime.queryInterface(XIndexAccess.class, o2); diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java b/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java index 7595155fafa4..8bdf5b0b12dd 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java @@ -248,7 +248,7 @@ public class DrawController_OutlineView extends TestCase { tEnv.addObjRelation("Selections", new Object[] { oDrawPage, oShapeCol1, oShapeCol2}); - tEnv.addObjRelation("Comparer", new Comparator() { + tEnv.addObjRelation("Comparer", new Comparator<Object>() { public int compare(Object o1, Object o2) { XIndexAccess indAc1 = UnoRuntime.queryInterface(XIndexAccess.class, o1); XIndexAccess indAc2 = UnoRuntime.queryInterface(XIndexAccess.class, o2); diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java b/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java index c2c2f5f2c5c2..2a6590f1530b 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java @@ -248,7 +248,7 @@ public class DrawController_PresentationView extends TestCase { tEnv.addObjRelation("Selections", new Object[] { oDrawPage, oShapeCol1, oShapeCol2}); - tEnv.addObjRelation("Comparer", new Comparator() { + tEnv.addObjRelation("Comparer", new Comparator<Object>() { public int compare(Object o1, Object o2) { XIndexAccess indAc1 = UnoRuntime.queryInterface(XIndexAccess.class, o1); XIndexAccess indAc2 = UnoRuntime.queryInterface(XIndexAccess.class, o2); diff --git a/qadevOOo/tests/java/mod/_sd/SdDrawPage.java b/qadevOOo/tests/java/mod/_sd/SdDrawPage.java index 780c56ce4a17..8b362da646a8 100644 --- a/qadevOOo/tests/java/mod/_sd/SdDrawPage.java +++ b/qadevOOo/tests/java/mod/_sd/SdDrawPage.java @@ -189,7 +189,7 @@ public class SdDrawPage extends TestCase { XControlShape aShape = FormTools.createControlShape( xDrawDoc,3000,4500,15000,10000,"CommandButton"); - oShapes.add((XShape) aShape); + oShapes.add(aShape); ShapeDsc sDsc = new ShapeDsc(5000, 3500, 7500, 10000, "Rectangle"); log.println( "adding Shape as mod relation to environment" ); diff --git a/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java b/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java index b148ccbb5d5d..32ea7f77c91b 100644 --- a/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java +++ b/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java @@ -103,7 +103,7 @@ public class SdDrawPagesAccess extends TestCase { // get the drawpage of drawing here log.println( "getting Drawpages" ); XDrawPagesSupplier oDPS = UnoRuntime.queryInterface(XDrawPagesSupplier.class, xDrawDoc); - XDrawPages oDP = (XDrawPages) oDPS.getDrawPages(); + XDrawPages oDP = oDPS.getDrawPages(); oDP.insertNewByIndex(1); oDP.insertNewByIndex(2); XInterface oObj = oDP; diff --git a/qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java b/qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java index 7020cff676d9..852dba72537f 100644 --- a/qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java +++ b/qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java @@ -110,8 +110,7 @@ public class SdPageLinkTargets extends TestCase { SOF.createShape(xDrawDoc, 15000, 13500, 5000, 5000, "OLE2"); oShapes.add(oShape); - XPropertySet shape_props = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oShape); + XPropertySet shape_props = UnoRuntime.queryInterface(XPropertySet.class,oShape); log.println("Inserting a Chart"); diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java b/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java index 881a2c17526d..aaa0040c0bcf 100644 --- a/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java +++ b/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java @@ -248,7 +248,7 @@ public class SdUnoDrawView extends TestCase { tEnv.addObjRelation("XComponent.DisposeThis", xDrawDoc); - tEnv.addObjRelation("Comparer", new Comparator() { + tEnv.addObjRelation("Comparer", new Comparator<Object>() { public int compare(Object o1, Object o2) { XIndexAccess indAc1 = UnoRuntime.queryInterface(XIndexAccess.class, o1); XIndexAccess indAc2 = UnoRuntime.queryInterface(XIndexAccess.class, o2); @@ -257,10 +257,7 @@ public class SdUnoDrawView extends TestCase { return 0; } return 1; - } - public boolean equals(Object obj) { - return compare(this, obj) == 0; - } }); + }}); return tEnv; diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java b/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java index 80e1afefd65f..db51a16fd3fa 100644 --- a/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java +++ b/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java @@ -216,7 +216,7 @@ public class SdUnoPresView extends TestCase { tEnv.addObjRelation("Selections", new Object[] { oDrawPage, secondDrawPage}); - tEnv.addObjRelation("Comparer", new Comparator() { + tEnv.addObjRelation("Comparer", new Comparator<Object>() { public int compare(Object o1, Object o2) { XIndexAccess indAc1 = UnoRuntime.queryInterface(XIndexAccess.class, o1); XIndexAccess indAc2 = UnoRuntime.queryInterface(XIndexAccess.class, o2); @@ -225,10 +225,7 @@ public class SdUnoPresView extends TestCase { return 0; } return 1; - } - public boolean equals(Object obj) { - return compare(this, obj) == 0; - } }); + }}); tEnv.addObjRelation("FirstPage", oDrawPage); tEnv.addObjRelation("SecondPage", secondDrawPage); diff --git a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java index 2beb29244e9d..679fd3d6f94b 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java +++ b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java @@ -126,8 +126,7 @@ public class SdXCustomPresentation extends TestCase { XCustomPresentationSupplier.class, xImpressDoc); XInterface oObj = oPS.getCustomPresentations(); - XSingleServiceFactory oSingleMSF = (XSingleServiceFactory) - UnoRuntime.queryInterface(XSingleServiceFactory.class, oObj); + XSingleServiceFactory oSingleMSF = UnoRuntime.queryInterface(XSingleServiceFactory.class, oObj); XInterface oInstance = null; try { @@ -137,8 +136,7 @@ public class SdXCustomPresentation extends TestCase { throw new StatusException("Couldn't create instance", e); } - XNameContainer aContainer = (XNameContainer) - UnoRuntime.queryInterface(XNameContainer.class, oObj); + XNameContainer aContainer = UnoRuntime.queryInterface(XNameContainer.class, oObj); try { aContainer.insertByName("FirstPresentation", oInstance); diff --git a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java index b0e10ade3ad5..e3a209ed1b07 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java +++ b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java @@ -125,8 +125,7 @@ public class SdXCustomPresentationAccess extends TestCase { XInterface oObj = oPS.getCustomPresentations(); - XSingleServiceFactory oSingleMSF = (XSingleServiceFactory) - UnoRuntime.queryInterface(XSingleServiceFactory.class, oObj); + XSingleServiceFactory oSingleMSF = UnoRuntime.queryInterface(XSingleServiceFactory.class, oObj); XInterface oInstance = null; XInterface oSecondInstance = null; @@ -138,8 +137,7 @@ public class SdXCustomPresentationAccess extends TestCase { throw new StatusException("Couldn't create instance", e); } - XNameContainer aContainer = (XNameContainer) - UnoRuntime.queryInterface(XNameContainer.class, oObj); + XNameContainer aContainer = UnoRuntime.queryInterface(XNameContainer.class, oObj); if (aContainer.hasByName("FirstPresentation")) { try { diff --git a/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java b/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java index 1fe938760f40..368bbafe93fc 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java +++ b/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java @@ -143,7 +143,7 @@ public class SdXImpressDocument extends TestCase { "Rectangle"); - XPropertySet xShapeProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aShape); + XPropertySet xShapeProps = UnoRuntime.queryInterface(XPropertySet.class, aShape); try { xShapeProps.setPropertyValue("FillStyle", com.sun.star.drawing.FillStyle.SOLID); diff --git a/qadevOOo/tests/java/mod/_sd/SdXPresentation.java b/qadevOOo/tests/java/mod/_sd/SdXPresentation.java index a8f754690a59..a9eadb8260b4 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXPresentation.java +++ b/qadevOOo/tests/java/mod/_sd/SdXPresentation.java @@ -116,8 +116,7 @@ public class SdXPresentation extends TestCase { XInterface oInstance = null; XInterface oInstance2 = null; - XSingleServiceFactory oSingleMSF = (XSingleServiceFactory) - UnoRuntime.queryInterface(XSingleServiceFactory.class, xCP); + XSingleServiceFactory oSingleMSF = UnoRuntime.queryInterface(XSingleServiceFactory.class, xCP); try{ oInstance = (XInterface) oSingleMSF.createInstance(); diff --git a/qadevOOo/tests/java/mod/_sd/SdXShape.java b/qadevOOo/tests/java/mod/_sd/SdXShape.java index 41c3b55b9ef7..7ca5704ce3a3 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXShape.java +++ b/qadevOOo/tests/java/mod/_sd/SdXShape.java @@ -156,14 +156,13 @@ public class SdXShape extends TestCase { XShape oShape = SOF.createShape (xDrawDoc, 3000, 4500, 15000, 1000, "Ellipse"); oShapes.add((XShape) oObj); - oShapes.add((XShape) oShape); + oShapes.add(oShape); log.println( "creating a new environment for XShape object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); log.println( "adding two style as ObjRelation for ShapeDescriptor" ); - XPropertySet oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oObj); + XPropertySet oShapeProps = UnoRuntime.queryInterface(XPropertySet.class, oObj); XStyle aStyle = null; try { aStyle = (XStyle) AnyConverter.toObject( @@ -184,8 +183,7 @@ public class SdXShape extends TestCase { } tEnv.addObjRelation("Style1", aStyle); - oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oShape); + oShapeProps = UnoRuntime.queryInterface(XPropertySet.class, oShape); try { aStyle = (XStyle) AnyConverter.toObject( new Type(XStyle.class),oShapeProps.getPropertyValue("Style")); diff --git a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java index 4b2645799f2f..c3684d16f10d 100644 --- a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java +++ b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java @@ -85,7 +85,7 @@ public class SmEditAccessible extends TestCase { // setting a formula in document final String expFormula = "sum hat a"; - final XPropertySet xPS = (XPropertySet) UnoRuntime.queryInterface + final XPropertySet xPS = UnoRuntime.queryInterface (XPropertySet.class, xMathDoc); try { xPS.setPropertyValue("Formula", expFormula); diff --git a/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java b/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java index 0b76f49b22f2..4a54b860c7c3 100644 --- a/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java +++ b/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java @@ -87,7 +87,7 @@ public class SmGraphicAccessible extends TestCase { // setting a formula in document final String expFormula = "sum a cdot b"; - final XPropertySet xPS = (XPropertySet) UnoRuntime.queryInterface + final XPropertySet xPS = UnoRuntime.queryInterface (XPropertySet.class, xMathDoc); try { xPS.setPropertyValue("Formula", expFormula); diff --git a/qadevOOo/tests/java/mod/_sm/XMLExporter.java b/qadevOOo/tests/java/mod/_sm/XMLExporter.java index 19258ba75eb0..893610c6049e 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLExporter.java @@ -125,7 +125,7 @@ public class XMLExporter extends TestCase { xEx.setSourceDocument(xMathDoc); // setting a formula in document - XPropertySet xPS = (XPropertySet) UnoRuntime.queryInterface + XPropertySet xPS = UnoRuntime.queryInterface (XPropertySet.class, xMathDoc) ; xPS.setPropertyValue("Formula", expFormula) ; } catch (com.sun.star.uno.Exception e) { diff --git a/qadevOOo/tests/java/mod/_sm/XMLImporter.java b/qadevOOo/tests/java/mod/_sm/XMLImporter.java index b3d589cfa95a..6a5e38a3a1da 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLImporter.java @@ -136,7 +136,7 @@ public class XMLImporter extends TestCase { tEnv.addObjRelation("XDocumentHandler.XMLData", xml) ; final PrintWriter logF = log ; - final XPropertySet xPS = (XPropertySet) UnoRuntime.queryInterface + final XPropertySet xPS = UnoRuntime.queryInterface (XPropertySet.class, xMathDoc) ; tEnv.addObjRelation("XDocumentHandler.ImportChecker", diff --git a/qadevOOo/tests/java/mod/_sm/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_sm/XMLMetaImporter.java index ea7b67127b03..bde9b09712cb 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLMetaImporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLMetaImporter.java @@ -157,9 +157,8 @@ public class XMLMetaImporter extends TestCase { public boolean checkImport() { try { XDocumentInfo xDocInfo = xDocInfoSup.getDocumentInfo() ; - XPropertySet xDocInfoProp = (XPropertySet) - UnoRuntime.queryInterface - (XPropertySet.class, xDocInfo) ; + XPropertySet xDocInfoProp = UnoRuntime.queryInterface + (XPropertySet.class, xDocInfo) ; boolean result = false ; for (short i = 0; i < xDocInfo.getUserFieldCount(); i++) { String gName = xDocInfo.getUserFieldName(i) ; diff --git a/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java index 4f96126fe95b..5106138ee6ef 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java @@ -126,7 +126,7 @@ public class XMLSettingsExporter extends TestCase { xEx.setSourceDocument(xMathDoc); // setting a formula in document - XPropertySet xPS = (XPropertySet) UnoRuntime.queryInterface + XPropertySet xPS = UnoRuntime.queryInterface (XPropertySet.class, xMathDoc) ; xPS.setPropertyValue("TopMargin", new Short(expMargin)) ; diff --git a/qadevOOo/tests/java/mod/_sm/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_sm/XMLSettingsImporter.java index eabf2d4bbafd..9860a8609fab 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLSettingsImporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLSettingsImporter.java @@ -146,7 +146,7 @@ public class XMLSettingsImporter extends TestCase { tEnv.addObjRelation("XDocumentHandler.XMLData", xml) ; final PrintWriter logF = log ; - final XPropertySet xPS = (XPropertySet) UnoRuntime.queryInterface + final XPropertySet xPS = UnoRuntime.queryInterface (XPropertySet.class, xMathDoc) ; tEnv.addObjRelation("XDocumentHandler.ImportChecker", diff --git a/qadevOOo/tests/java/mod/_smgr/OServiceManager.java b/qadevOOo/tests/java/mod/_smgr/OServiceManager.java index c855144a225d..18d649f7b33c 100644 --- a/qadevOOo/tests/java/mod/_smgr/OServiceManager.java +++ b/qadevOOo/tests/java/mod/_smgr/OServiceManager.java @@ -117,9 +117,9 @@ public class OServiceManager extends TestCase { } try { - XSet set = (XSet) UnoRuntime.queryInterface + XSet set = UnoRuntime.queryInterface (XSet.class, oInterface) ; - XSet set1 = (XSet) UnoRuntime.queryInterface + XSet set1 = UnoRuntime.queryInterface (XSet.class, srvMan) ; XEnumeration oEnum = set1.createEnumeration(); Object srv = oEnum.nextElement(); @@ -128,7 +128,7 @@ public class OServiceManager extends TestCase { newElement = oEnum.nextElement(); - XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface( + XPropertySet xProp = UnoRuntime.queryInterface( XPropertySet.class, oInterface); if (xProp != null) { xContext = (XComponentContext) AnyConverter.toObject( diff --git a/qadevOOo/tests/java/mod/_stm/DataInputStream.java b/qadevOOo/tests/java/mod/_stm/DataInputStream.java index a16475076e98..9acc80713db1 100644 --- a/qadevOOo/tests/java/mod/_stm/DataInputStream.java +++ b/qadevOOo/tests/java/mod/_stm/DataInputStream.java @@ -107,8 +107,7 @@ public class DataInputStream extends TestCase { throw new StatusException("Couldn't create instance", e); } - XInputStream xPipeInput = (XInputStream) - UnoRuntime.queryInterface(XInputStream.class, oPipe); + XInputStream xPipeInput = UnoRuntime.queryInterface(XInputStream.class, oPipe); XOutputStream xPipeOutput = UnoRuntime.queryInterface(XOutputStream.class, oPipe); XInterface oDataOutput = null; diff --git a/qadevOOo/tests/java/mod/_stm/DataOutputStream.java b/qadevOOo/tests/java/mod/_stm/DataOutputStream.java index 225aaa13a69a..d939efba379e 100644 --- a/qadevOOo/tests/java/mod/_stm/DataOutputStream.java +++ b/qadevOOo/tests/java/mod/_stm/DataOutputStream.java @@ -125,8 +125,7 @@ public class DataOutputStream extends TestCase { //add relation for io.XOutputStream final XMultiServiceFactory msf = xMSF; - final XInputStream xPipeInput = (XInputStream) - UnoRuntime.queryInterface(XInputStream.class, oPipe); + final XInputStream xPipeInput = UnoRuntime.queryInterface(XInputStream.class, oPipe); tEnv.addObjRelation("XOutputStream.StreamChecker", new ifc.io._XOutputStream.StreamChecker() { XInputStream xInStream = null; @@ -150,7 +149,7 @@ public class DataOutputStream extends TestCase { try { Object oInStream = msf.createInstance( "com.sun.star.io.DataInputStream"); - xInStream = (XInputStream) UnoRuntime.queryInterface + xInStream = UnoRuntime.queryInterface (XInputStream.class, oInStream); } catch(com.sun.star.uno.Exception e) { return null; diff --git a/qadevOOo/tests/java/mod/_stm/MarkableInputStream.java b/qadevOOo/tests/java/mod/_stm/MarkableInputStream.java index 85b00ddcdafc..2afa3f1a97e7 100644 --- a/qadevOOo/tests/java/mod/_stm/MarkableInputStream.java +++ b/qadevOOo/tests/java/mod/_stm/MarkableInputStream.java @@ -104,8 +104,7 @@ public class MarkableInputStream extends TestCase { XActiveDataSource xdSmo = UnoRuntime.queryInterface(XActiveDataSource.class, mostream); XOutputStream PipeOut = UnoRuntime.queryInterface(XOutputStream.class, aPipe); - XInputStream PipeIn = (XInputStream) - UnoRuntime.queryInterface(XInputStream.class, aPipe); + XInputStream PipeIn = UnoRuntime.queryInterface(XInputStream.class, aPipe); xdSmo.setOutputStream(PipeOut); diff --git a/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java index 1ee7ddbc1b6b..8203db02c8ba 100644 --- a/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java +++ b/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java @@ -115,8 +115,7 @@ public class MarkableOutputStream extends TestCase { XActiveDataSource xdSmo = UnoRuntime.queryInterface(XActiveDataSource.class, mostream); final XOutputStream PipeOut = UnoRuntime.queryInterface(XOutputStream.class,aPipe); - final XInputStream PipeIn = (XInputStream) - UnoRuntime.queryInterface(XInputStream.class,aPipe); + final XInputStream PipeIn = UnoRuntime.queryInterface(XInputStream.class,aPipe); xdSmo.setOutputStream(PipeOut); @@ -173,7 +172,7 @@ public class MarkableOutputStream extends TestCase { try { Object oInStream = msf.createInstance( "com.sun.star.io.MarkableInputStream"); - xInStream = (XInputStream) UnoRuntime.queryInterface + xInStream = UnoRuntime.queryInterface (XInputStream.class, oInStream); } catch(com.sun.star.uno.Exception e) { return null; diff --git a/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java b/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java index 1ca8772b3a05..220d37ad9c54 100644 --- a/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java +++ b/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java @@ -191,7 +191,7 @@ public class ObjectInputStream extends TestCase { ("com.sun.star.io.MarkableInputStream"); mostream = xMSF.createInstance ("com.sun.star.io.MarkableOutputStream"); - xConnect = (XInterface)xMSF.createInstance + xConnect = xMSF.createInstance ("com.sun.star.io.DataInputStream") ; } catch( com.sun.star.uno.Exception e ) { @@ -208,8 +208,7 @@ public class ObjectInputStream extends TestCase { XOutputStream moStream = UnoRuntime.queryInterface(XOutputStream.class, mostream); XOutputStream PipeOut = UnoRuntime.queryInterface(XOutputStream.class, aPipe); - XInputStream PipeIn = (XInputStream) - UnoRuntime.queryInterface(XInputStream.class, aPipe); + XInputStream PipeIn = UnoRuntime.queryInterface(XInputStream.class, aPipe); xdSo.setOutputStream(moStream); xdSmo.setOutputStream(PipeOut); @@ -219,8 +218,7 @@ public class ObjectInputStream extends TestCase { oStream = UnoRuntime.queryInterface(XObjectOutputStream.class, ostream); XActiveDataSink xmSi = UnoRuntime.queryInterface(XActiveDataSink.class, mistream); - XInputStream xmIstream = (XInputStream) - UnoRuntime.queryInterface(XInputStream.class, mistream); + XInputStream xmIstream = UnoRuntime.queryInterface(XInputStream.class, mistream); XActiveDataSink xdSi = UnoRuntime.queryInterface (XActiveDataSink.class, istream); @@ -232,8 +230,7 @@ public class ObjectInputStream extends TestCase { try { Object oPersObj = xMSF.createInstance ("com.sun.star.cmp.PersistObject"); - xPersObj = (XPersistObject) - UnoRuntime.queryInterface(XPersistObject.class, oPersObj); + xPersObj = UnoRuntime.queryInterface(XPersistObject.class, oPersObj); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); throw new StatusException("Can't write persist object.", e); diff --git a/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java b/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java index ca180e3868c4..675de8cdd949 100644 --- a/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java +++ b/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java @@ -201,12 +201,10 @@ public class ObjectOutputStream extends TestCase { XActiveDataSink markIn = UnoRuntime.queryInterface(XActiveDataSink.class, minstream); XActiveDataSink inStream = UnoRuntime.queryInterface(XActiveDataSink.class, istream); - XInputStream markInStream = (XInputStream) - UnoRuntime.queryInterface(XInputStream.class, minstream); + XInputStream markInStream = UnoRuntime.queryInterface(XInputStream.class, minstream); final XOutputStream PipeOut = UnoRuntime.queryInterface(XOutputStream.class,aPipe); - final XInputStream PipeIn = (XInputStream) - UnoRuntime.queryInterface(XInputStream.class,aPipe); + final XInputStream PipeIn = UnoRuntime.queryInterface(XInputStream.class,aPipe); markIn.setInputStream(PipeIn); inStream.setInputStream(markInStream); @@ -221,8 +219,7 @@ public class ObjectOutputStream extends TestCase { try { Object oPersObj = xMSF.createInstance ("com.sun.star.cmp.PersistObject"); - xPersObj = (XPersistObject) - UnoRuntime.queryInterface(XPersistObject.class, oPersObj); + xPersObj = UnoRuntime.queryInterface(XPersistObject.class, oPersObj); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); throw new StatusException("Can't write persist object.", e) ; @@ -280,7 +277,7 @@ public class ObjectOutputStream extends TestCase { try { Object oInStream = msf.createInstance( "com.sun.star.io.ObjectInputStream"); - xInStream = (XInputStream) UnoRuntime.queryInterface + xInStream = UnoRuntime.queryInterface (XInputStream.class, oInStream); } catch(com.sun.star.uno.Exception e) { return null; diff --git a/qadevOOo/tests/java/mod/_stm/Pipe.java b/qadevOOo/tests/java/mod/_stm/Pipe.java index 1c026d08b45f..e3c869aec22d 100644 --- a/qadevOOo/tests/java/mod/_stm/Pipe.java +++ b/qadevOOo/tests/java/mod/_stm/Pipe.java @@ -82,8 +82,7 @@ public class Pipe extends TestCase { TestEnvironment tEnv = new TestEnvironment( oObj ); //add relation for io.XOutputStream - final XInputStream iStream = (XInputStream) - UnoRuntime.queryInterface(XInputStream.class, oObj); + final XInputStream iStream = UnoRuntime.queryInterface(XInputStream.class, oObj); tEnv.addObjRelation("ByteData", byteData); tEnv.addObjRelation("StreamWriter", oObj); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java index 6c21e77c57f3..d2e7effb02e9 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java @@ -246,7 +246,7 @@ public class AccessibleIconChoiceCtrl extends TestCase { tEnv.addObjRelation("expectedStateNames", expectedStateNames); tEnv.addObjRelation("expectedStates", expectedStates); - final XAccessibleSelection selection = (XAccessibleSelection) UnoRuntime.queryInterface( + final XAccessibleSelection selection = UnoRuntime.queryInterface( XAccessibleSelection.class, oObj); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java index 6ccca61e0087..429e061671ca 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java @@ -85,8 +85,7 @@ public class AccessibleOLEShape extends TestCase { DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape); - XPropertySet shape_props = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oShape); + XPropertySet shape_props = UnoRuntime.queryInterface(XPropertySet.class,oShape); log.println("Inserting a Chart"); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java index c84cebb013a9..d0f723e97248 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java @@ -99,8 +99,7 @@ public class AccessiblePageShape extends TestCase { // UnoRuntime.queryInterface // (XAccessibleValue.class, at.SearchedContext) ; oPage = DrawTools.getDrawPage(xDrawDoc,0); - final XPropertySet PageProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oPage); + final XPropertySet PageProps = UnoRuntime.queryInterface(XPropertySet.class, oPage); tEnv.addObjRelation("EventProducer", new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java index 43c9df187313..61fbd7cf0e0d 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java @@ -91,8 +91,7 @@ public class AccessiblePresentationGraphicShape extends TestCase { DrawTools.getShapes(DrawTools.getDrawPage(xDoc,0)).add(oShape); - XPropertySet oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oShape); + XPropertySet oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,oShape); try { oShapeProps.setPropertyValue( "GraphicURL",util.utils.getFullTestURL("space-metal.jpg")); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java index 3e9773585f19..d4cbf2fcd8f2 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java @@ -91,8 +91,7 @@ public class AccessiblePresentationOLEShape extends TestCase { //DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape); - XPropertySet oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oShape); + XPropertySet oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,oShape); try { oShapeProps.setPropertyValue("IsEmptyPresentationObject", new Boolean(false)); } catch (com.sun.star.lang.WrappedTargetException e) { diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java index 42beb8b234a7..13fb69e5c269 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java @@ -92,8 +92,7 @@ public class AccessiblePresentationShape extends TestCase { DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape); - XPropertySet shapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oShape); + XPropertySet shapeProps = UnoRuntime.queryInterface(XPropertySet.class, oShape); try { shapeProps.setPropertyValue( diff --git a/qadevOOo/tests/java/mod/_svx/GraphicExporter.java b/qadevOOo/tests/java/mod/_svx/GraphicExporter.java index bbabd04c83e9..d4d430a8d637 100644 --- a/qadevOOo/tests/java/mod/_svx/GraphicExporter.java +++ b/qadevOOo/tests/java/mod/_svx/GraphicExporter.java @@ -141,7 +141,7 @@ public class GraphicExporter extends TestCase { "GraphicObject"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc, 0)).add(oShape); - XPropertySet oShapeProps = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet oShapeProps = UnoRuntime.queryInterface( XPropertySet.class, oShape); XComponent xComp = null; @@ -153,7 +153,7 @@ public class GraphicExporter extends TestCase { oShape); XExporter xEx = UnoRuntime.queryInterface( - XExporter.class, (XInterface) go); + XExporter.class, go); xEx.setSourceDocument(xComp); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java b/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java index ba2b953cbe23..55b93eeb2d1e 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java +++ b/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java @@ -155,7 +155,7 @@ public class SvxDrawPage extends TestCase { XDrawPagesSupplier oDPS = UnoRuntime.queryInterface( XDrawPagesSupplier.class, xDoc); - oDP = (XDrawPages) oDPS.getDrawPages(); + oDP = oDPS.getDrawPages(); oDP.insertNewByIndex(1); oDP.insertNewByIndex(2); oObj = (XDrawPage) AnyConverter.toObject(new Type(XDrawPage.class), diff --git a/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java b/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java index cc70da81de69..db6146c79d9c 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java +++ b/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java @@ -87,8 +87,7 @@ public class SvxGraphCtrlAccessibleContext extends TestCase{ DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape); - XPropertySet shapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oShape); + XPropertySet shapeProps = UnoRuntime.queryInterface(XPropertySet.class, oShape); String url = util.utils.getFullTestURL("space-metal.jpg"); diff --git a/qadevOOo/tests/java/mod/_svx/SvxGraphicObject.java b/qadevOOo/tests/java/mod/_svx/SvxGraphicObject.java index 716bbf97290c..f1641f9c1d81 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxGraphicObject.java +++ b/qadevOOo/tests/java/mod/_svx/SvxGraphicObject.java @@ -168,8 +168,7 @@ public class SvxGraphicObject extends TestCase { oShape = SOF.createShape(xDrawDoc,3000,4500,15000,1000,"Ellipse"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape); - XPropertySet oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oObj); + XPropertySet oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,oObj); XStyle aStyle = null; try { aStyle = (XStyle) AnyConverter.toObject( @@ -180,8 +179,7 @@ public class SvxGraphicObject extends TestCase { } tEnv.addObjRelation("Style1",aStyle); - oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oShape); + oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,oShape); try { aStyle = (XStyle) AnyConverter.toObject( new Type(XStyle.class),oShapeProps.getPropertyValue("Style")); @@ -193,8 +191,7 @@ public class SvxGraphicObject extends TestCase { // adding graphic as ObjRelation for GraphicObjectShape - oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oObj); + oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,oObj); XBitmap aBitmap = null; try { oShapeProps.setPropertyValue( diff --git a/qadevOOo/tests/java/mod/_svx/SvxShape.java b/qadevOOo/tests/java/mod/_svx/SvxShape.java index 7a4eb70802da..c6f364aea036 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShape.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShape.java @@ -183,8 +183,7 @@ public class SvxShape extends TestCase { DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape); log.println( "adding two style as ObjRelation for ShapeDescriptor" ); - XPropertySet oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oObj); + XPropertySet oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,oObj); XStyle aStyle = null; try { aStyle = (XStyle) AnyConverter.toObject( @@ -195,7 +194,7 @@ public class SvxShape extends TestCase { } tEnv.addObjRelation("Style1",aStyle); - oShapeProps = (XPropertySet) UnoRuntime.queryInterface + oShapeProps = UnoRuntime.queryInterface (XPropertySet.class,oShape); try { aStyle = (XStyle) AnyConverter.toObject( diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java b/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java index b0a6db52e0d6..15a00912a0fc 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java @@ -170,7 +170,7 @@ public class SvxShapeCircle extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)tParam.getMSF()) ; oShape = SOF.createShape(xDrawDoc,5000,5000,3000,3000,"Ellipse"); - XPropertySet props = (XPropertySet) UnoRuntime.queryInterface + XPropertySet props = UnoRuntime.queryInterface (XPropertySet.class, oShape) ; DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape) ; @@ -202,8 +202,7 @@ public class SvxShapeCircle extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); log.println( "adding two styles as ObjRelation for ShapeDescriptor" ); - XPropertySet oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oObj); + XPropertySet oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,oObj); XStyle aStyle = null; try { @@ -215,8 +214,7 @@ public class SvxShapeCircle extends TestCase { } tEnv.addObjRelation("Style1",aStyle); - oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oShape); + oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,oShape); try { aStyle = (XStyle) AnyConverter.toObject( new Type(XStyle.class),oShapeProps.getPropertyValue("Style")); diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeConnector.java b/qadevOOo/tests/java/mod/_svx/SvxShapeConnector.java index 4ce666cf608e..f1c080d9eda2 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeConnector.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeConnector.java @@ -156,8 +156,7 @@ public class SvxShapeConnector extends TestCase { } log.println( "adding two style as ObjRelation for ShapeDescriptor" ); - XPropertySet oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oObj); + XPropertySet oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,oObj); XStyle aStyle = null; try { aStyle = (XStyle) AnyConverter.toObject( @@ -165,8 +164,7 @@ public class SvxShapeConnector extends TestCase { } catch (Exception e) {} tEnv.addObjRelation("Style1",aStyle); - oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oShape); + oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,oShape); try { aStyle = (XStyle) AnyConverter.toObject( new Type(XStyle.class),oShapeProps.getPropertyValue("Style")); diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java b/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java index bdff0c54982d..d7965e20ae43 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java @@ -123,16 +123,14 @@ public class SvxShapeControl extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); log.println( "adding two styles as ObjRelation for ShapeDescriptor" ); - XPropertySet oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oObj); + XPropertySet oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,oObj); XStyle aStyle = null; try { aStyle = (XStyle) AnyConverter.toObject( new Type(XStyle.class),oShapeProps.getPropertyValue("Style")); } catch (Exception e) {} tEnv.addObjRelation("Style1",aStyle); - oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oShape); + oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,oShape); try { aStyle = (XStyle) AnyConverter.toObject( new Type(XStyle.class),oShapeProps.getPropertyValue("Style")); diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java b/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java index 0e6ad96e57ac..57a56803f18b 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java @@ -132,16 +132,14 @@ public class SvxShapeDimensioning extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); log.println( "adding two styles as ObjRelation for ShapeDescriptor" ); - XPropertySet oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oObj); + XPropertySet oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,oObj); XStyle aStyle = null; try { aStyle = (XStyle) AnyConverter.toObject( new Type(XStyle.class),oShapeProps.getPropertyValue("Style")); } catch (Exception e) {} tEnv.addObjRelation("Style1",aStyle); - oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oShape); + oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,oShape); try { aStyle = (XStyle) AnyConverter.toObject( new Type(XStyle.class),oShapeProps.getPropertyValue("Style")); diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java b/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java index d0902ae695ad..5abdc141e705 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java @@ -134,15 +134,13 @@ public class SvxShapeGroup extends TestCase { oShapes.add(Shape2); log.println( "adding two style as ObjRelation for ShapeDescriptor" ); - XPropertySet oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,Shape1); + XPropertySet oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,Shape1); XStyle aStyle1 = null; try { aStyle1 = (XStyle) AnyConverter.toObject( new Type(XStyle.class),oShapeProps.getPropertyValue("Style")); } catch (Exception e) {} - oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,Shape2); + oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,Shape2); XStyle aStyle2 = null; try { aStyle2 = (XStyle) AnyConverter.toObject( diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java index 7dd897328c8b..915976c6d995 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java @@ -207,8 +207,8 @@ public class SvxShapePolyPolygon extends TestCase { Point[][] polygon = new Point[][] {square1, square2}; - ((XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, - oShape)).setPropertyValue("PolyPolygon", polygon) ; + UnoRuntime.queryInterface(XPropertySet.class, + oShape).setPropertyValue("PolyPolygon", polygon) ; oObj = oShape ; @@ -226,16 +226,14 @@ public class SvxShapePolyPolygon extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); log.println( "adding two styles as ObjRelation for ShapeDescriptor" ); - XPropertySet oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oObj); + XPropertySet oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,oObj); XStyle aStyle = null; try { aStyle = (XStyle) AnyConverter.toObject( new Type(XStyle.class),oShapeProps.getPropertyValue("Style")); } catch (Exception e) {} tEnv.addObjRelation("Style1",aStyle); - oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oShape); + oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,oShape); try { aStyle = (XStyle) AnyConverter.toObject( new Type(XStyle.class),oShapeProps.getPropertyValue("Style")); diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java index abc012ae6477..3247af2e2fe4 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java @@ -220,7 +220,7 @@ public class SvxShapePolyPolygonBezier extends TestCase { oObj = oShape ; - XPropertySet shapeProps = (XPropertySet) UnoRuntime.queryInterface + XPropertySet shapeProps = UnoRuntime.queryInterface (XPropertySet.class, oObj); shapeProps.setPropertyValue("PolyPolygonBezier",coords); @@ -239,16 +239,14 @@ public class SvxShapePolyPolygonBezier extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); log.println( "adding two styles as ObjRelation for ShapeDescriptor" ); - XPropertySet oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oObj); + XPropertySet oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,oObj); XStyle aStyle = null; try { aStyle = (XStyle) AnyConverter.toObject( new Type(XStyle.class),oShapeProps.getPropertyValue("Style")); } catch (Exception e) {} tEnv.addObjRelation("Style1",aStyle); - oShapeProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oShape); + oShapeProps = UnoRuntime.queryInterface(XPropertySet.class,oShape); try { aStyle = (XStyle) AnyConverter.toObject( new Type(XStyle.class),oShapeProps.getPropertyValue("Style")); diff --git a/qadevOOo/tests/java/mod/_sw/CharacterStyle.java b/qadevOOo/tests/java/mod/_sw/CharacterStyle.java index 8a72e83f4680..da479a855640 100644 --- a/qadevOOo/tests/java/mod/_sw/CharacterStyle.java +++ b/qadevOOo/tests/java/mod/_sw/CharacterStyle.java @@ -104,10 +104,10 @@ public class CharacterStyle extends TestCase { xTextDoc); XNameAccess oSF = oSFS.getStyleFamilies(); XIndexAccess oSFsIA = UnoRuntime.queryInterface(XIndexAccess.class, oSF); - oSFNA = (XNameAccess) UnoRuntime.queryInterface( + oSFNA = UnoRuntime.queryInterface( XNameAccess.class,oSFsIA.getByIndex(0)); XIndexAccess oSFIA = UnoRuntime.queryInterface(XIndexAccess.class, oSFNA); - oStyle = (XStyle) UnoRuntime.queryInterface( + oStyle = UnoRuntime.queryInterface( XStyle.class,oSFIA.getByIndex(0)); } catch ( com.sun.star.lang.WrappedTargetException e ) { log.println("Error: exception occurred."); @@ -124,7 +124,7 @@ public class CharacterStyle extends TestCase { XMultiServiceFactory oMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDoc); XInterface oInt = (XInterface) oMSF.createInstance("com.sun.star.style.CharacterStyle"); - oMyStyle = (XStyle) UnoRuntime.queryInterface(XStyle.class, oInt); + oMyStyle = UnoRuntime.queryInterface(XStyle.class, oInt); } catch ( com.sun.star.uno.Exception e ) { log.println("Error: exception occurred."); e.printStackTrace(log); @@ -136,8 +136,7 @@ public class CharacterStyle extends TestCase { log.println("FAILED"); else log.println("OK"); - XNameContainer oSFNC = (XNameContainer) - UnoRuntime.queryInterface(XNameContainer.class, oSFNA); + XNameContainer oSFNC = UnoRuntime.queryInterface(XNameContainer.class, oSFNA); try { if ( oSFNC.hasByName("My Style") ) @@ -159,8 +158,7 @@ public class CharacterStyle extends TestCase { XText oText = xTextDoc.getText(); XTextCursor oCursor = oText.createTextCursor(); - XPropertySet xProp = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oCursor); + XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, oCursor); try { xProp.setPropertyValue("CharStyleName", oMyStyle.getName()); @@ -182,8 +180,7 @@ public class CharacterStyle extends TestCase { tEnv = new TestEnvironment(oMyStyle); tEnv.addObjRelation("PoolStyle", oStyle); - XPropertySet xStyleProp = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oMyStyle); + XPropertySet xStyleProp = UnoRuntime.queryInterface(XPropertySet.class, oMyStyle); short exclude = PropertyAttribute.MAYBEVOID + PropertyAttribute.READONLY; tEnv.addObjRelation("PropertyNames",utils.getFilteredPropertyNames(xStyleProp, (short)0, exclude)); diff --git a/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java b/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java index e9bc64e1ab2b..e5d53a4eef6b 100644 --- a/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java +++ b/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java @@ -92,10 +92,10 @@ public class ConditionalParagraphStyle extends TestCase { XStyleFamiliesSupplier oSFS = UnoRuntime.queryInterface(XStyleFamiliesSupplier.class, xTextDoc); XNameAccess oSF = oSFS.getStyleFamilies(); - oSFNA = (XNameAccess) UnoRuntime.queryInterface( + oSFNA = UnoRuntime.queryInterface( XNameAccess.class,oSF.getByName("ParagraphStyles")); XIndexAccess oSFIA = UnoRuntime.queryInterface(XIndexAccess.class, oSFNA); - oStyle = (XStyle) UnoRuntime.queryInterface( + oStyle = UnoRuntime.queryInterface( XStyle.class,oSFIA.getByIndex(1)); } catch ( com.sun.star.lang.WrappedTargetException e ) { log.println("Error: exception occurred."); @@ -116,7 +116,7 @@ public class ConditionalParagraphStyle extends TestCase { XMultiServiceFactory oMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDoc); XInterface oInt = (XInterface) oMSF.createInstance("com.sun.star.style.ConditionalParagraphStyle"); - oMyStyle = (XStyle) UnoRuntime.queryInterface(XStyle.class, oInt); + oMyStyle = UnoRuntime.queryInterface(XStyle.class, oInt); } catch ( com.sun.star.uno.Exception e ) { log.println("Error: exception occurred."); e.printStackTrace(log); @@ -132,8 +132,7 @@ public class ConditionalParagraphStyle extends TestCase { log.println("OK"); } - XNameContainer oSFNC = (XNameContainer) - UnoRuntime.queryInterface(XNameContainer.class, oSFNA); + XNameContainer oSFNC = UnoRuntime.queryInterface(XNameContainer.class, oSFNA); try { if ( oSFNC.hasByName("My Style") ) @@ -155,8 +154,7 @@ public class ConditionalParagraphStyle extends TestCase { XText oText = xTextDoc.getText(); XTextCursor oCursor = oText.createTextCursor(); - XPropertySet xProp = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oCursor); + XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, oCursor); try { xProp.setPropertyValue("ParaStyleName", oMyStyle.getName()); } catch ( com.sun.star.lang.WrappedTargetException e ) { @@ -177,8 +175,7 @@ public class ConditionalParagraphStyle extends TestCase { tEnv = new TestEnvironment(oMyStyle); tEnv.addObjRelation("PoolStyle", oStyle); - XPropertySet xStyleProp = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oMyStyle); + XPropertySet xStyleProp = UnoRuntime.queryInterface(XPropertySet.class, oMyStyle); short exclude = PropertyAttribute.MAYBEVOID + PropertyAttribute.READONLY; String[] names = utils.getFilteredPropertyNames(xStyleProp, (short)0, exclude); tEnv.addObjRelation("PropertyNames", names); diff --git a/qadevOOo/tests/java/mod/_sw/PageStyle.java b/qadevOOo/tests/java/mod/_sw/PageStyle.java index 0f7564035a5e..9d41a288b57e 100644 --- a/qadevOOo/tests/java/mod/_sw/PageStyle.java +++ b/qadevOOo/tests/java/mod/_sw/PageStyle.java @@ -85,10 +85,10 @@ public class PageStyle extends TestCase { XStyleFamiliesSupplier oSFS = UnoRuntime.queryInterface(XStyleFamiliesSupplier.class, xTextDoc); XNameAccess oSF = oSFS.getStyleFamilies(); - oSFNA = (XNameAccess) UnoRuntime.queryInterface( + oSFNA = UnoRuntime.queryInterface( XNameAccess.class,oSF.getByName("PageStyles")); // get the page style XIndexAccess oSFIA = UnoRuntime.queryInterface(XIndexAccess.class, oSFNA); - oStyle = (XStyle) UnoRuntime.queryInterface( + oStyle = UnoRuntime.queryInterface( XStyle.class,oSFIA.getByIndex(0)); log.println("Chosen pool style: "+oStyle.getName()); @@ -112,7 +112,7 @@ public class PageStyle extends TestCase { XInterface oInt = (XInterface) oMSF.createInstance("com.sun.star.style.PageStyle"); // oMSF.createInstanceWithArguments("com.sun.star.style.PageStyle",new Object[]{oStyle}); - oMyStyle = (XStyle) UnoRuntime.queryInterface(XStyle.class, oInt); + oMyStyle = UnoRuntime.queryInterface(XStyle.class, oInt); } catch ( com.sun.star.uno.Exception e ) { log.println("Error: exception occurred."); e.printStackTrace(log); @@ -125,8 +125,7 @@ public class PageStyle extends TestCase { else log.println("OK"); - XNameContainer oSFNC = (XNameContainer) - UnoRuntime.queryInterface(XNameContainer.class, oSFNA); + XNameContainer oSFNC = UnoRuntime.queryInterface(XNameContainer.class, oSFNA); try { @@ -149,8 +148,7 @@ public class PageStyle extends TestCase { XText oText = xTextDoc.getText(); XTextCursor oCursor = oText.createTextCursor(); - XPropertySet xProp = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oCursor); + XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, oCursor); Property[] props = xProp.getPropertySetInfo().getProperties(); for (int i=0; i<props.length; i++) System.out.println("# Property: " + props[i].Name + " val: " + props[i].Type.toString() + " attr: " + props[i].Attributes); @@ -176,8 +174,7 @@ public class PageStyle extends TestCase { tEnv.addObjRelation("PoolStyle", oStyle); tEnv.addObjRelation("FollowStyle", "Envelope"); - XPropertySet xStyleProp = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oMyStyle); + XPropertySet xStyleProp = UnoRuntime.queryInterface(XPropertySet.class, oMyStyle); short exclude = PropertyAttribute.MAYBEVOID + PropertyAttribute.READONLY; String[] names = utils.getFilteredPropertyNames(xStyleProp, (short)0, exclude); diff --git a/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java b/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java index c0d95a6163be..68dddf1fc7ac 100644 --- a/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java +++ b/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java @@ -85,11 +85,11 @@ public class ParagraphStyle extends TestCase { XStyleFamiliesSupplier oSFS = UnoRuntime.queryInterface(XStyleFamiliesSupplier.class, xTextDoc); XNameAccess oSF = oSFS.getStyleFamilies(); - oSFNA = (XNameAccess) UnoRuntime.queryInterface( + oSFNA = UnoRuntime.queryInterface( XNameAccess.class,oSF.getByName("ParagraphStyles")); XIndexAccess oSFIA = UnoRuntime.queryInterface(XIndexAccess.class, oSFNA); String[] els = oSFNA.getElementNames(); - oStyle = (XStyle) UnoRuntime.queryInterface( + oStyle = UnoRuntime.queryInterface( XStyle.class,oSFIA.getByIndex(1)); } catch ( com.sun.star.lang.WrappedTargetException e ) { log.println("Error: exception occurred."); @@ -110,7 +110,7 @@ public class ParagraphStyle extends TestCase { XMultiServiceFactory oMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDoc); XInterface oInt = (XInterface) oMSF.createInstance("com.sun.star.style.ParagraphStyle"); - oMyStyle = (XStyle) UnoRuntime.queryInterface(XStyle.class, oInt); + oMyStyle = UnoRuntime.queryInterface(XStyle.class, oInt); } catch ( com.sun.star.uno.Exception e ) { log.println("Error: exception occurred."); e.printStackTrace(log); @@ -122,8 +122,7 @@ public class ParagraphStyle extends TestCase { log.println("FAILED"); else log.println("OK"); - XNameContainer oSFNC = (XNameContainer) - UnoRuntime.queryInterface(XNameContainer.class, oSFNA); + XNameContainer oSFNC = UnoRuntime.queryInterface(XNameContainer.class, oSFNA); try { if ( oSFNC.hasByName("My Style") ) @@ -145,8 +144,7 @@ public class ParagraphStyle extends TestCase { XText oText = xTextDoc.getText(); XTextCursor oCursor = oText.createTextCursor(); - XPropertySet xProp = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oCursor); + XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, oCursor); try { xProp.setPropertyValue("ParaStyleName", oMyStyle.getName()); @@ -168,8 +166,7 @@ public class ParagraphStyle extends TestCase { tEnv = new TestEnvironment(oMyStyle); tEnv.addObjRelation("PoolStyle", oStyle); - XPropertySet xStyleProp = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oMyStyle); + XPropertySet xStyleProp = UnoRuntime.queryInterface(XPropertySet.class, oMyStyle); short exclude = PropertyAttribute.MAYBEVOID + PropertyAttribute.READONLY; String[] names = utils.getFilteredPropertyNames(xStyleProp, (short)0, exclude); tEnv.addObjRelation("PropertyNames", names); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java index 007f6a3171e8..768436f10513 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java @@ -69,7 +69,7 @@ public class SwAccessibleEndnoteView extends TestCase { XMultiServiceFactory msf = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDoc); log.println("creating a endnote"); try { - oEndnote = (XInterface) UnoRuntime.queryInterface(XInterface.class, + oEndnote = UnoRuntime.queryInterface(XInterface.class, msf.createInstance("com.sun.star.text.Endnote")); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java index 95ecd52424e5..9e098cdd1e62 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java @@ -97,8 +97,7 @@ public class SwAccessibleFooterView extends TestCase { throw new StatusException("Error getting style by name!", e); } - final XPropertySet PropSet = (XPropertySet) - UnoRuntime.queryInterface( XPropertySet.class, StdStyle); + final XPropertySet PropSet = UnoRuntime.queryInterface( XPropertySet.class, StdStyle); // changing/getting some properties try { diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java index 544e27b1279c..d58bb3819084 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java @@ -95,8 +95,7 @@ public class SwAccessibleHeaderView extends TestCase { throw new StatusException("Error getting style by name!", e); } - final XPropertySet PropSet = (XPropertySet) - UnoRuntime.queryInterface( XPropertySet.class, StdStyle); + final XPropertySet PropSet = UnoRuntime.queryInterface( XPropertySet.class, StdStyle); // changing/getting some properties try { diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java index 8c183b6d41ec..4364ad03dfe9 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java @@ -125,10 +125,8 @@ public class SwAccessiblePageView extends TestCase { } try { - portP = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, port); - paraP = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, para); + portP = UnoRuntime.queryInterface(XPropertySet.class, port); + paraP = UnoRuntime.queryInterface(XPropertySet.class, para); paraP.setPropertyValue("BreakType",com.sun.star.style.BreakType.PAGE_AFTER); } catch ( com.sun.star.lang.WrappedTargetException e ) { log.println("Error, exception occurred..."); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java index 36679927caf4..f0071b6f76bc 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java @@ -84,7 +84,7 @@ public class SwAccessibleTextFrameView extends TestCase { log.println( "creating Frames" ); try { oFrame1 = SOF.createTextFrame(xTextDoc, 500, 500); - oPropSet = (XPropertySet)UnoRuntime.queryInterface( + oPropSet = UnoRuntime.queryInterface( XPropertySet.class, oFrame1 ); oPropSet.setPropertyValue("AnchorType", TextContentAnchorType.AS_CHARACTER); diff --git a/qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry.java b/qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry.java index 0fdacdebbf3e..afa7c6ab6123 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry.java +++ b/qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry.java @@ -136,7 +136,7 @@ public class SwXAutoTextEntry extends TestCase { throw new StatusException("Couldn't create AutoTextContainer", e); } - XNameAccess oContNames = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, oContainer); + XNameAccess oContNames = UnoRuntime.queryInterface(XNameAccess.class, oContainer); String contNames[] = oContNames.getElementNames(); for (int i =0; i < contNames.length; i++){ @@ -159,7 +159,7 @@ public class SwXAutoTextEntry extends TestCase { XText oText = xTextDoc.getText(); oText.insertString(oText.getStart(), "New AutoText", true); - XTextRange oTextRange = (XTextRange) oText; + XTextRange oTextRange = oText; try { if ( oGroup.hasByName("NewEntryName") ) { oGroup.removeByName("NewEntryName"); diff --git a/qadevOOo/tests/java/mod/_sw/SwXAutoTextGroup.java b/qadevOOo/tests/java/mod/_sw/SwXAutoTextGroup.java index 232e634c2a90..3f2e802473b2 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXAutoTextGroup.java +++ b/qadevOOo/tests/java/mod/_sw/SwXAutoTextGroup.java @@ -135,7 +135,7 @@ public class SwXAutoTextGroup extends TestCase { } - XNameAccess oContNames = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, oContainer); + XNameAccess oContNames = UnoRuntime.queryInterface(XNameAccess.class, oContainer); if (Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)){ String contNames[] = oContNames.getElementNames(); diff --git a/qadevOOo/tests/java/mod/_sw/SwXCellRange.java b/qadevOOo/tests/java/mod/_sw/SwXCellRange.java index 2d2c386e08b1..f65046d4d718 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXCellRange.java +++ b/qadevOOo/tests/java/mod/_sw/SwXCellRange.java @@ -111,8 +111,7 @@ public class SwXCellRange extends TestCase { } } try { - XCellRange the_Range = (XCellRange) - UnoRuntime.queryInterface(XCellRange.class, the_table); + XCellRange the_Range = UnoRuntime.queryInterface(XCellRange.class, the_table); oObj = the_Range.getCellRangeByPosition(0, 0, 3, 4); } catch (com.sun.star.uno.Exception e) { e.printStackTrace( log ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXEndnoteProperties.java b/qadevOOo/tests/java/mod/_sw/SwXEndnoteProperties.java index 2e1e7d20e000..87d1dc9aa2b4 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXEndnoteProperties.java +++ b/qadevOOo/tests/java/mod/_sw/SwXEndnoteProperties.java @@ -91,7 +91,7 @@ public class SwXEndnoteProperties extends TestCase { XMultiServiceFactory msf = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDoc); log.println("creating a endnote"); try { - oEndnote = (XInterface) UnoRuntime.queryInterface(XInterface.class, + oEndnote = UnoRuntime.queryInterface(XInterface.class, msf.createInstance("com.sun.star.text.Endnote")); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_sw/SwXFieldEnumeration.java b/qadevOOo/tests/java/mod/_sw/SwXFieldEnumeration.java index 39f4999e4a7f..67f80b319f1c 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFieldEnumeration.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFieldEnumeration.java @@ -107,8 +107,8 @@ public class SwXFieldEnumeration extends TestCase { try { FieldMaster = oDocMSF.createInstance ( "com.sun.star.text.FieldMaster.Database" ); - PFieldMaster = (XPropertySet) UnoRuntime.queryInterface - (XPropertySet.class,(XInterface) FieldMaster); + PFieldMaster = UnoRuntime.queryInterface + (XPropertySet.class,FieldMaster); oObj = (XInterface) oDocMSF.createInstance("com.sun.star.text.TextField.Database"); xTF = UnoRuntime.queryInterface(XDependentTextField.class,oObj); diff --git a/qadevOOo/tests/java/mod/_sw/SwXFootnoteText.java b/qadevOOo/tests/java/mod/_sw/SwXFootnoteText.java index 6a563a6977a2..6c1edcb810a7 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFootnoteText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFootnoteText.java @@ -148,7 +148,7 @@ public class SwXFootnoteText extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); log.println( "adding TextDocument as mod relation to environment" ); - tEnv.addObjRelation("TEXT", (XText) oObj); + tEnv.addObjRelation("TEXT", oObj); TextSectionDsc tDsc = new TextSectionDsc(); log.println( " adding InstCreator object" ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXHeadFootText.java b/qadevOOo/tests/java/mod/_sw/SwXHeadFootText.java index 580b7b95c260..28e111b3c36e 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXHeadFootText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXHeadFootText.java @@ -141,8 +141,7 @@ public class SwXHeadFootText extends TestCase { throw new StatusException("Error getting style by name!", e); } - PropSet = (XPropertySet) - UnoRuntime.queryInterface( XPropertySet.class, StdStyle); + PropSet = UnoRuntime.queryInterface( XPropertySet.class, StdStyle); // changing/getting some properties try { diff --git a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java index cdf3d693425f..a57fd9d6b21a 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java +++ b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java @@ -105,8 +105,7 @@ public class SwXMailMerge extends TestCase { } catch (Exception e) { throw new StatusException("Can't create com.sun.star.sdb.RowSet", e); } - XPropertySet oRowSetProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oRowSet); + XPropertySet oRowSetProps = UnoRuntime.queryInterface(XPropertySet.class, oRowSet); XRowSet xRowSet = UnoRuntime.queryInterface(XRowSet.class, oRowSet); try { oRowSetProps.setPropertyValue("DataSourceName",cDataSourceName); @@ -150,8 +149,7 @@ public class SwXMailMerge extends TestCase { log.println("fill MailMerge with default connection"); - XPropertySet oObjProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oObj); + XPropertySet oObjProps = UnoRuntime.queryInterface(XPropertySet.class, oObj); try { oObjProps.setPropertyValue("ActiveConnection", getLocalXConnection(Param)); oObjProps.setPropertyValue("DataSourceName", cDataSourceName); @@ -222,7 +220,7 @@ public class SwXMailMerge extends TestCase { vXJobArgs[3] = vXJobArg3; - Job = (XJob) UnoRuntime.queryInterface(XJob.class, oObj); + Job = UnoRuntime.queryInterface(XJob.class, oObj); try{ Job.execute(vXJobArg2); } catch ( IllegalArgumentException e){ @@ -241,7 +239,7 @@ public class SwXMailMerge extends TestCase { } catch (Exception e) { throw new StatusException("Can't create com.sun.star.sdb.RowSet", e); } - oRowSetProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, oRowSet); + oRowSetProps = UnoRuntime.queryInterface(XPropertySet.class, oRowSet); xRowSet = UnoRuntime.queryInterface(XRowSet.class, oRowSet); @@ -269,9 +267,8 @@ public class SwXMailMerge extends TestCase { XResultSet oMMXResultSet = null; try { oMMXResultSet = UnoRuntime.queryInterface(XResultSet.class, - ( (XInterface) - ( (XMultiServiceFactory) - Param.getMSF()).createInstance("com.sun.star.sdb.RowSet"))); + ( (XMultiServiceFactory) + Param.getMSF()).createInstance("com.sun.star.sdb.RowSet")); } catch (Exception e) { throw new StatusException("Can't create com.sun.star.sdb.RowSet", e); @@ -332,8 +329,7 @@ public class SwXMailMerge extends TestCase { XInterface newSource = (XInterface) xMSF.createInstance ("com.sun.star.sdb.DataSource") ; - XPropertySet xSrcProp = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, newSource); + XPropertySet xSrcProp = UnoRuntime.queryInterface(XPropertySet.class, newSource); xSrcProp.setPropertyValue("URL", tmpDatabaseUrl) ; @@ -367,8 +363,7 @@ public class SwXMailMerge extends TestCase { } catch(Exception e) { throw new StatusException("Couldn't create instance of 'com.sun.star.sdb.DatabaseContext'", e); } - XNameAccess xNADataCont = (XNameAccess) - UnoRuntime.queryInterface(XNameAccess.class, oDataCont); + XNameAccess xNADataCont = UnoRuntime.queryInterface(XNameAccess.class, oDataCont); String[] dataNames = xNADataCont.getElementNames(); diff --git a/qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java b/qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java index f2700b03095c..d88fc9516c9c 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java +++ b/qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java @@ -138,8 +138,7 @@ public class SwXNumberingRules extends TestCase { try { oObj = (XInterface) AnyConverter.toObject( new Type(XInterface.class),NumStyleI.getByIndex(0)); - XPropertySet props = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oObj); + XPropertySet props = UnoRuntime.queryInterface(XPropertySet.class, oObj); oObj = (XInterface) AnyConverter.toObject( new Type(XInterface.class),props.getPropertyValue("NumberingRules")); XIndexAccess nRules = UnoRuntime.queryInterface(XIndexAccess.class, props.getPropertyValue("NumberingRules")); diff --git a/qadevOOo/tests/java/mod/_sw/SwXParagraph.java b/qadevOOo/tests/java/mod/_sw/SwXParagraph.java index 3520338d5b0c..7a2e85b3659c 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXParagraph.java +++ b/qadevOOo/tests/java/mod/_sw/SwXParagraph.java @@ -212,10 +212,8 @@ public class SwXParagraph extends TestCase { } try { - portP = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, port); - paraP = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, para); + portP = UnoRuntime.queryInterface(XPropertySet.class, port); + paraP = UnoRuntime.queryInterface(XPropertySet.class, para); paraP.setPropertyValue("NumberingStyleName","Numbering 4"); nRules = paraP.getPropertyValue("NumberingRules"); } catch ( com.sun.star.lang.WrappedTargetException e ) { diff --git a/qadevOOo/tests/java/mod/_sw/SwXPropertySetInfo.java b/qadevOOo/tests/java/mod/_sw/SwXPropertySetInfo.java index b756da47b7ad..1971579eb332 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXPropertySetInfo.java +++ b/qadevOOo/tests/java/mod/_sw/SwXPropertySetInfo.java @@ -75,8 +75,7 @@ public class SwXPropertySetInfo extends TestCase { } log.println( " getting the XPropertySetInfo" ); - XPropertySet xProp = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xTextDoc); + XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, xTextDoc); oObj = xProp.getPropertySetInfo(); log.println( " creating a new environment for PropertySetInfo object" ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXReferenceMark.java b/qadevOOo/tests/java/mod/_sw/SwXReferenceMark.java index 6fc12bc9ad31..c345785dae87 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXReferenceMark.java +++ b/qadevOOo/tests/java/mod/_sw/SwXReferenceMark.java @@ -99,7 +99,7 @@ public class SwXReferenceMark extends TestCase { try { oObj = (XInterface) oDocMSF.createInstance ("com.sun.star.text.ReferenceMark"); - instance = (XInterface) oDocMSF.createInstance + instance = oDocMSF.createInstance ("com.sun.star.text.ReferenceMark"); } catch ( com.sun.star.uno.Exception e ) { e.printStackTrace( log ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXStyle.java b/qadevOOo/tests/java/mod/_sw/SwXStyle.java index 640295b53ebe..0371ffe866b0 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXStyle.java +++ b/qadevOOo/tests/java/mod/_sw/SwXStyle.java @@ -146,7 +146,7 @@ public class SwXStyle extends TestCase { XMultiServiceFactory oMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDoc); XInterface oInt = (XInterface) oMSF.createInstance("com.sun.star.style.CharacterStyle"); - oMyStyle = (XStyle) UnoRuntime.queryInterface(XStyle.class, oInt); + oMyStyle = UnoRuntime.queryInterface(XStyle.class, oInt); } catch ( com.sun.star.uno.Exception e ) { log.println("Error: exception occurred."); e.printStackTrace(log); @@ -158,8 +158,7 @@ public class SwXStyle extends TestCase { log.println("FAILED"); else log.println("OK"); - XNameContainer oSFNC = (XNameContainer) - UnoRuntime.queryInterface(XNameContainer.class, oSFNA); + XNameContainer oSFNC = UnoRuntime.queryInterface(XNameContainer.class, oSFNA); try { if ( oSFNC.hasByName("My Style") ) @@ -181,8 +180,7 @@ public class SwXStyle extends TestCase { XText oText = xTextDoc.getText(); XTextCursor oCursor = oText.createTextCursor(); - XPropertySet xProp = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oCursor); + XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, oCursor); try { xProp.setPropertyValue("CharStyleName", oMyStyle.getName()); @@ -204,8 +202,7 @@ public class SwXStyle extends TestCase { tEnv = new TestEnvironment(oMyStyle); tEnv.addObjRelation("PoolStyle", oStyle); - XPropertySet xStyleProp = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oMyStyle); + XPropertySet xStyleProp = UnoRuntime.queryInterface(XPropertySet.class, oMyStyle); tEnv.addObjRelation("PropertyNames",getPropertyNames(xStyleProp)); return tEnv; diff --git a/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java b/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java index 3ba157938b76..e2fdb12febd6 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java +++ b/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java @@ -142,8 +142,7 @@ public class SwXStyleFamily extends TestCase { throw new StatusException("Unexpected exception. ", e); } - XNameContainer oContainer = (XNameContainer) - UnoRuntime.queryInterface(XNameContainer.class, oSFNA); + XNameContainer oContainer = UnoRuntime.queryInterface(XNameContainer.class, oSFNA); // insert a Style which can be replaced by name try { diff --git a/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java b/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java index cc59873ab331..cae0cde49251 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java @@ -144,7 +144,7 @@ public class SwXTableCellText extends TestCase { TestEnvironment tEnv = new TestEnvironment( oObj ); log.println( "adding TextDocument as mod relation to environment" ); - tEnv.addObjRelation("TEXT", (XText) oObj); + tEnv.addObjRelation("TEXT", oObj); log.println( " adding InstCreator object" ); TextSectionDsc tDsc = new TextSectionDsc(); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextColumns.java b/qadevOOo/tests/java/mod/_sw/SwXTextColumns.java index 98a073d32dad..7d4746ab1ac3 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextColumns.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextColumns.java @@ -125,8 +125,7 @@ public class SwXTextColumns extends TestCase { try { log.println("Getting property ('TextColumns') value of style " + oStyle.getName()); - XPropertySet xProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oStyle); + XPropertySet xProps = UnoRuntime.queryInterface(XPropertySet.class,oStyle); oObj = (XTextColumns) AnyConverter.toObject( new Type(XTextColumns.class),xProps.getPropertyValue("TextColumns")); } catch ( com.sun.star.lang.WrappedTargetException e ) { diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java b/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java index 7f943e2bca76..c175421a1d53 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java @@ -174,7 +174,7 @@ public class SwXTextCursor extends TestCase { tEnv.addObjRelation("XTEXT", xTextDoc.getText()); - XPropertySet xCursorProp = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet xCursorProp = UnoRuntime.queryInterface( XPropertySet.class, oObj); tEnv.addObjRelation("PropertyNames", getPropertyNames(xCursorProp)); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextDocument.java b/qadevOOo/tests/java/mod/_sw/SwXTextDocument.java index b6c1d07c7fa9..96bb97faa565 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextDocument.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextDocument.java @@ -148,7 +148,7 @@ public class SwXTextDocument extends TestCase { oTSSuppName); log.println( "getting a TextSection with the XTextSectionSupplier()"); - xTS = (XTextSection) UnoRuntime.queryInterface(XTextSection.class, + xTS = UnoRuntime.queryInterface(XTextSection.class, oTSSuppIndex.getByIndex(0)); XNamed xTSName = UnoRuntime.queryInterface(XNamed.class, @@ -162,7 +162,7 @@ public class SwXTextDocument extends TestCase { the_table); the_name.setName("SwXTextDocument"); SOfficeFactory.insertTextContent(xTextDoc, - (XTextContent) the_table); + the_table); log.println(" adding ReferenceMark"); @@ -173,7 +173,7 @@ public class SwXTextDocument extends TestCase { XTextContent oTC = UnoRuntime.queryInterface( XTextContent.class, aMark); - SOfficeFactory.insertTextContent(xTextDoc, (XTextContent) oTC); + SOfficeFactory.insertTextContent(xTextDoc, oTC); log.println(" adding TextGraphic"); WriterTools.insertTextGraphic(xTextDoc, oDocMSF, 5200, 4200, 4400, @@ -186,17 +186,17 @@ public class SwXTextDocument extends TestCase { "com.sun.star.text.Endnote"); oTC = UnoRuntime.queryInterface(XTextContent.class, aEndNote); - SOfficeFactory.insertTextContent(xTextDoc, (XTextContent) oTC); + SOfficeFactory.insertTextContent(xTextDoc, oTC); log.println(" adding Bookmark"); SOfficeFactory.insertTextContent(xTextDoc, - (XTextContent) SOfficeFactory.createBookmark( + SOfficeFactory.createBookmark( xTextDoc)); log.println(" adding DocumentIndex"); oTC = SOfficeFactory.createIndex(xTextDoc, "com.sun.star.text.DocumentIndex"); - SOfficeFactory.insertTextContent(xTextDoc, (XTextContent) oTC); + SOfficeFactory.insertTextContent(xTextDoc, oTC); log.println(" adding TextFrame"); @@ -204,7 +204,7 @@ public class SwXTextDocument extends TestCase { 500); oTC = UnoRuntime.queryInterface(XTextContent.class, frame); - SOfficeFactory.insertTextContent(xTextDoc, (XTextContent) oTC); + SOfficeFactory.insertTextContent(xTextDoc, oTC); log.println("creating a second textdocument"); xSecondTextDoc = WriterTools.createTextDoc( diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java b/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java index 3fcbd3687ba8..64ef1bfbf3ab 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java @@ -111,14 +111,13 @@ public class SwXTextEmbeddedObject extends TestCase { Object o = xMultiServiceFactory.createInstance("com.sun.star.text.TextEmbeddedObject" ); XTextContent xTextContent = UnoRuntime.queryInterface(XTextContent.class, o); String sChartClassID = "12dcae26-281f-416f-a234-c3086127382e"; - XPropertySet xPropertySet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xTextContent); + XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xTextContent); xPropertySet.setPropertyValue( "CLSID", sChartClassID ); xTextDoc.getText().insertTextContent( xCursor, xTextContent, false ); } catch(com.sun.star.uno.Exception e) { - e.printStackTrace((java.io.PrintWriter)log); + e.printStackTrace(log); } XTextEmbeddedObjectsSupplier oTEOS = UnoRuntime.queryInterface( diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObjects.java b/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObjects.java index b1e209575d03..5a477f5ed48f 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObjects.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObjects.java @@ -103,14 +103,13 @@ public class SwXTextEmbeddedObjects extends TestCase { Object o = xMultiServiceFactory.createInstance("com.sun.star.text.TextEmbeddedObject" ); XTextContent xTextContent = UnoRuntime.queryInterface(XTextContent.class, o); String sChartClassID = "12dcae26-281f-416f-a234-c3086127382e"; - XPropertySet xPropertySet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xTextContent); + XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xTextContent); xPropertySet.setPropertyValue( "CLSID", sChartClassID ); oDoc.getText().insertTextContent( xCursor, xTextContent, false ); } catch(com.sun.star.uno.Exception e) { - e.printStackTrace((java.io.PrintWriter)log); + e.printStackTrace(log); } XTextEmbeddedObjectsSupplier oTEOS = UnoRuntime.queryInterface(XTextEmbeddedObjectsSupplier.class, oDoc); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextField.java b/qadevOOo/tests/java/mod/_sw/SwXTextField.java index 3de89f88e159..88a912036fcc 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextField.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextField.java @@ -117,12 +117,12 @@ public class SwXTextField extends TestCase { Object FieldMaster = oDocMSF.createInstance ( "com.sun.star.text.FieldMaster.Database" ); - XPropertySet PFieldMaster = (XPropertySet) UnoRuntime.queryInterface - (XPropertySet.class,(XInterface) FieldMaster); + XPropertySet PFieldMaster = UnoRuntime.queryInterface + (XPropertySet.class,FieldMaster); oObj = (XInterface) oDocMSF.createInstance ( "com.sun.star.text.TextField.Database" ); - instance = (XInterface) oDocMSF.createInstance + instance = oDocMSF.createInstance ( "com.sun.star.text.TextField.DateTime" ); XDependentTextField xTF = UnoRuntime.queryInterface(XDependentTextField.class,oObj); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java b/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java index 05127431b3a5..7f7b54b6be5a 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java @@ -94,7 +94,7 @@ public class SwXTextFrame extends TestCase { try { oFrame1 = SOF.createTextFrame(xTextDoc, 500, 500); oFrame2 = SOF.createTextFrame(xTextDoc, 1500, 1500); - oPropSet = (XPropertySet) UnoRuntime.queryInterface( + oPropSet = UnoRuntime.queryInterface( XPropertySet.class, oFrame1); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java b/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java index a083cf58a378..41302376bc21 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java @@ -102,7 +102,7 @@ public class SwXTextFrameText extends TestCase { try { oFrame1 = SOF.createTextFrame(xTextDoc, 500, 500); - oPropSet = (XPropertySet)UnoRuntime.queryInterface + oPropSet = UnoRuntime.queryInterface (XPropertySet.class, oFrame1 ); //AnchorTypes: 0 = paragraph, 1 = as char, 2 = page, // 3 = frame/paragraph 4= at char @@ -128,7 +128,7 @@ public class SwXTextFrameText extends TestCase { TestEnvironment tEnv = new TestEnvironment( oObj ); log.println( "adding TextDocument as mod relation to environment" ); - tEnv.addObjRelation("TEXT", (XText) oObj); + tEnv.addObjRelation("TEXT", oObj); log.println( "adding InstDescriptor object" ); TableDsc tDsc = new TableDsc( 6, 4 ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java index 9956a8f93fd3..632b941674d0 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java @@ -142,8 +142,7 @@ public class SwXTextGraphicObject extends TestCase { } log.println( "adding graphic" ); - XPropertySet oProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oObj); + XPropertySet oProps = UnoRuntime.queryInterface(XPropertySet.class,oObj); try { String wat = util.utils.getFullTestURL("space-metal.jpg"); oProps.setPropertyValue("AnchorType", diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java index 3a0ec080f562..37588d1a9f63 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java @@ -125,8 +125,7 @@ public class SwXTextGraphicObjects extends TestCase { } log.println( "adding graphic" ); - XPropertySet oProps = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class,oObj); + XPropertySet oProps = UnoRuntime.queryInterface(XPropertySet.class,oObj); try { String wat = util.utils.getFullTestURL("space-metal.jpg"); oProps.setPropertyValue("GraphicURL",wat); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java b/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java index b5c816ca3dfc..98b057f86e78 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java @@ -148,10 +148,8 @@ public class SwXTextPortion extends TestCase { throw new StatusException( "Couldn't get TextPortion", e ); } - portP = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, oObj); - paraP = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, param); + portP = UnoRuntime.queryInterface(XPropertySet.class, oObj); + paraP = UnoRuntime.queryInterface(XPropertySet.class, param); log.println( "creating a new environment for Paragraph object" ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextSection.java b/qadevOOo/tests/java/mod/_sw/SwXTextSection.java index e8ff1259a720..cea7b360bdb8 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextSection.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextSection.java @@ -150,7 +150,7 @@ public class SwXTextSection extends TestCase { tEnv.addObjRelation("TRO",new Boolean(true)); try { - TC = (XTextColumns) UnoRuntime.queryInterface(XTextColumns.class, + TC = UnoRuntime.queryInterface(XTextColumns.class, oDocMSF.createInstance("com.sun.star.text.TextColumns")); } catch ( com.sun.star.uno.Exception e ) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java index db5f8d3b4a97..f97032b4daa7 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java @@ -111,7 +111,7 @@ public class SwXTextTable extends TestCase { } } - XPropertySet props = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet props = UnoRuntime.queryInterface( XPropertySet.class, oObj); try { diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java b/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java index d1ed329ee344..7c2522fb6756 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java @@ -77,7 +77,7 @@ public class SwXTextTableRow extends TestCase { try { log.println("creating a texttable"); - oTable = (XTextTable) SOF.createTextTable(xTextDoc,5,5); + oTable = SOF.createTextTable(xTextDoc,5,5); } catch( Exception e ) { e.printStackTrace(log); } diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextView.java b/qadevOOo/tests/java/mod/_sw/SwXTextView.java index b27c77da8510..b01971dab125 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextView.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextView.java @@ -175,12 +175,10 @@ public class SwXTextView extends TestCase { tEnv.addObjRelation("Selections", new Object[] { oFrame1, oFrame2, textRanges1, textRanges2}); - tEnv.addObjRelation("Comparer", new Comparator() { + tEnv.addObjRelation("Comparer", new Comparator<Object>() { public int compare(Object o1, Object o2) { - XServiceInfo serv1 = (XServiceInfo) - UnoRuntime.queryInterface(XServiceInfo.class, o1); - XServiceInfo serv2 = (XServiceInfo) - UnoRuntime.queryInterface(XServiceInfo.class, o2); + XServiceInfo serv1 = UnoRuntime.queryInterface(XServiceInfo.class, o1); + XServiceInfo serv2 = UnoRuntime.queryInterface(XServiceInfo.class, o2); String implName1 = serv1.getImplementationName(); String implName2 = serv2.getImplementationName(); @@ -206,9 +204,7 @@ public class SwXTextView extends TestCase { return -1; } - public boolean equals(Object obj) { - return compare(this, obj) == 0; - } }); + }); XSelectionSupplier xsel = UnoRuntime.queryInterface(XSelectionSupplier.class,xContr); try { @@ -237,7 +233,7 @@ public class SwXTextView extends TestCase { log.println("adding relation for com.sun.star.view.XFormLayerAccess: XForm"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); try { diff --git a/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java b/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java index b5ce7ab8412c..8f7603a37eb1 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java @@ -129,7 +129,7 @@ public class XMLContentExporter extends TestCase { // text added to the document XSimpleText aText = xTextDoc.getText(); - XTextCursor curs = (XTextCursor) aText.createTextCursor(); + XTextCursor curs = aText.createTextCursor(); aText.insertString(curs, CONTENT, false); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log) ; diff --git a/qadevOOo/tests/java/mod/_sw/XMLExporter.java b/qadevOOo/tests/java/mod/_sw/XMLExporter.java index 66bcc8971825..b1c3d39b4b36 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLExporter.java @@ -128,7 +128,7 @@ public class XMLExporter extends TestCase { xEx.setSourceDocument(xTextDoc); XSimpleText aText = xTextDoc.getText(); - XTextCursor curs = (XTextCursor) aText.createTextCursor(); + XTextCursor curs = aText.createTextCursor(); aText.insertString(curs, TEST_STR, false); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log) ; diff --git a/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java index 52df6783e384..dadcd90ddbd5 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java @@ -131,7 +131,7 @@ public class XMLMetaExporter extends TestCase { //set some meta data XDocumentInfoSupplier infoSup = UnoRuntime.queryInterface (XDocumentInfoSupplier.class, xTextDoc) ; - XPropertySet docInfo = (XPropertySet) UnoRuntime.queryInterface + XPropertySet docInfo = UnoRuntime.queryInterface (XPropertySet.class, infoSup.getDocumentInfo()) ; docInfo.setPropertyValue("Title", TITLE); diff --git a/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java index 6b24e0232efb..c234003caf8c 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java @@ -155,7 +155,7 @@ public class XMLMetaImporter extends TestCase { XDocumentInfoSupplier infoSup = UnoRuntime.queryInterface (XDocumentInfoSupplier.class, xTextDoc) ; - 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/_tdmgr/TypeDescriptionManager.java b/qadevOOo/tests/java/mod/_tdmgr/TypeDescriptionManager.java index e018ba2f8e6a..bde66fc4d2c0 100644 --- a/qadevOOo/tests/java/mod/_tdmgr/TypeDescriptionManager.java +++ b/qadevOOo/tests/java/mod/_tdmgr/TypeDescriptionManager.java @@ -48,12 +48,11 @@ public class TypeDescriptionManager extends TestCase { try { XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); - XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface( + XPropertySet xProp = UnoRuntime.queryInterface( XPropertySet.class, xMSF); // get context - XComponentContext xContext = (XComponentContext) - UnoRuntime.queryInterface(XComponentContext.class, - xProp.getPropertyValue("DefaultContext")); + XComponentContext xContext = UnoRuntime.queryInterface(XComponentContext.class, + xProp.getPropertyValue("DefaultContext")); // get the type description manager from context oInterface = xContext.getValueByName("/singletons/" + "com.sun.star.reflection.theTypeDescriptionManager"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java index 8810e79b33ff..01a7ab25e91c 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java @@ -235,7 +235,7 @@ public class AccessibleTabControl extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); - final XAccessibleSelection selection = (XAccessibleSelection) UnoRuntime.queryInterface( + final XAccessibleSelection selection = UnoRuntime.queryInterface( XAccessibleSelection.class, oObj); diff --git a/qadevOOo/tests/java/mod/_toolkit/TabController.java b/qadevOOo/tests/java/mod/_toolkit/TabController.java index 8730b99cd2e9..72ebe93560b1 100644 --- a/qadevOOo/tests/java/mod/_toolkit/TabController.java +++ b/qadevOOo/tests/java/mod/_toolkit/TabController.java @@ -83,7 +83,7 @@ public class TabController extends TestCase { 10000, "CommandButton", "UnoControlButton"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XControlModel model = aShape.getControl(); XControlAccess access = UnoRuntime.queryInterface( diff --git a/qadevOOo/tests/java/mod/_toolkit/Toolkit.java b/qadevOOo/tests/java/mod/_toolkit/Toolkit.java index e4e3ddc36bdb..c18e01c50b98 100644 --- a/qadevOOo/tests/java/mod/_toolkit/Toolkit.java +++ b/qadevOOo/tests/java/mod/_toolkit/Toolkit.java @@ -85,7 +85,7 @@ public class Toolkit extends TestCase { 4500, 15000, 10000, "CommandButton"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XControlModel the_Model = aShape.getControl(); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java index 30247d29dbee..3667d1695f3b 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java @@ -89,7 +89,7 @@ public class UnoControlButton extends TestCase { "CommandButton", "UnoControlButton"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XControlModel the_Model = aShape.getControl(); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java index b5a67eb9acde..dded17ac6c33 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java @@ -90,7 +90,7 @@ public class UnoControlCheckBox extends TestCase { "CheckBox", "UnoControlCheckBox"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XControlModel the_Model = aShape.getControl(); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java index 9994981195fa..8f1202df0af8 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java @@ -84,7 +84,7 @@ util.DesktopTools.closeDoc(xTextDoc); "ComboBox", "UnoControlComboBox"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XControlModel the_Model = aShape.getControl(); @@ -92,7 +92,7 @@ util.DesktopTools.closeDoc(xTextDoc); 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/_toolkit/UnoControlContainer.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java index 8886950357af..47d4fca4030d 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java @@ -99,7 +99,7 @@ public class UnoControlContainer extends TestCase { // create first XControl shape = FormTools.createControlShape(xTextDoc, 3000, 4500, 15000, 10000, "TextField"); - WriterTools.getDrawPage(xTextDoc).add((XShape) shape); + WriterTools.getDrawPage(xTextDoc).add(shape); model = shape.getControl(); access = UnoRuntime.queryInterface( XControlAccess.class, xTextDoc.getCurrentController()); @@ -115,7 +115,7 @@ public class UnoControlContainer extends TestCase { // create second XControl shape = FormTools.createControlShape(xTextDoc, 3000, 4500, 15000, 10000, "TextField"); - WriterTools.getDrawPage(xTextDoc).add((XShape) shape); + WriterTools.getDrawPage(xTextDoc).add(shape); model = shape.getControl(); access = UnoRuntime.queryInterface( XControlAccess.class, xTextDoc.getCurrentController()); @@ -131,7 +131,7 @@ public class UnoControlContainer extends TestCase { // create third XControl shape = FormTools.createControlShape(xTextDoc, 3000, 4500, 15000, 10000, "CommandButton"); - WriterTools.getDrawPage(xTextDoc).add((XShape) shape); + WriterTools.getDrawPage(xTextDoc).add(shape); model = shape.getControl(); access = UnoRuntime.queryInterface( XControlAccess.class, xTextDoc.getCurrentController()); @@ -151,7 +151,7 @@ public class UnoControlContainer extends TestCase { "CommandButton", "UnoControlButton"); - WriterTools.getDrawPage(xTD2).add((XShape) aShape); + WriterTools.getDrawPage(xTD2).add(aShape); XControlModel the_Model = aShape.getControl(); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java index 6950343d205f..abec47b268ef 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java @@ -85,7 +85,7 @@ public class UnoControlCurrencyField extends TestCase { "CurrencyField", "UnoControlCurrencyField"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XControlModel the_Model = aShape.getControl(); @@ -93,7 +93,7 @@ public class UnoControlCurrencyField 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/_toolkit/UnoControlDateField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java index 0beb53871adc..edace2a7197c 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java @@ -90,7 +90,7 @@ public class UnoControlDateField extends TestCase { "DateField", "UnoControlDateField"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XControlModel the_Model = aShape.getControl(); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java index f254bf745f33..1d8f50e365f8 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java @@ -84,7 +84,7 @@ public class UnoControlDialogModel extends TestCase { "com.sun.star.awt.UnoControlDialogModel"); // create the dialog model and set the properties - XPropertySet xPSetDialog = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet xPSetDialog = UnoRuntime.queryInterface( XPropertySet.class, dialogModel); xPSetDialog.setPropertyValue("PositionX", new Integer(100)); xPSetDialog.setPropertyValue("PositionY", new Integer(100)); @@ -102,7 +102,7 @@ public class UnoControlDialogModel extends TestCase { // create the button model and set the properties Object buttonModel = xMultiServiceFactory.createInstance( "com.sun.star.awt.UnoControlButtonModel"); - XPropertySet xPSetButton = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet xPSetButton = UnoRuntime.queryInterface( XPropertySet.class, buttonModel); xPSetButton.setPropertyValue("PositionX", new Integer(50)); xPSetButton.setPropertyValue("PositionY", new Integer(30)); @@ -115,7 +115,7 @@ public class UnoControlDialogModel extends TestCase { // create the label model and set the properties Object labelModel = xMultiServiceFactory.createInstance( "com.sun.star.awt.UnoControlFixedTextModel"); - XPropertySet xPSetLabel = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet xPSetLabel = UnoRuntime.queryInterface( XPropertySet.class, labelModel); xPSetLabel.setPropertyValue("PositionX", new Integer(40)); xPSetLabel.setPropertyValue("PositionY", new Integer(60)); @@ -126,7 +126,7 @@ public class UnoControlDialogModel extends TestCase { xPSetLabel.setPropertyValue("Label", _labelPrefix); // insert the control models into the dialog model - XNameContainer xNameCont = (XNameContainer) UnoRuntime.queryInterface( + XNameContainer xNameCont = UnoRuntime.queryInterface( XNameContainer.class, dialogModel); xNameCont.insertByName(_buttonName, buttonModel); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java index 8815295c239c..f9a597d5e9a0 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java @@ -85,7 +85,7 @@ public class UnoControlEdit extends TestCase { "TextField", "UnoControlEdit"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XControlModel the_Model = aShape.getControl(); @@ -93,7 +93,7 @@ public class UnoControlEdit 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/_toolkit/UnoControlFileControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java index d259ffdc90bd..327578348a70 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java @@ -85,7 +85,7 @@ public class UnoControlFileControl extends TestCase { "FileControl", "UnoControlFileControl"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XControlModel the_Model = aShape.getControl(); @@ -93,7 +93,7 @@ public class UnoControlFileControl 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/_toolkit/UnoControlFixedText.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java index 18d3c00d67d5..ff3766a4fb00 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java @@ -84,7 +84,7 @@ public class UnoControlFixedText extends TestCase { "FixedText", "UnoControlFixedText"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XControlModel the_Model = aShape.getControl(); @@ -92,7 +92,7 @@ public class UnoControlFixedText 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/_toolkit/UnoControlFormattedField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java index c46b879f8ed6..6583ec57ab38 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java @@ -86,7 +86,7 @@ public class UnoControlFormattedField extends TestCase { "DatabaseFormattedField", "UnoControlFormattedField"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XControlModel the_Model = aShape.getControl(); @@ -94,11 +94,11 @@ public class UnoControlFormattedField extends TestCase { 4500, 5000, 10000, "TextField"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape2); + WriterTools.getDrawPage(xTextDoc).add(aShape2); XControlModel the_Model2 = aShape2.getControl(); - XPropertySet xPS = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet xPS = UnoRuntime.queryInterface( XPropertySet.class, the_Model); //Try to query XControlAccess diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java index 86761173d7d6..fa2d1b4abc1a 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java @@ -84,7 +84,7 @@ public class UnoControlGroupBox extends TestCase { "GroupBox", "UnoControlGroupBox"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XControlModel the_Model = aShape.getControl(); @@ -92,7 +92,7 @@ public class UnoControlGroupBox 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/_toolkit/UnoControlImageControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java index ea60ce757147..2b73cdd45bd8 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java @@ -85,18 +85,18 @@ public class UnoControlImageControl extends TestCase { "DatabaseImageControl", "UnoControlImageControl"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XControlModel the_Model = aShape.getControl(); - XPropertySet xPS = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet xPS = UnoRuntime.queryInterface( XPropertySet.class, the_Model); 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/_toolkit/UnoControlListBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java index 5d027152af12..6f8896077b97 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java @@ -85,7 +85,7 @@ public class UnoControlListBox extends TestCase { "ListBox", "UnoControlListBox"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XControlModel the_Model = aShape.getControl(); @@ -93,7 +93,7 @@ public class UnoControlListBox 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/_toolkit/UnoControlNumericField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java index a49384e924f2..c5db88db77c4 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java @@ -92,7 +92,7 @@ public class UnoControlNumericField extends TestCase { "NumericField", "UnoControlNumericField"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XControlModel the_Model = aShape.getControl(); @@ -100,7 +100,7 @@ public class UnoControlNumericField 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/_toolkit/UnoControlPatternField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java index 766d1eb07839..b8d64230ec6d 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java @@ -85,7 +85,7 @@ public class UnoControlPatternField extends TestCase { "PatternField", "UnoControlPatternField"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XControlModel the_Model = aShape.getControl(); @@ -93,7 +93,7 @@ public class UnoControlPatternField 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/_toolkit/UnoControlRadioButton.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java index 593bd53cdd70..9b223c106ce2 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java @@ -84,7 +84,7 @@ public class UnoControlRadioButton extends TestCase { "RadioButton", "UnoControlRadioButton"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XControlModel the_Model = aShape.getControl(); @@ -92,7 +92,7 @@ public class UnoControlRadioButton 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/_toolkit/UnoControlTimeField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java index de9cf193df10..a9b46671644a 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java @@ -85,7 +85,7 @@ public class UnoControlTimeField extends TestCase { "TimeField", "UnoControlTimeField"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XControlModel the_Model = aShape.getControl(); @@ -93,7 +93,7 @@ public class UnoControlTimeField 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/_toolkit/UnoScrollBarControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java index c331429494b3..57b15539be4e 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java @@ -107,7 +107,7 @@ public class UnoScrollBarControl extends TestCase { "ScrollBar", "UnoControlScrollBar"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XControlModel the_Model = aShape.getControl(); @@ -115,7 +115,7 @@ public class UnoScrollBarControl 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/_toolkit/UnoSpinButtonControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java index 8f10bfa41104..4320d300ba8e 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java @@ -75,7 +75,7 @@ public class UnoSpinButtonControl extends TestCase { "SpinButton", "UnoControlSpinButton"); - WriterTools.getDrawPage(xTextDoc).add((XShape) aShape); + WriterTools.getDrawPage(xTextDoc).add(aShape); XControlModel the_Model = aShape.getControl(); @@ -83,7 +83,7 @@ public class UnoSpinButtonControl 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/_toolkit/UnoTreeControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java index eee6fa0f5000..570e12d588c8 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java @@ -107,7 +107,7 @@ public class UnoTreeControl extends TestCase { XControlModel xDialogModel = UnoRuntime.queryInterface(XControlModel.class, mxMSF.createInstance("com.sun.star.awt.UnoControlDialogModel")); - XPropertySet xDialogPropertySet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xDialogModel); + XPropertySet xDialogPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xDialogModel); xDialogPropertySet.setPropertyValue( "PositionX", new Integer(50) ); xDialogPropertySet.setPropertyValue( "PositionY", new Integer(50) ); xDialogPropertySet.setPropertyValue( "Width", new Integer(256) ); @@ -119,7 +119,7 @@ public class UnoTreeControl extends TestCase { XControlModel xTreeControlModel = UnoRuntime.queryInterface(XControlModel.class, xDialogMSF.createInstance("com.sun.star.awt.tree.TreeControlModel")); - XPropertySet XTreeControlModelSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTreeControlModel); + XPropertySet XTreeControlModelSet = UnoRuntime.queryInterface(XPropertySet.class, xTreeControlModel); XTreeControlModelSet.setPropertyValue( "SelectionType",com.sun.star.view.SelectionType.NONE); XTreeControlModelSet.setPropertyValue( "PositionX", new Integer(3 )); @@ -132,8 +132,7 @@ public class UnoTreeControl extends TestCase { XTreeControlModelSet.setPropertyValue( "RootDisplayed", new Boolean (true)); XTreeControlModelSet.setPropertyValue( "Editable", new Boolean (true )); - XNameContainer xDialogModelContainer = (XNameContainer) - UnoRuntime.queryInterface(XNameContainer.class, xDialogModel); + XNameContainer xDialogModelContainer = UnoRuntime.queryInterface(XNameContainer.class, xDialogModel); xDialogModelContainer.insertByName( sTreeControlName, xTreeControlModel); @@ -181,7 +180,7 @@ public class UnoTreeControl extends TestCase { } tEnv.addObjRelation("Comparer", - new Comparator() { + new Comparator<Object>() { public int compare(Object o1, Object o2) { XMutableTreeNode xNode1 = UnoRuntime.queryInterface( XMutableTreeNode.class, o1); @@ -195,7 +194,7 @@ public class UnoTreeControl extends TestCase { XMutableTreeNode xNode2 = UnoRuntime.queryInterface( XMutableTreeNode.class, xNode2a); - if (((String) xNode1.getDataValue()).equals((String)xNode2.getDataValue())) { + if (((String) xNode1.getDataValue()).equals(xNode2.getDataValue())) { return 0; } diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java index c7922f7f342f..be1f603ad3fb 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java @@ -130,7 +130,7 @@ public class XMLContentExporter extends TestCase { xEx.setSourceDocument(xChartDoc); Object oTitle = xChartDoc.getTitle() ; - XPropertySet xTitleProp = (XPropertySet) UnoRuntime.queryInterface + XPropertySet xTitleProp = UnoRuntime.queryInterface (XPropertySet.class, oTitle) ; xTitleProp.setPropertyValue("String", exportStr) ; } catch (com.sun.star.uno.Exception e) { diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java index f78b779bee62..6e6cc2646735 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java @@ -132,7 +132,7 @@ public class XMLContentImporter extends TestCase { Object oTitle = xChartDoc.getTitle() ; - xTitleProp = (XPropertySet) UnoRuntime.queryInterface + xTitleProp = UnoRuntime.queryInterface (XPropertySet.class, oTitle) ; } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log) ; diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java index 82b1a43a5f95..eece10c34068 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java @@ -131,7 +131,7 @@ public class XMLExporter extends TestCase { xEx.setSourceDocument(xChartDoc); Object oTitle = xChartDoc.getTitle() ; - XPropertySet xTitleProp = (XPropertySet) UnoRuntime.queryInterface + XPropertySet xTitleProp = UnoRuntime.queryInterface (XPropertySet.class, oTitle) ; xTitleProp.setPropertyValue("String", exportStr) ; } catch (com.sun.star.uno.Exception e) { diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java index ac381a634347..40c47b6e9a12 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java @@ -130,7 +130,7 @@ public class XMLImporter extends TestCase { oInt = xMSF.createInstance("com.sun.star.comp.Chart.XMLImporter") ; Object oTitle = xChartDoc.getTitle() ; - xTitleProp = (XPropertySet) UnoRuntime.queryInterface + xTitleProp = UnoRuntime.queryInterface (XPropertySet.class, oTitle) ; } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log) ; diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java index 287695778987..3007c80c8bb1 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java @@ -142,12 +142,10 @@ public class XMLContentExporter extends TestCase { // can not be exported to XML) set.insertNewByIndex(1); - XDrawPage page1 = (XDrawPage) - UnoRuntime.queryInterface(XDrawPage.class, set.getByIndex(0)); + XDrawPage page1 = UnoRuntime.queryInterface(XDrawPage.class, set.getByIndex(0)); XNamed NPage1 = UnoRuntime.queryInterface(XNamed.class,page1); NPage1.setName("NewSlide1"); - XDrawPage page2 = (XDrawPage) - UnoRuntime.queryInterface(XDrawPage.class, set.getByIndex(1)); + XDrawPage page2 = UnoRuntime.queryInterface(XDrawPage.class, set.getByIndex(1)); XNamed NPage2 = UnoRuntime.queryInterface(XNamed.class,page2); NPage2.setName("NewSlide2"); xEx.setSourceDocument(xDrawDoc); diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java index 9bce636bb357..3730d72e000c 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java @@ -141,12 +141,10 @@ public class XMLExporter extends TestCase { // This is an XML-export BUG (new slide named "NewSlide2" can not be exported to XML) set.insertNewByIndex(1); - XDrawPage page1 = (XDrawPage) - UnoRuntime.queryInterface(XDrawPage.class, set.getByIndex(0)); + XDrawPage page1 = UnoRuntime.queryInterface(XDrawPage.class, set.getByIndex(0)); XNamed NPage1 = UnoRuntime.queryInterface(XNamed.class,page1); NPage1.setName("NewSlide1"); - XDrawPage page2 = (XDrawPage) - UnoRuntime.queryInterface(XDrawPage.class, set.getByIndex(1)); + XDrawPage page2 = UnoRuntime.queryInterface(XDrawPage.class, set.getByIndex(1)); XNamed NPage2 = UnoRuntime.queryInterface(XNamed.class,page2); NPage2.setName("NewSlide2"); diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java index e572aeb7c13f..01b61cb665f7 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java @@ -130,7 +130,7 @@ public class XMLMetaExporter extends TestCase { //set some meta data XDocumentInfoSupplier infoSup = UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xDrawDoc) ; - XPropertySet docInfo = (XPropertySet) UnoRuntime.queryInterface + XPropertySet docInfo = UnoRuntime.queryInterface (XPropertySet.class, infoSup.getDocumentInfo()) ; docInfo.setPropertyValue("Title", TITLE); diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaImporter.java index 7c951ad28ab8..1fbfb34922c8 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaImporter.java @@ -154,7 +154,7 @@ public class XMLMetaImporter extends TestCase { //set some meta data XDocumentInfoSupplier infoSup = UnoRuntime.queryInterface (XDocumentInfoSupplier.class, xDrawDoc); - 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/Draw/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java index 5b6ff5b1df0b..3197070f159d 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java @@ -131,8 +131,7 @@ public class XMLSettingsExporter extends TestCase { //set some settings XModel xDrawModel = UnoRuntime.queryInterface(XModel.class, xDrawDoc); XController xController = xDrawModel.getCurrentController(); - XPropertySet xPropSet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xController); + XPropertySet xPropSet = UnoRuntime.queryInterface(XPropertySet.class, xController); xPropSet.setPropertyValue("IsLayerMode", new Boolean("true")); } catch (com.sun.star.uno.Exception e) { diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java index 1872604bba32..7debe8e434f6 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java @@ -164,8 +164,7 @@ public class XMLSettingsImporter extends TestCase { final PrintWriter logF = log; XModel xDrawModel = UnoRuntime.queryInterface(XModel.class, xDrawDoc); XController xController = xDrawModel.getCurrentController(); - final XPropertySet xPropSet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xController); + final XPropertySet xPropSet = UnoRuntime.queryInterface(XPropertySet.class, xController); tEnv.addObjRelation("XDocumentHandler.ImportChecker", new ifc.xml.sax._XDocumentHandler.ImportChecker() { diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java index c964b0c31a61..8f6bc82ffcd1 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java @@ -138,11 +138,10 @@ public class XMLStylesExporter extends TestCase { String styleFamilyName = styleFamiliesNames[0]; //obtain style family with name[0] Object objectStyle = StyleFamilies.getByName(styleFamilyName); - XNameContainer xStyleFamilyName = (XNameContainer) - UnoRuntime.queryInterface(XNameContainer.class, objectStyle); + XNameContainer xStyleFamilyName = UnoRuntime.queryInterface(XNameContainer.class, objectStyle); //creat new style Object SC = SOF.createInstance(xDrawDoc, "com.sun.star.style.Style"); - XStyle Style = (XStyle) UnoRuntime.queryInterface(XStyle.class,SC); + XStyle Style = UnoRuntime.queryInterface(XStyle.class,SC); //add new style to style familiy with name[0] xStyleFamilyName.insertByName(STYLE_NAME,Style); } catch (com.sun.star.uno.Exception e) { diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java index aa067b04b939..d5981a0f9614 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java @@ -166,9 +166,8 @@ public class XMLStylesImporter extends TestCase { try { Object objectStyle = StyleFamilies.getByName(impFamilyName); - XNameContainer StyleFamilyName = (XNameContainer) - UnoRuntime.queryInterface - (XNameContainer.class, objectStyle); + XNameContainer StyleFamilyName = UnoRuntime.queryInterface + (XNameContainer.class, objectStyle); boolean hasStyle = StyleFamilyName.hasByName(impStyleName); logF.println("Does style with name '" + impStyleName 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() ; |