svn commit: r502234 - /incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/PrefsMediator.java

[al...@apache.org]

Author: alally
Date: Thu Feb  1 06:52:10 2007
New Revision: 502234

URL: http://svn.apache.org/viewvc?view=rev&rev=502234
Log:
Fix for style map file naming problem.
UIMA-257: https://issues.apache.org/jira/browse/UIMA-257

Modified:
    incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/PrefsMediator.java

Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/PrefsMediator.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/PrefsMediator.java?view=diff&rev=502234&r1=502233&r2=502234
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/PrefsMediator.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/PrefsMediator.java Thu Feb  1 06:52:10 2007
@@ -163,7 +163,7 @@
    * 
    */
   public String getTAEPath() {
-    int index = taeDir.lastIndexOf(File.separator);
+    int index = indexOfLastFileSeparator(taeDir);
     if (index > 0) {
       String path = taeDir.substring(0, index);
       return path;
@@ -173,15 +173,32 @@
   }
 
   public String getTAEFileNameRoot() {
-    int index = taeDir.lastIndexOf(File.separator);
+    String file;
+    int index = indexOfLastFileSeparator(taeDir);
     if (index > 0) {
-      String file = taeDir.substring(index);
-      int ix = file.indexOf(".xml");
-      file = file.substring(0, ix);
-      return file;
+      file = taeDir.substring(index);
     } else {
-      return "";
+      file = taeDir;
+    }
+    int ix = file.indexOf(".xml");
+    if (ix >= 0) {
+      file = file.substring(0, ix);
+    }
+    return file;
+  }
+
+  /**
+   * Gets index of last file separator character in a file path.
+   * Supports File.separator but also / on Windows.
+   * @param path
+   * @return index of the last file separator char.  Returns -1 if none.
+   */
+  private int indexOfLastFileSeparator(String path) {
+    int index = path.lastIndexOf(File.separator);
+    if (!File.separator.equals("/")) {
+      index = Math.max(index, path.lastIndexOf('/'));
     }
+    return index;
   }
 
   /**