diff options
author | Noel Grandin <noel@peralex.com> | 2013-04-26 08:36:04 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-04-26 08:36:04 +0200 |
commit | 6f17a2f66fa2a4fec56334783410005c4f2f357a (patch) | |
tree | 728696d0f0603783e8d50b9c4c7b43f3016d51ce /bean | |
parent | From the context of the code, this field should not be static (diff) | |
download | core-6f17a2f66fa2a4fec56334783410005c4f2f357a.tar.gz core-6f17a2f66fa2a4fec56334783410005c4f2f357a.zip |
Java cleanup, access static methods using correct syntax
Change-Id: I8443aef43d82de33ac7cb47d40cc5b544f7c9c87
Diffstat (limited to 'bean')
-rw-r--r-- | bean/com/sun/star/beans/LocalOfficeWindow.java | 2 | ||||
-rw-r--r-- | bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 3 | ||||
-rw-r--r-- | bean/qa/complex/bean/OOoBeanTest.java | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/bean/com/sun/star/beans/LocalOfficeWindow.java b/bean/com/sun/star/beans/LocalOfficeWindow.java index 90ddbe8a8311..7d81eb041619 100644 --- a/bean/com/sun/star/beans/LocalOfficeWindow.java +++ b/bean/com/sun/star/beans/LocalOfficeWindow.java @@ -274,7 +274,7 @@ public class LocalOfficeWindow aWatchedThread = null; stop(); - if ( aThread.interrupted() ) + if ( Thread.interrupted() ) throw new InterruptedException(); } diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index 27467f051c5b..c8bafaa6e9a0 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java @@ -315,8 +315,9 @@ public class LocalOfficeConnection { try { + Thread.currentThread(); // try to connect to soffice - Thread.currentThread().sleep( 500 ); + Thread.sleep( 500 ); aInitialObject = resolve(xLocalContext, mURL); } catch( com.sun.star.connection.NoConnectException aEx ) diff --git a/bean/qa/complex/bean/OOoBeanTest.java b/bean/qa/complex/bean/OOoBeanTest.java index c72e18e25647..bb12bca5aa05 100644 --- a/bean/qa/complex/bean/OOoBeanTest.java +++ b/bean/qa/complex/bean/OOoBeanTest.java @@ -19,7 +19,6 @@ package complex.bean; import java.awt.event.*; -import java.awt.event.KeyEvent; import com.sun.star.comp.beans.OOoBean; import com.sun.star.uno.UnoRuntime; @@ -483,7 +482,7 @@ public class OOoBeanTest for (; i < 1; i++) { EventQueue q = Toolkit.getDefaultToolkit().getSystemEventQueue(); - q.invokeAndWait( new Runnable() { + EventQueue.invokeAndWait( new Runnable() { public void run() { try { @@ -499,7 +498,7 @@ public class OOoBeanTest }); // #2 Thread.sleep(1000); - q.invokeAndWait( new Runnable() { + EventQueue.invokeAndWait( new Runnable() { public void run() { try { |