svn commit: r1299712 - /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeViewPage.java

2012-03-12 Thread pkluegl 
Author: pkluegl
Date: Mon Mar 12 15:32:46 2012
New Revision: 1299712

URL: http://svn.apache.org/viewvc?rev=1299712view=rev
Log:
UIMA-2380
added code to remove listener

Modified:

uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeViewPage.java

Modified: 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeViewPage.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeViewPage.java?rev=1299712r1=1299711r2=1299712view=diff
==
--- 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeViewPage.java
 (original)
+++ 
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeViewPage.java
 Mon Mar 12 15:32:46 2012
@@ -227,6 +227,7 @@ public class AnnotationTreeViewPage exte
   public void dispose() {
 super.dispose();
 getSite().getPage().removeSelectionListener(this);
+editor.removeAnnotationListener(this);
 
editor.getCasDocumentProvider().getTypeSystemPreferenceStore(editor.getEditorInput())
 .removePropertyChangeListener(styleListener);
 overlay.dispose();

svn commit: r1299918 - in /uima/uimaj/trunk/uimaj-core/src: main/java/org/apache/uima/ main/java/org/apache/uima/impl/ main/java/org/apache/uima/resource/ main/java/org/apache/uima/resource/impl/ main

2012-03-12 Thread burn 
Author: burn
Date: Mon Mar 12 22:48:13 2012
New Revision: 1299918

URL: http://svn.apache.org/viewvc?rev=1299918view=rev
Log:
[UIMA-2378] Add support for External Override Settings for configuration 
parameters

Added:

uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ExternalOverrideSettings.java
   (with props)

uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ExternalOverrideSettings_impl.java
   (with props)

uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AnnotatorWithExternalOverrides.xml
   (with props)

uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/testExternalOverride.settings
Modified:

uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/ResourceSpecifierFactory.java

uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/ResourceSpecifierFactory_impl.java

uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java

uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java

uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java

uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameter.java

uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/OperationalProperties.java

uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java

uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/OperationalProperties_impl.java

uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/InvalidXMLException.java

uima/uimaj/trunk/uimaj-core/src/main/resources/org/apache/uima/UIMAException_Messages.properties

uima/uimaj/trunk/uimaj-core/src/main/resources/org/apache/uima/impl/factoryConfig.xml

uima/uimaj/trunk/uimaj-core/src/main/resources/org/apache/uima/impl/log_messages.properties
uima/uimaj/trunk/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd

uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java

uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/AggregateWithUnknownRemoteComponent.xml

Modified: 
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/ResourceSpecifierFactory.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/ResourceSpecifierFactory.java?rev=1299918r1=1299917r2=1299918view=diff
==
--- 
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/ResourceSpecifierFactory.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/ResourceSpecifierFactory.java
 Mon Mar 12 22:48:13 2012
@@ -64,6 +64,7 @@ import org.apache.uima.resource.metadata
 import org.apache.uima.resource.metadata.ConfigurationParameter;
 import org.apache.uima.resource.metadata.ConfigurationParameterDeclarations;
 import org.apache.uima.resource.metadata.ConfigurationParameterSettings;
+import org.apache.uima.resource.metadata.ExternalOverrideSettings;
 import org.apache.uima.resource.metadata.ExternalResourceBinding;
 import org.apache.uima.resource.metadata.FeatureDescription;
 import org.apache.uima.resource.metadata.FsIndexCollection;
@@ -475,4 +476,5 @@ public interface ResourceSpecifierFactor
 
   public CasProcessorRuntimeEnvParam createEnv();
 
+  public ExternalOverrideSettings createExternalOverrideSettings();
 }

Modified: 
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/ResourceSpecifierFactory_impl.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/ResourceSpecifierFactory_impl.java?rev=1299918r1=1299917r2=1299918view=diff
==
--- 
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/ResourceSpecifierFactory_impl.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/ResourceSpecifierFactory_impl.java
 Mon Mar 12 22:48:13 2012
@@ -73,6 +73,7 @@ import org.apache.uima.resource.metadata
 import org.apache.uima.resource.metadata.ConfigurationParameter;
 import org.apache.uima.resource.metadata.ConfigurationParameterDeclarations;
 import org.apache.uima.resource.metadata.ConfigurationParameterSettings;
+import org.apache.uima.resource.metadata.ExternalOverrideSettings;
 import org.apache.uima.resource.metadata.ExternalResourceBinding;
 import org.apache.uima.resource.metadata.FeatureDescription;
 import org.apache.uima.resource.metadata.FsIndexCollection;
@@ -541,4 +542,8 @@ public class ResourceSpecifierFactory_im
 
   }
 
+  public ExternalOverrideSettings createExternalOverrideSettings() {
+return