external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move WaitCallback and WaitRunnable to forge-gui

Browse Source
This commit is contained in:
drdev
2014-12-06 18:16:30 +00:00
parent b9275d5678
commit 8e26dc333f
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored
View File

@@ -1343,8 +1343,6 @@ forge-gui-mobile/src/forge/toolbox/ListChooser.java -text
forge-gui-mobile/src/forge/util/LayoutHelper.java -text forge-gui-mobile/src/forge/util/LayoutHelper.java -text
forge-gui-mobile/src/forge/util/PhysicsObject.java -text forge-gui-mobile/src/forge/util/PhysicsObject.java -text
forge-gui-mobile/src/forge/util/Utils.java -text forge-gui-mobile/src/forge/util/Utils.java -text
forge-gui-mobile/src/forge/util/WaitCallback.java -text
forge-gui-mobile/src/forge/util/WaitRunnable.java -text
forge-gui/.classpath -text forge-gui/.classpath -text
forge-gui/.project -text forge-gui/.project -text
forge-gui/.settings/org.eclipse.core.resources.prefs -text forge-gui/.settings/org.eclipse.core.resources.prefs -text
@@ -17306,6 +17304,8 @@ forge-gui/src/main/java/forge/util/IgnoringXStream.java -text
forge-gui/src/main/java/forge/util/LineReader.java -text forge-gui/src/main/java/forge/util/LineReader.java -text
forge-gui/src/main/java/forge/util/MultiplexOutputStream.java svneol=native#text/plain forge-gui/src/main/java/forge/util/MultiplexOutputStream.java svneol=native#text/plain
forge-gui/src/main/java/forge/util/OperatingSystem.java -text forge-gui/src/main/java/forge/util/OperatingSystem.java -text
forge-gui/src/main/java/forge/util/WaitCallback.java -text
forge-gui/src/main/java/forge/util/WaitRunnable.java -text
forge-gui/src/main/java/forge/util/XmlUtil.java -text forge-gui/src/main/java/forge/util/XmlUtil.java -text
forge-gui/src/main/java/forge/util/gui/SGuiChoose.java -text forge-gui/src/main/java/forge/util/gui/SGuiChoose.java -text
forge-gui/src/main/java/forge/util/gui/SGuiDialog.java -text forge-gui/src/main/java/forge/util/gui/SGuiDialog.java -text

0
forge-gui-mobile/src/forge/util/WaitCallback.java → forge-gui/src/main/java/forge/util/WaitCallback.java
View File

6
forge-gui-mobile/src/forge/util/WaitRunnable.java → forge-gui/src/main/java/forge/util/WaitRunnable.java
View File

@@ -1,7 +1,5 @@
package forge.util; package forge.util;
import com.badlogic.gdx.Gdx;
import forge.FThreads; import forge.FThreads;
public abstract class WaitRunnable implements Runnable { public abstract class WaitRunnable implements Runnable {
@@ -11,8 +9,8 @@ public abstract class WaitRunnable implements Runnable {
private final Lock lock = new Lock(); private final Lock lock = new Lock();
public void invokeAndWait() { public void invokeAndWait() {
FThreads.assertExecutedByEdt(false); FThreads.assertExecutedByEdt(false); //not supported if on UI thread
Gdx.app.postRunnable(new Runnable() { FThreads.invokeInEdtLater(new Runnable() {
@Override @Override
public void run() { public void run() {
WaitRunnable.this.run(); WaitRunnable.this.run();