bean/com/sun/star/beans/LocalOfficeWindow.java | 2 ++
bean/com/sun/star/comp/beans/CallWatchThread.java | 2 +-
bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 2 ++
bean/com/sun/star/comp/beans/OOoBean.java | 2 +-
jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java | 2 ++
jurt/com/sun/star/lib/util/AsynchronousFinalizer.java | 2 +-
swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java | 7 +++----
swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java | 7 ++++---
8 files changed, 16 insertions(+), 10 deletions(-)
New commits:
commit 53425404ae70bf365073cce2f5d576b769446c97
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Sep 2 10:49:51 2014 +0200
swext: use proper syntax for accessing outer class this
Change-Id: Ie2d466b4e1a567d204b109208fce84842bea2a19
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
index 1c9db30..2c74d40 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
@@ -361,7 +361,6 @@ public class WikiEditSettingDialog extends WikiDialog
{
final XDialog xDialogForThread = xDialog;
final XComponentContext xContext = m_xContext;
- final WikiEditSettingDialog aThis = this;
// the thread name is used to allow the error dialogs
m_bThreadFinished = false;
@@ -376,9 +375,9 @@ public class WikiEditSettingDialog extends WikiDialog
} catch( java.lang.Exception e ){}
DoLogin();
- aThis.EnableControls( true );
- aThis.SetThrobberActive( false );
- aThis.SetThrobberVisible( false );
+ WikiEditSettingDialog.this.EnableControls( true );
+ WikiEditSettingDialog.this.SetThrobberActive( false );
+ WikiEditSettingDialog.this.SetThrobberVisible( false );
ThreadStop( true );
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
index 48e55f3..a9df952 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
@@ -275,7 +275,6 @@ public class WikiPropDialog extends WikiDialog{
ex.printStackTrace();
}
- final WikiPropDialog aThisDialog = this;
final XDialog xDialogToClose = xDialog;
final XComponentContext xContext = m_xContext;
@@ -297,7 +296,8 @@ public class WikiPropDialog extends WikiDialog{
if ( m_aWikiEditor != null )
{
Thread.yield();
- m_bAction = m_aWikiEditor.SendArticleImpl(
aThisDialog, aWikiSettings );
+ m_bAction = m_aWikiEditor.SendArticleImpl(
+ WikiPropDialog.this, aWikiSettings);
}
}
finally
@@ -321,7 +321,8 @@ public class WikiPropDialog extends WikiDialog{
{
if ( m_aWikiEditor != null )
{
- m_bAction = m_aWikiEditor.SendArticleImpl(
aThisDialog, aWikiSettings );
+ m_bAction = m_aWikiEditor.SendArticleImpl(
+ WikiPropDialog.this, aWikiSettings);
}
} catch( java.lang.Exception e )
{}
commit 420170c8ddc5b6f16ca44113e28f77653aa3262f
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Sep 2 10:42:37 2014 +0200
set names on some Java threads
Change-Id: I611821d5f84b440ba542a8d62a374df7b505de15
diff --git a/bean/com/sun/star/beans/LocalOfficeWindow.java
b/bean/com/sun/star/beans/LocalOfficeWindow.java
index ebae69d..d7356f8 100644
--- a/bean/com/sun/star/beans/LocalOfficeWindow.java
+++ b/bean/com/sun/star/beans/LocalOfficeWindow.java
@@ -264,6 +264,8 @@ public class LocalOfficeWindow
private CallWatchThread( long nTimeout )
{
+ super("CallWatchThread deprecated");
+
this.aWatchedThread = Thread.currentThread();
this.nTimeout = nTimeout;
start();
diff --git a/bean/com/sun/star/comp/beans/CallWatchThread.java
b/bean/com/sun/star/comp/beans/CallWatchThread.java
index 45cecbc..2f99adc 100644
--- a/bean/com/sun/star/comp/beans/CallWatchThread.java
+++ b/bean/com/sun/star/comp/beans/CallWatchThread.java
@@ -36,7 +36,7 @@ public class CallWatchThread extends Thread
public CallWatchThread(long nTimeout)
{
- this(nTimeout, "");
+ this(nTimeout, "CallWatchThread");
}
public CallWatchThread( long nTimeout, String aTag )
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index bfcbd94..e289fb1 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -731,6 +731,8 @@ public class LocalOfficeConnection
private StreamProcessor(final java.io.InputStream in, final
java.io.PrintStream out)
{
+ super("StreamProcessor");
+
m_in = in;
m_print = out;
start();
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java
b/bean/com/sun/star/comp/beans/OOoBean.java
index 3c2c17e..2ffe5ee 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -269,7 +269,7 @@ public class OOoBean
// avoid concurrent access from multiple threads
final OfficeConnection iConn = getOOoConnection();
- Thread aConnectorThread = new Thread() {
+ Thread aConnectorThread = new Thread("getServiceManager") {
@Override
public void run()
{
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
index c817392..9d96476 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
@@ -69,6 +69,8 @@ public class JobQueue {
Object _disposeId;
JobDispatcher(Object disposeId) {
+ super("JobDispatcher");
+
if(DEBUG) System.err.println("JobQueue$JobDispatcher.<init>:" +
_threadId);
_disposeId = disposeId;
diff --git a/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java
b/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java
index 28c32bb..2c884c8 100644
--- a/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java
+++ b/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java
@@ -68,7 +68,7 @@ public final class AsynchronousFinalizer {
private static final LinkedList<Job> queue = new LinkedList<Job>();
static {
- Thread t = new Thread() {
+ Thread t = new Thread("AsynchronousFinalizer") {
@Override
public void run() {
for (;;) {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
