Merge branch 'fix' into 'master'

autopilots->softwares rename fix

See merge request !13

src/main/java/de/rwth/monticore/EmbeddedMontiArc/simulators/rmimodelserver/RMIServer.java

@@ -59,9 +59,9 @@ public class RMIServer {
             return;
         }
 
-        File autopilot_folder = new File(options.containsKey("autopilots_folder") ? options.get("autopilots_folder") : "autopilots");
-        if (!autopilot_folder.exists()){
-            System.out.printf("The autopilot folder %s does not exist\n", autopilot_folder);
+        File softwares_folder = new File(options.containsKey("softwares_folder") ? options.get("softwares_folder") : "autopilots");
+        if (!softwares_folder.exists()){
+            System.out.printf("The autopilot folder %s does not exist\n", softwares_folder);
             return;
         }
 
@@ -71,10 +71,10 @@ public class RMIServer {
 
         SoftwareSimulatorConfig manager_config = new SoftwareSimulatorConfig();
         try {// Load AutopilotAdapter.dll from libraryPath
-            manager_config.set_softwares_folder(autopilot_folder.getCanonicalPath());
+            manager_config.set_softwares_folder(softwares_folder.getCanonicalPath());
         } catch (IOException e) {
             e.printStackTrace();
-            System.out.println("Could not resolve the SoftwareSimulator's software folder path. ("+autopilot_folder+")");
+            System.out.println("Could not resolve the SoftwareSimulator's software folder path. ("+softwares_folder+")");
         }
 
         int port_id = Integer.valueOf(port);