svn commit: r1755160 - in /uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide: launching/RutaLauncher.java ui/preferences/RutaProjectPreferencePage.java

[pk...@apache.org]

Author: pkluegl
Date: Thu Aug  4 09:42:50 2016
New Revision: 1755160

URL: http://svn.apache.org/viewvc?rev=1755160&view=rev
Log:
UIMA-5017
- use url interface
- manual selection and order of format options

Modified:
    uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java
    uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaProjectPreferencePage.java

Modified: uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java?rev=1755160&r1=1755159&r2=1755160&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java (original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java Thu Aug  4 09:42:50 2016
@@ -176,7 +176,7 @@ public class RutaLauncher {
       cas.setDocumentText(document);
     } else {
       try {
-        format = CasIOUtils.load(file, null, cas, true);
+        format = CasIOUtils.load(file.toURI().toURL(), null, cas, true);
       } catch (Exception e) {
         // no format? maybe really a plain text format?
         String document = FileUtils.file2String(file, inputEncoding);

Modified: uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaProjectPreferencePage.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaProjectPreferencePage.java?rev=1755160&r1=1755159&r2=1755160&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaProjectPreferencePage.java (original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaProjectPreferencePage.java Thu Aug  4 09:42:50 2016
@@ -61,13 +61,16 @@ public class RutaProjectPreferencePage e
             getFieldEditorParent());
     addField(addSDI);
 
-    SerialFormat[] formats = SerialFormat.values();
-    String[][] values = new String[formats.length][];
-    for (int i = 0; i < formats.length; i++) {
-      values[i] = new String[] {
-          formats[i].toString() + " (" + formats[i].getDefaultFileExtension() + ")",
-          formats[i].toString() };
-    }
+    String[][] values = new String[7][];
+    int index = 0;
+    addFormat(values, index++, SerialFormat.XMI);
+    addFormat(values, index++, SerialFormat.XCAS);
+    addFormat(values, index++, SerialFormat.BINARY);
+    addFormat(values, index++, SerialFormat.COMPRESSED);
+    addFormat(values, index++, SerialFormat.COMPRESSED_FILTERED);
+    addFormat(values, index++, SerialFormat.SERIALIZED);
+    addFormat(values, index++, SerialFormat.SERIALIZED_TS);
+    
 
     defaultCasSerializationFormat = new ComboFieldEditor(
             RutaCorePreferences.DEFAULT_CAS_SERIALIZATION_FORMAT,
@@ -76,6 +79,12 @@ public class RutaProjectPreferencePage e
 
   }
 
+  private void addFormat(String[][] values, int index, SerialFormat serialFormat) {
+    values[index] = new String[] {
+        serialFormat.toString() + " (" + serialFormat.getDefaultFileExtension() + ")",
+        serialFormat.toString() };
+  }
+
   public void init(IWorkbench workbench) {
   }