diff options
author | Markus Tiede | 2015-01-27 14:59:43 +0000 |
---|---|---|
committer | Markus Tiede | 2015-01-27 15:00:01 +0000 |
commit | 4139198b74fb0114bef3738b4ff2391b8dd7b12c (patch) | |
tree | 50db5482b04dfcd5b863079d6abb7006b0e1c022 | |
parent | dfc64400d8672a3ff40ac15110202d371e3b7441 (diff) | |
download | org.eclipse.jubula.core-4139198b74fb0114bef3738b4ff2391b8dd7b12c.tar.gz org.eclipse.jubula.core-4139198b74fb0114bef3738b4ff2391b8dd7b12c.tar.xz org.eclipse.jubula.core-4139198b74fb0114bef3738b4ff2391b8dd7b12c.zip |
Sprint task - preparation for http://eclip.se/457600 - part 4: avoid (unnecessary) usage on RC-side as it might be causing issues like http://bugzilla.bredex.de/1625
7 files changed, 11 insertions, 16 deletions
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AUTServer.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AUTServer.java index ad0756571..1fb678bcb 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AUTServer.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AUTServer.java @@ -44,7 +44,6 @@ import org.eclipse.jubula.tools.internal.exception.CommunicationException; import org.eclipse.jubula.tools.internal.exception.JBVersionException; import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier; import org.eclipse.jubula.tools.internal.registration.AutIdentifier; -import org.eclipse.jubula.tools.internal.utils.IsAliveThread; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -335,7 +334,7 @@ public abstract class AUTServer { addToolKitEventListenerToAUT();
return;
}
- setAutThread(new IsAliveThread(new Runnable() {
+ setAutThread(new Thread(new Runnable() {
public void run() {
try {
startTasks();
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/PrepareForShutdownCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/PrepareForShutdownCommand.java index a322b0b10..66840e173 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/PrepareForShutdownCommand.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/PrepareForShutdownCommand.java @@ -25,7 +25,6 @@ import org.eclipse.jubula.tools.internal.constants.TimeoutConstants; import org.eclipse.jubula.tools.internal.exception.CommunicationException; import org.eclipse.jubula.tools.internal.objects.ComponentIdentifier; import org.eclipse.jubula.tools.internal.utils.EnvironmentUtils; -import org.eclipse.jubula.tools.internal.utils.IsAliveThread; import org.eclipse.jubula.tools.internal.utils.TimeUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -177,7 +176,7 @@ public class PrepareForShutdownCommand implements ICommand { } else { if (shutdownHookThread == null) { int addDelay = message.getAdditionalDelay(); - shutdownHookThread = new IsAliveThread( + shutdownHookThread = new Thread( new AUTProperTerminationShutdownHook(addDelay)); Runtime.getRuntime().addShutdownHook(shutdownHookThread); } diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/driver/DefaultEventThreadQueuer.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/driver/DefaultEventThreadQueuer.java index 8fcddc521..04386ac42 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/driver/DefaultEventThreadQueuer.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/driver/DefaultEventThreadQueuer.java @@ -1,7 +1,6 @@ package org.eclipse.jubula.rc.common.driver; import org.eclipse.jubula.rc.common.exception.StepExecutionException; -import org.eclipse.jubula.tools.internal.utils.IsAliveThread; /** * @@ -11,6 +10,7 @@ import org.eclipse.jubula.tools.internal.utils.IsAliveThread; * */ public class DefaultEventThreadQueuer implements IEventThreadQueuer { + /** * * {@inheritDoc} @@ -28,6 +28,7 @@ public class DefaultEventThreadQueuer implements IEventThreadQueuer { public void invokeLater(String name, Runnable runnable) throws StepExecutionException { - new IsAliveThread(runnable, name).start(); + new Thread(runnable, name).start(); } + } diff --git a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/util/concurrent/JBExecutors.java b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/util/concurrent/JBExecutors.java index a226d7fb1..1523d8f08 100644 --- a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/util/concurrent/JBExecutors.java +++ b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/util/concurrent/JBExecutors.java @@ -17,7 +17,6 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; import org.apache.commons.lang.Validate; -import org.eclipse.jubula.tools.internal.utils.IsAliveThread; /** * Factory and utility methods for @@ -54,8 +53,8 @@ public class JBExecutors { @Override public Thread newThread(Runnable r) { - Thread newThread = new IsAliveThread(r, m_poolName - + m_threadNumber.incrementAndGet()); + Thread newThread = + new Thread(r, m_poolName + m_threadNumber.incrementAndGet()); newThread.setDaemon(true); return newThread; diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/components/AUTSwingHierarchy.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/components/AUTSwingHierarchy.java index 6ae06301f..2e835c8b2 100644 --- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/components/AUTSwingHierarchy.java +++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/components/AUTSwingHierarchy.java @@ -53,7 +53,6 @@ import org.eclipse.jubula.tools.internal.objects.ComponentIdentifier; import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier; import org.eclipse.jubula.tools.internal.objects.MappingConstants; import org.eclipse.jubula.tools.internal.utils.EnvironmentUtils; -import org.eclipse.jubula.tools.internal.utils.IsAliveThread; @@ -125,7 +124,7 @@ public class AUTSwingHierarchy extends AUTHierarchy if (!m_syncListenerRegistration) { Thread registrationThread = - new IsAliveThread(m_listenerRegistrationWorker, + new Thread(m_listenerRegistrationWorker, "Jubula Listener Registration"); //$NON-NLS-1$ registrationThread.setDaemon(true); registrationThread.start(); diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/driver/RobotEventConfirmerSwtImpl.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/driver/RobotEventConfirmerSwtImpl.java index 3445fa088..edd4e427e 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/driver/RobotEventConfirmerSwtImpl.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/driver/RobotEventConfirmerSwtImpl.java @@ -28,7 +28,6 @@ import org.eclipse.jubula.rc.swt.SwtAUTServer; import org.eclipse.jubula.rc.swt.utils.SwtUtils; import org.eclipse.jubula.tools.internal.objects.event.EventFactory; import org.eclipse.jubula.tools.internal.objects.event.TestErrorEvent; -import org.eclipse.jubula.tools.internal.utils.IsAliveThread; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; @@ -397,7 +396,7 @@ class RobotEventConfirmerSwtImpl implements IRobotEventConfirmer, return; } // !! Never block in the GUI thread, it may cause deadlocks! - new IsAliveThread(new Runnable() { + new Thread(new Runnable() { public void run() { try { addEventToList(event); diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/util/SimulatedTooltip.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/util/SimulatedTooltip.java index bc1b3aa76..e7e785f70 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/util/SimulatedTooltip.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/util/SimulatedTooltip.java @@ -14,7 +14,6 @@ import org.eclipse.jubula.rc.common.driver.IEventThreadQueuer; import org.eclipse.jubula.rc.common.driver.IRunnable; import org.eclipse.jubula.rc.common.logger.AutServerLogger; import org.eclipse.jubula.rc.swt.driver.EventThreadQueuerSwtImpl; -import org.eclipse.jubula.tools.internal.utils.IsAliveThread; import org.eclipse.jubula.tools.internal.utils.StringParsing; import org.eclipse.jubula.tools.internal.utils.TimeUtil; import org.eclipse.swt.SWT; @@ -35,7 +34,7 @@ import org.eclipse.swt.widgets.Shell; * @author BREDEX GmbH * @created Jul 24, 2007 */ -public class SimulatedTooltip extends IsAliveThread { +public class SimulatedTooltip extends Thread { /** the logger */ private static AutServerLogger log = @@ -253,7 +252,7 @@ public class SimulatedTooltip extends IsAliveThread { bar.setMaximum(m_timeout); final int maximum = bar.getMaximum(); - Thread progressBarThread = new IsAliveThread() { + Thread progressBarThread = new Thread() { public void run() { int refreshIntervall = 25; // Calculate how often an update has to be done |