From dfbdbb5bfe753832514d870c20c83a19edb3bf48 Mon Sep 17 00:00:00 2001 From: dcollin Date: Tue, 17 Nov 2015 15:55:52 +0100 Subject: [PATCH] Removed unused code --- src/com/coder/client/CoderClient.java | 17 +++++++---------- src/com/coder/client/gui/login/LoginDialog.java | 2 -- .../client/gui/newProject/NewProjectDialog.java | 2 -- .../gui/selectProject/SelectProjectDialog.java | 4 +--- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/com/coder/client/CoderClient.java b/src/com/coder/client/CoderClient.java index c04b447..f89e129 100755 --- a/src/com/coder/client/CoderClient.java +++ b/src/com/coder/client/CoderClient.java @@ -24,11 +24,6 @@ public class CoderClient extends Application{ //GUI elements private Stage mainStage; - private EditorWindow editorWindow; - private LoginDialog loginDialog; - private SelectProjectDialog selectProjectDialog; - private SelectServerDialog selectServerDialog; - private NewProjectDialog newProjectDialog; public static void main(String[] args) { Application.launch(args); @@ -53,12 +48,14 @@ public class CoderClient extends Application{ //setup GUI elements this.mainStage = mainStage; mainStage.setTitle("CoderClient"); + SelectServerDialog selectServerDialog = null; + LoginDialog loginDialog = null; try{ - this.selectServerDialog = new SelectServerDialog(this); - this.loginDialog = new LoginDialog(this); - this.selectProjectDialog = new SelectProjectDialog(this); - this.newProjectDialog = new NewProjectDialog(this); - this.editorWindow = new EditorWindow(this); + selectServerDialog = new SelectServerDialog(this); + loginDialog = new LoginDialog(this); + new SelectProjectDialog(this); + new NewProjectDialog(this); + new EditorWindow(this); }catch(IOException e){ logger.log(Level.SEVERE, "could not load all GUI elements", e); exit(); diff --git a/src/com/coder/client/gui/login/LoginDialog.java b/src/com/coder/client/gui/login/LoginDialog.java index 6de89a0..273f321 100644 --- a/src/com/coder/client/gui/login/LoginDialog.java +++ b/src/com/coder/client/gui/login/LoginDialog.java @@ -23,7 +23,6 @@ import com.coder.client.session.SessionEventHandler; public class LoginDialog extends GuiWindow { public static final Logger logger = LogUtil.getLogger(); - private CoderClient client; private SessionHandler sessionHandler; @@ -35,7 +34,6 @@ public class LoginDialog extends GuiWindow { public LoginDialog(final CoderClient client) throws IOException { super(LoginDialog.class.getResource("LoginDialog.fxml")); - this.client = client; this.sessionHandler = SessionHandler.getInstance(); diff --git a/src/com/coder/client/gui/newProject/NewProjectDialog.java b/src/com/coder/client/gui/newProject/NewProjectDialog.java index f6a7802..1e7a08f 100755 --- a/src/com/coder/client/gui/newProject/NewProjectDialog.java +++ b/src/com/coder/client/gui/newProject/NewProjectDialog.java @@ -33,7 +33,6 @@ import com.coder.client.session.ProjectTypeRspMsgListener; public class NewProjectDialog extends GuiWindow { public static final Logger logger = LogUtil.getLogger(); - private CoderClient client; private SessionHandler sessionHandler; private ProjectHandler projectHandler; @@ -51,7 +50,6 @@ public class NewProjectDialog extends GuiWindow { super(NewProjectDialog.class.getResource("NewProjectDialog.fxml")); projectTypeList = FXCollections.observableArrayList(); projectTypeComboBox.setItems(projectTypeList); - this.client = client; this.sessionHandler = SessionHandler.getInstance(); this.projectHandler = ProjectHandler.getInstance(); diff --git a/src/com/coder/client/gui/selectProject/SelectProjectDialog.java b/src/com/coder/client/gui/selectProject/SelectProjectDialog.java index dc792d6..4421a7f 100644 --- a/src/com/coder/client/gui/selectProject/SelectProjectDialog.java +++ b/src/com/coder/client/gui/selectProject/SelectProjectDialog.java @@ -42,7 +42,6 @@ import com.coder.server.message.ProjectRspMsg; public class SelectProjectDialog extends GuiWindow { public static final Logger logger = LogUtil.getLogger(); private ObservableList projectList; - private CoderClient client; private SessionHandler sessionHandler; private ProjectHandler projectHandler; @@ -55,10 +54,9 @@ public class SelectProjectDialog extends GuiWindow { public SelectProjectDialog(final CoderClient client) throws IOException { super(SelectProjectDialog.class.getResource("SelectProjectDialog.fxml")); - this.client = client; this.sessionHandler = SessionHandler.getInstance(); - this.projectHandler = projectHandler.getInstance(); + this.projectHandler = ProjectHandler.getInstance(); sessionHandler.addSessionEventHandler(new SessionEventHandler() { @Override