Merge pull request #34 from Blo0dR0gue/gui_new

Version 1.0

.gitignore

@@ -29,39 +29,10 @@ hs_err_pid*
 
 ### JetBrains ###
 
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
 # Gradle and Maven with auto-import
 # When using Gradle or Maven with auto-import, you should exclude module files,
 # since they will be recreated, and may cause churn.  Uncomment if using
 # auto-import.
- .idea/artifacts
- .idea/compiler.xml
- .idea/jarRepositories.xml
- .idea/modules.xml
- .idea/*.iml
- .idea/modules
  *.iml
  *.ipr
 
@@ -78,4 +49,4 @@ crashlytics-build.properties
 fabric.properties
 
 modules.xml
-.idea/misc.xml
+

src/main/java/com/dhbw/thesim/Main.java

@@ -18,36 +18,9 @@
  */
 public class Main {
 
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) {
         Application.launch(Display.class,args);
         JsonHandler.setDirectory();
-
-        //------------------------------------------------------------------------------------------------------------------
-        //Testen von JsonHandler: TODO nur zum Testen, bzw. fürs Verständnis
-
-            //ArrayList<String> aller json-Dateien mit Scenario im Namen
-            System.out.println(JsonHandler.getExistingScenarioFileNames());
-
-            JsonHandler.exportDefaultScenarioConfig();
-            JsonHandler.exportDefaultSimulationObjectsConfig();
-
-            HashMap<String,Integer> tempDino = new HashMap<>();
-            tempDino.put("Abrictosaurus",3);
-            HashMap<String,Integer> tempPlant = new HashMap<>();
-            tempPlant.put("Farn",4);
-            JsonHandler.exportScenarioConfig(tempDino,tempPlant,"landschaftsName", 9.0, "test");
-
-        //Testen von Json2Objects: TODO nur zum Testen, bzw. fürs Verständnis
-            HashMap<String,Integer> testInitDino=new HashMap<>();
-            testInitDino.put("Abrictosaurus",2);
-            HashMap<String,Integer> testInitPlant=new HashMap<>();
-            testInitPlant.put("Farn",4);
-            Json2Objects.initSimObjects(testInitDino, testInitPlant, 3.0);
-
-            Json2Objects.getParamsForGUI(Json2Objects.Type.NO_SCENARIO_FILE, "");
-            System.out.println("--------------");
-            Json2Objects.getParamsForGUI(Json2Objects.Type.WITH_SCENARIO_FILE, "testScenarioConfiguration");
-        //------------------------------------------------------------------------------------------------------------------
     }
 
 }