svn commit: r1811631 - in /uima/uv3/uimaj-v3/trunk: uimaj-core/src/main/java/org/apache/uima/internal/util/ uimaj-core/src/main/java/org/apache/uima/resource/impl/ uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/

[sc...@apache.org]

Author: schor
Date: Tue Oct 10 00:44:29 2017
New Revision: 1811631

URL: http://svn.apache.org/viewvc?rev=1811631&view=rev
Log:
[UIMA-5609] fix emptyURL to be URL[0], not null.  Also - switch back to using just \n as line ending

Modified:
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Misc.java
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
    uima/uv3/uimaj-v3/trunk/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Misc.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Misc.java?rev=1811631&r1=1811630&r2=1811631&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Misc.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Misc.java Tue Oct 10 00:44:29 2017
@@ -65,7 +65,7 @@ public class Misc {
 
   public static final String blanks = new String(new char[1000]).replace('\0', ' ');
   public static final String dots = "...";
-  public static final String ls = System.lineSeparator(); // n or r n
+//  public static final String ls = System.lineSeparator(); // n or r n
   public static final int[] INT0 = new int[] {0};
   
   private static final Pattern whitespace = Pattern.compile("\\s");
@@ -186,20 +186,20 @@ public class Misc {
   public static StringBuilder indent(StringBuilder sb, int indent) {
     // if the current sb doesn't end with a new line and indent > 0, add a new line
     if (!endsWithNl(sb) && indent > 0) {
-      sb.append(ls);
+      sb.append('\n');
     }
     return sb.append(blanks, 0, Math.min(blanks.length(), indent));    
   }
   
   public static void addNlIfMissing(StringBuilder sb) {
     if (!endsWithNl(sb)) {
-      sb.append(ls);
+      sb.append('\n');
     }
   }
   
   public static void addNlIfMissing(StringBuffer sb) {
     if (!endsWithNl(sb)) {
-      sb.append(ls);
+      sb.append('\n');
     }
   }
   

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java?rev=1811631&r1=1811630&r2=1811631&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java Tue Oct 10 00:44:29 2017
@@ -101,7 +101,7 @@ public class ResourceManager_impl implem
   
   protected static final Class<Resource> EMPTY_RESOURCE_CLASS = Resource.class;
 
-  private static final URL[] emptyURLarray = null; 
+  private static final URL[] emptyURLarray = new URL[0]; 
 
   private AtomicBoolean isDestroyed = new AtomicBoolean(false);
   /**

Modified: uima/uv3/uimaj-v3/trunk/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java?rev=1811631&r1=1811630&r2=1811631&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java Tue Oct 10 00:44:29 2017
@@ -668,7 +668,7 @@ public class MigrateJCas extends VoidVis
                       ? Misc.ppList(indent, Misc.setAsList(containersAndV2Paths), -1, StringBuilder::append)
                       : "null").append(',');
       si(sb).append("v3SourcePath=").append(v3SourcePath).append(',');
-      si(sb).append("fqcn_slash=").append(fqcn_slash).append("]").append(Misc.ls);
+      si(sb).append("fqcn_slash=").append(fqcn_slash).append("]").append('\n');
       } finally {
         indent[0] -= 2;
       }
@@ -2057,7 +2057,7 @@ public class MigrateJCas extends VoidVis
   
   private void logPrintNl(String msg, Writer bw) throws IOException {
     logPrint(msg, bw);
-    logPrint(Misc.ls, bw);
+    logPrint("\n", bw);
   }
   
   /**