Addition of error handling

None.
SimpleMethod · May 13, 2018 · 41c15e2 · 41c15e2
1 parent c8c2fc4
commit 41c15e2
Show file tree

Hide file tree

Showing 63 changed files with 44,331 additions and 184 deletions.
diff --git a/.idea/libraries/Maven__org_attoparser_attoparser_2_0_4_RELEASE.xml b/.idea/libraries/Maven__org_attoparser_attoparser_2_0_4_RELEASE.xml
diff --git a/...libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_0_1_RELEASE.xml b/...libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_0_1_RELEASE.xml
diff --git a/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_1_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_1_RELEASE.xml
diff --git a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_9_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_9_RELEASE.xml
diff --git a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_9_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_9_RELEASE.xml
diff --git a/.idea/libraries/Maven__org_unbescape_unbescape_1_1_5_RELEASE.xml b/.idea/libraries/Maven__org_unbescape_unbescape_1_1_5_RELEASE.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/main.nzprofile b/main.nzprofile
@@ -48,30 +48,30 @@
       }
    },
    "pump_settings":{  
-      "100_degrees":100,
-      "50_degrees":100,
-      "20_degrees":100,
-      "70_degrees":100,
-      "0_degrees":100,
-      "90_degrees":100,
-      "60_degrees":100,
-      "30_degrees":100,
-      "10_degrees":100,
-      "40_degrees":100,
-      "80_degrees":100
+      "100_degrees":60,
+      "50_degrees":50,
+      "20_degrees":25,
+      "70_degrees":50,
+      "0_degrees":25,
+      "90_degrees":60,
+      "60_degrees":50,
+      "30_degrees":25,
+      "10_degrees":25,
+      "40_degrees":25,
+      "80_degrees":50
    },
    "fan_settings":{  
       "100_degrees":100,
-      "50_degrees":100,
-      "20_degrees":100,
-      "70_degrees":100,
-      "0_degrees":100,
-      "90_degrees":100,
-      "60_degrees":100,
-      "30_degrees":100,
-      "10_degrees":100,
-      "40_degrees":100,
-      "80_degrees":100
+      "50_degrees":60,
+      "20_degrees":30,
+      "70_degrees":70,
+      "0_degrees":30,
+      "90_degrees":80,
+      "60_degrees":60,
+      "30_degrees":30,
+      "10_degrees":30,
+      "40_degrees":30,
+      "80_degrees":80
    },
    "id":1002,
    "nzreal_class_version":3,

diff --git a/nzOS.iml b/nzOS.iml
@@ -108,5 +108,11 @@
     <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.29" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.29" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.0.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring5:3.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:3.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.attoparser:attoparser:2.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.1.RELEASE" level="project" />
   </component>
 </module>
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.0.1.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <relativePath/>
     </parent>
 
     <properties>
@@ -87,7 +87,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -119,8 +118,6 @@
             </exclusions>
             <scope>test</scope>
         </dependency>
-
-
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
@@ -131,11 +128,12 @@
             <artifactId>spring-boot-starter-tomcat</artifactId>
             <version>2.0.1.RELEASE</version>
         </dependency>
-
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
     </dependencies>
 
-
     <build>
         <plugins>
             <plugin>
@@ -149,5 +147,4 @@
         </plugins>
     </build>
 
-
 </project>
diff --git a/src/main/java/com/project/pcmr/nzos/data_base/PreDataBase.java b/src/main/java/com/project/pcmr/nzos/data_base/PreDataBase.java
@@ -117,10 +117,19 @@ public PreDataBase(String FILE_NAME) {
      */
     private static String CPUNAME;
 
+    /**
+     * Pole zawierające temperaturę CPU.
+     */
     private static long TEMP;
 
+    /**
+     * Pole zawierające prędkość wentylatora wyrażoną w RPM.
+     */
     private static long FAN;
 
+    /**
+     * Pole zawierające temperaturę CPU.
+     */
     private static long LIQUID;
     /**
      * Metoda zwracająca domyślną nazwę pliku.

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,2 +1,3 @@
 server.port = 8090
 spring.jmx.enabled=false
+server.error.whitelabel.enabled=false