Small fixes

Author: nygrenh

build.xml

@@ -10,7 +10,7 @@
 
     <target name="-check-mavenmodules">
         <uptodate property="mavenmodules.uptodate"
-                  srcfile="maven-wrapper/target/nbm/maven-wrapper-1.8.nbm"
+                  srcfile="maven-wrapper/target/nbm/maven-wrapper-1.9.nbm"
                   targetfile="mavenmodules"/>
     </target>
 

maven-wrapper/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>fi.helsinki.cs.tmc</groupId>
     <artifactId>maven-wrapper</artifactId>
-    <version>1.8</version>
+    <version>1.9</version>
     <packaging>nbm</packaging>
 
     <name>TMC Maven Wrapper</name>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>core</artifactId>
-            <version>0.9.4-SNAPSHOT</version>
+            <version>0.9.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

nbproject/genfiles.properties

@@ -8,4 +8,4 @@ nbproject/build-impl.xml.script.CRC32=416371d0
 nbproject/build-impl.xml.stylesheet.CRC32=0f381476@2.50.1
 nbproject/platform.xml.data.CRC32=b49f54e7
 nbproject/platform.xml.script.CRC32=6dcbd131
-nbproject/platform.xml.stylesheet.CRC32=4e1f53d4@2.62.1
+nbproject/platform.xml.stylesheet.CRC32=45ddf0e0@2.72.1

nbproject/project.properties

@@ -16,4 +16,4 @@ project.fi.helsinki.cs.tmc.application=tmc-application
 run.args=-J-client -J-Xss2m -J-Xms32m -J-XX:PermSize=256m -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.zip.disableMemoryMapping=true
 run.jvmargs= -J-XX:PermSize=1024m -J-XX:MaxPermSize=2048m -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled
 # NB version
-app.version=8.1.0
+app.version=8.2.0

tmc-plugin/manifest.mf

@@ -6,4 +6,4 @@ OpenIDE-Module-Requires:
   org.openide.windows.IOProvider,
   org.openide.windows.WindowManager
 OpenIDE-Module-Install: fi/helsinki/cs/tmc/actions/TmcModuleInstall.class
-OpenIDE-Module-Specification-Version: 0.9.2
+OpenIDE-Module-Specification-Version: 1.1.0

tmc-plugin/src/fi/helsinki/cs/tmc/data/ResultCollector.java

@@ -12,6 +12,7 @@
 import com.google.common.collect.ImmutableList;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -59,15 +60,15 @@ public void setLocalTestResults(RunResult runResult) {
             String STDOUT = "stdout";
             String STDERR = "stderr";
             List<String> log = new ArrayList<String>();
-            Splitter s = Splitter.on("\n");
             Map<String,byte[]> logs = runResult.logs;
 
             if (logs.containsKey(STDOUT)) {
-                String str1 = new String(logs.get(STDOUT), Charset.forName("utf-8"));
-                log.addAll(s.splitToList(str1));
+                final String str1 = new String(logs.get(STDOUT), Charset.forName("utf-8"));
+                log.addAll(Arrays.asList(str1.split("\\r?\\n")));
             }
             if (logs.containsKey(STDERR)) {
-                log.addAll(s.splitToList(new String(logs.get(STDERR), Charset.forName("utf-8"))));
+                final String str2 = new String(logs.get(STDERR), Charset.forName("utf-8"));
+                log.addAll(Arrays.asList(str2.split("\\r?\\n")));
             }
 
             log = tryToCleanLog(log);