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

[pk...@apache.org]

Author: pkluegl
Date: Wed Jul 20 09:49:18 2016
New Revision: 1753478

URL: http://svn.apache.org/viewvc?rev=1753478&view=rev
Log:
UIMA-5017
- use SerialFormat

Modified:
    uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConfigurationDelegate.java
    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/RutaLaunchConfigurationDelegate.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConfigurationDelegate.java?rev=1753478&r1=1753477&r2=1753478&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConfigurationDelegate.java (original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConfigurationDelegate.java Wed Jul 20 09:49:18 2016
@@ -33,11 +33,11 @@ import java.util.TreeSet;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.uima.cas.CAS;
+import org.apache.uima.cas.SerialFormat;
 import org.apache.uima.ruta.ide.RutaIdeCorePlugin;
 import org.apache.uima.ruta.ide.RutaIdeUIPlugin;
 import org.apache.uima.ruta.ide.core.RutaCorePreferences;
 import org.apache.uima.ruta.ide.core.builder.RutaProjectUtils;
-import org.apache.uima.util.SerializationFormat;
 import org.eclipse.core.internal.resources.Folder;
 import org.eclipse.core.resources.IProjectNature;
 import org.eclipse.core.resources.IResource;
@@ -83,7 +83,7 @@ public class RutaLaunchConfigurationDele
     String defaultFormat = preferenceStore
             .getString(RutaCorePreferences.DEFAULT_CAS_SERIALIZATION_FORMAT);
     if (defaultFormat == null) {
-      defaultFormat = SerializationFormat.XMI.name();
+      defaultFormat = SerialFormat.XMI.name();
     }
 
     IResource member = proj.getProject().findMember(mainScriptAttribute);

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=1753478&r1=1753477&r2=1753478&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 Wed Jul 20 09:49:18 2016
@@ -35,12 +35,12 @@ import org.apache.commons.io.IOUtils;
 import org.apache.uima.analysis_engine.AnalysisEngine;
 import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.cas.CAS;
+import org.apache.uima.cas.SerialFormat;
 import org.apache.uima.resource.ResourceConfigurationException;
 import org.apache.uima.ruta.engine.Ruta;
 import org.apache.uima.ruta.engine.RutaEngine;
 import org.apache.uima.util.CasIOUtils;
 import org.apache.uima.util.FileUtils;
-import org.apache.uima.util.SerializationFormat;
 import org.apache.uima.util.impl.ProcessTrace_impl;
 import org.xml.sax.SAXException;
 
@@ -166,7 +166,7 @@ public class RutaLauncher {
 
     }
     
-    SerializationFormat format = SerializationFormat.valueOf(defaultFormat);
+    SerialFormat format = SerialFormat.valueOf(defaultFormat);
     String extension = FilenameUtils.getExtension(file.getName());
     if(COMMON_PLAIN_TEXT_FILE_EXTENSIONS.contains(extension)) {
       String document = FileUtils.file2String(file, inputEncoding);
@@ -227,7 +227,7 @@ public class RutaLauncher {
   }
 
 
-  private static File getOutputFile(File inputFile, File inputFolder, File outputFolder, SerializationFormat format) {
+  private static File getOutputFile(File inputFile, File inputFolder, File outputFolder, SerialFormat format) {
     URI relativize = inputFolder.toURI().relativize(inputFile.toURI());
     String path = relativize.getPath();
     String ext = "." + format.getDefaultFileExtension();

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=1753478&r1=1753477&r2=1753478&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 Wed Jul 20 09:49:18 2016
@@ -19,9 +19,9 @@
 
 package org.apache.uima.ruta.ide.ui.preferences;
 
+import org.apache.uima.cas.SerialFormat;
 import org.apache.uima.ruta.ide.RutaIdeUIPlugin;
 import org.apache.uima.ruta.ide.core.RutaCorePreferences;
-import org.apache.uima.util.SerializationFormat;
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.ComboFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
@@ -61,7 +61,7 @@ public class RutaProjectPreferencePage e
             RutaPreferencesMessages.AddSDI, getFieldEditorParent());
     addField(addSDI);
     
-    SerializationFormat[] formats = SerializationFormat.values();
+    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].toString()};