This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 33bb4d69a60d3954682b82ec7f2334e01af215e6
Author: mseidel <mseidel@unknown>
AuthorDate: Tue Feb 12 10:34:11 2019 +0000
Removed whitespace, fixed typos
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1853425
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 485a2fc301daa4837aca0c298427bb10210f324e)
---
.../com/sun/star/comp/beans/CallWatchThread.java | 173 ++++++++++-----------
.../com/sun/star/comp/beans/ContainerFactory.java | 10 +-
.../sun/star/comp/beans/JavaWindowPeerFake.java | 11 +-
3 files changed, 94 insertions(+), 100 deletions(-)
diff --git
a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java
b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java
index 036dc08..5e01043 100644
---
a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java
+++
b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,118 +7,113 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
package com.sun.star.comp.beans;
-
//---------------------------------------------------------------------------
-/** Helper class to watch calls into OOo with a timeout.
+/** Helper class to watch calls into AOO with a timeout.
*/
-//Do not add the thread instances to a threadgroup. When testing the bean in
-//an applet it turned out the the ThreadGroup was in an inconsistent state
-//after navigating off the site that contains the applet and back to it.
-//That was tested with a Sun JRE 1.4.2_06
+// Do not add the thread instances to a threadgroup. When testing the bean in
+// an applet it turned out the the ThreadGroup was in an inconsistent state
+// after navigating off the site that contains the applet and back to it.
+// That was tested with a Sun JRE 1.4.2_06
public class CallWatchThread extends Thread
{
- private static boolean DEBUG = false;
-
- private Thread aWatchedThread;
- private String aTag;
- private boolean bAlive;
- private long nTimeout;
-
- public CallWatchThread(long nTimeout)
- {
- this(nTimeout, "");
- }
+ private static boolean DEBUG = false;
- public CallWatchThread( long nTimeout, String aTag )
- {
- super(aTag);
- this.aWatchedThread = Thread.currentThread();
- this.nTimeout = nTimeout;
+ private Thread aWatchedThread;
+ private String aTag;
+ private boolean bAlive;
+ private long nTimeout;
- this.aTag = aTag;
- setDaemon( true );
- dbgPrint( "CallWatchThread(" + this + ").start(" + aTag + ")" );
- start();
- }
-
- public void cancel()
- throws java.lang.InterruptedException
- {
- dbgPrint( "CallWatchThread(" + this + ".cancel(" + aTag + ")" );
- if ( aWatchedThread != null && aWatchedThread !=
Thread.currentThread() )
- throw new RuntimeException( "wrong thread" );
- aWatchedThread = null;
- if ( interrupted() )
- throw new InterruptedException();
- }
+ public CallWatchThread(long nTimeout)
+ {
+ this(nTimeout, "");
+ }
- public synchronized void restart()
- throws java.lang.InterruptedException
- {
- dbgPrint( "CallWatchThread(" + this + ".restart(" + aTag + ")" );
- if ( aWatchedThread != null && aWatchedThread !=
Thread.currentThread() )
- throw new RuntimeException( "wrong thread" );
- bAlive = true;
- if ( interrupted() )
- throw new InterruptedException();
- notify();
- }
+ public CallWatchThread( long nTimeout, String aTag )
+ {
+ super(aTag);
+ this.aWatchedThread = Thread.currentThread();
+ this.nTimeout = nTimeout;
+
+ this.aTag = aTag;
+ setDaemon( true );
+ dbgPrint( "CallWatchThread(" + this + ").start(" + aTag + ")" );
+ start();
+ }
- public void run()
- {
- dbgPrint( "CallWatchThread(" + this + ".run(" + aTag + ") *****
STARTED *****" );
- long n = 0;
- while ( aWatchedThread != null )
- {
- dbgPrint( "CallWatchThread(" + this + ").run(" + aTag + ") running
#" + ++n );
- synchronized(this)
- {
- bAlive = false;
- try
- {
- wait( nTimeout );
- }
- catch ( java.lang.InterruptedException aExc )
- {
- bAlive = false;
- }
+ public void cancel()
+ throws java.lang.InterruptedException
+ {
+ dbgPrint( "CallWatchThread(" + this + ".cancel(" + aTag + ")" );
+ if ( aWatchedThread != null && aWatchedThread !=
Thread.currentThread() )
+ throw new RuntimeException( "wrong thread" );
+ aWatchedThread = null;
+ if ( interrupted() )
+ throw new InterruptedException();
+ }
- // watched thread seems to be dead (not answering)?
- if ( !bAlive && aWatchedThread != null )
- {
- dbgPrint( "CallWatchThread(" + this + ").run(" + aTag + ")
interrupting" );
- aWatchedThread.interrupt();
- aWatchedThread = null;
- }
- }
- }
+ public synchronized void restart()
+ throws java.lang.InterruptedException
+ {
+ dbgPrint( "CallWatchThread(" + this + ".restart(" + aTag + ")"
);
+ if ( aWatchedThread != null && aWatchedThread !=
Thread.currentThread() )
+ throw new RuntimeException( "wrong thread" );
+ bAlive = true;
+ if ( interrupted() )
+ throw new InterruptedException();
+ notify();
+ }
- dbgPrint( "CallWatchThread(" + this + ").run(" + aTag + ") terminated"
);
- }
+ public void run()
+ {
+ dbgPrint( "CallWatchThread(" + this + ".run(" + aTag + ") *****
STARTED *****" );
+ long n = 0;
+ while ( aWatchedThread != null )
+ {
+ dbgPrint( "CallWatchThread(" + this + ").run(" + aTag +
") running #" + ++n );
+ synchronized(this)
+ {
+ bAlive = false;
+ try
+ {
+ wait( nTimeout );
+ }
+ catch ( java.lang.InterruptedException aExc )
+ {
+ bAlive = false;
+ }
+
+ // watched thread seems to be dead (not
answering)?
+ if ( !bAlive && aWatchedThread != null )
+ {
+ dbgPrint( "CallWatchThread(" + this +
").run(" + aTag + ") interrupting" );
+ aWatchedThread.interrupt();
+ aWatchedThread = null;
+ }
+ }
+ }
+
+ dbgPrint( "CallWatchThread(" + this + ").run(" + aTag + ")
terminated" );
+ }
- private void dbgPrint( String aMessage )
+ private void dbgPrint( String aMessage )
{
- if (DEBUG)
- System.err.println( "OOoBean: " + aMessage );
+ if (DEBUG)
+ System.err.println( "OOoBean: " + aMessage );
}
}
-
-
-
-
diff --git
a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java
b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java
index 7f6ee8c..2375992 100644
---
a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java
+++
b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -26,7 +26,7 @@ package com.sun.star.comp.beans;
import java.awt.Container;
/**
- * This interface reprecents an AWT container factory.
+ * This interface represents an AWT container factory.
*
* @deprecated
*
diff --git
a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java
b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java
index b4a5633..4a28270 100644
---
a/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java
+++
b/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -33,7 +33,7 @@ import com.sun.star.awt.*;
/* package */ class JavaWindowPeerFake
implements XSystemDependentWindowPeer, XWindowPeer
{
- protected int localSystemType;
+ protected int localSystemType;
protected Any wrappedHandle;
/** Create the faked window peer.
@@ -115,4 +115,3 @@ import com.sun.star.awt.*;
{
}
}
-
