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 2013/06/13 17:38:03 UTC
svn commit: r1492709 - in /uima/sandbox/ruta/trunk/ruta-ep-ide/src/main:
java/org/apache/uima/ruta/ide/core/ java/org/apache/uima/ruta/ide/launching/
java/org/apache/uima/ruta/ide/ui/preferences/
resources/org/apache/uima/ruta/ide/ui/preferences/
Author: pkluegl
Date: Thu Jun 13 15:38:03 2013
New Revision: 1492709
URL: http://svn.apache.org/r1492709
Log:
UIMA-2995
- started to add sdi in launcher
Modified:
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaCorePreferences.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaPreferenceInitializer.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConfigurationDelegate.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConstants.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaPreferencesMessages.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaProjectPreferencePage.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/resources/org/apache/uima/ruta/ide/ui/preferences/RutaPreferencesMessages.properties
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaCorePreferences.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaCorePreferences.java?rev=1492709&r1=1492708&r2=1492709&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaCorePreferences.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaCorePreferences.java Thu Jun 13 15:38:03 2013
@@ -29,4 +29,6 @@ public class RutaCorePreferences {
public static final String PROJECT_CLEAR_OUTPUT = "ProjectClearOutput";
public static final String NO_VM_IN_DEV_MODE = "NoVMInDevMode";
+
+ public static final String ADD_SDI = "AddSDI";
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaPreferenceInitializer.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaPreferenceInitializer.java?rev=1492709&r1=1492708&r2=1492709&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaPreferenceInitializer.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaPreferenceInitializer.java Thu Jun 13 15:38:03 2013
@@ -36,6 +36,7 @@ public class RutaPreferenceInitializer e
store.setDefault(RutaCorePreferences.BUILDER_IGNORE_DUPLICATE_SHORTNAMES, false);
store.setDefault(RutaCorePreferences.PROJECT_CLEAR_OUTPUT, false);
store.setDefault(RutaCorePreferences.NO_VM_IN_DEV_MODE, false);
+ store.setDefault(RutaCorePreferences.ADD_SDI, false);
}
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConfigurationDelegate.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConfigurationDelegate.java?rev=1492709&r1=1492708&r2=1492709&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConfigurationDelegate.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConfigurationDelegate.java Thu Jun 13 15:38:03 2013
@@ -80,6 +80,10 @@ public class RutaLaunchConfigurationDele
}
boolean recursive = configuration.getAttribute(RutaLaunchConstants.RECURSIVE, false);
+ IPreferenceStore preferenceStore = RutaIdePlugin.getDefault().getPreferenceStore();
+ boolean addSDI = preferenceStore.getBoolean(RutaCorePreferences.ADD_SDI);
+
+
IResource member = proj.getProject().findMember(mainScriptAttribute);
IPath projectPath = proj.getResource().getLocation();
IPath inputDirPath = projectPath.append(RutaProjectUtils.getDefaultInputLocation());
@@ -118,6 +122,9 @@ public class RutaLaunchConfigurationDele
cmdline.append(RutaLaunchConstants.ARG_RECURSIVE + " ");
cmdline.append(recursive + " ");
+ cmdline.append(RutaLaunchConstants.ARG_ADD_SDI + " ");
+ cmdline.append(addSDI + " ");
+
return cmdline.toString();
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConstants.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConstants.java?rev=1492709&r1=1492708&r2=1492709&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConstants.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConstants.java Thu Jun 13 15:38:03 2013
@@ -43,4 +43,6 @@ public class RutaLaunchConstants {
public static final String VIEW = "org.apache.uima.ruta.ide.launching.view";
+ public static final String ARG_ADD_SDI = "org.apache.uima.ruta.ide.launching.addsdi";;
+
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java?rev=1492709&r1=1492708&r2=1492709&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java Thu Jun 13 15:38:03 2013
@@ -51,6 +51,8 @@ public class RutaLauncher {
private static boolean inputRecursive = false;
+ private static boolean addSDI = false;
+
private static String inputEncoding = java.nio.charset.Charset.defaultCharset().name();
private static String launchMode = "run";
@@ -84,6 +86,11 @@ public class RutaLauncher {
return false;
}
inputRecursive = Boolean.parseBoolean(args[index++]);
+ } else if (RutaLaunchConstants.ARG_ADD_SDI.equals(each)) {
+ if (index >= args.length) {
+ return false;
+ }
+ addSDI = Boolean.parseBoolean(args[index++]);
} else if (RutaLaunchConstants.ARG_RECURSIVE.equals(each)) {
if (index >= args.length) {
return false;
@@ -148,6 +155,11 @@ public class RutaLauncher {
String document = FileUtils.file2String(file, inputEncoding);
cas.setDocumentText(document);
}
+
+ if (addSDI) {
+ RutaEngine.removeSourceDocumentInformation(cas);
+ RutaEngine.addSourceDocumentInformation(cas, file);
+ }
ae.process(cas);
if (outputFolder != null) {
File outputFile = getOutputFile(file, inputFolder, outputFolder);
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaPreferencesMessages.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaPreferencesMessages.java?rev=1492709&r1=1492708&r2=1492709&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaPreferencesMessages.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaPreferencesMessages.java Thu Jun 13 15:38:03 2013
@@ -24,6 +24,8 @@ import org.eclipse.osgi.util.NLS;
public class RutaPreferencesMessages extends NLS {
private static final String BUNDLE_NAME = "org.apache.uima.ruta.ide.ui.preferences.RutaPreferencesMessages";//$NON-NLS-1$
+
+
private RutaPreferencesMessages() {
// Do not instantiate
}
@@ -77,4 +79,6 @@ public class RutaPreferencesMessages ext
public static String ProjectClearOutput;
public static String NoVMInDevMode;
+
+ public static String AddSDI;
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaProjectPreferencePage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaProjectPreferencePage.java?rev=1492709&r1=1492708&r2=1492709&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaProjectPreferencePage.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/preferences/RutaProjectPreferencePage.java Thu Jun 13 15:38:03 2013
@@ -36,6 +36,8 @@ public class RutaProjectPreferencePage e
private BooleanFieldEditor noVM;
+ private BooleanFieldEditor addSDI;
+
public RutaProjectPreferencePage() {
setPreferenceStore(RutaIdePlugin.getDefault().getPreferenceStore());
setDescription("Project Management");
@@ -50,6 +52,10 @@ public class RutaProjectPreferencePage e
noVM = new BooleanFieldEditor(RutaCorePreferences.NO_VM_IN_DEV_MODE,
RutaPreferencesMessages.NoVMInDevMode, getFieldEditorParent());
addField(noVM);
+
+ addSDI = new BooleanFieldEditor(RutaCorePreferences.NO_VM_IN_DEV_MODE,
+ RutaPreferencesMessages.AddSDI, getFieldEditorParent());
+ addField(addSDI);
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/resources/org/apache/uima/ruta/ide/ui/preferences/RutaPreferencesMessages.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/resources/org/apache/uima/ruta/ide/ui/preferences/RutaPreferencesMessages.properties?rev=1492709&r1=1492708&r2=1492709&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/resources/org/apache/uima/ruta/ide/ui/preferences/RutaPreferencesMessages.properties (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/resources/org/apache/uima/ruta/ide/ui/preferences/RutaPreferencesMessages.properties Thu Jun 13 15:38:03 2013
@@ -41,4 +41,5 @@ BuilderResolveImports = Resolve imports
BuilderImportByName = Use import by name when creating descriptors.
BuilderIgnoreDuplicateShortnames = Hide warnings for conflicting short names of types.
ProjectClearOutput = Clear output folder before running a script.
-NoVMInDevMode = Do not start a VM in development mode
\ No newline at end of file
+NoVMInDevMode = Do not start a VM in development mode.
+AddSDI = Update Source Document Information when launching a script
\ No newline at end of file