You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by jo...@apache.org on 2011/04/08 14:28:48 UTC
svn commit: r1090220 - in
/uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher:
AnalysisEngineLaunchConfigurationDelegate.java LauncherConstants.java
RemoteLauncher.java ui/AnalysisEngineMainTab.java
Author: joern
Date: Fri Apr 8 12:28:47 2011
New Revision: 1090220
URL: http://svn.apache.org/viewvc?rev=1090220&view=rev
Log:
UIMA-2100 Added language parameter for plain text input files
Modified:
uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/AnalysisEngineLaunchConfigurationDelegate.java
uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/LauncherConstants.java
uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/RemoteLauncher.java
uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/ui/AnalysisEngineMainTab.java
Modified: uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/AnalysisEngineLaunchConfigurationDelegate.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/AnalysisEngineLaunchConfigurationDelegate.java?rev=1090220&r1=1090219&r2=1090220&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/AnalysisEngineLaunchConfigurationDelegate.java (original)
+++ uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/AnalysisEngineLaunchConfigurationDelegate.java Fri Apr 8 12:28:47 2011
@@ -100,6 +100,9 @@ public class AnalysisEngineLaunchConfigu
cmdline.append(RemoteLauncher.INPUT_ENCODING_PARAM + " ");
cmdline.append(configuration.getAttribute(LauncherConstants.ATTR_INPUT_ENCODING_NAME, "")
+ " ");
+
+ cmdline.append(RemoteLauncher.INPUT_LANGUAGE_PARAM + " ");
+ cmdline.append(configuration.getAttribute(LauncherConstants.ATTR_INPUT_LANGUAGE_NAME, "") + " ");
}
cmdline.append(RemoteLauncher.INPUT_RECURSIVE_PARAM + " ");
Modified: uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/LauncherConstants.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/LauncherConstants.java?rev=1090220&r1=1090219&r2=1090220&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/LauncherConstants.java (original)
+++ uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/LauncherConstants.java Fri Apr 8 12:28:47 2011
@@ -24,6 +24,7 @@ public class LauncherConstants {
public static final String ATTR_INPUT_NAME = "org.apache.uima.ep_launcher.INPUT_ATTR";
public static final String ATTR_INPUT_RECURSIVELY_NAME = "org.apache.uima.ep_launcher.INPUT_RECURSIVELY_ATTR";
public static final String ATTR_INPUT_ENCODING_NAME = "org.apache.uima.ep_launcher.INPUT_ENCODING_ATTR";
+ public static final String ATTR_INPUT_LANGUAGE_NAME = "org.apache.uima.ep_launcher.INPUT_LANGUAGE_ATTR";
public static final String ATTR_INPUT_FORMAT_NAME = "org.apache.uima.ep_launcher.INPUT_FORMAT_ATTR";
public static final String ATTR_OUTPUT_FOLDER_NAME = "org.apache.uima.ep_launcher.OUTPUT_FOLDER_ATTR";
Modified: uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/RemoteLauncher.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/RemoteLauncher.java?rev=1090220&r1=1090219&r2=1090220&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/RemoteLauncher.java (original)
+++ uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/RemoteLauncher.java Fri Apr 8 12:28:47 2011
@@ -49,6 +49,7 @@ public class RemoteLauncher {
public static final String INPUT_RECURSIVE_PARAM = "-recursive";
public static final String INPUT_FORMAT_PARAM = "-format";
public static final String INPUT_ENCODING_PARAM = "-encoding";
+ public static final String INPUT_LANGUAGE_PARAM = "-language";
public static final String OUTPUT_FOLDER_PARAM = "-output";
public static final String OUTPUT_CLEAR_PARAM = "-clear";
@@ -57,6 +58,7 @@ public class RemoteLauncher {
private static boolean inputRecursive;
private static InputFormat inputFormat = InputFormat.CAS;
private static String inputEncoding = java.nio.charset.Charset.defaultCharset().name();
+ private static String inputLanguage;
private static File outputFolder;
private static boolean outputFolderClear;
@@ -118,6 +120,13 @@ public class RemoteLauncher {
inputEncoding = args[index++];
}
+ else if (INPUT_LANGUAGE_PARAM.equals(arg)) {
+ if (index >= args.length) {
+ return false;
+ }
+
+ inputLanguage = args[index++];
+ }
else if (OUTPUT_FOLDER_PARAM.equals(arg)) {
if (index >= args.length) {
return false;
@@ -147,6 +156,9 @@ public class RemoteLauncher {
// put document text in CAS
aCAS.setDocumentText(document);
+
+ if (inputLanguage != null)
+ aCAS.setDocumentLanguage(inputLanguage);
}
else if (InputFormat.CAS.equals(format)) {
if (inputFile.getName().endsWith(".xmi")) {
Modified: uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/ui/AnalysisEngineMainTab.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/ui/AnalysisEngineMainTab.java?rev=1090220&r1=1090219&r2=1090220&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/ui/AnalysisEngineMainTab.java (original)
+++ uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/ui/AnalysisEngineMainTab.java Fri Apr 8 12:28:47 2011
@@ -56,6 +56,7 @@ import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.dialogs.ElementListSelectionDialog;
import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
@@ -81,6 +82,7 @@ public class AnalysisEngineMainTab exten
private Button casButton;
private Button plainTextButton;
private Combo encodingCombo;
+ private Text languageText;
private Text outputFolderText;
private Button clearFolderButton;
@@ -261,13 +263,13 @@ public class AnalysisEngineMainTab exten
GridDataFactory.swtDefaults().align(SWT.FILL, SWT.CENTER).
grab(true, false).applyTo(inputFormatGroup);
- GridLayout inputFormatGroupLayout = new GridLayout(2, false);
+ GridLayout inputFormatGroupLayout = new GridLayout(4, false);
inputFormatGroup.setLayout(inputFormatGroupLayout);
casButton = new Button(inputFormatGroup, SWT.RADIO);
casButton.setText("CASes (XMI or XCAS format)");
GridDataFactory.swtDefaults().align(SWT.FILL, SWT.CENTER).
- grab(true, false).span(2, 1).applyTo(casButton);
+ grab(true, false).span(4, 1).applyTo(casButton);
casButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent event) {
@@ -285,6 +287,7 @@ public class AnalysisEngineMainTab exten
public void widgetSelected(SelectionEvent event) {
encodingCombo.setEnabled(plainTextButton.getSelection());
+ languageText.setEnabled(plainTextButton.getSelection());
updateLaunchConfigurationDialog();
}
@@ -319,6 +322,22 @@ public class AnalysisEngineMainTab exten
// Will be enabled by initializeForm if format is plain text
encodingCombo.setEnabled(false);
+ // Add language label
+ Label languageLabel = new Label(inputFormatGroup, SWT.NONE);
+ languageLabel.setText("Language:");
+
+ // Add language text field
+ languageText = new Text(inputFormatGroup, SWT.BORDER);
+ GridDataFactory.swtDefaults().hint(250, SWT.DEFAULT).align(SWT.LEFT, SWT.CENTER).
+ grab(true, false).applyTo(languageText);
+
+ languageText.addModifyListener(new ModifyListener() {
+
+ public void modifyText(ModifyEvent event) {
+ updateLaunchConfigurationDialog();
+ }
+ });
+
// Output Folder
Group outputFolderGroup = new Group(projectComposite, SWT.None);
outputFolderGroup.setText("Output Folder:");
@@ -459,13 +478,18 @@ public class AnalysisEngineMainTab exten
config.setAttribute(LauncherConstants.ATTR_INPUT_ENCODING_NAME, encodingCombo.getText());
+ config.setAttribute(LauncherConstants.ATTR_INPUT_LANGUAGE_NAME, languageText.getText());
+
config.setAttribute(LauncherConstants.ATTR_OUTPUT_FOLDER_NAME, outputFolderText.getText());
config.setAttribute(LauncherConstants.ATTR_OUTPUT_CLEAR_NAME,
Boolean.valueOf(clearFolderButton.getSelection()));
}
public void setDefaults(ILaunchConfigurationWorkingCopy config) {
- // no defaults are provided yet
+ config.setAttribute(LauncherConstants.ATTR_INPUT_RECURSIVELY_NAME, false);
+ config.setAttribute(LauncherConstants.ATTR_INPUT_FORMAT_NAME, InputFormat.CAS.toString());
+ config.setAttribute(LauncherConstants.ATTR_INPUT_LANGUAGE_NAME, "x-unspecified");
+ config.setAttribute(LauncherConstants.ATTR_OUTPUT_CLEAR_NAME, false);
}
@Override
@@ -514,7 +538,16 @@ public class AnalysisEngineMainTab exten
else if (InputFormat.PLAIN_TEXT.toString().equals(formatName)) {
plainTextButton.setSelection(true);
encodingCombo.setEnabled(true);
+ languageText.setEnabled(true);
+
+ String language;
+ try {
+ language = config.getAttribute(LauncherConstants.ATTR_INPUT_LANGUAGE_NAME, "x-unspecified");
+ } catch (CoreException e) {
+ language = "x-unspecified";
+ }
+ languageText.setText(language);
}
// Always remember the input encoding, even so plain text is not selected,