summaryrefslogtreecommitdiff
path: root/qadevOOo/runner
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-19 14:18:44 +0200
committerNoel Grandin <noel@peralex.com>2014-08-19 14:57:16 +0200
commit56ef5533fc1bce2134721ae64d4d6c18a3526a7a (patch)
treeeafaa8b3c9c7fd4bbeb03fdb1be091f94c870953 /qadevOOo/runner
parent1e6f0b2d8b35f856637eedf91729e522fcc633e8 (diff)
java: classes in java.lang package do not need to be fully qualified
Change-Id: I7b18f62336c3a8ca4c538b30ce04c99f202a4756
Diffstat (limited to 'qadevOOo/runner')
-rw-r--r--qadevOOo/runner/convwatch/BorderRemover.java10
-rw-r--r--qadevOOo/runner/convwatch/SimpleFileSemaphore.java2
-rw-r--r--qadevOOo/runner/convwatch/TimeHelper.java2
-rw-r--r--qadevOOo/runner/graphical/TimeHelper.java2
-rw-r--r--qadevOOo/runner/helper/OfficeProvider.java2
-rw-r--r--qadevOOo/runner/helper/OfficeWatcher.java2
-rw-r--r--qadevOOo/runner/helper/ProcessHandler.java4
-rw-r--r--qadevOOo/runner/helper/UnoProvider.java2
-rw-r--r--qadevOOo/runner/util/DesktopTools.java2
9 files changed, 14 insertions, 14 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");
}