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

Rollback (temporary): Remove second-game-constructed load layout bug.

Browse Source
This commit is contained in:
Doublestrike
2012-05-21 11:20:23 +00:00
parent 3203c89e14
commit 21578c5ae5
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/forge/gui/match/VMatchUI.java
View File

@@ -4,22 +4,15 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.swing.JButton; import javax.swing.JButton;
import javax.swing.SwingUtilities;
import forge.AllZone; import forge.AllZone;
import forge.Singletons;
import forge.gui.framework.DragCell;
import forge.gui.framework.EDocID; import forge.gui.framework.EDocID;
import forge.gui.framework.IVDoc; import forge.gui.framework.IVDoc;
import forge.gui.framework.IVTopLevelUI; import forge.gui.framework.IVTopLevelUI;
import forge.gui.framework.SLayoutIO; import forge.gui.framework.SLayoutIO;
import forge.gui.framework.SRearrangingUtil;
import forge.gui.match.nonsingleton.VField; import forge.gui.match.nonsingleton.VField;
import forge.gui.match.nonsingleton.VHand; import forge.gui.match.nonsingleton.VHand;
import forge.gui.match.views.VDev;
import forge.gui.match.views.VMessage; import forge.gui.match.views.VMessage;
import forge.properties.ForgePreferences.FPref;
import forge.view.FView;
/** /**
* Top level view class for match UI drag layout.<br> * Top level view class for match UI drag layout.<br>
@@ -42,6 +35,7 @@ public enum VMatchUI implements IVTopLevelUI {
// Other instantiations // Other instantiations
private final CMatchUI control = null; private final CMatchUI control = null;
private boolean isPopulated = false;
/** */ /** */
@Override @Override
@@ -51,8 +45,20 @@ public enum VMatchUI implements IVTopLevelUI {
/** */ /** */
@Override @Override
public void populate() { public void populate() {
if (isPopulated) { return; }
else { isPopulated = true; }
SLayoutIO.loadLayout(null); SLayoutIO.loadLayout(null);
/*System.out.println(SwingUtilities.isEventDispatchThread());
final SwingWorker<Void, Void> w = new SwingWorker<Void, Void>() {
@Override
public Void doInBackground() {
SLayoutIO.loadLayout(null);
return null;
}
};
w.execute();
// Pull dev mode if necessary, remove parent cell if required. // Pull dev mode if necessary, remove parent cell if required.
if (!Singletons.getModel().getPreferences().getPrefBoolean(FPref.DEV_MODE_ENABLED)) { if (!Singletons.getModel().getPreferences().getPrefBoolean(FPref.DEV_MODE_ENABLED)) {
VDev.SINGLETON_INSTANCE.getParentCell().removeDoc(VDev.SINGLETON_INSTANCE); VDev.SINGLETON_INSTANCE.getParentCell().removeDoc(VDev.SINGLETON_INSTANCE);
@@ -68,7 +74,7 @@ public enum VMatchUI implements IVTopLevelUI {
} }
} }
} }
}); });*/
} }
//========== Retrieval methods //========== Retrieval methods