diff options
87 files changed, 277 insertions, 288 deletions
diff --git a/bean/com/sun/star/beans/LocalOfficeWindow.java b/bean/com/sun/star/beans/LocalOfficeWindow.java index 9283b013a43e..03a4bd4b90ca 100644 --- a/bean/com/sun/star/beans/LocalOfficeWindow.java +++ b/bean/com/sun/star/beans/LocalOfficeWindow.java @@ -164,7 +164,7 @@ public class LocalOfficeWindow CallWatchThread aCallWatchThread = new CallWatchThread( 500 ); setVisible(false); try { aCallWatchThread.cancel(); } - catch ( java.lang.InterruptedException aExc ) + catch ( InterruptedException aExc ) {} // ignore } @@ -270,7 +270,7 @@ public class LocalOfficeWindow } private void cancel() - throws java.lang.InterruptedException + throws InterruptedException { aWatchedThread = null; stop(); @@ -285,7 +285,7 @@ public class LocalOfficeWindow while ( aWatchedThread != null ) { try { sleep( nTimeout ); } - catch ( java.lang.InterruptedException aExc ) + catch ( InterruptedException aExc ) {} //synchronized diff --git a/bean/com/sun/star/comp/beans/CallWatchThread.java b/bean/com/sun/star/comp/beans/CallWatchThread.java index b9de0a826384..45cecbc367e8 100644 --- a/bean/com/sun/star/comp/beans/CallWatchThread.java +++ b/bean/com/sun/star/comp/beans/CallWatchThread.java @@ -52,7 +52,7 @@ public class CallWatchThread extends Thread } public void cancel() - throws java.lang.InterruptedException + throws InterruptedException { dbgPrint( "CallWatchThread(" + this + ".cancel(" + aTag + ")" ); if ( aWatchedThread != null && aWatchedThread != Thread.currentThread() ) @@ -63,7 +63,7 @@ public class CallWatchThread extends Thread } public synchronized void restart() - throws java.lang.InterruptedException + throws InterruptedException { dbgPrint( "CallWatchThread(" + this + ".restart(" + aTag + ")" ); if ( aWatchedThread != null && aWatchedThread != Thread.currentThread() ) @@ -89,7 +89,7 @@ public class CallWatchThread extends Thread { wait( nTimeout ); } - catch ( java.lang.InterruptedException aExc ) + catch ( InterruptedException aExc ) { bAlive = false; } diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java index b84ad5c4dd2c..b6504fa733bd 100644 --- a/bean/com/sun/star/comp/beans/OOoBean.java +++ b/bean/com/sun/star/comp/beans/OOoBean.java @@ -281,7 +281,7 @@ public class OOoBean }; aConnectorThread.start(); try { aConnectorThread.join(nOOoStartTimeOut); } - catch ( java.lang.InterruptedException aExc ) + catch ( InterruptedException aExc ) { throw new NoConnectionException(); } if ( xServiceFactory == null ) throw new NoConnectionException(); @@ -381,7 +381,7 @@ public class OOoBean aCallWatchThread.cancel(); } - catch ( java.lang.InterruptedException aExc ) + catch ( InterruptedException aExc ) { /* can be ignored */ } } @@ -648,7 +648,7 @@ public class OOoBean applyToolVisibilities(); } - catch ( java.lang.InterruptedException aExc ) + catch ( InterruptedException aExc ) { throw new NoConnectionException(); } @@ -802,7 +802,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); boolean bOldValue, boolean bNewValue ) throws - java.lang.InterruptedException + InterruptedException { // start runtime timeout CallWatchThread aCallWatchThread = @@ -871,7 +871,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); bMenuBarVisible = setToolVisible( "MenuBarVisible", "private:resource/menubar/menubar", bMenuBarVisible, bVisible ); } - catch ( java.lang.InterruptedException aExc ) + catch ( InterruptedException aExc ) { bMenuBarVisible = bVisible; } @@ -919,7 +919,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); bStandardBarVisible = setToolVisible( "StandardBarVisible", "private:resource/toolbar/standardbar", bStandardBarVisible, bVisible ); } - catch ( java.lang.InterruptedException aExc ) + catch ( InterruptedException aExc ) { bMenuBarVisible = bVisible; } @@ -967,7 +967,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); bToolBarVisible = setToolVisible( "ToolBarVisible", "private:resource/toolbar/toolbar", bToolBarVisible, bVisible ); } - catch ( java.lang.InterruptedException aExc ) + catch ( InterruptedException aExc ) { bMenuBarVisible = bVisible; } @@ -1015,7 +1015,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); bStatusBarVisible = setToolVisible( "StatusBarVisible", "private:resource/statusbar/statusbar", bStatusBarVisible, bVisible ); } - catch ( java.lang.InterruptedException aExc ) + catch ( InterruptedException aExc ) { bMenuBarVisible = bVisible; } @@ -1204,7 +1204,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); { aCallWatchThread.restart(); } - catch ( java.lang.InterruptedException aExc ) + catch ( InterruptedException aExc ) { // ignore late interrupt } @@ -1221,7 +1221,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); try { sleep(nOOoCheckCycle); } - catch ( java.lang.InterruptedException aExc ) + catch ( InterruptedException aExc ) { dbgPrint("EventListener(" + aTag + ") interrupted."); // thread can be ended by EvendListener.end(); diff --git a/chart2/qa/TestCaseOldAPI.java b/chart2/qa/TestCaseOldAPI.java index 29662004d0f2..1c61e339c3b2 100644 --- a/chart2/qa/TestCaseOldAPI.java +++ b/chart2/qa/TestCaseOldAPI.java @@ -964,7 +964,7 @@ public class TestCaseOldAPI extends ComplexTestCase { private boolean approxEqual( int a, int b, int tolerance ) { if( a != b ) - log.println( "Integer values differ by " + java.lang.Math.abs( a-b )); + log.println( "Integer values differ by " + Math.abs( a-b )); return ( ( a - tolerance <= b ) || ( a + tolerance >= b )); } diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java index e71c42a9963c..9248cdf5a546 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java @@ -35,22 +35,22 @@ public class StorageFileAccess implements org.hsqldb.lib.FileAccess{ this.key = (String)key; } - public void createParentDirs(java.lang.String filename) { + public void createParentDirs(String filename) { } - public boolean isStreamElement(java.lang.String elementName) { + public boolean isStreamElement(String elementName) { return isStreamElement(key,elementName); } - public java.io.InputStream openInputStreamElement(java.lang.String streamName) throws java.io.IOException { + public java.io.InputStream openInputStreamElement(String streamName) throws java.io.IOException { return new NativeInputStreamHelper(key,streamName); } - public java.io.OutputStream openOutputStreamElement(java.lang.String streamName) throws java.io.IOException { + public java.io.OutputStream openOutputStreamElement(String streamName) throws java.io.IOException { return new NativeOutputStreamHelper(key,streamName); } - public void removeElement(java.lang.String filename) throws java.util.NoSuchElementException { + public void removeElement(String filename) throws java.util.NoSuchElementException { try { if ( isStreamElement(key,filename) ) removeElement(key,filename); @@ -59,7 +59,7 @@ public class StorageFileAccess implements org.hsqldb.lib.FileAccess{ } } - public void renameElement(java.lang.String oldName, java.lang.String newName) throws java.util.NoSuchElementException { + public void renameElement(String oldName, String newName) throws java.util.NoSuchElementException { try { if ( isStreamElement(key,oldName) ){ removeElement(key,newName); @@ -88,7 +88,7 @@ public class StorageFileAccess implements org.hsqldb.lib.FileAccess{ return new FileSync((NativeOutputStreamHelper)os); } - static native boolean isStreamElement(java.lang.String key,java.lang.String elementName); - static native void removeElement(java.lang.String key,java.lang.String filename) throws java.util.NoSuchElementException, java.io.IOException; - static native void renameElement(java.lang.String key,java.lang.String oldName, java.lang.String newName) throws java.util.NoSuchElementException, java.io.IOException; + static native boolean isStreamElement(String key,String elementName); + static native void removeElement(String key,String filename) throws java.util.NoSuchElementException, java.io.IOException; + static native void renameElement(String key,String oldName, String newName) throws java.util.NoSuchElementException, java.io.IOException; } diff --git a/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java b/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java index 178c33f7093f..f18b35c34c87 100644 --- a/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java +++ b/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java @@ -296,14 +296,14 @@ public class DBaseNumericFunctions extends SubTestCase private void exp(final XRowSet xRowRes) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException { final XRow row = execute(xRowRes, "EXP(2),EXP(-2) "); - assure("EXP(2) failed!", (float) row.getDouble(1) == (float) java.lang.Math.exp(2)); - assure("EXP(-2) failed!", (float) row.getDouble(2) == (float) java.lang.Math.exp(-2)); + assure("EXP(2) failed!", (float) row.getDouble(1) == (float) Math.exp(2)); + assure("EXP(-2) failed!", (float) row.getDouble(2) == (float) Math.exp(-2)); } private void log(final XRowSet xRowRes) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException { final XRow row = execute(xRowRes, "LOG(2),LOG(-2) "); - assure("LOG(2) failed!", (float) row.getDouble(1) == (float) java.lang.Math.log(2)); + assure("LOG(2) failed!", (float) row.getDouble(1) == (float) Math.log(2)); row.getDouble(2); assure("LOG(-2) failed!", row.wasNull()); } @@ -329,7 +329,7 @@ public class DBaseNumericFunctions extends SubTestCase private void pi(final XRowSet xRowRes) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException { final XRow row = execute(xRowRes, "PI() "); - assure("PI() failed!", (float) row.getDouble(1) == (float) java.lang.Math.PI); + assure("PI() failed!", (float) row.getDouble(1) == (float) Math.PI); } private void cos(final XRowSet xRowRes) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException @@ -341,13 +341,13 @@ public class DBaseNumericFunctions extends SubTestCase private void sin(final XRowSet xRowRes) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException { final XRow row = execute(xRowRes, "SIN(2) "); - assure("SIN(PI()) failed!", (float) row.getDouble(1) == (float) java.lang.Math.sin(2)); + assure("SIN(PI()) failed!", (float) row.getDouble(1) == (float) Math.sin(2)); } private void tan(final XRowSet xRowRes) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException { final XRow row = execute(xRowRes, "TAN(PI()+1) "); - assure("TAN(PI()+1) failed!", (float) row.getDouble(1) == (float) java.lang.Math.tan(java.lang.Math.PI + 1.0)); + assure("TAN(PI()+1) failed!", (float) row.getDouble(1) == (float) Math.tan(Math.PI + 1.0)); } private void acos(final XRowSet xRowRes) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException @@ -359,7 +359,7 @@ public class DBaseNumericFunctions extends SubTestCase private void asin(final XRowSet xRowRes) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException { final XRow row = execute(xRowRes, "ASIN(0) "); - assure("ASIN(0) failed!", (float) row.getDouble(1) == (float) java.lang.Math.asin(0.0)); + assure("ASIN(0) failed!", (float) row.getDouble(1) == (float) Math.asin(0.0)); } private void atan(final XRowSet xRowRes) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException @@ -383,6 +383,6 @@ public class DBaseNumericFunctions extends SubTestCase private void radians(final XRowSet xRowRes) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException { final XRow row = execute(xRowRes, "RADIANS(90) "); - assure("RADIANS(90) failed!", (float) row.getDouble(1) == (float) (java.lang.Math.PI / 2.0)); + assure("RADIANS(90) failed!", (float) row.getDouble(1) == (float) (Math.PI / 2.0)); } } diff --git a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java index 2539d92506df..0d3609648ce5 100644 --- a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java +++ b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java @@ -213,7 +213,7 @@ public class CopyTableWizard extends CRMBasedTestCase { Thread.sleep(500); } - catch (java.lang.InterruptedException e) + catch (InterruptedException e) { } } diff --git a/filter/qa/complex/filter/detection/typeDetection/Helper.java b/filter/qa/complex/filter/detection/typeDetection/Helper.java index 1c445901cdcd..81bd8bb64b3d 100644 --- a/filter/qa/complex/filter/detection/typeDetection/Helper.java +++ b/filter/qa/complex/filter/detection/typeDetection/Helper.java @@ -208,7 +208,7 @@ public class Helper { } }catch (IOException e) { - }catch(java.lang.NullPointerException e) { + }catch(NullPointerException e) { return null; } return null; @@ -343,7 +343,7 @@ public class Helper { try{ String fileURL = m_hFileURLs.get(fileAlias).toString(); return utils.getFullURL(ensureEndingFileSep(m_sTestDocPath) + fileURL); - } catch (java.lang.NullPointerException e){ + } catch (NullPointerException e){ throw new FileAliasNotFoundException(fileAlias); } @@ -358,7 +358,7 @@ public class Helper { throws FileAliasNotFoundException{ try{ return m_hFileTypes.get(fileAlias).toString(); - } catch (java.lang.NullPointerException e){ + } catch (NullPointerException e){ throw new FileAliasNotFoundException(fileAlias); } } diff --git a/filter/source/config/tools/split/FCFGSplit.java b/filter/source/config/tools/split/FCFGSplit.java index e1902ba48157..a9803fa2a992 100644 --- a/filter/source/config/tools/split/FCFGSplit.java +++ b/filter/source/config/tools/split/FCFGSplit.java @@ -41,10 +41,10 @@ public class FCFGSplit // private const /** specify the command line parameter to set the debug level for this app. */ - private static final java.lang.String CMD_DEBUG = "debug" ; + private static final String CMD_DEBUG = "debug" ; /** specify the command line parameter to set a configuration file for this app. */ - private static final java.lang.String CMD_CONFIG = "config"; + private static final String CMD_CONFIG = "config"; /** The following strings are used as property names of * the configuration file we need here. @@ -52,38 +52,38 @@ public class FCFGSplit * @seealso readCfg() */ - private static final java.lang.String CFGKEY_XMLFILE = "xmlfile" ; - private static final java.lang.String CFGKEY_INFORMAT = "informat" ; - private static final java.lang.String CFGKEY_OUTFORMAT = "outformat" ; - private static final java.lang.String CFGKEY_INENCODING = "inencoding" ; - private static final java.lang.String CFGKEY_OUTENCODING = "outencoding" ; - private static final java.lang.String CFGKEY_OUTDIR = "outdir" ; - private static final java.lang.String CFGKEY_FRAGMENT_EXTENSION = "fragment_extension" ; - private static final java.lang.String CFGKEY_CREATE_COMBINE_FILTER_FLAG = "create_combine_filter_flag" ; - private static final java.lang.String CFGKEY_REMOVE_FILTER_FLAG_BROWSERPREFERRED = "remove_filter_flag_browserpreferred" ; - private static final java.lang.String CFGKEY_REMOVE_FILTER_FLAG_PREFERRED = "remove_filter_flag_preferred" ; - private static final java.lang.String CFGKEY_REMOVE_FILTER_FLAG_3RDPARTY = "remove_filter_flag_3rdparty" ; - private static final java.lang.String CFGKEY_REMOVE_FILTER_UINAMES = "remove_filter_uinames" ; - private static final java.lang.String CFGKEY_REMOVE_GRAPHIC_FILTERS = "remove_graphic_filters" ; - private static final java.lang.String CFGKEY_SET_DEFAULT_DETECTOR = "set_default_detector" ; - - private static final java.lang.String CFGKEY_SUBDIR_TYPES = "subdir_types" ; - private static final java.lang.String CFGKEY_SUBDIR_FILTERS = "subdir_filters" ; - private static final java.lang.String CFGKEY_SUBDIR_DETECTSERVICES = "subdir_detectservices" ; - private static final java.lang.String CFGKEY_SUBDIR_FRAMELOADERS = "subdir_frameloaders" ; - private static final java.lang.String CFGKEY_SUBDIR_CONTENTHANDLERS = "subdir_contenthandlers" ; - - private static final java.lang.String CFGKEY_SEPARATE_FILTERS_BY_MODULE = "separate_filters_by_module" ; - - private static final java.lang.String CFGKEY_SUBDIR_MODULE_SWRITER = "subdir_module_swriter" ; - private static final java.lang.String CFGKEY_SUBDIR_MODULE_SWEB = "subdir_module_sweb" ; - private static final java.lang.String CFGKEY_SUBDIR_MODULE_SGLOBAL = "subdir_module_sglobal" ; - private static final java.lang.String CFGKEY_SUBDIR_MODULE_SCALC = "subdir_module_scalc" ; - private static final java.lang.String CFGKEY_SUBDIR_MODULE_SDRAW = "subdir_module_sdraw" ; - private static final java.lang.String CFGKEY_SUBDIR_MODULE_SIMPRESS = "subdir_module_simpress" ; - private static final java.lang.String CFGKEY_SUBDIR_MODULE_SMATH = "subdir_module_smath" ; - private static final java.lang.String CFGKEY_SUBDIR_MODULE_SCHART = "subdir_module_schart" ; - private static final java.lang.String CFGKEY_SUBDIR_MODULE_OTHERS = "subdir_module_others" ; + private static final String CFGKEY_XMLFILE = "xmlfile" ; + private static final String CFGKEY_INFORMAT = "informat" ; + private static final String CFGKEY_OUTFORMAT = "outformat" ; + private static final String CFGKEY_INENCODING = "inencoding" ; + private static final String CFGKEY_OUTENCODING = "outencoding" ; + private static final String CFGKEY_OUTDIR = "outdir" ; + private static final String CFGKEY_FRAGMENT_EXTENSION = "fragment_extension" ; + private static final String CFGKEY_CREATE_COMBINE_FILTER_FLAG = "create_combine_filter_flag" ; + private static final String CFGKEY_REMOVE_FILTER_FLAG_BROWSERPREFERRED = "remove_filter_flag_browserpreferred" ; + private static final String CFGKEY_REMOVE_FILTER_FLAG_PREFERRED = "remove_filter_flag_preferred" ; + private static final String CFGKEY_REMOVE_FILTER_FLAG_3RDPARTY = "remove_filter_flag_3rdparty" ; + private static final String CFGKEY_REMOVE_FILTER_UINAMES = "remove_filter_uinames" ; + private static final String CFGKEY_REMOVE_GRAPHIC_FILTERS = "remove_graphic_filters" ; + private static final String CFGKEY_SET_DEFAULT_DETECTOR = "set_default_detector" ; + + private static final String CFGKEY_SUBDIR_TYPES = "subdir_types" ; + private static final String CFGKEY_SUBDIR_FILTERS = "subdir_filters" ; + private static final String CFGKEY_SUBDIR_DETECTSERVICES = "subdir_detectservices" ; + private static final String CFGKEY_SUBDIR_FRAMELOADERS = "subdir_frameloaders" ; + private static final String CFGKEY_SUBDIR_CONTENTHANDLERS = "subdir_contenthandlers" ; + + private static final String CFGKEY_SEPARATE_FILTERS_BY_MODULE = "separate_filters_by_module" ; + + private static final String CFGKEY_SUBDIR_MODULE_SWRITER = "subdir_module_swriter" ; + private static final String CFGKEY_SUBDIR_MODULE_SWEB = "subdir_module_sweb" ; + private static final String CFGKEY_SUBDIR_MODULE_SGLOBAL = "subdir_module_sglobal" ; + private static final String CFGKEY_SUBDIR_MODULE_SCALC = "subdir_module_scalc" ; + private static final String CFGKEY_SUBDIR_MODULE_SDRAW = "subdir_module_sdraw" ; + private static final String CFGKEY_SUBDIR_MODULE_SIMPRESS = "subdir_module_simpress" ; + private static final String CFGKEY_SUBDIR_MODULE_SMATH = "subdir_module_smath" ; + private static final String CFGKEY_SUBDIR_MODULE_SCHART = "subdir_module_schart" ; + private static final String CFGKEY_SUBDIR_MODULE_OTHERS = "subdir_module_others" ; /** The following strings are used as property default * values if a configuration key does not exist. @@ -94,44 +94,44 @@ public class FCFGSplit * @seealso readCfg() */ - private static final java.lang.String DEFAULT_XMLFILE = ".//TypeDetection.xcu" ; - private static final java.lang.String DEFAULT_INFORMAT = "6.0" ; - private static final java.lang.String DEFAULT_OUTFORMAT = "6.Y" ; - private static final java.lang.String DEFAULT_INENCODING = "UTF-8" ; - private static final java.lang.String DEFAULT_OUTENCODING = "UTF-8" ; - private static final java.lang.String DEFAULT_OUTDIR = ".//temp" ; - private static final java.lang.String DEFAULT_FRAGMENT_EXTENSION = ".xcu" ; - private static final java.lang.String DEFAULT_CREATE_COMBINE_FILTER_FLAG = "false" ; - private static final java.lang.String DEFAULT_REMOVE_FILTER_FLAG_BROWSERPREFERRED = "false" ; - private static final java.lang.String DEFAULT_REMOVE_FILTER_FLAG_PREFERRED = "false" ; - private static final java.lang.String DEFAULT_REMOVE_FILTER_FLAG_3RDPARTY = "false" ; - private static final java.lang.String DEFAULT_REMOVE_FILTER_UINAMES = "false" ; - private static final java.lang.String DEFAULT_REMOVE_GRAPHIC_FILTERS = "false" ; - private static final java.lang.String DEFAULT_SET_DEFAULT_DETECTOR = "false" ; - - private static final java.lang.String DEFAULT_SUBDIR_TYPES = "Types" ; - private static final java.lang.String DEFAULT_SUBDIR_FILTERS = "Filters" ; - private static final java.lang.String DEFAULT_SUBDIR_DETECTSERVICES = "DetectServices" ; - private static final java.lang.String DEFAULT_SUBDIR_FRAMELOADERS = "FrameLoaders" ; - private static final java.lang.String DEFAULT_SUBDIR_CONTENTHANDLERS = "ContentHandlers" ; - - private static final java.lang.String DEFAULT_SEPARATE_FILTERS_BY_MODULE = "false" ; - - private static final java.lang.String DEFAULT_SUBDIR_MODULE_SWRITER = "SWriter" ; - private static final java.lang.String DEFAULT_SUBDIR_MODULE_SWEB = "SWeb" ; - private static final java.lang.String DEFAULT_SUBDIR_MODULE_SGLOBAL = "SGlobal" ; - private static final java.lang.String DEFAULT_SUBDIR_MODULE_SCALC = "SCalc" ; - private static final java.lang.String DEFAULT_SUBDIR_MODULE_SDRAW = "SDraw" ; - private static final java.lang.String DEFAULT_SUBDIR_MODULE_SIMPRESS = "SImpress" ; - private static final java.lang.String DEFAULT_SUBDIR_MODULE_SMATH = "SMath" ; - private static final java.lang.String DEFAULT_SUBDIR_MODULE_SCHART = "SChart" ; - private static final java.lang.String DEFAULT_SUBDIR_MODULE_OTHERS = "Others" ; + private static final String DEFAULT_XMLFILE = ".//TypeDetection.xcu" ; + private static final String DEFAULT_INFORMAT = "6.0" ; + private static final String DEFAULT_OUTFORMAT = "6.Y" ; + private static final String DEFAULT_INENCODING = "UTF-8" ; + private static final String DEFAULT_OUTENCODING = "UTF-8" ; + private static final String DEFAULT_OUTDIR = ".//temp" ; + private static final String DEFAULT_FRAGMENT_EXTENSION = ".xcu" ; + private static final String DEFAULT_CREATE_COMBINE_FILTER_FLAG = "false" ; + private static final String DEFAULT_REMOVE_FILTER_FLAG_BROWSERPREFERRED = "false" ; + private static final String DEFAULT_REMOVE_FILTER_FLAG_PREFERRED = "false" ; + private static final String DEFAULT_REMOVE_FILTER_FLAG_3RDPARTY = "false" ; + private static final String DEFAULT_REMOVE_FILTER_UINAMES = "false" ; + private static final String DEFAULT_REMOVE_GRAPHIC_FILTERS = "false" ; + private static final String DEFAULT_SET_DEFAULT_DETECTOR = "false" ; + + private static final String DEFAULT_SUBDIR_TYPES = "Types" ; + private static final String DEFAULT_SUBDIR_FILTERS = "Filters" ; + private static final String DEFAULT_SUBDIR_DETECTSERVICES = "DetectServices" ; + private static final String DEFAULT_SUBDIR_FRAMELOADERS = "FrameLoaders" ; + private static final String DEFAULT_SUBDIR_CONTENTHANDLERS = "ContentHandlers" ; + + private static final String DEFAULT_SEPARATE_FILTERS_BY_MODULE = "false" ; + + private static final String DEFAULT_SUBDIR_MODULE_SWRITER = "SWriter" ; + private static final String DEFAULT_SUBDIR_MODULE_SWEB = "SWeb" ; + private static final String DEFAULT_SUBDIR_MODULE_SGLOBAL = "SGlobal" ; + private static final String DEFAULT_SUBDIR_MODULE_SCALC = "SCalc" ; + private static final String DEFAULT_SUBDIR_MODULE_SDRAW = "SDraw" ; + private static final String DEFAULT_SUBDIR_MODULE_SIMPRESS = "SImpress" ; + private static final String DEFAULT_SUBDIR_MODULE_SMATH = "SMath" ; + private static final String DEFAULT_SUBDIR_MODULE_SCHART = "SChart" ; + private static final String DEFAULT_SUBDIR_MODULE_OTHERS = "Others" ; // private member /** contains the name of the reading xcu file. */ - private static java.lang.String m_sXMLFile; + private static String m_sXMLFile; /** specify the xml file format, which must be interpreted at reading time. */ private static int m_nInFormat; @@ -141,41 +141,41 @@ public class FCFGSplit private static int m_nOutFormat; /** specify the file encoding for reading. */ - private static java.lang.String m_sInEncoding; + private static String m_sInEncoding; /** specify the file encoding for writing fragments. */ - private static java.lang.String m_sOutEncoding; + private static String m_sOutEncoding; /** specify the target directory, where all results of this * process can be generated. * Note: May it will be cleared! */ - private static java.lang.String m_sOutDir; + private static String m_sOutDir; /** can be used to generate some output on the console. */ private static Logger m_aDebug; /** contains the file extension for all generated xml fragments. */ - private static java.lang.String m_sFragmentExtension; + private static String m_sFragmentExtension; /** specify the sub directory to generate type fragments. * Its meaned relative to m_sOutDir. */ - private static java.lang.String m_sSubDirTypes; + private static String m_sSubDirTypes; /** specify the sub directory to generate filter fragments. * Its meaned relative to m_sOutDir. */ - private static java.lang.String m_sSubDirFilters; + private static String m_sSubDirFilters; /** specify the sub directory to generate detect service fragments. * Its meaned relative to m_sOutDir. */ - private static java.lang.String m_sSubDirDetectServices; + private static String m_sSubDirDetectServices; /** specify the sub directory to generate frame loader fragments. * Its meaned relative to m_sOutDir. */ - private static java.lang.String m_sSubDirFrameLoaders; + private static String m_sSubDirFrameLoaders; /** specify the sub directory to generate content handler fragments. * Its meaned relative to m_sOutDir. */ - private static java.lang.String m_sSubDirContentHandlers; + private static String m_sSubDirContentHandlers; /** enable/disable generating of filter groups - separated by * application modules. */ @@ -184,48 +184,48 @@ public class FCFGSplit /** specify the sub directory to generate filter groups * for the module writer. Will be used only, * if m_bSeparateFiltersByModule is set to TRUE.*/ - private static java.lang.String m_sSubDirModuleSWriter; + private static String m_sSubDirModuleSWriter; /** specify the sub directory to generate filter groups * for the module writer/web. Will be used only, * if m_bSeparateFiltersByModule is set to TRUE.*/ - private static java.lang.String m_sSubDirModuleSWeb; + private static String m_sSubDirModuleSWeb; /** specify the sub directory to generate filter groups * for the module writer/global. Will be used only, * if m_bSeparateFiltersByModule is set to TRUE.*/ - private static java.lang.String m_sSubDirModuleSGlobal; + private static String m_sSubDirModuleSGlobal; /** specify the sub directory to generate filter groups * for the module calc. Will be used only, * if m_bSeparateFiltersByModule is set to TRUE.*/ - private static java.lang.String m_sSubDirModuleSCalc; + private static String m_sSubDirModuleSCalc; /** specify the sub directory to generate filter groups * for the module draw. Will be used only, * if m_bSeparateFiltersByModule is set to TRUE.*/ - private static java.lang.String m_sSubDirModuleSDraw; + private static String m_sSubDirModuleSDraw; /** specify the sub directory to generate filter groups * for the module impress. Will be used only, * if m_bSeparateFiltersByModule is set to TRUE.*/ - private static java.lang.String m_sSubDirModuleSImpress; + private static String m_sSubDirModuleSImpress; /** specify the sub directory to generate filter groups * for the module math. Will be used only, * if m_bSeparateFiltersByModule is set to TRUE.*/ - private static java.lang.String m_sSubDirModuleSMath; + private static String m_sSubDirModuleSMath; /** specify the sub directory to generate filter groups * for the module chart. Will be used only, * if m_bSeparateFiltersByModule is set to TRUE.*/ - private static java.lang.String m_sSubDirModuleSChart; + private static String m_sSubDirModuleSChart; /** specify the sub directory to generate filter groups * for unknown modules - e.g. the graphic filters. * Will be used only, if m_bSeparateFiltersByModule * is set to TRUE.*/ - private static java.lang.String m_sSubDirModuleOthers; + private static String m_sSubDirModuleOthers; private static boolean m_bCreateCombineFilterFlag; private static boolean m_bRemoveFilterFlagBrowserPreferred; @@ -247,7 +247,7 @@ public class FCFGSplit * @param lArgs * contains the command line arguments. */ - public static void main(java.lang.String[] lArgs) + public static void main(String[] lArgs) { long t_start = System.currentTimeMillis(); @@ -442,7 +442,7 @@ public class FCFGSplit // analyze some time stamps long t_end = System.currentTimeMillis(); - java.lang.StringBuffer sTimes = new java.lang.StringBuffer(100); + StringBuffer sTimes = new StringBuffer(100); sTimes.append("Needed times:\n" ); sTimes.append("t [all]\t\t=\t" ); sTimes.append(t_end-t_start ); @@ -509,7 +509,7 @@ public class FCFGSplit m_bRemoveGraphicFilters = new java.lang.Boolean(aCfg.getProperty(CFGKEY_REMOVE_GRAPHIC_FILTERS , DEFAULT_REMOVE_GRAPHIC_FILTERS )).booleanValue(); m_bSetDefaultDetector = new java.lang.Boolean(aCfg.getProperty(CFGKEY_SET_DEFAULT_DETECTOR , DEFAULT_SET_DEFAULT_DETECTOR )).booleanValue(); - java.lang.String sFormat = aCfg.getProperty(CFGKEY_INFORMAT, DEFAULT_INFORMAT); + String sFormat = aCfg.getProperty(CFGKEY_INFORMAT, DEFAULT_INFORMAT); m_nInFormat = Cache.mapFormatString2Format(sFormat); sFormat = aCfg.getProperty(CFGKEY_OUTFORMAT, DEFAULT_OUTFORMAT); @@ -522,7 +522,7 @@ public class FCFGSplit */ private static void printCopyright() { - java.lang.StringBuffer sOut = new java.lang.StringBuffer(256); + StringBuffer sOut = new StringBuffer(256); sOut.append("FCFGSplit\n"); sOut.append("Copyright: 2000 by Sun Microsystems, Inc.\n"); sOut.append("All Rights Reserved.\n"); @@ -535,7 +535,7 @@ public class FCFGSplit */ private static void printHelp() { - java.lang.StringBuffer sOut = new java.lang.StringBuffer(1000); + StringBuffer sOut = new StringBuffer(1000); sOut.append("_______________________________________________________________________________\n\n" ); sOut.append("usage: FCFGSplit "+CMD_CONFIG+"=<file name> "+CMD_DEBUG+"=<level>\n" ); sOut.append("parameters:\n" ); diff --git a/filter/source/config/tools/split/Splitter.java b/filter/source/config/tools/split/Splitter.java index a347fd93edda..5be4bfab7b5a 100644 --- a/filter/source/config/tools/split/Splitter.java +++ b/filter/source/config/tools/split/Splitter.java @@ -84,7 +84,7 @@ public class Splitter java.util.ArrayList lNames = m_aDataSet.m_aCache.getItemNames(Cache.E_TYPE); java.util.Enumeration it = lNames.elements(); while(it.hasMoreElements()) - generateXMLFragment(Cache.E_TYPE, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirTypes); + generateXMLFragment(Cache.E_TYPE, (String)it.nextElement(), m_aDataSet.m_aFragmentDirTypes); nTypes -= lNames.size(); // generate filter fragments for the writer module @@ -95,7 +95,7 @@ public class Splitter lNames = m_aDataSet.m_aCache.getMatchedItemNames(Cache.E_FILTER, rRequestedProps); it = lNames.elements(); while(it.hasMoreElements()) - generateXMLFragment(Cache.E_FILTER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSWriter); + generateXMLFragment(Cache.E_FILTER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSWriter); nFilters -= lNames.size(); // generate filter fragments for the writer/web module @@ -104,7 +104,7 @@ public class Splitter lNames = m_aDataSet.m_aCache.getMatchedItemNames(Cache.E_FILTER, rRequestedProps); it = lNames.elements(); while(it.hasMoreElements()) - generateXMLFragment(Cache.E_FILTER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSWeb); + generateXMLFragment(Cache.E_FILTER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSWeb); nFilters -= lNames.size(); // generate filter fragments for the writer/global module @@ -113,7 +113,7 @@ public class Splitter lNames = m_aDataSet.m_aCache.getMatchedItemNames(Cache.E_FILTER, rRequestedProps); it = lNames.elements(); while(it.hasMoreElements()) - generateXMLFragment(Cache.E_FILTER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSGlobal); + generateXMLFragment(Cache.E_FILTER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSGlobal); nFilters -= lNames.size(); // generate filter fragments for the calc module @@ -122,7 +122,7 @@ public class Splitter lNames = m_aDataSet.m_aCache.getMatchedItemNames(Cache.E_FILTER, rRequestedProps); it = lNames.elements(); while(it.hasMoreElements()) - generateXMLFragment(Cache.E_FILTER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSCalc); + generateXMLFragment(Cache.E_FILTER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSCalc); nFilters -= lNames.size(); // generate filter fragments for the draw module @@ -131,7 +131,7 @@ public class Splitter lNames = m_aDataSet.m_aCache.getMatchedItemNames(Cache.E_FILTER, rRequestedProps); it = lNames.elements(); while(it.hasMoreElements()) - generateXMLFragment(Cache.E_FILTER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSDraw); + generateXMLFragment(Cache.E_FILTER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSDraw); nFilters -= lNames.size(); // generate filter fragments for the impress module @@ -140,7 +140,7 @@ public class Splitter lNames = m_aDataSet.m_aCache.getMatchedItemNames(Cache.E_FILTER, rRequestedProps); it = lNames.elements(); while(it.hasMoreElements()) - generateXMLFragment(Cache.E_FILTER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSImpress); + generateXMLFragment(Cache.E_FILTER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSImpress); nFilters -= lNames.size(); // generate filter fragments for the chart module @@ -149,7 +149,7 @@ public class Splitter lNames = m_aDataSet.m_aCache.getMatchedItemNames(Cache.E_FILTER, rRequestedProps); it = lNames.elements(); while(it.hasMoreElements()) - generateXMLFragment(Cache.E_FILTER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSChart); + generateXMLFragment(Cache.E_FILTER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSChart); nFilters -= lNames.size(); // generate filter fragments for the math module @@ -158,7 +158,7 @@ public class Splitter lNames = m_aDataSet.m_aCache.getMatchedItemNames(Cache.E_FILTER, rRequestedProps); it = lNames.elements(); while(it.hasMoreElements()) - generateXMLFragment(Cache.E_FILTER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSMath); + generateXMLFragment(Cache.E_FILTER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleSMath); nFilters -= lNames.size(); // generate fragments for 3rdParty or unspecified (may graphics) filters! @@ -167,7 +167,7 @@ public class Splitter lNames = m_aDataSet.m_aCache.getMatchedItemNames(Cache.E_FILTER, rRequestedProps); it = lNames.elements(); while(it.hasMoreElements()) - generateXMLFragment(Cache.E_FILTER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleOthers); + generateXMLFragment(Cache.E_FILTER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirModuleOthers); nFilters -= lNames.size(); // generate all detect service fragments @@ -175,7 +175,7 @@ public class Splitter lNames = m_aDataSet.m_aCache.getItemNames(Cache.E_DETECTSERVICE); it = lNames.elements(); while(it.hasMoreElements()) - generateXMLFragment(Cache.E_DETECTSERVICE, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirDetectServices); + generateXMLFragment(Cache.E_DETECTSERVICE, (String)it.nextElement(), m_aDataSet.m_aFragmentDirDetectServices); nDetectServices -= lNames.size(); // generate all frame loader fragments @@ -183,7 +183,7 @@ public class Splitter lNames = m_aDataSet.m_aCache.getItemNames(Cache.E_FRAMELOADER); it = lNames.elements(); while(it.hasMoreElements()) - generateXMLFragment(Cache.E_FRAMELOADER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirFrameLoaders); + generateXMLFragment(Cache.E_FRAMELOADER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirFrameLoaders); nFrameLoaders -= lNames.size(); // generate all content handler fragments @@ -191,7 +191,7 @@ public class Splitter lNames = m_aDataSet.m_aCache.getItemNames(Cache.E_CONTENTHANDLER); it = lNames.elements(); while(it.hasMoreElements()) - generateXMLFragment(Cache.E_CONTENTHANDLER, (java.lang.String)it.nextElement(), m_aDataSet.m_aFragmentDirContentHandlers); + generateXMLFragment(Cache.E_CONTENTHANDLER, (String)it.nextElement(), m_aDataSet.m_aFragmentDirContentHandlers); nContentHandlers -= lNames.size(); // check if all cache items was handled @@ -203,7 +203,7 @@ public class Splitter (nContentHandlers != 0) ) { - java.lang.StringBuffer sStatistic = new java.lang.StringBuffer(256); + StringBuffer sStatistic = new StringBuffer(256); sStatistic.append("some cache items seems to be not transformed:\n"); sStatistic.append(nTypes +" unhandled types\n" ); sStatistic.append(nFilters +" unhandled filters\n" ); @@ -233,12 +233,12 @@ public class Splitter * successfully. */ private void generateXMLFragment(int eItemType, - java.lang.String sItemName, + String sItemName, java.io.File aOutDir ) throws java.lang.Exception { - java.lang.String sFileName = FileHelper.convertName2FileName(sItemName); - java.lang.String sXML = m_aDataSet.m_aCache.getItemAsXML(eItemType, sItemName, m_aDataSet.m_nFormat); + String sFileName = FileHelper.convertName2FileName(sItemName); + String sXML = m_aDataSet.m_aCache.getItemAsXML(eItemType, sItemName, m_aDataSet.m_nFormat); java.io.File aFile = new java.io.File(aOutDir, sFileName+m_aDataSet.m_sFragmentExtension); if (aFile.exists()) diff --git a/filter/source/config/tools/split/SplitterData.java b/filter/source/config/tools/split/SplitterData.java index fd73bbbba44d..7160c125d770 100644 --- a/filter/source/config/tools/split/SplitterData.java +++ b/filter/source/config/tools/split/SplitterData.java @@ -44,7 +44,7 @@ public class SplitterData public int m_nFormat; /** specify the encoding for the output xml files. */ - public java.lang.String m_sEncoding; + public String m_sEncoding; /** directory to generate some generic views. */ public java.io.File m_aOutDir; @@ -74,5 +74,5 @@ public class SplitterData public java.io.File m_aFragmentDirModuleOthers; /** file extension for generated xml fragments. */ - public java.lang.String m_sFragmentExtension; + public String m_sFragmentExtension; } diff --git a/forms/qa/integration/forms/ListSelection.java b/forms/qa/integration/forms/ListSelection.java index 2529b08c31e9..17a63bde458e 100644 --- a/forms/qa/integration/forms/ListSelection.java +++ b/forms/qa/integration/forms/ListSelection.java @@ -120,7 +120,7 @@ public class ListSelection extends integration.forms.TestCase this.wait( 500 ); } } - catch( java.lang.InterruptedException e ) { } + catch( InterruptedException e ) { } XNamed sheetName = UnoRuntime.queryInterface( XNamed.class, view.getActiveSheet() ); assure( "sheet was not selected as expected!", sheetName.getName().equals( selectSheetName ) ); diff --git a/forms/qa/integration/forms/MasterDetailForms.java b/forms/qa/integration/forms/MasterDetailForms.java index e824ac50f98d..48868bce8397 100644 --- a/forms/qa/integration/forms/MasterDetailForms.java +++ b/forms/qa/integration/forms/MasterDetailForms.java @@ -347,7 +347,7 @@ public class MasterDetailForms extends complexlib.ComplexTestCase implements com while ( !m_loaded ) { try { m_waitForLoad.wait(); } - catch( java.lang.InterruptedException e ) { } + catch( InterruptedException e ) { } } // reset the flag for the next time m_loaded = false; diff --git a/forms/qa/integration/forms/NumericValidator.java b/forms/qa/integration/forms/NumericValidator.java index 0d5a74e8621d..0be23690d67d 100644 --- a/forms/qa/integration/forms/NumericValidator.java +++ b/forms/qa/integration/forms/NumericValidator.java @@ -70,6 +70,6 @@ public class NumericValidator extends integration.forms.ControlValidator private boolean isProperDigitCount( double value) { - return ( java.lang.Math.floor( value * 10 ) == value * 10 ); + return ( Math.floor( value * 10 ) == value * 10 ); } } diff --git a/framework/qa/complex/api_internal/CheckAPI.java b/framework/qa/complex/api_internal/CheckAPI.java index c2a5f5f95476..bf1e2d750987 100644 --- a/framework/qa/complex/api_internal/CheckAPI.java +++ b/framework/qa/complex/api_internal/CheckAPI.java @@ -149,7 +149,7 @@ public class CheckAPI { try { Thread.sleep(10000); } - catch(java.lang.InterruptedException e) {} + catch(InterruptedException e) {} OfficeProvider op = new OfficeProvider(); xMSF = (XMultiServiceFactory)op.getManager(param); param.put("ServiceFactory",xMSF); diff --git a/framework/qa/complex/desktop/DesktopTerminate.java b/framework/qa/complex/desktop/DesktopTerminate.java index f11923312d27..82e753e71e31 100644 --- a/framework/qa/complex/desktop/DesktopTerminate.java +++ b/framework/qa/complex/desktop/DesktopTerminate.java @@ -93,7 +93,7 @@ public class DesktopTerminate { Thread.sleep(10000); } - catch (java.lang.InterruptedException e) + catch (InterruptedException e) { } } @@ -119,7 +119,7 @@ public class DesktopTerminate { Thread.sleep(iOfficeCloseTime); } - catch (java.lang.InterruptedException e) + catch (InterruptedException e) { } xMSF = null; diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java index 33b3d1dd2127..225ebce46207 100644 --- a/framework/qa/complex/framework/autosave/Protocol.java +++ b/framework/qa/complex/framework/autosave/Protocol.java @@ -818,7 +818,7 @@ public class Protocol extends JComponent else if (com.sun.star.uno.AnyConverter.isArray(aAny)) { - if (aAny instanceof java.lang.String[]) + if (aAny instanceof String[]) { sOut.append("[sequence< string >] {"); sOut.append("}"); diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java index 572ac50946ba..988d00a7d860 100644 --- a/framework/qa/complex/framework/recovery/RecoveryTest.java +++ b/framework/qa/complex/framework/recovery/RecoveryTest.java @@ -360,7 +360,7 @@ public class RecoveryTest extends ComplexTestCase { try{ oButton = oUITools.getButton("Next >"); - } catch (java.lang.NullPointerException e){ + } catch (NullPointerException e){ // no fault: The title "Start Recovery" switches to "Next" // while all documents are recoverd } diff --git a/framework/qa/complex/framework/recovery/RecoveryTools.java b/framework/qa/complex/framework/recovery/RecoveryTools.java index 0de2d69437c4..080d84c2fe2c 100644 --- a/framework/qa/complex/framework/recovery/RecoveryTools.java +++ b/framework/qa/complex/framework/recovery/RecoveryTools.java @@ -122,7 +122,7 @@ public class RecoveryTools { private void sleep(long millis){ try{ Thread.sleep(millis); - }catch (java.lang.InterruptedException e){} + }catch (InterruptedException e){} } /** diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java index 19d73e49e523..514d2a5ea028 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java @@ -96,7 +96,7 @@ XMultiPropertySet * <em>id</em> is used to identify the storage of the property value. How property values are stored * and retrieved is determined by the methods {@link #convertPropertyValue convertPropertyValue}, * {@link #setPropertyValueNoBroadcast setPropertyValueNoBroadcast} and {@link #getPropertyValue(Property) getPropertyValue} - * These methods expect <em>id</em> to be a java.lang.String which represents the name of a member variable + * These methods expect <em>id</em> to be a String which represents the name of a member variable * which holds the property value. * Only properties which are registered can be accessed. Registration has to occur during * initialization of the inheriting class (i.e. within the contructor). @@ -253,10 +253,10 @@ XMultiPropertySet * can be obtained by {@link #getPropertyId getPropertyId} later on. The identifyer * is used to specify a certain storage for the property's value. If you do not * override {@link #setPropertyValueNoBroadcast setPropertyValueNoBroadcast} or {@link #getPropertyValue(Property)} - * then the argument <em>id</em> has to be a java.lang.String that equals the name of + * then the argument <em>id</em> has to be a String that equals the name of * the member variable that holds the Property's value. * Override this method if you want to implement your own mapping from Property objects to ids or - * if you need ids of a type other then java.lang.String. + * if you need ids of a type other then String. * Then you also need to override {@link #initMappings initMappings} and {@link #getPropertyId getPropertyId}. * @param prop The Property object that is being assigned an id. * @param id The object which identifies the storage used for the property's value. @@ -446,7 +446,7 @@ XMultiPropertySet * <li>java.lang.Long</li> * <li>java.lang.Float</li> * <li>java.lang.Double</li> - * <li>java.lang.String</li> + * <li>String</li> * <li>com.sun.star.uno.Type</li> * <li><em>objects which implement UNO interfaces</em></li> * <li><em>arrays which contain elements of the types above</em></li> @@ -549,7 +549,7 @@ XMultiPropertySet * property values. The variables must be public. A property must have been registered (e.g. by * {@link #registerProperty(Property, Object)} in order for this method to work. The identifyer argument (type Object) * used in the registerProperty methods must - * be a java.lang.String, which is, the name of the member variable that holds the property value. + * be a String, which is, the name of the member variable that holds the property value. * If one opts to store values differently then one may override * this method, as well as {@link #setPropertyValueNoBroadcast setPropertyValueNoBroadcast} and * {@link #getPropertyValue(Property) getPropertyValue(Property)}. @@ -821,7 +821,7 @@ XMultiPropertySet * of the furthest inheriting class (see {@link #convertPropertyValue convertPropertyValue}) and that the * variables are public. The property must have * been registered, for example by {@link #registerProperty(Property, Object)}. The identifyer Object argument - * must have been a java.lang.String which was the name of the member variable holding the property value. + * must have been a String which was the name of the member variable holding the property value. * When properties are to be stored differently one has to override this method as well as * {@link #convertPropertyValue} and {@link #setPropertyValueNoBroadcast}. <br> * If a value is stored in a variable of a primitive type then this method returns an instance of the respective diff --git a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java b/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java index c57d236943dd..2552c9b9689b 100644 --- a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java +++ b/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java @@ -84,7 +84,7 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster { // create the pipe try { createJNI( aPipeName ); - } catch ( java.lang.NullPointerException aNPE ) { + } catch ( NullPointerException aNPE ) { throw new IOException( aNPE.getMessage() ); } catch ( com.sun.star.io.IOException aIOE ) { throw new IOException( aIOE.getMessage() ); diff --git a/odk/examples/DevelopersGuide/Charts/CalcHelper.java b/odk/examples/DevelopersGuide/Charts/CalcHelper.java index 5d8a80061181..fa02dc398ac0 100644 --- a/odk/examples/DevelopersGuide/Charts/CalcHelper.java +++ b/odk/examples/DevelopersGuide/Charts/CalcHelper.java @@ -281,7 +281,7 @@ public class CalcHelper int nCol, nRow; double fValue; - double fFactor = 2.0 * java.lang.Math.PI / (nRowCount - 1); + double fFactor = 2.0 * Math.PI / (nRowCount - 1); String aFormula; // set variable factor for cos formula diff --git a/odk/examples/DevelopersGuide/Charts/ChartInDraw.java b/odk/examples/DevelopersGuide/Charts/ChartInDraw.java index bf16e57bb40e..cf9822c9bdb8 100644 --- a/odk/examples/DevelopersGuide/Charts/ChartInDraw.java +++ b/odk/examples/DevelopersGuide/Charts/ChartInDraw.java @@ -237,18 +237,18 @@ public class ChartInDraw // rotate 10 degrees along the x axis double fAngle = 10.0; - double fCosX = java.lang.Math.cos( java.lang.Math.PI / 180.0 * fAngle ); - double fSinX = java.lang.Math.sin( java.lang.Math.PI / 180.0 * fAngle ); + double fCosX = Math.cos( Math.PI / 180.0 * fAngle ); + double fSinX = Math.sin( Math.PI / 180.0 * fAngle ); // rotate -20 degrees along the y axis fAngle = -20.0; - double fCosY = java.lang.Math.cos( java.lang.Math.PI / 180.0 * fAngle ); - double fSinY = java.lang.Math.sin( java.lang.Math.PI / 180.0 * fAngle ); + double fCosY = Math.cos( Math.PI / 180.0 * fAngle ); + double fSinY = Math.sin( Math.PI / 180.0 * fAngle ); // rotate -5 degrees along the z axis fAngle = -5.0; - double fCosZ = java.lang.Math.cos( java.lang.Math.PI / 180.0 * fAngle ); - double fSinZ = java.lang.Math.sin( java.lang.Math.PI / 180.0 * fAngle ); + double fCosZ = Math.cos( Math.PI / 180.0 * fAngle ); + double fSinZ = Math.sin( Math.PI / 180.0 * fAngle ); aMatrix.Line1.Column1 = fCosY * fCosZ; aMatrix.Line1.Column2 = fCosY * -fSinZ; diff --git a/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java b/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java index c59942ce0c35..fd852f3c6fab 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java +++ b/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java @@ -52,13 +52,13 @@ public class AsyncJob extends WeakBase implements XServiceInfo, XAsyncJob public final XComponentContext m_xCmpCtx; /** the const list of supported uno service names. */ - public static final java.lang.String[] SERVICENAMES = {"com.sun.star.task.AsyncJob"}; + public static final String[] SERVICENAMES = {"com.sun.star.task.AsyncJob"}; /** the const uno implementation name. * It must be an unique value! The best naming schema seems to use * a registered domain in reverse order ... */ - public static final java.lang.String IMPLEMENTATIONNAME = "com.sun.star.comp.framework.java.services.AsyncJob"; + public static final String IMPLEMENTATIONNAME = "com.sun.star.comp.framework.java.services.AsyncJob"; // interface @@ -122,8 +122,8 @@ public class AsyncJob extends WeakBase implements XServiceInfo, XAsyncJob if (lEnvironment == null) throw new com.sun.star.lang.IllegalArgumentException("no environment"); - java.lang.String sEnvType = null; - java.lang.String sEventName = null; + String sEnvType = null; + String sEventName = null; com.sun.star.frame.XFrame xFrame = null; c = lEnvironment.length; for (int i=0; i<c; ++i) @@ -149,7 +149,7 @@ public class AsyncJob extends WeakBase implements XServiceInfo, XAsyncJob ) ) { - java.lang.String sMessage = "\"" + sEnvType + "\" isn't a valid value for EnvType"; + String sMessage = "\"" + sEnvType + "\" isn't a valid value for EnvType"; throw new com.sun.star.lang.IllegalArgumentException(sMessage); } @@ -166,7 +166,7 @@ public class AsyncJob extends WeakBase implements XServiceInfo, XAsyncJob // do your job ... // Here we print out all found arguments. - java.lang.String sOut = formatOutArgs(lGenericConfig, lJobConfig, lEnvironment, lDynamicData); + String sOut = formatOutArgs(lGenericConfig, lJobConfig, lEnvironment, lDynamicData); if (xFrame != null) showInfoModal(xFrame.getContainerWindow(), "Arguments of AsyncJob initialization ...", sOut); else @@ -246,8 +246,8 @@ public class AsyncJob extends WeakBase implements XServiceInfo, XAsyncJob */ private void showInfoModal( com.sun.star.awt.XWindow xParent , - java.lang.String sTitle , - java.lang.String sMessage ) + String sTitle , + String sMessage ) { try { @@ -293,15 +293,15 @@ public class AsyncJob extends WeakBase implements XServiceInfo, XAsyncJob - private void showInfoNonModal( java.lang.String sTitle , - java.lang.String sMessage ) + private void showInfoNonModal( String sTitle , + String sMessage ) { // Couldnt be implemented really using the toolkit ... // Because we need a parent anytime. // And showing e.g. a java dialog can make some trouble // inside office ... but we have no chance here. - final java.lang.String sFinalTitle = sTitle; - final java.lang.String sFinalMessage = sMessage; + final String sFinalTitle = sTitle; + final String sFinalMessage = sMessage; // On Mac OS X, AWT/Swing must not be accessed from the AppKit thread, so call // SwingUtilities.invokeLater always on a fresh thread to avoid that problem @@ -336,12 +336,12 @@ public class AsyncJob extends WeakBase implements XServiceInfo, XAsyncJob * contains optional data of a might corresponding dispatch() request */ - private java.lang.String formatOutArgs(com.sun.star.beans.NamedValue[] lGenericConfig, + private String formatOutArgs(com.sun.star.beans.NamedValue[] lGenericConfig, com.sun.star.beans.NamedValue[] lJobConfig , com.sun.star.beans.NamedValue[] lEnvironment , com.sun.star.beans.NamedValue[] lDynamicData ) { - java.lang.StringBuffer sOut = new java.lang.StringBuffer(1024); + StringBuffer sOut = new StringBuffer(1024); sOut.append("list \"Config\": "); if (lGenericConfig==null) @@ -409,7 +409,7 @@ public class AsyncJob extends WeakBase implements XServiceInfo, XAsyncJob - public synchronized static com.sun.star.lang.XSingleComponentFactory __getComponentFactory(java.lang.String sImplName) + public synchronized static com.sun.star.lang.XSingleComponentFactory __getComponentFactory(String sImplName) { com.sun.star.lang.XSingleComponentFactory xFactory = null; if (sImplName.equals(AsyncJob.IMPLEMENTATIONNAME)) diff --git a/odk/examples/DevelopersGuide/Forms/NumericValidator.java b/odk/examples/DevelopersGuide/Forms/NumericValidator.java index 38a9972c7363..ec1f2cf96965 100644 --- a/odk/examples/DevelopersGuide/Forms/NumericValidator.java +++ b/odk/examples/DevelopersGuide/Forms/NumericValidator.java @@ -69,6 +69,6 @@ public class NumericValidator extends ControlValidator private boolean isProperDigitCount( double value) { - return ( java.lang.Math.floor( value * 10 ) == value * 10 ); + return ( Math.floor( value * 10 ) == value * 10 ); } } diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java index 68524136d84a..e02af229a601 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java @@ -34,7 +34,6 @@ import java.awt.*; import javax.swing.*; -import java.lang.String; import java.awt.event.*; /** diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java index d89a413decff..77779e73be54 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java @@ -34,8 +34,6 @@ // __________ Imports __________ -import java.lang.String; - // __________ Implementation __________ /** diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java index f34f6f9a96cc..ae7625bfff7e 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java @@ -36,7 +36,6 @@ import java.awt.*; import javax.swing.*; -import java.lang.String; // __________ Implementation __________ diff --git a/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java b/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java index 7990a226a20e..f6ec7bf5a280 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java +++ b/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java @@ -36,9 +36,6 @@ import com.sun.star.uno.UnoRuntime; -// others -import java.lang.String; - // __________ Implementation __________ /** diff --git a/odk/examples/DevelopersGuide/ProfUNO/Lifetime/MyUnoObject.java b/odk/examples/DevelopersGuide/ProfUNO/Lifetime/MyUnoObject.java index 62949299b37f..5f0e975bdf78 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/Lifetime/MyUnoObject.java +++ b/odk/examples/DevelopersGuide/ProfUNO/Lifetime/MyUnoObject.java @@ -42,7 +42,7 @@ class MyUnoObject implements com.sun.star.uno.XInterface System.out.println( "finalizer called" ); } - public static void main( String args[] ) throws java.lang.InterruptedException + public static void main( String args[] ) throws InterruptedException { com.sun.star.uno.XInterface a = new MyUnoObject(); a = null; diff --git a/odk/examples/java/Drawing/SDraw.java b/odk/examples/java/Drawing/SDraw.java index f48f485854b8..a70a9288e01f 100644 --- a/odk/examples/java/Drawing/SDraw.java +++ b/odk/examples/java/Drawing/SDraw.java @@ -39,8 +39,6 @@ -import java.lang.Math; - import com.sun.star.uno.UnoRuntime; public class SDraw { diff --git a/odk/examples/java/Inspector/UnoNode.java b/odk/examples/java/Inspector/UnoNode.java index 965f8aa0ad0a..c4789303dd45 100644 --- a/odk/examples/java/Inspector/UnoNode.java +++ b/odk/examples/java/Inspector/UnoNode.java @@ -330,7 +330,7 @@ public class UnoNode{ if ( xServiceInfo != null ) { return xServiceInfo.getImplementationName(); } - if (Introspector.isObjectPrimitive(_oUnoObject)){ //super.isO{sObjectClassName.equals("java.lang.String"))issClassName.equals("java.lang.String")) + if (Introspector.isObjectPrimitive(_oUnoObject)){ //super.isO{sObjectClassName.equals("String"))issClassName.equals("String")) return _oUnoObject.toString(); } else{ diff --git a/qadevOOo/runner/convwatch/BorderRemover.java b/qadevOOo/runner/convwatch/BorderRemover.java index 26b61be9ec66..650412b46e3b 100644 --- a/qadevOOo/runner/convwatch/BorderRemover.java +++ b/qadevOOo/runner/convwatch/BorderRemover.java @@ -140,7 +140,7 @@ class BorderRemover getWriterMIMETypesMethod.invoke(imageIOClass, new Object[]{ }); Method writeMethod = imageIOClass.getDeclaredMethod("write", new Class[]{ java.awt.image.RenderedImage.class, - java.lang.String.class, + String.class, java.io.File.class}); writeMethod.invoke(imageIOClass, new Object[]{aImage, "image/jpeg", aWriteFile}); } @@ -195,8 +195,8 @@ class BorderRemover int nCurrentColor = _aImage.getPixel(x, y); if (! compareColorWithTolerance(nCurrentColor, _nBorderColor, 10)) { - nXMin = java.lang.Math.min(nXMin, x); - nYMin = java.lang.Math.min(nYMin, y); + nXMin = Math.min(nXMin, x); + nYMin = Math.min(nYMin, y); } } } @@ -208,8 +208,8 @@ class BorderRemover int nCurrentColor = _aImage.getPixel(nx, ny); if (! compareColorWithTolerance(nCurrentColor, _nBorderColor, 10)) { - nXMax = java.lang.Math.max(nXMax, nx); - nYMax = java.lang.Math.max(nYMax, ny); + nXMax = Math.max(nXMax, nx); + nYMax = Math.max(nYMax, ny); } } } diff --git a/qadevOOo/runner/convwatch/SimpleFileSemaphore.java b/qadevOOo/runner/convwatch/SimpleFileSemaphore.java index db087ba7d5d0..02c965ceb37f 100644 --- a/qadevOOo/runner/convwatch/SimpleFileSemaphore.java +++ b/qadevOOo/runner/convwatch/SimpleFileSemaphore.java @@ -35,7 +35,7 @@ public class SimpleFileSemaphore /* extends *//* implements */ { java.lang.Thread.sleep(_nSeconds * 1000); } - catch (java.lang.InterruptedException e2) + catch (InterruptedException e2) { } } diff --git a/qadevOOo/runner/convwatch/TimeHelper.java b/qadevOOo/runner/convwatch/TimeHelper.java index 3b06f1fa50a9..92f8033d4ad8 100644 --- a/qadevOOo/runner/convwatch/TimeHelper.java +++ b/qadevOOo/runner/convwatch/TimeHelper.java @@ -30,6 +30,6 @@ public class TimeHelper GlobalLogWriter.get().println("Wait " + String.valueOf(_nSeconds) + " sec. Reason: " + _sReason); try { java.lang.Thread.sleep(_nSeconds * 1000); - } catch (java.lang.InterruptedException e2) {} + } catch (InterruptedException e2) {} } } diff --git a/qadevOOo/runner/graphical/TimeHelper.java b/qadevOOo/runner/graphical/TimeHelper.java index ee49315e424f..1905e6acf554 100644 --- a/qadevOOo/runner/graphical/TimeHelper.java +++ b/qadevOOo/runner/graphical/TimeHelper.java @@ -32,7 +32,7 @@ public class TimeHelper GlobalLogWriter.println("Wait 0.25 * " + String.valueOf(_nSeconds) + " sec. Reason: " + _sReason); try { java.lang.Thread.sleep(_nSeconds * 250); - } catch (java.lang.InterruptedException e2) {} + } catch (InterruptedException e2) {} } private int m_nSeconds; diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java index c33bfd7c54b3..1f0643d2fc9f 100644 --- a/qadevOOo/runner/helper/OfficeProvider.java +++ b/qadevOOo/runner/helper/OfficeProvider.java @@ -492,7 +492,7 @@ public class OfficeProvider implements AppProvider dbg("the Office has " + closeTime / 1000 + " seconds for closing..."); Thread.sleep(closeTime); } - catch (java.lang.InterruptedException e) + catch (InterruptedException e) { } } diff --git a/qadevOOo/runner/helper/OfficeWatcher.java b/qadevOOo/runner/helper/OfficeWatcher.java index 2e48887c5d9f..624e5c0238d1 100644 --- a/qadevOOo/runner/helper/OfficeWatcher.java +++ b/qadevOOo/runner/helper/OfficeWatcher.java @@ -102,7 +102,7 @@ public class OfficeWatcher extends Thread implements share.Watcher { private void shortWait(int timeOut) { try { OfficeWatcher.sleep(timeOut); - } catch (java.lang.InterruptedException ie) { + } catch (InterruptedException ie) { } } diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java index 85accac84cd8..49e4814257a7 100644 --- a/qadevOOo/runner/helper/ProcessHandler.java +++ b/qadevOOo/runner/helper/ProcessHandler.java @@ -448,7 +448,7 @@ public class ProcessHandler { Thread.sleep(1000 * counter); // 5000 } - catch (java.lang.InterruptedException e) + catch (InterruptedException e) { } try @@ -809,7 +809,7 @@ public class ProcessHandler { sleep(1000); } - catch(java.lang.InterruptedException e) + catch(InterruptedException e) { // interrupt flag is set back to 'not interrupted' :-( } diff --git a/qadevOOo/runner/helper/UnoProvider.java b/qadevOOo/runner/helper/UnoProvider.java index 3f6c743f97e6..5c4ae5ac5b6c 100644 --- a/qadevOOo/runner/helper/UnoProvider.java +++ b/qadevOOo/runner/helper/UnoProvider.java @@ -77,7 +77,7 @@ public class UnoProvider implements AppProvider { try { Thread.sleep(1000); } - catch(java.lang.InterruptedException e) {} + catch(InterruptedException e) {} return true; } diff --git a/qadevOOo/runner/util/DesktopTools.java b/qadevOOo/runner/util/DesktopTools.java index 8e6ad3238cde..075980db9b03 100644 --- a/qadevOOo/runner/util/DesktopTools.java +++ b/qadevOOo/runner/util/DesktopTools.java @@ -301,7 +301,7 @@ public class DesktopTools { System.out.println("Couldn't close document"); } - catch (java.lang.NullPointerException e) + catch (NullPointerException e) { System.out.println("Couldn't close document"); } diff --git a/qadevOOo/tests/java/ifc/awt/_XTextComponent.java b/qadevOOo/tests/java/ifc/awt/_XTextComponent.java index ae8de12c7efa..33f8fdfe10e5 100644 --- a/qadevOOo/tests/java/ifc/awt/_XTextComponent.java +++ b/qadevOOo/tests/java/ifc/awt/_XTextComponent.java @@ -92,7 +92,7 @@ public class _XTextComponent extends MultiMethodTest { oObj.setText("Listen"); try { Thread.sleep(500); - } catch(java.lang.InterruptedException e) { + } catch(InterruptedException e) { e.printStackTrace(log); } if (!textChanged) { diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java index 4b2a03f1c104..a47758a26ffc 100644 --- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java @@ -344,7 +344,7 @@ public class _XMultiPropertySet extends MultiMethodTest { private void waitAMoment() { try { Thread.sleep(200) ; - } catch (java.lang.InterruptedException e) { + } catch (InterruptedException e) { log.println("!!! Exception while waiting !!!") ; } } diff --git a/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java b/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java index 8d72ae42d661..bebad0e524f2 100644 --- a/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java +++ b/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java @@ -165,7 +165,7 @@ public class _XBridgeFactory extends MultiMethodTest { try { Thread.sleep(500); } - catch (java.lang.InterruptedException e) {} + catch (InterruptedException e) {} conn = xCntr.connect(connectString) ; } catch (com.sun.star.uno.Exception e) { diff --git a/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java b/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java index 8c06a2a89277..d108053e2341 100644 --- a/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java +++ b/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java @@ -169,7 +169,7 @@ public class _XUnoUrlResolver extends MultiMethodTest { try { Thread.sleep(500); } - catch(java.lang.InterruptedException e) {} + catch(InterruptedException e) {} // get an instance from the remote Object obj = oObj.resolve( "uno:" + connectStr + ";urp;com.sun.star.lang.ServiceManager"); diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java b/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java index 224394755ad8..445a820c6bff 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java @@ -44,14 +44,14 @@ public class _XLayerHandler extends MultiMethodTest { oObj.overrideNode("org.openoffice.Setup", (short) 0, false); oObj.overrideNode("Office", (short) 0, false); oObj.overrideProperty("ooSetupInstCompleted", (short) 0, - new Type(java.lang.String.class), false); + new Type(String.class), false); oObj.setPropertyValue(new Boolean(false)); oObj.endProperty(); oObj.overrideNode("Factories", (short) 0, false); oObj.addOrReplaceNode("com.sun.star.chart.ChartDocument", (short) 0); oObj.overrideProperty("ooSetupFactoryEmptyDocumentURL", (short) 0, - new Type(java.lang.String.class), false); + new Type(String.class), false); oObj.setPropertyValue("private:factory/schart"); oObj.endProperty(); oObj.overrideProperty("ooSetupFactoryIcon", (short) 0, @@ -59,23 +59,23 @@ public class _XLayerHandler extends MultiMethodTest { oObj.setPropertyValue(new Integer(13)); oObj.endProperty(); oObj.overrideProperty("ooSetupFactoryShortName", (short) 0, - new Type(java.lang.String.class), false); + new Type(String.class), false); oObj.setPropertyValue("schart"); oObj.setPropertyValueForLocale("TemplateFile", "en-US"); oObj.endProperty(); oObj.overrideProperty("ooSetupFactoryTemplateFile", (short) 0, - new Type(java.lang.String.class), false); + new Type(String.class), false); oObj.setPropertyValue("empty"); oObj.endProperty(); oObj.addProperty("ooSetupFactoryTemplateFile", (short) 0, - new Type(java.lang.String.class)); + new Type(String.class)); oObj.addPropertyWithValue("ooSetupFactoryTemplateFile", (short) 0, "TemplateFile"); oObj.endNode(); oObj.addOrReplaceNode("dropme", (short) 0); oObj.overrideProperty("anyway", (short) 0, - new Type(java.lang.String.class), false); + new Type(String.class), false); oObj.setPropertyValue("nice"); oObj.endProperty(); oObj.dropNode("dropme"); diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java b/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java index 6e86d034c3e6..4c38734682b7 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java @@ -40,7 +40,7 @@ public class _XUpdateHandler extends MultiMethodTest { false); xLayerHandler.overrideNode("Office", (short) 0, false); xLayerHandler.overrideProperty("ooSetupInstCompleted", (short) 0, - new Type(java.lang.String.class), + new Type(String.class), false); xLayerHandler.setPropertyValue(new Boolean(false)); xLayerHandler.endProperty(); @@ -49,7 +49,7 @@ public class _XUpdateHandler extends MultiMethodTest { (short) 0); xLayerHandler.overrideProperty("ooSetupFactoryEmptyDocumentURL", (short) 0, - new Type(java.lang.String.class), + new Type(String.class), false); xLayerHandler.setPropertyValue("private:factory/schart"); xLayerHandler.endProperty(); @@ -60,26 +60,26 @@ public class _XUpdateHandler extends MultiMethodTest { xLayerHandler.endProperty(); xLayerHandler.overrideProperty("ooSetupFactoryShortName", (short) 0, - new Type(java.lang.String.class), + new Type(String.class), false); xLayerHandler.setPropertyValue("schart"); xLayerHandler.setPropertyValueForLocale("TemplateFile", "en-US"); xLayerHandler.endProperty(); xLayerHandler.overrideProperty("ooSetupFactoryTemplateFile", (short) 0, - new Type(java.lang.String.class), + new Type(String.class), false); xLayerHandler.setPropertyValue("empty"); xLayerHandler.endProperty(); xLayerHandler.addProperty("ooSetupFactoryTemplateFile", (short) 0, - new Type(java.lang.String.class)); + new Type(String.class)); xLayerHandler.addPropertyWithValue("ooSetupFactoryTemplateFile", (short) 0, "TemplateFile"); xLayerHandler.endNode(); xLayerHandler.addOrReplaceNode("dropme", (short) 0); xLayerHandler.overrideProperty("anyway", (short) 0, - new Type(java.lang.String.class), + new Type(String.class), false); xLayerHandler.setPropertyValue("nice"); xLayerHandler.endProperty(); @@ -195,15 +195,15 @@ public class _XUpdateHandler extends MultiMethodTest { oObj.addOrReplaceNodeFromTemplate("Office", (short) 0, new TemplateIdentifier()); oObj.addOrReplaceProperty("prop", (short) 0, - new Type(java.lang.String.class)); + new Type(String.class)); oObj.addOrReplacePropertyWithValue("prop2", (short) 0, "this"); oObj.modifyProperty("ooSetupFactoryIcon", (short) 0, (short) 0, - new Type(java.lang.String.class)); + new Type(String.class)); oObj.resetPropertyValue(); oObj.resetPropertyValueForLocale("en-US"); oObj.endProperty(); oObj.modifyProperty("ooSetupFactoryEmptyDocumentURL", (short) 0, - (short) 0, new Type(java.lang.String.class)); + (short) 0, new Type(String.class)); oObj.setPropertyValue("newValue"); oObj.setPropertyValueForLocale("newValue-US", "de-DE"); oObj.endProperty(); diff --git a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java index 09ff4c65a421..01d8fdff0cad 100644 --- a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java +++ b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java @@ -149,7 +149,7 @@ public class _XAcceptor extends MultiMethodTest { try { Thread.sleep(500); } - catch (java.lang.InterruptedException e) {} + catch (InterruptedException e) {} XConnection con = xConnector.connect(connectString) ; diff --git a/qadevOOo/tests/java/ifc/connection/_XConnector.java b/qadevOOo/tests/java/ifc/connection/_XConnector.java index d9ac5b10c529..16319b34e13f 100644 --- a/qadevOOo/tests/java/ifc/connection/_XConnector.java +++ b/qadevOOo/tests/java/ifc/connection/_XConnector.java @@ -130,7 +130,7 @@ public class _XConnector extends MultiMethodTest { try { Thread.sleep(500); } - catch (java.lang.InterruptedException e) {} + catch (InterruptedException e) {} // connect to acceptor try { diff --git a/qadevOOo/tests/java/ifc/container/_XIndexAccess.java b/qadevOOo/tests/java/ifc/container/_XIndexAccess.java index 2c27f95faf20..5b5e8f8de987 100644 --- a/qadevOOo/tests/java/ifc/container/_XIndexAccess.java +++ b/qadevOOo/tests/java/ifc/container/_XIndexAccess.java @@ -78,7 +78,7 @@ public class _XIndexAccess extends MultiMethodTest { try { Thread.sleep(200); } - catch(java.lang.InterruptedException e) {} + catch(InterruptedException e) {} boolean result = true; log.println("Testing getByIndex()"); diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatch.java b/qadevOOo/tests/java/ifc/frame/_XDispatch.java index d1f50fc24171..a31f9b93c5ff 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatch.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatch.java @@ -133,7 +133,7 @@ public class _XDispatch extends MultiMethodTest { try { Thread.sleep(200); } - catch(java.lang.InterruptedException e) {} + catch(InterruptedException e) {} log.println(" Listener called: "+ notificationListener.finishedDispatch); @@ -177,7 +177,7 @@ public class _XDispatch extends MultiMethodTest { try { Thread.sleep(200); } - catch(java.lang.InterruptedException e) {} + catch(InterruptedException e) {} log.println("Listener called: "+ listener.statusChangedCalled); @@ -222,7 +222,7 @@ public class _XDispatch extends MultiMethodTest { try { Thread.sleep(200); } - catch(java.lang.InterruptedException e) {} + catch(InterruptedException e) {} System.out.println("Listener called: "+ listener.statusChangedCalled); diff --git a/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java b/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java index 650b2dba35c2..c570f6531c98 100644 --- a/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java +++ b/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java @@ -109,7 +109,7 @@ public class _XNotifyingDispatch extends MultiMethodTest { try { Thread.sleep(200); } - catch(java.lang.InterruptedException e) {} + catch(InterruptedException e) {} log.println("Listener called: "+ notificationListener.finishedDispatch); diff --git a/qadevOOo/tests/java/ifc/i18n/_XCharacterClassification.java b/qadevOOo/tests/java/ifc/i18n/_XCharacterClassification.java index 2258c6b93383..4510c88f63cb 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XCharacterClassification.java +++ b/qadevOOo/tests/java/ifc/i18n/_XCharacterClassification.java @@ -95,7 +95,7 @@ public class _XCharacterClassification extends MultiMethodTest { /** * Test calls the method for different locales. Then each result is compared * with a string, converted to a upper case using - * <code>java.lang.String</code> method <code>toUpperCase()</code>.<p> + * <code>String</code> method <code>toUpperCase()</code>.<p> * Has <b> OK </b> status if string, returned by the method is equal to * a string that is returned by String.toUpperCase() for all locales. */ @@ -124,7 +124,7 @@ public class _XCharacterClassification extends MultiMethodTest { /** * Test calls the method for different locales. Then each result is compared * with a string, converted to a lower case using - * <code>java.lang.String</code> method <code>toLowerCase()</code>.<p> + * <code>String</code> method <code>toLowerCase()</code>.<p> * Has <b> OK </b> status if string, returned by the method is equal to * a string that is returned by String.toLowerCase() for all locales. */ diff --git a/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java b/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java index a300454cca81..055f9c43fa66 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java +++ b/qadevOOo/tests/java/ifc/i18n/_XTransliteration.java @@ -325,7 +325,7 @@ public class _XTransliteration extends MultiMethodTest { int res = -666 ; try { res = oObj.compareSubstring(str1, p1, len1, str2, p2, len2); - } catch (java.lang.NullPointerException e) { + } catch (NullPointerException e) { log.println("Exception while method calling occurs :" + e); } @@ -342,7 +342,7 @@ public class _XTransliteration extends MultiMethodTest { res = -666 ; try { res = oObj.compareSubstring(str2, p2, len2, str1, p1, len1); - } catch (java.lang.NullPointerException e) { + } catch (NullPointerException e) { log.println("Exception while method calling occurs :" + e); } @@ -411,7 +411,7 @@ public class _XTransliteration extends MultiMethodTest { int res = -666 ; try { res = oObj.compareString(str1, str2); - } catch (java.lang.NullPointerException e) { + } catch (NullPointerException e) { log.println("Exception while method calling occurs :" + e); } @@ -428,7 +428,7 @@ public class _XTransliteration extends MultiMethodTest { res = -666 ; try { res = oObj.compareString(str2, str1); - } catch (java.lang.NullPointerException e) { + } catch (NullPointerException e) { log.println("Exception while method calling occurs :" + e); } diff --git a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java index 5701729ecac3..36d0bddc2ead 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java @@ -82,7 +82,7 @@ import com.sun.star.util.Time; * index 0 must be used. </li> * </ul> * Other methods uses types of their arguments (i.e. -* <code>java.lang.String</code> +* <code>String</code> * for <code>setString</code> method, <code>com.sun.star.sdbc.XRef</code> * for <code>setRef</code> method). * </li> diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRow.java b/qadevOOo/tests/java/ifc/sdbc/_XRow.java index d681384b9bac..8f1264182f95 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XRow.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XRow.java @@ -82,7 +82,7 @@ import com.sun.star.util.Time; * <code>java.lang.Object[]</code> class, the element with * index 0 must be used. </li> * </ul> -* Other methods uses types they return (i.e. <code>java.lang.String</code> +* Other methods uses types they return (i.e. <code>String</code> * for <code>getString</code> method, <code>com.sun.star.sdbc.XRef</code> * for <code>getRef</code> method). * </li> diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java index 9b55ded68714..68e76a9c6519 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java @@ -75,7 +75,7 @@ import com.sun.star.util.Time; * <code>java.lang.Object[]</code> class, the element with * index 0 must be used. </li> * </ul> -* Other methods uses types they return (i.e. <code>java.lang.String</code> +* Other methods uses types they return (i.e. <code>String</code> * for <code>setString</code> method, <code>com.sun.star.sdbc.XRef</code> * for <code>setRef</code> method). * </li> diff --git a/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java b/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java index bba15dd95b95..f87d38145680 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java @@ -73,7 +73,7 @@ public class _XDocumentAuditing extends MultiMethodTest { catch(com.sun.star.lang.WrappedTargetException e) { ex = e; } - catch(java.lang.NullPointerException e) { + catch(NullPointerException e) { ex = e; } if (ex != null) { diff --git a/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java b/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java index c8c31ac79229..e18a834eb118 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java +++ b/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java @@ -55,7 +55,7 @@ public class _XGoalSeek extends MultiMethodTest { catch(com.sun.star.lang.WrappedTargetException e) { ex = e; } - catch(java.lang.NullPointerException e) { + catch(NullPointerException e) { ex = e; } if (ex != null) { diff --git a/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java b/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java index 0ba9a03e9acf..751c22efacfd 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java +++ b/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java @@ -234,7 +234,7 @@ public class _XCommandProcessor extends MultiMethodTest { try { aborter.join(5000); aborter.interrupt(); - } catch(java.lang.InterruptedException e) { + } catch(InterruptedException e) { } } } diff --git a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java index 4d2f1464745a..71f7a5af6ec7 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java @@ -226,7 +226,7 @@ public class various extends TestCase { try { Thread.sleep(500); } - catch (java.lang.InterruptedException e) {} + catch (InterruptedException e) {} // establish the connection XConnection xConnection = xCntr.connect(connectString); @@ -291,7 +291,7 @@ public class various extends TestCase { try { Thread.sleep(5000); } - catch(java.lang.InterruptedException e) { + catch(InterruptedException e) { } } } diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java b/qadevOOo/tests/java/mod/_remotebridge/various.java index 06e9eaca4a7c..a3caa518fd05 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/various.java @@ -218,7 +218,7 @@ public class various extends TestCase { try { Thread.sleep(500); } - catch (java.lang.InterruptedException e) {} + catch (InterruptedException e) {} // establish the connection XConnection xConnection = xCntr.connect(connectString); @@ -283,7 +283,7 @@ public class various extends TestCase { try { Thread.sleep(5000); } - catch(java.lang.InterruptedException e) { + catch(InterruptedException e) { } } } diff --git a/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java b/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java index 59e809ff6b7a..782fdd9c3df2 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java @@ -100,7 +100,7 @@ public class ScTabViewObj extends TestCase { xSpreadsheetDoc = SOF.createCalcDoc(null); try { Thread.sleep(1000); - } catch (java.lang.InterruptedException e) {} + } catch (InterruptedException e) {} xSpreadsheetDoc2 = SOF.createCalcDoc(null); } catch (com.sun.star.uno.Exception e) { e.printStackTrace( log ); diff --git a/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java b/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java index 4f99925d27ef..b8cca11f83c2 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java @@ -156,7 +156,7 @@ public class ScTableSheetObj extends TestCase { log.println("Couldn't close document"); } catch (com.sun.star.lang.DisposedException e) { log.println("Document already disposed"); - } catch (java.lang.NullPointerException e) { + } catch (NullPointerException e) { log.println("Couldn't get XCloseable"); } diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java index 0ec0a1c59290..4096ac6f70c5 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java @@ -148,7 +148,7 @@ public class AccessibleTabBar extends TestCase { closer.close(true); } catch (com.sun.star.util.CloseVetoException e) { log.println("Couldn't close document " + e.getMessage()); - } catch (java.lang.NullPointerException e) { + } catch (NullPointerException e) { log.println("Couldn't close document " + e.getMessage()); } } diff --git a/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java b/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java index 77dad34a522f..5b0c9a77de75 100644 --- a/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java +++ b/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java @@ -130,7 +130,7 @@ public class CheckXCellRangesQuery /* extends ComplexTestCase */ { } catch (com.sun.star.lang.DisposedException e) { worked = false; System.out.println("Document already disposed"); - } catch (java.lang.NullPointerException e) { + } catch (NullPointerException e) { worked = false; System.out.println("Couldn't get XCloseable"); } diff --git a/sc/qa/complex/dataPilot/CheckDataPilot.java b/sc/qa/complex/dataPilot/CheckDataPilot.java index aee79e1d0891..efa3aee6b6f3 100644 --- a/sc/qa/complex/dataPilot/CheckDataPilot.java +++ b/sc/qa/complex/dataPilot/CheckDataPilot.java @@ -357,7 +357,7 @@ public class CheckDataPilot { } catch (com.sun.star.lang.DisposedException e) { worked = false; System.out.println("Document already disposed"); - } catch (java.lang.NullPointerException e) { + } catch (NullPointerException e) { worked = false; System.out.println("Couldn't get XCloseable"); } diff --git a/sc/qa/complex/sc/CalcRTL.java b/sc/qa/complex/sc/CalcRTL.java index 586d01505fe5..0a1e15d5968d 100644 --- a/sc/qa/complex/sc/CalcRTL.java +++ b/sc/qa/complex/sc/CalcRTL.java @@ -241,7 +241,7 @@ public class CalcRTL /* extends ComplexTestCase */ } catch (com.sun.star.lang.DisposedException e) { worked = false; System.out.println("Document already disposed"); - } catch (java.lang.NullPointerException e) { + } catch (NullPointerException e) { worked = false; System.out.println("Couldn't get XCloseable"); } diff --git a/scripting/examples/java/MemoryUsage/MemoryUsage.java b/scripting/examples/java/MemoryUsage/MemoryUsage.java index 4776f2323cc0..63a643e90621 100644 --- a/scripting/examples/java/MemoryUsage/MemoryUsage.java +++ b/scripting/examples/java/MemoryUsage/MemoryUsage.java @@ -124,7 +124,7 @@ public class MemoryUsage XTableCharts charts = supp.getCharts(); charts.addNewByName("Example", rect, addr, false, true); - try { Thread.sleep(3000); } catch (java.lang.InterruptedException e) { } + try { Thread.sleep(3000); } catch (InterruptedException e) { } // get the diagram and Change some of the properties XNameAccess chartsAccess = (XNameAccess) diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java index 7ee111e48a6e..0e4005828c9c 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java @@ -27,7 +27,7 @@ import org.openoffice.netbeans.modules.office.utils.FrameworkJarChecker; public class ConfigureParcelAction extends CookieAction { - public java.lang.String getName() { + public String getName() { return "Configure"; } diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/MountDocumentAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/MountDocumentAction.java index 258c3a1783d9..adde6466ce74 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/actions/MountDocumentAction.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/MountDocumentAction.java @@ -32,7 +32,7 @@ public class MountDocumentAction extends CookieAction { } - public java.lang.String getName() + public String getName() { return "Mount Document"; //NOI18N } diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/MountParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/MountParcelAction.java index 31c38d1bfc1f..ba1ca9503319 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/actions/MountParcelAction.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/MountParcelAction.java @@ -32,7 +32,7 @@ public class MountParcelAction extends CookieAction { } - public java.lang.String getName() + public String getName() { return "Mount Parcel"; //NOI18N } diff --git a/scripting/workben/installer/Register.java b/scripting/workben/installer/Register.java index d9bca56d7261..a3634143bd2e 100644 --- a/scripting/workben/installer/Register.java +++ b/scripting/workben/installer/Register.java @@ -18,7 +18,6 @@ package installer; -import java.lang.String; import java.io.*; import javax.swing.*; public class Register{ diff --git a/toolkit/test/accessibility/SimpleOffice.java b/toolkit/test/accessibility/SimpleOffice.java index 634169141f71..134e0d29fa5b 100644 --- a/toolkit/test/accessibility/SimpleOffice.java +++ b/toolkit/test/accessibility/SimpleOffice.java @@ -86,7 +86,7 @@ public class SimpleOffice xModel = UnoRuntime.queryInterface( XModel.class, xComponent); } - catch (java.lang.NullPointerException e) + catch (NullPointerException e) { MessageArea.println ("caught exception while loading " + URL + " : " + e); diff --git a/toolkit/test/accessibility/ov/StateSetView.java b/toolkit/test/accessibility/ov/StateSetView.java index a2a7c2632f01..82a39f7b2c58 100644 --- a/toolkit/test/accessibility/ov/StateSetView.java +++ b/toolkit/test/accessibility/ov/StateSetView.java @@ -185,7 +185,7 @@ public static class StateSetAllView AffineTransform aTransform = g.getTransform (); g.setColor (aTextColor); int y = aWidgetArea.y+aWidgetArea.height - 12; - double nTextRotation = -0.9;//-java.lang.Math.PI/2; + double nTextRotation = -0.9;//-Math.PI/2; double nScale = 0.6; // Create a shape for the boxes. diff --git a/ucb/qa/complex/tdoc/_XCommandProcessor.java b/ucb/qa/complex/tdoc/_XCommandProcessor.java index b745a0568267..f1598217ba96 100644 --- a/ucb/qa/complex/tdoc/_XCommandProcessor.java +++ b/ucb/qa/complex/tdoc/_XCommandProcessor.java @@ -248,7 +248,7 @@ public class _XCommandProcessor { try { aborter.join(5000); aborter.interrupt(); - } catch(java.lang.InterruptedException e) { + } catch(InterruptedException e) { } return true; } diff --git a/vcl/qa/complex/memCheck/CheckMemoryUsage.java b/vcl/qa/complex/memCheck/CheckMemoryUsage.java index 94d369e2ae59..9483825ea546 100644 --- a/vcl/qa/complex/memCheck/CheckMemoryUsage.java +++ b/vcl/qa/complex/memCheck/CheckMemoryUsage.java @@ -500,7 +500,7 @@ public class CheckMemoryUsage /* extends ComplexTestCase */ { Thread.sleep(milliSeconds); } - catch (java.lang.InterruptedException e) + catch (InterruptedException e) { // ignore } } diff --git a/vcl/qa/complex/persistent_window_states/DocumentHandle.java b/vcl/qa/complex/persistent_window_states/DocumentHandle.java index daeef05d0aba..dc45ab10cc7d 100644 --- a/vcl/qa/complex/persistent_window_states/DocumentHandle.java +++ b/vcl/qa/complex/persistent_window_states/DocumentHandle.java @@ -88,7 +88,7 @@ public class DocumentHandle { try { Thread.sleep(10000); } - catch(java.lang.InterruptedException e) {} + catch(InterruptedException e) {} xWin = xFrame.getContainerWindow(); xWin.addWindowListener(wl); @@ -147,7 +147,7 @@ public class DocumentHandle { try { Thread.sleep(3000); } - catch(java.lang.InterruptedException e) {} + catch(InterruptedException e) {} return wl.resizedTrigger; } } diff --git a/vcl/qa/complex/persistent_window_states/PersistentWindowTest.java b/vcl/qa/complex/persistent_window_states/PersistentWindowTest.java index b35bd6b7c14d..03329b05adb0 100644 --- a/vcl/qa/complex/persistent_window_states/PersistentWindowTest.java +++ b/vcl/qa/complex/persistent_window_states/PersistentWindowTest.java @@ -288,7 +288,7 @@ public class PersistentWindowTest { connection.setUp(); } - catch (java.lang.InterruptedException e) + catch (InterruptedException e) { fail("can't connect."); } @@ -305,7 +305,7 @@ public class PersistentWindowTest { connection.tearDown(); } - catch (java.lang.InterruptedException e) + catch (InterruptedException e) { fail("can't disconnect."); } diff --git a/wizards/com/sun/star/wizards/form/CallFormWizard.java b/wizards/com/sun/star/wizards/form/CallFormWizard.java index 94a141a6072a..1d729091e273 100644 --- a/wizards/com/sun/star/wizards/form/CallFormWizard.java +++ b/wizards/com/sun/star/wizards/form/CallFormWizard.java @@ -103,7 +103,7 @@ public class CallFormWizard /** This method returns an array of all supported service names. * @return Array of supported service names. */ - public java.lang.String[] getSupportedServiceNames() + public String[] getSupportedServiceNames() { String[] stringSupportedServiceNames = new String[1]; @@ -137,7 +137,7 @@ public class CallFormWizard /** Return the class name of the component. * @return Class name of the component. */ - public java.lang.String getImplementationName() + public String getImplementationName() { return (FormWizardImplementation.class.getName()); } diff --git a/wizards/com/sun/star/wizards/query/CallQueryWizard.java b/wizards/com/sun/star/wizards/query/CallQueryWizard.java index 853e23801a81..7a966bdcfcd7 100644 --- a/wizards/com/sun/star/wizards/query/CallQueryWizard.java +++ b/wizards/com/sun/star/wizards/query/CallQueryWizard.java @@ -108,7 +108,7 @@ public class CallQueryWizard /** This method returns an array of all supported service names. * @return Array of supported service names. */ - public java.lang.String[] getSupportedServiceNames() + public String[] getSupportedServiceNames() { String[] stringSupportedServiceNames = new String[1]; @@ -142,7 +142,7 @@ public class CallQueryWizard /** Return the class name of the component. * @return Class name of the component. */ - public java.lang.String getImplementationName() + public String getImplementationName() { return (QueryWizardImplementation.class.getName()); } diff --git a/wizards/com/sun/star/wizards/report/CallReportWizard.java b/wizards/com/sun/star/wizards/report/CallReportWizard.java index d6d531fd1a9a..d6e3881e3c78 100644 --- a/wizards/com/sun/star/wizards/report/CallReportWizard.java +++ b/wizards/com/sun/star/wizards/report/CallReportWizard.java @@ -107,7 +107,7 @@ public class CallReportWizard /** This method returns an array of all supported service names. * @return Array of supported service names. */ - public java.lang.String[] getSupportedServiceNames() + public String[] getSupportedServiceNames() { String[] stringSupportedServiceNames = new String[1]; @@ -141,7 +141,7 @@ public class CallReportWizard /** Return the class name of the component. * @return Class name of the component. */ - public java.lang.String getImplementationName() + public String getImplementationName() { return CallReportWizard.class.getName(); } diff --git a/wizards/com/sun/star/wizards/report/DBColumn.java b/wizards/com/sun/star/wizards/report/DBColumn.java index 7a5cfc358db1..7394ee9a151d 100644 --- a/wizards/com/sun/star/wizards/report/DBColumn.java +++ b/wizards/com/sun/star/wizards/report/DBColumn.java @@ -167,7 +167,7 @@ public class DBColumn { xRows = xTextTable.getRows(); } - catch (java.lang.NullPointerException e) + catch (NullPointerException e) { e.printStackTrace(); // TODO: handle the nullpointer right diff --git a/wizards/com/sun/star/wizards/table/CallTableWizard.java b/wizards/com/sun/star/wizards/table/CallTableWizard.java index 32a367fc0d63..09e99ff18690 100644 --- a/wizards/com/sun/star/wizards/table/CallTableWizard.java +++ b/wizards/com/sun/star/wizards/table/CallTableWizard.java @@ -107,7 +107,7 @@ public class CallTableWizard /** This method returns an array of all supported service names. * @return Array of supported service names. */ - public java.lang.String[] getSupportedServiceNames() + public String[] getSupportedServiceNames() { String[] stringSupportedServiceNames = new String[1]; @@ -141,7 +141,7 @@ public class CallTableWizard /** Return the class name of the component. * @return Class name of the component. */ - public java.lang.String getImplementationName() + public String getImplementationName() { return (TableWizardImplementation.class.getName()); } diff --git a/xmerge/source/bridge/java/XMergeBridge.java b/xmerge/source/bridge/java/XMergeBridge.java index 65e8504fd4a5..30fe66b48d99 100644 --- a/xmerge/source/bridge/java/XMergeBridge.java +++ b/xmerge/source/bridge/java/XMergeBridge.java @@ -143,7 +143,7 @@ public class XMergeBridge { public boolean importer(com.sun.star.beans.PropertyValue[] aSourceData, com.sun.star.xml.sax.XDocumentHandler xDocHandler, - java.lang.String[] msUserData) throws com.sun.star.uno.RuntimeException { + String[] msUserData) throws com.sun.star.uno.RuntimeException { sFileName=""; sURL=""; @@ -161,7 +161,7 @@ public class XMergeBridge { xis=(com.sun.star.io.XInputStream)AnyConverter.toObject(new Type(com.sun.star.io.XInputStream.class), pValue[i].Value); } if (pValue[i].Name.equals("FileName")){ - sFileName=(String)AnyConverter.toObject(new Type(java.lang.String.class), pValue[i].Value); + sFileName=(String)AnyConverter.toObject(new Type(String.class), pValue[i].Value); } } @@ -220,7 +220,7 @@ public class XMergeBridge { } public boolean exporter(com.sun.star.beans.PropertyValue[] aSourceData, - java.lang.String[] msUserData) throws com.sun.star.uno.RuntimeException{ + String[] msUserData) throws com.sun.star.uno.RuntimeException{ sFileName=null; sURL=null; @@ -239,11 +239,11 @@ public class XMergeBridge { } if (pValue[i].Name.equals("FileName")){ - sFileName=(String)AnyConverter.toObject(new Type(java.lang.String.class), pValue[i].Value); + sFileName=(String)AnyConverter.toObject(new Type(String.class), pValue[i].Value); } if (pValue[i].Name.equals("URL")){ - sURL=(String)AnyConverter.toObject(new Type(java.lang.String.class), pValue[i].Value); + sURL=(String)AnyConverter.toObject(new Type(String.class), pValue[i].Value); } } catch(com.sun.star.lang.IllegalArgumentException AnyExec){ diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java index 11c29459a2e2..593ed3402c5c 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java @@ -96,7 +96,7 @@ public final class PluginFactoryImpl extends PluginFactory } @Override - public org.openoffice.xmerge.Document createDeviceDocument(java.lang.String str, java.io.InputStream inputStream) throws java.io.IOException { + public org.openoffice.xmerge.Document createDeviceDocument(String str, java.io.InputStream inputStream) throws java.io.IOException { String ext = this.getDeviceFileExtension(); DOMDocument domDoc = new DOMDocument(str,ext); domDoc.read(inputStream); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java index aa903f2cf348..f66c71abed06 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java @@ -19,7 +19,6 @@ package org.openoffice.xmerge.util; import java.util.ArrayList; -import java.lang.Integer; /** * This is a convenience class used to create an |