Dependencies corrected.

Author: khodabande

Mithosis/src/core/Context.java

@@ -4,6 +4,7 @@
 import com.google.gson.JsonParseException;
 import core.model.*;
 import core.model.Map;
+import model.*;
 import server.core.model.ClientInfo;
 import util.Constants;
 
@@ -23,8 +24,8 @@ public class Context {
     private Map map;
     private Team[] teams;
 
-    private HashMap<String,DynamicGameObject> allDynamicObjects;
-    private HashMap<String,Cell> allCells;
+    private HashMap<String, DynamicGameObject> allDynamicObjects;
+    private HashMap<String, Cell> allCells;
 
     private ArrayList<Position[]> relatedVisiblePositionsFromOdd;
     private ArrayList<Position[]> relatedVisiblePositionsFromEven;

Mithosis/src/core/MitosisGameLogic.java

@@ -1,15 +1,15 @@
 package core;
 
 import core.model.*;
-import core.model.Cell;
+import model.*;
 import core.model.Map;
-import messages.*;
+import data.*;
 import util.Constants;
 import server.Server;
 import server.core.GameLogic;
 import server.core.model.ClientInfo;
-import server.core.model.Event;
-import server.network.data.Message;
+import model.Event;
+import network.data.Message;
 
 import java.io.IOException;
 import java.util.*;

Mithosis/src/core/model/Block.java

@@ -1,8 +1,9 @@
 package core.model;
 
 import core.Context;
-import messages.BlockData;
-import messages.StaticData;
+import data.BlockData;
+import data.StaticData;
+import model.Position;
 import util.Constants;
 import util.UID;
 

Mithosis/src/core/model/Cell.java

@@ -1,20 +1,19 @@
 package core.model;
 
 import core.Context;
-import messages.CellData;
-import messages.DynamicData;
+import data.CellData;
+import data.DynamicData;
+import model.Direction;
+import model.Position;
 import util.Constants;
 import util.UID;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
 
 /**
  * Created by rajabzz on 2/2/15.
  */
-public class Cell extends  DynamicGameObject{
+public class Cell extends DynamicGameObject {
     public static final int MIN_ENERGY_FOR_MITOSIS = 50; //TODO can change later
 
     private Context ctx;

Mithosis/src/core/model/DynamicGameObject.java

@@ -1,24 +1,25 @@
 package core.model;
 
 
+import model.GameObject;
+
 /**
  * Created by rajabzz on 2/3/15.
  */
-public class DynamicGameObject extends GameObject{
+public class DynamicGameObject extends GameObject {
+
     public static final String NAME = "dynamic";
 
     public static final int CELL_OTHER_INDEX_TEAM_ID = 0;
 
     final protected int teamId;
 
-    DynamicGameObject(int teamId)
-    {
+    DynamicGameObject(int teamId) {
         this.teamId = teamId;
     }
 
-
-
     public int getTeamId() {
         return teamId;
     }
+
 }

Mithosis/src/core/model/Map.java

@@ -1,8 +1,8 @@
 package core.model;
 
 import com.google.gson.Gson;
-import com.google.gson.JsonObject;
 import core.Context;
+import model.Position;
 import util.Constants;
 
 import java.io.File;

Mithosis/src/core/model/Position.java

@@ -1,7 +1,7 @@
 package core.model;
 
 import core.Context;
-import core.MitosisGameLogic;
+import model.Position;
 import server.core.model.ClientInfo;
 import util.Constants;
 

Mithosis/src/core/model/Team.java

@@ -1,8 +1,8 @@
-package messages;
+package core.model;
 
-import core.model.DynamicGameObject;
-import core.model.StaticGameObject;
-import core.model.Transient;
+import data.DynamicData;
+import data.StaticData;
+import model.Transient;
 
 import java.util.ArrayList;
 

common/src/messages/UITurnData.java Mithosis/src/core/model/UITurnData.javacommon/src/messages/UITurnData.java renamed to Mithosis/src/core/model/UITurnData.java

@@ -7,10 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="JGFramework" />
-    <orderEntry type="module" module-name="JeyC2015" />
-    <orderEntry type="library" name="gson-2.3.1 (2)" level="project" />
-    <orderEntry type="module" module-name="JeyC2015" />
     <orderEntry type="library" name="gson-2.3.1" level="project" />
+    <orderEntry type="module" module-name="common" />
   </component>
 </module>