You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2008/07/10 23:11:21 UTC
svn commit: r675752 - in /incubator/uima/sandbox/trunk/uima-as:
uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/page/OverviewPage.java
uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/impl/AEService_Impl.java
Author: schor
Date: Thu Jul 10 14:11:21 2008
New Revision: 675752
URL: http://svn.apache.org/viewvc?rev=675752&view=rev
Log:
[UIMA-1011] apply patches
Modified:
incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/page/OverviewPage.java
incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/impl/AEService_Impl.java
Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/page/OverviewPage.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/page/OverviewPage.java?rev=675752&r1=675751&r2=675752&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/page/OverviewPage.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/page/OverviewPage.java Thu Jul 10 14:11:21 2008
@@ -499,7 +499,8 @@
glayout.numColumns = 3;
tableComposite.setLayout(glayout);
- final Table table = toolkit.createTable(tableComposite, SWT.HIDE_SELECTION | SWT.FULL_SELECTION
+ // Add SWT.BORDER style to make table's border visible in Linux
+ final Table table = toolkit.createTable(tableComposite, SWT.BORDER | SWT.HIDE_SELECTION | SWT.FULL_SELECTION
| SWT.H_SCROLL | SWT.V_SCROLL);
table.setLinesVisible(true);
table.setHeaderVisible(true);
@@ -880,9 +881,9 @@
aeService.getAnalysisEngineDeploymentMetaData(multiPageEditor
.cde.createResourceManager()).setDelegates(delegates);
- // If C++ descriptor, activate C++ settings
- updateCPlusPlusSettings ();
}
+ // If C++ descriptor, activate C++ settings
+ updateCPlusPlusSettings ();
} else {
Trace.err("Cannot resolve: " + relativeFile);
}
@@ -1159,9 +1160,27 @@
} else {
customButton.setSelection(false);
+ // Clear Env vars
+ if (aeService.getEnvironmentVariables() != null) {
+ aeService.getEnvironmentVariables().clear();
+ }
+ if (customComposite != null) {
+ customComposite.dispose();
+ customComposite = null;
+ }
}
} else {
- customButton.setEnabled(false);
+ customButton.setSelection(false);
+ customButton.setEnabled(false);
+ aeService.setCustomValue(null);
+ if (aeService.getEnvironmentVariables() != null) {
+ aeService.getEnvironmentVariables().clear();
+ }
+ if (customComposite != null) {
+ customComposite.dispose();
+ customComposite = null;
+ }
+
}
}
}
Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/impl/AEService_Impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/impl/AEService_Impl.java?rev=675752&r1=675751&r2=675752&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/impl/AEService_Impl.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/impl/AEService_Impl.java Thu Jul 10 14:11:21 2008
@@ -543,19 +543,10 @@
*/
public ResourceSpecifier resolveTopAnalysisEngineDescription(
ResourceManager aResourceManager, boolean recursive) throws InvalidXMLException {
- // Trace.err(10, "0");
if (importDescriptor == null) {
return null;
}
-
- // Comment out to allow replacement of Top AE
-// if (importResolved) {
-// if (topAnalysisEngineDescription == null) {
-// Trace.bug("topAnalysisEngineDescription == null");
-// }
-// return topAnalysisEngineDescription;
-// }
-
+
topAnalysisEngineDescription = resolveImport(aResourceManager);
// If C++ descriptor, active C++ settings
@@ -563,11 +554,13 @@
if (((ResourceCreationSpecifier)topAnalysisEngineDescription).getFrameworkImplementation().equalsIgnoreCase(Constants.CPP_FRAMEWORK_NAME)) {
cPlusPlusTopAE = true;
} else {
- // Check that there are NO for C++ Settings
- if (customValue != null) {
- throw new InvalidXMLException(InvalidXMLException.UNKNOWN_ELEMENT,
- new Object[]{TAG_CUSTOM});
- }
+ cPlusPlusTopAE = false;
+ // Check that there are NO Settings for C++
+ // Note: Comment out to be "user-friendly" when switching from C++ to Java AE
+// if (customValue != null) {
+// throw new InvalidXMLException(InvalidXMLException.UNKNOWN_ELEMENT,
+// new Object[]{TAG_CUSTOM});
+// }
}
}