From: Tuukka Lehtonen Date: Mon, 20 Mar 2017 06:56:08 +0000 (+0200) Subject: Removed useless class org.simantics.utils.thread.Executors2. X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=a3b94986eb2eb9b8a46ac89431215d4cbee4a295;p=simantics%2Fplatform.git Removed useless class org.simantics.utils.thread.Executors2. Also removed the optional org.eclipse.swt dependency introduced to org.simantics.utils.thread by Executors2. org.simantics.utils.thread.swt already contains SWTThread which is where this dependency should be kept. refs #7099 Change-Id: Ica27eed205306090f876767cd0a018009fb25fd5 --- diff --git a/bundles/org.simantics.utils.thread/META-INF/MANIFEST.MF b/bundles/org.simantics.utils.thread/META-INF/MANIFEST.MF index c71e25156..44435fa6e 100644 --- a/bundles/org.simantics.utils.thread/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.utils.thread/META-INF/MANIFEST.MF @@ -6,5 +6,4 @@ Bundle-Version: 1.1.0.qualifier Export-Package: org.simantics.utils.threads, org.simantics.utils.threads.logger Bundle-Vendor: VTT Technical Research Centre of Finland -Require-Bundle: org.eclipse.swt;bundle-version="3.6.0";resolution:=optional Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/bundles/org.simantics.utils.thread/src/org/simantics/utils/threads/Executors2.java b/bundles/org.simantics.utils.thread/src/org/simantics/utils/threads/Executors2.java deleted file mode 100644 index 66af9794b..000000000 --- a/bundles/org.simantics.utils.thread/src/org/simantics/utils/threads/Executors2.java +++ /dev/null @@ -1,60 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 VTT Technical Research Centre of Finland and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * VTT Technical Research Centre of Finland - initial API and implementation - *******************************************************************************/ -package org.simantics.utils.threads; - -import java.util.concurrent.Executor; - -import org.eclipse.swt.widgets.Display; - -public class Executors2 { - - public static Executor createSWTExecutor(Display display, boolean async) { - return async ? new SWTExecutorAsync(display) : new SWTExecutorSync(display); - } - -} - -class SWTExecutorAsync implements Executor { - - Display display; - public SWTExecutorAsync(Display display) - { - this.display = display; - } - - @Override - public void execute(Runnable command) { - // Don't accept work if the SWT thread is disposed. - if (display.isDisposed()) - throw new RuntimeException("The SWT thread has been disposed"); - display.asyncExec(command); - } - -} - -class SWTExecutorSync implements Executor { - - Display display; - public SWTExecutorSync(Display display) - { - this.display = display; - } - - @Override - public void execute(Runnable command) { - // Don't accept work if the SWT thread is disposed. - if (display.isDisposed()) - throw new RuntimeException("The SWT thread has been disposed"); - display.syncExec(command); - } - -} -