You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2016/07/22 13:37:08 UTC
svn commit: r1753791 - in
/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide:
launching/RutaLauncher.java ui/preferences/RutaProjectPreferencePage.java
Author: pkluegl
Date: Fri Jul 22 13:37:08 2016
New Revision: 1753791
URL: http://svn.apache.org/viewvc?rev=1753791&view=rev
Log:
UIMA-5017
- improve preference page, use valid default format
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=1753791&r1=1753790&r2=1753791&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 Fri Jul 22 13:37:08 2016
@@ -167,6 +167,9 @@ public class RutaLauncher {
}
SerialFormat format = SerialFormat.valueOf(defaultFormat);
+ if(format == SerialFormat.UNKNOWN) {
+ format = SerialFormat.XMI;
+ }
String extension = FilenameUtils.getExtension(file.getName());
if(COMMON_PLAIN_TEXT_FILE_EXTENSIONS.contains(extension)) {
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=1753791&r1=1753790&r2=1753791&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 Fri Jul 22 13:37:08 2016
@@ -31,8 +31,8 @@ import org.eclipse.ui.IWorkbenchPreferen
/**
* Preference page to manage preferences for the ide plugin.
*/
-public class RutaProjectPreferencePage extends FieldEditorPreferencePage implements
- IWorkbenchPreferencePage {
+public class RutaProjectPreferencePage extends FieldEditorPreferencePage
+ implements IWorkbenchPreferencePage {
private BooleanFieldEditor clearOutput;
@@ -41,7 +41,7 @@ public class RutaProjectPreferencePage e
private BooleanFieldEditor addSDI;
private ComboFieldEditor defaultCasSerializationFormat;
-
+
public RutaProjectPreferencePage() {
setPreferenceStore(RutaIdeUIPlugin.getDefault().getPreferenceStore());
setDescription("Project Management");
@@ -56,18 +56,21 @@ public class RutaProjectPreferencePage e
noVM = new BooleanFieldEditor(RutaCorePreferences.NO_VM_IN_DEV_MODE,
RutaPreferencesMessages.NoVMInDevMode, getFieldEditorParent());
addField(noVM);
-
- addSDI = new BooleanFieldEditor(RutaCorePreferences.ADD_SDI,
- RutaPreferencesMessages.AddSDI, getFieldEditorParent());
+
+ addSDI = new BooleanFieldEditor(RutaCorePreferences.ADD_SDI, RutaPreferencesMessages.AddSDI,
+ 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].toString()};
+ values[i] = new String[] {
+ formats[i].toString() + " (" + formats[i].getDefaultFileExtension() + ")",
+ formats[i].toString() };
}
-
- defaultCasSerializationFormat = new ComboFieldEditor(RutaCorePreferences.DEFAULT_CAS_SERIALIZATION_FORMAT,
+
+ defaultCasSerializationFormat = new ComboFieldEditor(
+ RutaCorePreferences.DEFAULT_CAS_SERIALIZATION_FORMAT,
RutaPreferencesMessages.DefaultCasSerializationFormat, values, getFieldEditorParent());
addField(defaultCasSerializationFormat);