Moved model to different package

src/camsucks/Communicator.java → src/camsucks/model/Communicator.java

@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package camsucks;
+package camsucks.model;
 
 import gnu.io.*;
 import java.io.IOException;

src/camsucks/ComputerModel.java → src/camsucks/model/ComputerModel.java

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package camsucks;
+package camsucks.model;
 
 import java.io.BufferedReader;
 import java.io.File;

src/camsucks/GRID.java → src/camsucks/model/GRID.java

@@ -3,8 +3,9 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package camsucks;
+package camsucks.model;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleIntegerProperty;
@@ -72,7 +73,7 @@ public class GRID {
 
         if (communicator.getConnected() == true) {
            communicator.initIOStream();
-           System.out.println(communicator.getBuffer());
+           //System.out.println(Arrays.toString(communicator.getBuffer()));
           
            
         }

src/camsucks/Sensor.java → src/camsucks/model/Sensor.java

@@ -3,7 +3,9 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package camsucks;
+package camsucks.model;
+
+import java.util.Arrays;
 
 
 /**
@@ -36,7 +38,9 @@ public class Sensor {
         
         temperatureSensorList = jWMI.getWMISensorList("Temperature").split(", ");
         loadSensorList = jWMI.getWMISensorList("Load").split(", ");
-        
+        //System.out.println(Arrays.toString(temperatureSensorList));
+        //System.out.println(Arrays.toString(loadSensorList));
+
         //Init for cpuCoreNumber
         cpuCoreNumber = 0;
         for (String temperatureSensorList1 : loadSensorList) {

src/camsucks/jWMI.java → src/camsucks/model/jWMI.java

@@ -1,4 +1,4 @@
-package camsucks;
+package camsucks.model;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
@@ -183,7 +183,7 @@ public class jWMI {
         String tmpFileName = tmpDirName + File.separator + "jwmi.vbs";
         writeStrToFile(tmpFileName, vbScript);
         String output = execute(new String[]{"cmd.exe", "/C", "cscript.exe", tmpFileName});
-        new File(tmpFileName).delete();
+        //new File(tmpFileName).delete();
 
         return output.trim();
     }
@@ -202,7 +202,7 @@ public class jWMI {
         String tmpFileName = tmpDirName + File.separator + "jwmi.vbs";
         writeStrToFile(tmpFileName, vbScript);
         String output = execute(new String[]{"cmd.exe", "/C", "cscript.exe", tmpFileName});
-        new File(tmpFileName).delete();
+        //new File(tmpFileName).delete();
 
         return output.trim();
     }
@@ -222,7 +222,7 @@ public class jWMI {
         String tmpFileName = tmpDirName + File.separator + "jwmi.vbs";
         writeStrToFile(tmpFileName, vbScript);
         String output = execute(new String[]{"cmd.exe", "/C", "cscript.exe", tmpFileName});
-        new File(tmpFileName).delete();
+        //new File(tmpFileName).delete();
 
         return output.trim();
     }