java: classes in java.lang package do not need to be fully qualified

Change-Id: I7b18f62336c3a8ca4c538b30ce04c99f202a4756

33 files changed, 59 insertions, 59 deletions

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());
         }
     }