diff --git a/CoderClient.iml b/CoderClient.iml
index b7733fa..6c9b304 100644
--- a/CoderClient.iml
+++ b/CoderClient.iml
@@ -9,5 +9,14 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/com/coder/client/CoderClient.java b/src/com/coder/client/CoderClient.java
index d9a62af..471ae08 100755
--- a/src/com/coder/client/CoderClient.java
+++ b/src/com/coder/client/CoderClient.java
@@ -7,7 +7,6 @@ import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
-import com.coder.client.Session;
import com.coder.client.gui.GuiWindow;
import com.coder.client.gui.editor.EditorWindow;
import com.coder.client.gui.editor.EditorWindowListener;
@@ -20,14 +19,7 @@ import com.coder.client.gui.selectProject.SelectProjectDialogListener;
import com.coder.client.gui.selectServer.SelectServerDialog;
import com.coder.client.gui.selectServer.SelectServerDialogListener;
import com.coder.server.CoderServer;
-import com.coder.server.message.CoderMessage;
-import com.coder.server.message.ConfigData;
-import com.coder.server.message.ProjectCreateReqMsg;
-import com.coder.server.message.ProjectListData;
-import com.coder.server.message.ProjectListReqMsg;
-import com.coder.server.message.ProjectReqMsg;
-import com.coder.server.message.ProjectRspMsg;
-import com.coder.server.message.ProjectTypeReqMsg;
+import com.coder.server.message.*;
import zutil.log.CompactLogFormatter;
import zutil.log.LogUtil;
@@ -230,7 +222,7 @@ public class CoderClient extends Application{
}}).start();
session.addCoderMessageReceivedListener(new CoderMessageReceivedListener() {
@Override
- public void projectListRspReceived(final Map projectListRsp) {
+ public void projectListRspReceived(final ProjectListRspMsg projectListRsp) {
logger.fine("a ProjectListRsp received");
Platform.runLater(new Runnable() {
@Override
@@ -275,13 +267,13 @@ public class CoderClient extends Application{
});
}
@Override
- public void projectTypeRspReceived(final Map projectTypeRsp) {
+ public void projectTypeRspReceived(final ProjectTypeRspMsg projectTypeRsp) {
logger.fine("a ProjectTypeRspMsg received");
Platform.runLater(new Runnable() {
@Override
public void run() {
for(String typeName : projectTypeRsp.keySet()){
- ConfigData typeData = projectTypeRsp.get(typeName);
+ SupportedProperties typeData = projectTypeRsp.get(typeName);
newProjectDialog.addProjectTypeToList(typeName, typeData);
}
}
diff --git a/src/com/coder/client/CoderMessageReceivedListener.java b/src/com/coder/client/CoderMessageReceivedListener.java
old mode 100644
new mode 100755
index bc75ba2..26d7358
--- a/src/com/coder/client/CoderMessageReceivedListener.java
+++ b/src/com/coder/client/CoderMessageReceivedListener.java
@@ -2,15 +2,13 @@ package com.coder.client;
import java.util.Map;
-import com.coder.server.message.ConfigData;
-import com.coder.server.message.ProjectListData;
-import com.coder.server.message.ProjectRspMsg;
+import com.coder.server.message.*;
public interface CoderMessageReceivedListener {
//project messages
- void projectTypeRspReceived(Map projectTypeRsp);
- void projectListRspReceived(Map projectListRsp);
+ void projectTypeRspReceived(ProjectTypeRspMsg projectTypeRsp);
+ void projectListRspReceived(ProjectListRspMsg projectListRsp);
void projectRspReceived(ProjectRspMsg projectRspMsg);
}
diff --git a/src/com/coder/client/gui/newProject/NewProjectDialog.java b/src/com/coder/client/gui/newProject/NewProjectDialog.java
index dd4a26a..7fe21f7 100755
--- a/src/com/coder/client/gui/newProject/NewProjectDialog.java
+++ b/src/com/coder/client/gui/newProject/NewProjectDialog.java
@@ -6,6 +6,7 @@ import java.util.HashSet;
import java.util.ResourceBundle;
import java.util.logging.Logger;
+import com.coder.server.message.SupportedProperties;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.event.ActionEvent;
@@ -20,7 +21,6 @@ import javafx.scene.input.KeyEvent;
import zutil.log.LogUtil;
import com.coder.client.gui.GuiWindow;
-import com.coder.server.message.ConfigData;
public class NewProjectDialog extends GuiWindow {
public static final Logger logger = LogUtil.getLogger();
@@ -114,7 +114,7 @@ public class NewProjectDialog extends GuiWindow {
this.listeners.add(newProjectDialogListener);
}
- public void addProjectTypeToList(String typeName, ConfigData typeData) {
+ public void addProjectTypeToList(String typeName, SupportedProperties typeData) {
logger.fine("Adding project type \"" + typeName + "\" to the project type list");
projectTypeList.add(typeName);
}