Refactoring: Moving GUI program logic from CoderClient to each controller class

-Removing the Session Guard
-Adding a SessionHandler
-Adding a ProjectHandler

src/com/coder/client/gui/GuiWindow.java

@@ -3,6 +3,9 @@ package com.coder.client.gui;
 import java.io.IOException;
 import java.net.URL;
 import java.util.ResourceBundle;
+import java.util.logging.Logger;
+
+import zutil.log.LogUtil;
 
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
@@ -11,7 +14,7 @@ import javafx.scene.Scene;
 import javafx.stage.Stage;
 
 public abstract class GuiWindow implements Initializable{
-	
+	public static final Logger logger = LogUtil.getLogger();
 	private Scene scene;
 	
 	/**
@@ -30,36 +33,19 @@ public abstract class GuiWindow implements Initializable{
 	 * @param stage The stage to show on
 	 */
 	public void showOnStage(Stage stage){
-		stage.setScene(scene);
-		stage.setTitle(getTitle());
-		//this.stage = stage;
-		willShow();
-        stage.show();
-	}
-
-	/**
-	 * show a modal dialog
-	 * @param parent The dialogs parent
-	 */
-/*	public void showModal(Stage parent){
-		Stage modalStage = new Stage();
-		modalStage.initModality(Modality.WINDOW_MODAL);
-		modalStage.initOwner(parent);
-		modalStage.setScene(scene);
-		modalStage.setTitle(getTitle());
-		this.stage = modalStage;
-		willShow();
-		modalStage.showAndWait();
-	}
-*/
-	
-/*	public void hide(){
-		if(stage != null){
-			this.stage.hide();
+		if(scene != null && stage.getScene() != null && stage.getScene().equals(scene)){
+			logger.fine("already showing " + getDescriptiveName() + " on stage");
+		}else{
+			stage.setScene(scene);
+			stage.setTitle(getTitle());
+			logger.fine("about to show " + getDescriptiveName() + " on stage");
+			willShow();
+			stage.show();
+			logger.fine("showing " + getDescriptiveName());
 		}
 	}
-*/	
 	
+	protected abstract String getDescriptiveName();
 	
 	protected abstract String getTitle();
 	
@@ -73,6 +59,4 @@ public abstract class GuiWindow implements Initializable{
 	 */
 	public abstract void initialize(URL fxmlFileLocation, ResourceBundle resources);
 	
-	public abstract void setErrorMessage(String msg);
-	
 }

src/com/coder/client/gui/editor/EditorWindow.fxml

@@ -51,12 +51,12 @@
          <children>
             <HBox alignment="CENTER_LEFT" maxHeight="50.0" prefHeight="50.0" prefWidth="200.0">
                <children>
-                  <Button fx:id="exitButton" mnemonicParsing="false" onAction="#handleExit" text="Exit">
+                  <Button fx:id="exitButton" mnemonicParsing="false" onAction="#exit" text="Exit">
                      <HBox.margin>
                         <Insets left="10.0" />
                      </HBox.margin>
                   </Button>
-                  <Button fx:id="changeProjectButton" mnemonicParsing="false" onAction="#handleChangeProject" text="Change Project">
+                  <Button fx:id="changeProjectButton" mnemonicParsing="false" onAction="#changeProject" text="Change Project">
                      <HBox.margin>
                         <Insets left="10.0" />
                      </HBox.margin>
@@ -65,12 +65,12 @@
             </HBox>
             <HBox alignment="CENTER_RIGHT" maxHeight="50.0" prefHeight="50.0" prefWidth="200.0" GridPane.columnIndex="1">
                <children>
-                  <Button fx:id="compileButton" mnemonicParsing="false" onAction="#handleCompile" text="Compile">
+                  <Button fx:id="compileButton" mnemonicParsing="false" onAction="#compile" text="Compile">
                      <HBox.margin>
                         <Insets right="10.0" />
                      </HBox.margin>
                   </Button>
-                  <Button fx:id="runButton" mnemonicParsing="false" onAction="#handleRun" text="Run">
+                  <Button fx:id="runButton" mnemonicParsing="false" onAction="#run" text="Run">
                      <HBox.margin>
                         <Insets right="10.0" />
                      </HBox.margin>

src/com/coder/client/gui/editor/EditorWindow.java

@@ -3,17 +3,26 @@ package com.coder.client.gui.editor;
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
 import java.util.ResourceBundle;
+import java.util.logging.Logger;
 
 import org.controlsfx.control.PropertySheet;
 import org.controlsfx.property.editor.PropertyEditor;
 
+import zutil.log.LogUtil;
+
+import com.coder.client.CoderClient;
 import com.coder.client.gui.GuiWindow;
 import com.coder.client.property.CheckBoxProperty;
 import com.coder.client.property.CoderClientProperty;
 import com.coder.client.property.ComboBoxProperty;
-
+import com.coder.client.session.ProjectRspMsgListener;
+import com.coder.client.session.ProjectTypeRspMsgListener;
+import com.coder.client.session.SessionListener;
+import com.coder.server.message.ProjectRspMsg;
+import com.coder.server.message.ProjectTypeRspMsg;
 
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
@@ -26,9 +35,9 @@ import javafx.scene.control.TreeView;
 import javafx.util.Callback;
 
 public class EditorWindow extends GuiWindow {
-	
-	private HashSet<EditorWindowListener> listsners;
-	
+	public static final Logger logger = LogUtil.getLogger();
+	private CoderClient client;
+		
 	@FXML private TreeView<String> fileTreeView;
 	@FXML private TextArea editTextArea;
 	@FXML private PropertySheet propertySheet;
@@ -37,9 +46,31 @@ public class EditorWindow extends GuiWindow {
 	@FXML private Button exitButton;
 	@FXML private Button changeProjectButton;
 	
-	public EditorWindow() throws IOException{
+	public EditorWindow(CoderClient client) throws IOException{
 		super(EditorWindow.class.getResource("EditorWindow.fxml"));
-		listsners = new HashSet<EditorWindowListener>();
+		this.client = client;
+		client.getSessionHandler().addMessageListener(new ProjectRspMsgListener() {
+			@Override
+			public void messageReceived(final ProjectRspMsg msg) {
+				logger.fine("a ProjectRspMsg received");
+				if(msg.error != null){
+					return;
+				}
+				setProjectName(msg.name);
+
+				Properties projectConfig = msg.config;
+				String projectDescription = msg.description;
+				List<String> fileList = msg.fileList;
+				String projectType = msg.type;
+				//TODO: handle msg
+			}
+		});
+		client.getSessionHandler().addMessageListener(new ProjectTypeRspMsgListener() {
+			@Override
+			public void messageReceived(ProjectTypeRspMsg msg) {
+				//TODO: update the project properties
+			}
+		});
 	}
 	
 	@Override
@@ -50,37 +81,28 @@ public class EditorWindow extends GuiWindow {
 	
 	@Override
 	protected void willShow(){
-		for(EditorWindowListener listener : listsners){
-			listener.willShow();
-		}
+		
 	}
 	
 	@FXML
-	protected void handleRun(ActionEvent event){
-		for(EditorWindowListener listener : listsners){
-			listener.run();
-		}
+	protected void run(ActionEvent event){
+		//TODO
 	}
 	
 	@FXML
-	protected void handleCompile(ActionEvent event){
-		for(EditorWindowListener listener : listsners){
-			listener.compile();
-		}
+	protected void compile(ActionEvent event){
+		//TODO
 	}
 	
 	@FXML
-	protected void handleChangeProject(ActionEvent event){
-		for(EditorWindowListener listener : listsners){
-			listener.changeProject();
-		}
+	protected void changeProject(ActionEvent event){
+		client.getProjectHandler().setProject(null);
+		client.getProjectHandler().selectProject();
 	}
 	
 	@FXML
-	protected void handleExit(ActionEvent event){
-		for(EditorWindowListener listener : listsners){
-			listener.exit();
-		}
+	protected void exit(ActionEvent event){
+		client.exit();
 	}
 	
 	private void setupFileTreeView(){
@@ -124,18 +146,13 @@ public class EditorWindow extends GuiWindow {
 		CheckBoxProperty p2 = new CheckBoxProperty("Melt?", false);
 		propertySheet.getItems().add(p2);
 	}
-	
-	public void addEditorWindowListener(EditorWindowListener listener) {
-		this.listsners.add(listener);
-	}
 
 	@Override
 	protected String getTitle() {
 		return "Coder Client";
 	}
 
-	@Override
-	public void setErrorMessage(String msg) {
+	private void setErrorMessage(String msg) {
 		// TODO Auto-generated method stub
 		
 	}
@@ -144,4 +161,9 @@ public class EditorWindow extends GuiWindow {
 		fileTreeView.getRoot().setValue(name);
 	}
 
+	@Override
+	protected String getDescriptiveName() {
+		return "Editor Window";
+	}
+
 }

src/com/coder/client/gui/editor/EditorWindowListener.java

@@ -1,11 +0,0 @@
-package com.coder.client.gui.editor;
-
-public interface EditorWindowListener {
-
-	public void willShow();
-	public void compile();
-	public void run();
-	public void changeProject();
-	public void exit();
-	
-}

src/com/coder/client/gui/login/LoginDialog.java

@@ -2,7 +2,6 @@ package com.coder.client.gui.login;
 
 import java.io.IOException;
 import java.net.URL;
-import java.util.HashSet;
 import java.util.ResourceBundle;
 import java.util.logging.Logger;
 
@@ -17,11 +16,13 @@ import javafx.scene.control.TextField;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 
+import com.coder.client.CoderClient;
 import com.coder.client.gui.GuiWindow;
+import com.coder.client.session.SessionListener;
 
 public class LoginDialog extends GuiWindow {
 	public static final Logger logger = LogUtil.getLogger();
-	private HashSet<LoginDialogListener> listeners;
+	private CoderClient client;
 	
 	@FXML private TextField usernameTextField;
 	@FXML private PasswordField passwordPasswordField;
@@ -29,9 +30,35 @@ public class LoginDialog extends GuiWindow {
 	@FXML private Button loginButton;
 	@FXML private Label errorLabel;
 	
-	public LoginDialog() throws IOException {
+	public LoginDialog(final CoderClient client) throws IOException {
 		super(LoginDialog.class.getResource("LoginDialog.fxml"));
-		this.listeners = new HashSet<LoginDialogListener>();
+		this.client = client;
+		client.getSessionHandler().addSessionListener(new SessionListener() {
+			@Override
+			public void sessionConnectionSuccess() {
+				
+			}
+			@Override
+			public void sessionDisconnected(boolean tryToEstablishConnection) {
+				setErrorMessage("");
+			}
+			@Override
+			public void sessionConnectionFailure() {
+				setErrorMessage("");
+			}
+			@Override
+			public void sessionAuthenticationSuccess() {
+				setErrorMessage("");
+			}
+			@Override
+			public void sessionAuthenticationFailure() {
+				setErrorMessage("Wrong username or password");
+			}
+			@Override
+			public void sessionAuthenticationCancel() {
+				setErrorMessage(null);
+			}
+		});
 	}
 
 	@Override
@@ -41,18 +68,12 @@ public class LoginDialog extends GuiWindow {
 	
 	@Override
 	protected void willShow(){
-		for(LoginDialogListener listener : this.listeners){
-			listener.willShow();
-		}
-		if(usernameTextField.getText() != null && !usernameTextField.getText().isEmpty() && passwordPasswordField.getText() != null && !passwordPasswordField.getText().isEmpty()){
-			loginButton.fire();
+		passwordPasswordField.setText("");
+		if(errorLabel.getText() != null && errorLabel.getText().isEmpty() && usernameTextField.getText() != null && !usernameTextField.getText().isEmpty()){
+			passwordPasswordField.requestFocus();
 		}else{
-			if(errorLabel.getText() != null && errorLabel.getText().isEmpty() && usernameTextField.getText() != null && !usernameTextField.getText().isEmpty()){
-				passwordPasswordField.requestFocus();
-			}else{
-				usernameTextField.requestFocus();
-				passwordPasswordField.setText("");
-			}
+			usernameTextField.requestFocus();
+			passwordPasswordField.setText("");
 		}
 	}
 	
@@ -69,42 +90,36 @@ public class LoginDialog extends GuiWindow {
 	
 	@FXML
 	protected void login(ActionEvent event){
-		for(LoginDialogListener listener : this.listeners){
-			listener.login(usernameTextField.getText(), passwordPasswordField.getText().toCharArray());
+		logger.fine("login button triggered");
+		//authenticate session
+		boolean authenticated = client.getSessionHandler().authenticateSession(usernameTextField.getText(), passwordPasswordField.getText().toCharArray());
+		if(!authenticated){
+			logger.severe("Authentication failed: wrong username or password");
 		}
 	}
 	
 	@FXML
 	protected void cancel(ActionEvent event){
-		for(LoginDialogListener listener : this.listeners){
-			listener.cancel();
-		}
+		logger.fine("cancel button triggered");
+		client.getSessionHandler().authenticationCancel();
 	}
 	
 	public void setUsername(String username){
 		usernameTextField.setText(username);
 	}
-	
-	public void setPassword(char[] password){
-		if(password != null){
-			passwordPasswordField.setText(new String(password));
-		}else{
-			passwordPasswordField.setText("");
-		}
-	}
-
-	public void addLoginDialogListener(LoginDialogListener listener) {
-		this.listeners.add(listener);
-	}
 
 	@Override
 	protected String getTitle() {
 		return "Login";
 	}
 
-	@Override
-	public void setErrorMessage(String msg) {
+	private void setErrorMessage(String msg) {
 		errorLabel.setText(msg);
 	}
 
+	@Override
+	protected String getDescriptiveName() {
+		return "Login Dialog";
+	}
+
 }

src/com/coder/client/gui/login/LoginDialogListener.java

@@ -1,9 +0,0 @@
-package com.coder.client.gui.login;
-
-public interface LoginDialogListener {
-
-	public void cancel();
-	public void login(String username, char[] password);
-	public void willShow();
-	
-}

src/com/coder/client/gui/newProject/NewProjectDialog.java

@@ -2,11 +2,14 @@ package com.coder.client.gui.newProject;
 
 import java.io.IOException;
 import java.net.URL;
-import java.util.HashSet;
 import java.util.ResourceBundle;
 import java.util.logging.Logger;
 
+import com.coder.server.message.CoderMessage;
+import com.coder.server.message.ProjectTypeReqMsg;
+import com.coder.server.message.ProjectTypeRspMsg;
 import com.coder.server.message.SupportedProperties;
+
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
@@ -20,11 +23,13 @@ import javafx.scene.input.KeyEvent;
 
 import zutil.log.LogUtil;
 
+import com.coder.client.CoderClient;
 import com.coder.client.gui.GuiWindow;
+import com.coder.client.session.ProjectTypeRspMsgListener;
 
 public class NewProjectDialog extends GuiWindow {
 	public static final Logger logger = LogUtil.getLogger();
-	private HashSet<NewProjectDialogListener> listeners;
+	private CoderClient client;
 	
 	@FXML private Button createButton;
 	@FXML private Button cancelButton;
@@ -35,18 +40,28 @@ public class NewProjectDialog extends GuiWindow {
 	
 	private ObservableList<String> projectTypeList = null;
 
-	public NewProjectDialog() throws IOException {
+	public NewProjectDialog(CoderClient client) throws IOException {
 		super(NewProjectDialog.class.getResource("NewProjectDialog.fxml"));
 		projectTypeList = FXCollections.observableArrayList();
 		projectTypeComboBox.setItems(projectTypeList);
-		listeners = new HashSet<NewProjectDialogListener>();
+		this.client = client;
+		client.getSessionHandler().addMessageListener(new ProjectTypeRspMsgListener() {
+			@Override
+			public void messageReceived(final ProjectTypeRspMsg msg) {
+				logger.fine("a ProjectTypeRspMsg received");
+				for(String typeName : msg.keySet()){
+					SupportedProperties typeData = msg.get(typeName);
+					addProjectTypeToList(typeName, typeData);
+				}
+			}
+		});
 	}
 
 	@Override
 	protected void willShow() {
-		for(NewProjectDialogListener listener : this.listeners){
-			listener.willShow();
-		}
+		clearProjectTypeList();
+		sendProjectTypeReqMsg();
+		
 		if(errorMessageLabel.getText() == null || errorMessageLabel.getText().isEmpty()){
 			projectNameTextField.setText(null);
 			projectTypeComboBox.setValue(null);
@@ -60,8 +75,15 @@ public class NewProjectDialog extends GuiWindow {
 		errorMessageLabel.setText("");
 	}
 	
+	private void sendProjectTypeReqMsg(){
+		CoderMessage msg = new CoderMessage();
+		msg.ProjectTypeReq = new ProjectTypeReqMsg();
+		client.getSessionHandler().sendMessage(msg);
+	}
+	
 	@FXML
 	protected void create(ActionEvent event){
+		logger.fine("create button triggered");
 		if(projectNameTextField.getText() == null || projectNameTextField.getText().isEmpty()){
 			logger.warning("Missing project name");
 			return;
@@ -70,19 +92,17 @@ public class NewProjectDialog extends GuiWindow {
 			logger.warning("Missing project type");
 			return;
 		}
-		for(NewProjectDialogListener listener : this.listeners){
-			listener.create(projectNameTextField.getText(), projectTypeComboBox.getValue(), projectDescriptionTextField.getText());
-		}
+		
+		client.getProjectHandler().createNewProject(projectNameTextField.getText(), projectTypeComboBox.getValue(), projectDescriptionTextField.getText());
 	}
 	
 	@FXML
 	protected void cancel(ActionEvent event){
-		for(NewProjectDialogListener listener : this.listeners){
-			listener.cancel();
-		}
+		logger.fine("cancel button triggered");
+		client.getProjectHandler().setProject(null);
+		client.getProjectHandler().selectProject();
 	}
 
-
 	@FXML
 	protected void keyPressed(KeyEvent event){
         enableDisableButton();
@@ -113,10 +133,6 @@ public class NewProjectDialog extends GuiWindow {
 		return "New Project";
 	}
 
-	public void addNewProjectDialogListener(NewProjectDialogListener newProjectDialogListener) {
-		this.listeners.add(newProjectDialogListener);
-	}
-
 	public void addProjectTypeToList(String typeName, SupportedProperties typeData) {
 		logger.fine("Adding project type \"" + typeName + "\" to the project type list");
 		projectTypeList.add(typeName);
@@ -126,9 +142,13 @@ public class NewProjectDialog extends GuiWindow {
 		projectTypeList.clear();
 	}
 
-	@Override
-	public void setErrorMessage(String errorMsg) {
+	private void setErrorMessage(String errorMsg) {
 		errorMessageLabel.setText(errorMsg);
 	}
 
+	@Override
+	protected String getDescriptiveName() {
+		return "New Project Dialog";
+	}
+
 }

src/com/coder/client/gui/newProject/NewProjectDialogListener.java

@@ -1,11 +0,0 @@
-package com.coder.client.gui.newProject;
-
-public interface NewProjectDialogListener {
-
-	public void willShow();
-
-	public void create(String projectName, String projectType, String projectDescription);
-
-	public void cancel();
-
-}

src/com/coder/client/gui/selectProject/SelectProjectDialog.java

@@ -2,7 +2,6 @@ package com.coder.client.gui.selectProject;
 
 import java.io.IOException;
 import java.net.URL;
-import java.util.HashSet;
 import java.util.ResourceBundle;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -25,33 +24,65 @@ import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
 import javafx.util.Callback;
 
+import com.coder.client.CoderClient;
 import com.coder.client.gui.GuiWindow;
+import com.coder.client.session.ProjectListRspMsgListener;
+import com.coder.client.session.ProjectRspMsgListener;
+import com.coder.server.message.CoderMessage;
 import com.coder.server.message.ProjectListData;
+import com.coder.server.message.ProjectListReqMsg;
+import com.coder.server.message.ProjectListRspMsg;
+import com.coder.server.message.ProjectRspMsg;
 
 public class SelectProjectDialog extends GuiWindow {
 	public static final Logger logger = LogUtil.getLogger();
-	private HashSet<SelectProjectDialogListener> listeners;
 	private ObservableList<ProjectListItem> projectList;
+	private CoderClient client;
 
 	@FXML private ListView<ProjectListItem> projectListView;
 	@FXML private Button newProjectButton;
 	@FXML private Button cancelButton;
 	@FXML private Button openButton;
 	@FXML private Label errorLabel;
-	
-	private String projectName = null;
 
-	public SelectProjectDialog() throws IOException {
-		super(SelectProjectDialog.class.getResource("SelectProjectDialog.fxml"));
-		listeners = new HashSet<SelectProjectDialogListener>();
+	public SelectProjectDialog(final CoderClient client) throws IOException {
+		super(SelectProjectDialog.class.getResource("SelectProjectDialog.fxml"));		
+		this.client = client;
+		
+		client.getSessionHandler().addMessageListener(new ProjectListRspMsgListener() {
+			@Override
+			public void messageReceived(final ProjectListRspMsg msg) {
+				logger.fine("a ProjectListRsp received");
+				for(String projectName : msg.keySet()){
+					ProjectListData projectData = msg.get(projectName);
+					addProjectToList(projectName, projectData);
+				}
+			}
+		});
+		
+		client.getSessionHandler().addMessageListener(new ProjectRspMsgListener() {
+			@Override
+			public void messageReceived(final ProjectRspMsg msg) {
+				logger.fine("a ProjectRspMsg received");
+				if(msg.error != null){
+					logger.severe("Server responded on the project request with the following error message: " + msg.error);
+					client.getProjectHandler().setProject(null);
+					setErrorMessage("ERROR: " + msg.error);
+				}else{
+					setErrorMessage("");
+					client.getProjectHandler().setProject(msg.name);
+				}
+			}
+		});
 	}
 
 	@Override
 	protected void willShow() {
-		for(SelectProjectDialogListener listener : this.listeners){
-			listener.willShow();
-		}
-		if(this.projectName != null && !this.projectName.isEmpty()){
+		clearProjectList();
+		if(!client.getProjectHandler().isProjectSet()){
+			sendProjectListReq();
+		}else{
+			logger.fine("will outofire the open button since all parameters are already set");
 			openButton.setDisable(false);
 			openButton.fire();
 		}
@@ -88,6 +119,13 @@ public class SelectProjectDialog extends GuiWindow {
 		});
 	}
 	
+	private void sendProjectListReq(){
+		//send a request for a new list of projects
+		CoderMessage msg = new CoderMessage();
+		msg.ProjectListReq = new ProjectListReqMsg();
+		client.getSessionHandler().sendMessage(msg);
+	}
+	
 	@FXML
 	protected void mouseClickedOnList(MouseEvent event){
 		if(event.getButton().equals(MouseButton.PRIMARY)){
@@ -113,42 +151,31 @@ public class SelectProjectDialog extends GuiWindow {
 	
 	@FXML
 	protected void newProject(ActionEvent event){
-		logger.fine("user triggered the new project button");
-		for(SelectProjectDialogListener listener : this.listeners){
-			listener.newProject();
-		}
+		logger.fine("new project button triggered");
+		client.getProjectHandler().createNewProject();
 	}
 	
 	@FXML
 	protected void cancel(ActionEvent event){
-		logger.fine("user triggered the cancel button");
-		for(SelectProjectDialogListener listener : this.listeners){
-			listener.cancel();
-		}
+		logger.fine("cancel button triggered");
+		client.getSessionHandler().closeCurrentSession(false);
 	}
 	
 	@FXML
 	protected void refresh(ActionEvent event){
-		for(SelectProjectDialogListener listener : this.listeners){
-			listener.refresh();
-		}
+		logger.fine("refresh button triggered");
+		clearProjectList();
+		sendProjectListReq();
 	}
 	
 	@FXML
 	protected void open(ActionEvent event){
-		if(this.projectName == null || this.projectName.isEmpty()){
+		logger.fine("open button triggered");
+		if(!client.getProjectHandler().isProjectSet()){
 			ProjectListItem selectedItem = projectListView.getSelectionModel().getSelectedItem();
-			projectName = selectedItem.getName();
+			client.getProjectHandler().setProject(selectedItem.getName());
 		}
-		for(SelectProjectDialogListener listener : this.listeners){
-			if(projectName != null){
-				listener.open(projectName);
-			}
-		}
-	}
-	
-	public void addSelectProjectDialogListener(SelectProjectDialogListener listener){
-		this.listeners.add(listener);
+		client.getProjectHandler().openProject();
 	}
 	
 	public void clearProjectList(){
@@ -167,21 +194,13 @@ public class SelectProjectDialog extends GuiWindow {
 		return "Open Project";
 	}
 
-	public void setProject(String project) {
-		this.projectName = project;
-	}
-
-	@Override
-	public void setErrorMessage(String errorMsg){
+	private void setErrorMessage(String errorMsg){
 		this.errorLabel.setText(errorMsg);
 	}
 
-	public boolean isProjectSelected() {
-		return this.projectName != null && !this.projectName.isEmpty();
-	}
-
-	public String getSelectedProject() {
-		return this.projectName;
+	@Override
+	protected String getDescriptiveName() {
+		return "Select Project Dialog";
 	}
 	
 }

src/com/coder/client/gui/selectProject/SelectProjectDialogListener.java

@@ -1,15 +0,0 @@
-package com.coder.client.gui.selectProject;
-
-public interface SelectProjectDialogListener {
-
-	void newProject();
-
-	void cancel();
-
-	void open(String selectedProjectName);
-
-	void willShow();
-
-	void refresh();
-
-}

src/com/coder/client/gui/selectServer/SelectServerDialog.java

@@ -2,7 +2,6 @@ package com.coder.client.gui.selectServer;
 
 import java.io.IOException;
 import java.net.URL;
-import java.util.HashSet;
 import java.util.ResourceBundle;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -24,13 +23,17 @@ import javafx.scene.input.MouseEvent;
 import javafx.util.Callback;
 
 import zutil.log.LogUtil;
+import zutil.net.ssdp.SSDPClient;
+import zutil.net.ssdp.StandardSSDPInfo;
 
+import com.coder.client.CoderClient;
 import com.coder.client.gui.GuiWindow;
+import com.coder.client.session.SessionListener;
 
 public class SelectServerDialog extends GuiWindow {
 	public static final Logger logger = LogUtil.getLogger();
-	private HashSet<SelectServerDialogListener> listeners;
 	private ObservableList<ServerListItem> serverList;
+	private CoderClient client;
 	
 	private String address = null;
 	private int port = -1;
@@ -40,19 +43,63 @@ public class SelectServerDialog extends GuiWindow {
 	@FXML private Button connectButton;
 	@FXML private Label errorLabel;
 	
-	public SelectServerDialog() throws IOException {
+	public SelectServerDialog(CoderClient client) throws IOException {
 		super(SelectServerDialog.class.getResource("SelectServerDialog.fxml"));
-		listeners = new HashSet<SelectServerDialogListener>();
+		this.client = client;
+		client.getSessionHandler().addSessionListener(new SessionListener() {
+			@Override
+			public void sessionConnectionSuccess() {
+				setErrorMessage("");
+			}
+			@Override
+			public void sessionDisconnected(boolean tryToEstablishConnection) {
+				if(!tryToEstablishConnection){
+					logger.info("No reconnection should be performed, reseting server address");
+					setServerAddress(null);
+				}else{
+					setErrorMessage("The current session was disconnected");
+				}
+			}
+			@Override
+			public void sessionConnectionFailure() {
+				setServerAddress(null);
+				setErrorMessage("ERROR: Unable to connect to remote host");
+			}
+			@Override
+			public void sessionAuthenticationSuccess() {
+				setErrorMessage("");
+			}
+			@Override
+			public void sessionAuthenticationFailure() {
+				setErrorMessage("");
+			}
+			@Override
+			public void sessionAuthenticationCancel() {
+				setServerAddress(null);
+				setErrorMessage(null);
+			}
+		});
 	}
 
 	@Override
 	protected void willShow() {
-		for(SelectServerDialogListener listener : this.listeners){
-			listener.willShow();
-		}
+		logger.fine("Clearing server list");
+		serverList.clear();
 		if(address != null && port != -1){
+			logger.fine("will outofire the connect button since all parameters are already set");
 			connectButton.setDisable(false);
 			connectButton.fire();
+		}else{
+			logger.fine("sending a SSDP request for local servers");
+			SSDPClient ssdpClient = client.getSSDPClient();
+			if(ssdpClient != null){
+				ssdpClient.requestService("coder:discover");
+				for(StandardSSDPInfo server : ssdpClient.getServices("coder:discover")){
+	                addServerToList(server.getInetAddress().getHostAddress(), 1337);
+				}
+			}else{
+				logger.severe("could not send a SSDP request since the client is not setup");
+			}
 		}
 		connectButton.setDisable(true);
 	}
@@ -110,21 +157,19 @@ public class SelectServerDialog extends GuiWindow {
 
 	@FXML
 	protected void exit(ActionEvent event){
-		for(SelectServerDialogListener listener : this.listeners){
-			listener.exit();
-		}
+		logger.fine("exit button triggered");
+		client.exit();
 	}
 
 	@FXML
 	protected void connect(ActionEvent event){
-		for(SelectServerDialogListener listener : this.listeners){
-			listener.connect(address, port);
+		logger.fine("connect button triggered");
+		//connect session
+		boolean success = client.getSessionHandler().setupConnection(address, port);
+		if(!success){
+			logger.severe("Could not setup a connection to " + address + ":" + port);
 		}
 	}
-	
-	public void addSelectProjectDialogListener(SelectServerDialogListener listener){
-		this.listeners.add(listener);
-	}
 
 	public void setServerAddress(String serverAddress) {
 		this.address = serverAddress;
@@ -144,15 +189,14 @@ public class SelectServerDialog extends GuiWindow {
 		ServerListItem item = new ServerListItem(ip, port);
 		this.serverList.add(item);
 	}
-	
-	public void clearServerList(){
-		logger.fine("Clearing server list");
-		serverList.clear();
-	}
 
-	@Override
-	public void setErrorMessage(String errorMsg) {
+	private void setErrorMessage(String errorMsg) {
 		this.errorLabel.setText(errorMsg);
 	}
 
+	@Override
+	protected String getDescriptiveName() {
+		return "Select Server Dialog";
+	}
+
 }

src/com/coder/client/gui/selectServer/SelectServerDialogListener.java

@@ -1,11 +0,0 @@
-package com.coder.client.gui.selectServer;
-
-public interface SelectServerDialogListener {
-
-	void willShow();
-
-	void exit();
-
-	void connect(String serverAddress, int port);
-
-}