different fixes

eschava · eschava · commit 4489913818f3 · 2016-03-09T23:18:01.000+02:00
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/libraries/purejavahidapi_0_0_1.xml b/.idea/libraries/purejavahidapi_0_0_1.xml
diff --git a/ht2000.iml b/ht2000.iml
@@ -9,7 +9,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="purejavahidapi-0.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.usb4java:usb4java:1.2.0" level="project" />
     <orderEntry type="library" name="Maven: org.usb4java:libusb4java:linux-x86:1.2.0" level="project" />
     <orderEntry type="library" name="Maven: org.usb4java:libusb4java:linux-x86_64:1.2.0" level="project" />
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.eschava</groupId>
     <artifactId>ht2000</artifactId>
-    <version>0.1-SNAPSHOT</version>
+    <version>0.2-SNAPSHOT</version>
 
 	<build>
         <sourceDirectory>src</sourceDirectory>
@@ -34,6 +34,25 @@
 					</execution>
 				</executions>
 			</plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>ideauidesigner-maven-plugin</artifactId>
+                <version>1.0-beta-1</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>javac2</goal>
+                        </goals>
+                    </execution>
+                </executions>
+
+                <configuration>
+                    <fork>true</fork>
+                    <debug>true</debug>
+                    <failOnError>true</failOnError>
+                </configuration>
+            </plugin>
 		</plugins>
 	</build>
 
diff --git a/release/gui.bat b/release/gui.bat
@@ -1,2 +1,2 @@
 @echo off
-java -classpath lib/* com.eschava.ht2000.gui.HT2000Window
+java -classpath "lib/*" com.eschava.ht2000.gui.HT2000Window
diff --git a/release/mqtt.bat b/release/mqtt.bat
@@ -11,7 +11,7 @@ SET co2Topic=/ht-2000/co2
 
 SET interval=60
 
-java -classpath lib/* ^
+java -classpath "lib/*" ^
 	 -DmqttUrl=%mqttUrl% ^
 	 -DmqttClientId=%mqttClientId% ^
 	 -DmqttUser=%mqttUser% ^
diff --git a/release/print.bat b/release/print.bat
@@ -1,2 +1,2 @@
 @echo off
-java -classpath lib/* com.eschava.ht2000.console.PrintState
+java -classpath "lib/*" com.eschava.ht2000.console.PrintState
diff --git a/src/com/eschava/ht2000/mqtt/MQTTMain.java b/src/com/eschava/ht2000/mqtt/MQTTMain.java
@@ -40,6 +40,10 @@ private static byte[] getPayload(double v) {
         return String.valueOf(v).getBytes();
     }
 
+    private static byte[] getPayload(int v) {
+        return String.valueOf(v).getBytes();
+    }
+
     public static void main(String[] args) throws Exception {
         new MqttMain().start();
     }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`@echo off`
`2`		`-java -classpath lib/* com.eschava.ht2000.gui.HT2000Window`
	`2`	`+java -classpath "lib/*" com.eschava.ht2000.gui.HT2000Window`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,10 @@ private static byte[] getPayload(double v) {`
`40`	`40`	`return String.valueOf(v).getBytes();`
`41`	`41`	`}`
`42`	`42`
	`43`	`+ private static byte[] getPayload(int v) {`
	`44`	`+ return String.valueOf(v).getBytes();`
	`45`	`+ }`
	`46`	`+`
`43`	`47`	`public static void main(String[] args) throws Exception {`
`44`	`48`	`new MqttMain().start();`
`45`	`49`	`}`