Cleanup

src/main/java/model/SOMConfig.java

@@ -24,7 +24,6 @@ public class SOMConfig {
     @XmlElement(name = "UPLOAD_PATH")
     public static final String UPLOAD_PATH = getEventPicDir();
     // The Box's ID
-    // Todo Throw out!! or by MAC Adress
     @XmlElement(name = "BOX_ID")
     public static final String BOX_ID = MachineWorker.getHostName();
     // Number of pictures in series mode
@@ -41,12 +40,12 @@ public class SOMConfig {
     public static final String CLOUD_CREDENTIALS = "upload:geheim";
     // Make the Scaling Algorithm switchable
     public static final int SCALING_GRAPHICS_2D = 0;
-    public static final int SCALING_IMAGE_ICON = 1;
-    public static final int SCALING_JAVAFX = 2;
+    public static final int SCALING_JAVAFX = 1;
+
     public static final int SCALING_ALGORITHM = SCALING_GRAPHICS_2D;
+    public static final String CLOUD_ADDRESS = "https://cloud.selfomat.de/remote.php/webdav/";
     // Path to configfile
-    //TODO Resource??
-    private static final File configfile = new File(SOMLayout.class.getResource("/config/config.xml").getFile());
+    private static final File configfile = new File(("config/config.xml"));
     // Instance
     private static SOMConfig config = null;
 
@@ -82,11 +81,6 @@ public class SOMConfig {
 
         File picturesPath = SOMConfig.PICTURES_PATH;
 
-//        File eventPicDir = new File(picturesPath.toString() + "/" + timeString
-//                + "/" + MachineWorker.getHostName());
-        // TODO catch possible fail
-//        eventPicDir.mkdirs();
-
         String eventPicDir = picturesPath.toString() + "/" + timeString
                 + "/" + MachineWorker.getHostName();
 
@@ -96,8 +90,6 @@ public class SOMConfig {
     // Write Config
     private void writeConfig() {
         try {
-
-            // TODO catch possible fail
             configfile.getParentFile().mkdirs();
 
             JAXBContext jaxbContext = JAXBContext.newInstance(SOMConfig.class);