openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msei...@apache.org
Subject svn commit: r1853425 - in /openoffice/trunk/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans: CallWatchThread.java ContainerFactory.java JavaWindowPeerFake.java
Date Tue, 12 Feb 2019 10:34:12 GMT
Author: mseidel
Date: Tue Feb 12 10:34:11 2019
New Revision: 1853425

URL: http://svn.apache.org/viewvc?rev=1853425&view=rev
Log:
Removed whitespace, fixed typos

Modified:
    openoffice/trunk/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java
    openoffice/trunk/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java
    openoffice/trunk/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java

Modified: openoffice/trunk/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java?rev=1853425&r1=1853424&r2=1853425&view=diff
==============================================================================
--- openoffice/trunk/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java
(original)
+++ openoffice/trunk/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java
Tue Feb 12 10:34:11 2019
@@ -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 static boolean DEBUG = false;
 
-    private Thread aWatchedThread;
-    private String aTag;
-    private boolean bAlive;
-    private long nTimeout;
-
-    public CallWatchThread(long nTimeout)
-    {
-        this(nTimeout, "");
-    }
-
-    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 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 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 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;
-                }
-            }
-        }
+	private Thread aWatchedThread;
+	private String aTag;
+	private boolean bAlive;
+	private long nTimeout;
 
-        dbgPrint( "CallWatchThread(" + this + ").run(" + aTag + ") terminated" );
-    }
+	public CallWatchThread(long nTimeout)
+	{
+		this(nTimeout, "");
+	}
 
-    private void dbgPrint( String aMessage )
+	public CallWatchThread( long nTimeout, String aTag )
 	{
-        if (DEBUG)
-            System.err.println( "OOoBean: " + aMessage );
+		super(aTag);
+		this.aWatchedThread = Thread.currentThread();
+		this.nTimeout = 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 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 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 )
+	{
+		if (DEBUG)
+			System.err.println( "OOoBean: " + aMessage );
+	}
+}

Modified: openoffice/trunk/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java?rev=1853425&r1=1853424&r2=1853425&view=diff
==============================================================================
--- openoffice/trunk/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java
(original)
+++ openoffice/trunk/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java
Tue Feb 12 10:34:11 2019
@@ -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
  *

Modified: openoffice/trunk/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java?rev=1853425&r1=1853424&r2=1853425&view=diff
==============================================================================
--- openoffice/trunk/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java
(original)
+++ openoffice/trunk/main/bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java
Tue Feb 12 10:34:11 2019
@@ -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.*;
 	{
 	}
 }
-



Mime
View raw message