- Remove old net code

- Remove "Start/Stop Server" buttons (related to old code) - Move new net code to forge-gui/forge/net/** - Remove all dependencies on project forge-net
2025-11-19 12:18:00 +00:00 · 2015-04-20 14:40:26 +00:00
parent 62a7b2b98d
commit 705d6cb937
41 changed files with 749 additions and 564 deletions
--- a/forge-gui-desktop/src/main/java/forge/gui/FNetOverlay.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/FNetOverlay.java
@@ -18,8 +18,8 @@ import org.apache.commons.lang3.StringUtils;
 import forge.Singletons;
 import forge.gui.framework.SDisplayUtil;
 import forge.model.FModel;
-import forge.net.game.IRemote;
-import forge.net.game.MessageEvent;
+import forge.net.IRemote;
+import forge.net.event.MessageEvent;
 import forge.properties.ForgePreferences;
 import forge.properties.ForgePreferences.FPref;
 import forge.toolbox.FLabel;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/CHomeUI.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/CHomeUI.java
@@ -6,14 +6,11 @@ import javax.swing.JMenu;

 import forge.Singletons;
 import forge.UiCommand;
-import forge.gui.FNetOverlay;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.ICDoc;
 import forge.menus.IMenuProvider;
 import forge.menus.MenuUtil;
 import forge.model.FModel;
-import forge.net.FServer;
-import forge.net.FServerManager;
 import forge.properties.ForgePreferences;
 import forge.properties.ForgePreferences.FPref;
 import forge.screens.home.sanctioned.VSubmenuConstructed;
@@ -83,31 +80,6 @@ public enum CHomeUI implements ICDoc, IMenuProvider {
        Singletons.getControl().getForgeMenu().setProvider(this);

        selectPrevious();
-
-        VHomeUI.SINGLETON_INSTANCE.getLblStartServer().setCommand(new Runnable() {
-            @Override
-            public void run() {
-                //final NetServer srv = FServer.getServer();
-                //srv.listen(ForgeConstants.SERVER_PORT_NUMBER);
-
-                VHomeUI.SINGLETON_INSTANCE.getLblStopServer().setEnabled(true);
-                VHomeUI.SINGLETON_INSTANCE.getLblStartServer().setEnabled(false);
-
-                FNetOverlay.SINGLETON_INSTANCE.showUp("");//"Server listening on port " + srv.getPortNumber());
-            }
-        });
-
-        VHomeUI.SINGLETON_INSTANCE.getLblStopServer().setCommand(new Runnable() {
-            @Override
-            public void run() {
-                FServer.getServer().stop();
-                FServerManager.getInstance().stopServer();
-                VHomeUI.SINGLETON_INSTANCE.getLblStopServer().setEnabled(false);
-                VHomeUI.SINGLETON_INSTANCE.getLblStartServer().setEnabled(true);
-
-                FNetOverlay.SINGLETON_INSTANCE.getWindow().setVisible(false);
-            }
-        });
    }

    /* (non-Javadoc)
--- a/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java
@@ -30,8 +30,8 @@ import forge.game.GameType;
 import forge.gui.framework.FScreen;
 import forge.item.PaperCard;
 import forge.match.LobbySlot;
+import forge.match.LobbySlotType;
 import forge.model.FModel;
-import forge.net.game.LobbySlotType;
 import forge.properties.ForgePreferences;
 import forge.properties.ForgePreferences.FPref;
 import forge.screens.deckeditor.CDeckEditorUI;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java
@@ -41,7 +41,6 @@ import forge.gui.framework.ICDoc;
 import forge.gui.framework.ILocalRepaint;
 import forge.gui.framework.IVTopLevelUI;
 import forge.model.FModel;
-import forge.properties.ForgeConstants;
 import forge.properties.ForgePreferences.FPref;
 import forge.screens.home.gauntlet.VSubmenuGauntletBuild;
 import forge.screens.home.gauntlet.VSubmenuGauntletContests;
@@ -97,35 +96,17 @@ public enum VHomeUI implements IVTopLevelUI {
        .iconAlignX(SwingConstants.CENTER)
        .iconInBackground(true).iconScaleFactor(1.0).build();

-    private final FLabel lblStartServer = new FLabel.ButtonBuilder().text("Start Server").fontSize(14).build();
-    private final FLabel lblStopServer = new FLabel.ButtonBuilder().text("Stop Server").fontSize(14).build();
-
    private VHomeUI() {
        // Add main menu containing logo and menu buttons
        final JPanel pnlMainMenu = new JPanel(new MigLayout("w 200px!, ax center, insets 0, gap 0, wrap"));
        pnlMainMenu.setOpaque(false);

-        final List<FLabel> mainMenuButtons = new ArrayList<FLabel>();
-        if (ForgeConstants.SERVER_PORT_NUMBER >= 80) {
-            mainMenuButtons.add(lblStartServer);
-            mainMenuButtons.add(lblStopServer);
-            lblStopServer.setEnabled(false);
-        }
-
        final int logoSize = 170;
        final int logoBottomGap = 4;
-        final int buttonHeight = 30;
-        final int buttonBottomGap = 8;
-        final int pnlMainMenuHeight = logoSize + logoBottomGap +
-                mainMenuButtons.size() * (buttonHeight + buttonBottomGap);
+        final int pnlMainMenuHeight = logoSize + logoBottomGap;

        pnlMainMenu.add(lblLogo, "w " + logoSize + "px!, h " + logoSize +
                "px!, gap 0 4px 0 " + logoBottomGap + "px");
-        String buttonLayout = "w 170px!, h " + buttonHeight +
-                "px!, gap 0 0 0 " + buttonBottomGap + "px";
-        for (FLabel button : mainMenuButtons) {
-            pnlMainMenu.add(button, buttonLayout);
-        }
        pnlMenu.add(pnlMainMenu);
        
        pnlSubmenus = new FScrollPanel(new MigLayout("insets 0, gap 0, wrap, hidemode 3"), true,
@@ -137,7 +118,7 @@ public enum VHomeUI implements IVTopLevelUI {
        allSubmenus.add(VSubmenuSealed.SINGLETON_INSTANCE);
        //allSubmenus.add(VSubmenuWinston.SINGLETON_INSTANCE);

-        //allSubmenus.add(VSubmenuOnlineLobby.SINGLETON_INSTANCE);
+        allSubmenus.add(VSubmenuOnlineLobby.SINGLETON_INSTANCE);

        allSubmenus.add(VSubmenuDuels.SINGLETON_INSTANCE);
        allSubmenus.add(VSubmenuChallenges.SINGLETON_INSTANCE);
@@ -189,14 +170,6 @@ public enum VHomeUI implements IVTopLevelUI {
        pnlDisplay.setBackground(l00.alphaColor(100));
    }

-    public final FLabel getLblStartServer() {
-        return lblStartServer;
-    }
-    
-    public final FLabel getLblStopServer() {
-        return lblStopServer;
-    }
-
    /** @return {@link javax.swing.JPanel} */
    public JPanel getPnlMenu() {
        return pnlMenu;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
@@ -42,9 +42,9 @@ import forge.interfaces.IUpdateable;
 import forge.item.PaperCard;
 import forge.match.GameLobby;
 import forge.match.LobbySlot;
+import forge.match.LobbySlotType;
 import forge.model.FModel;
-import forge.net.game.LobbySlotType;
-import forge.net.game.UpdateLobbyPlayerEvent;
+import forge.net.event.UpdateLobbyPlayerEvent;
 import forge.properties.ForgePreferences;
 import forge.properties.ForgePreferences.FPref;
 import forge.toolbox.FCheckBox;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/online/CSubmenuOnlineLobby.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/online/CSubmenuOnlineLobby.java
@@ -20,15 +20,15 @@ import forge.match.GameLobby.GameLobbyData;
 import forge.menus.IMenuProvider;
 import forge.menus.MenuUtil;
 import forge.model.FModel;
-import forge.net.ClientGameLobby;
-import forge.net.FGameClient;
-import forge.net.FServerManager;
-import forge.net.ServerGameLobby;
-import forge.net.game.IRemote;
-import forge.net.game.IdentifiableNetEvent;
-import forge.net.game.MessageEvent;
-import forge.net.game.NetEvent;
-import forge.net.game.UpdateLobbyPlayerEvent;
+import forge.net.IRemote;
+import forge.net.client.ClientGameLobby;
+import forge.net.client.FGameClient;
+import forge.net.event.IdentifiableNetEvent;
+import forge.net.event.MessageEvent;
+import forge.net.event.NetEvent;
+import forge.net.event.UpdateLobbyPlayerEvent;
+import forge.net.server.FServerManager;
+import forge.net.server.ServerGameLobby;
 import forge.properties.ForgePreferences.FPref;
 import forge.screens.home.VLobby;
 import forge.screens.home.sanctioned.ConstructedGameMenu;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/online/VOnlineLobby.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/online/VOnlineLobby.java
@@ -14,8 +14,8 @@ import forge.gui.framework.FScreen;
 import forge.gui.framework.IVDoc;
 import forge.gui.framework.IVTopLevelUI;
 import forge.match.GameLobby;
-import forge.net.FGameClient;
-import forge.net.FServerManager;
+import forge.net.client.FGameClient;
+import forge.net.server.FServerManager;
 import forge.screens.home.VLobby;
 import forge.toolbox.FPanel;
 import forge.util.gui.SOptionPane;
--- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuConstructed.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuConstructed.java
@@ -12,7 +12,7 @@ import forge.gui.framework.EDocID;
 import forge.interfaces.IPlayerChangeListener;
 import forge.match.GameLobby;
 import forge.match.LocalLobby;
-import forge.net.game.UpdateLobbyPlayerEvent;
+import forge.net.event.UpdateLobbyPlayerEvent;
 import forge.screens.home.EMenuGroup;
 import forge.screens.home.IVSubmenu;
 import forge.screens.home.VHomeUI;