svn commit: r1197746 - /uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
Author: cwiklik
Date: Fri Nov 4 20:23:36 2011
New Revision: 1197746
URL: http://svn.apache.org/viewvc?rev=1197746&view=rev
Log:
UIMA-2180 When generating per CAS stats skip the top level aggregate stats, and
only include primitives
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java?rev=1197746&r1=1197745&r2=1197746&view=diff
==
---
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
(original)
+++
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
Fri Nov 4 20:23:36 2011
@@ -538,9 +538,10 @@ public class PrimitiveAnalysisEngineCont
AnalysisEngineManagement rootAem = ae.getManagementInterface();
- beforeAnalysisManagementObjects.add(deepCopy(rootAem));
if ( rootAem.getComponents().size() > 0 ) {
getLeafManagementObjects(rootAem, beforeAnalysisManagementObjects,
true);
+ } else {
+ beforeAnalysisManagementObjects.add(deepCopy(rootAem));
}
CasIterator casIterator = ae.processAndOutputNewCASes(aCAS);
@@ -795,13 +796,14 @@ public class PrimitiveAnalysisEngineCont
// These stats are internally maintained in a Map. If the AE is an
aggregate
// the Map will contain AnalysisEngineManagement instance for each AE.
AnalysisEngineManagement aem = ae.getManagementInterface();
- // Add the top level AnalysisEngineManagement instance.
- afterAnalysisManagementObjects.add(aem);
if ( aem.getComponents().size() > 0) {
// Flatten the hierarchy by recursively (if this AE is an
aggregate) extracting
// primitive AE's AnalysisEngineManagement instance and placing it
in
// afterAnalysisManagementObjects List.
getLeafManagementObjects(aem, afterAnalysisManagementObjects, false);
+ } else {
+ // Add the top level AnalysisEngineManagement instance.
+ afterAnalysisManagementObjects.add(aem);
}
// Create a List to hold per CAS analysisTime and total number of CASes
processed
svn commit: r1197584 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditorInputListener.java
Author: pkluegl
Date: Fri Nov 4 14:41:59 2011
New Revision: 1197584
URL: http://svn.apache.org/viewvc?rev=1197584&view=rev
Log:
UIMA-2273
extended javadoc
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditorInputListener.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditorInputListener.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditorInputListener.java?rev=1197584&r1=1197583&r2=1197584&view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditorInputListener.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditorInputListener.java
Fri Nov 4 14:41:59 2011
@@ -23,6 +23,9 @@ public interface ICasEditorInputListener
/**
* This method is called if an {@link ICasDocument} is exchanged.
+ * The arguments of this methods can be null under certain circumstances.
+ * For example, if a document is opened where the type system cannot be
found
+ * for, then the new document will be null.
*
* @param oldDocument
* - the replaced, old document {@link ICasDocument}.
svn commit: r1197547 - in /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor: ICasEditor.java editview/FeatureStructureContentProvider.java fsview/FeatureStructureBro
Author: pkluegl
Date: Fri Nov 4 13:18:24 2011
New Revision: 1197547
URL: http://svn.apache.org/viewvc?rev=1197547&view=rev
Log:
UIMA-2273
added listener methods to ICasEditor and removed casts to AnnotationEditor in
two views
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditor.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditor.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditor.java?rev=1197547&r1=1197546&r2=1197547&view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditor.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditor.java
Fri Nov 4 13:18:24 2011
@@ -36,4 +36,9 @@ public interface ICasEditor extends IEdi
CasDocumentProvider getCasDocumentProvider();
void reopenEditorWithNewTypeSystem();
+
+ void addCasEditorInputListener(ICasEditorInputListener listener);
+
+ void removeCasEditorInputListener(ICasEditorInputListener listener);
+
}
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java?rev=1197547&r1=1197546&r2=1197547&view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java
Fri Nov 4 13:18:24 2011
@@ -29,7 +29,6 @@ import org.apache.uima.cas.FeatureStruct
import org.apache.uima.cas.StringArrayFS;
import org.apache.uima.cas.Type;
import org.apache.uima.caseditor.editor.AbstractDocumentListener;
-import org.apache.uima.caseditor.editor.AnnotationEditor;
import org.apache.uima.caseditor.editor.ArrayValue;
import org.apache.uima.caseditor.editor.CasEditorError;
import org.apache.uima.caseditor.editor.FeatureValue;
@@ -55,9 +54,7 @@ final class FeatureStructureContentProvi
if (mDocument == null) {
throw new IllegalArgumentException("document parameter must not be
null!");
}
-if(mEditor instanceof AnnotationEditor) {
- ((AnnotationEditor)mEditor).addCasEditorInputListener(this);
-}
+ mEditor.addCasEditorInputListener(this);
}
private int arraySize(FeatureStructure value) {
@@ -123,9 +120,7 @@ final class FeatureStructureContentProvi
public void dispose() {
mDocument.removeChangeListener(this);
-if(mEditor instanceof AnnotationEditor) {
- ((AnnotationEditor)mEditor).removeCasEditorInputListener(this);
-}
+mEditor.removeCasEditorInputListener(this);
}
public void inputChanged(final Viewer viewer, Object oldInput, Object
newInput) {
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java?rev=1197547&r1=1197546&r2=1197547&view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java
Fri Nov 4 13:18:24 2011
@@ -33,7 +33,6 @@ import org.apache.uima.cas.text.Annotati
import org.apache.uima.caseditor.CasEditorPlugin;
import org.apache.uima.caseditor.Images;
import org.apache.uima.caseditor.editor.AbstractAnnotationDocumentListener;
-import org.apache.uima.caseditor.editor.AnnotationEditor;
import org.apache.uima.caseditor.editor.FeatureValue;
import org.apache.uima.caseditor.editor.ICasDocument;
import org.apache.uima.caseditor.editor.ICasEditor;
@@ -81,9 +80,7 @@ public final class FeatureStructureBrows
FeatureStructureTreeContentProvider(ICasEditor editor) {
mEditor = editor;
mDocument = editor.getDocument();
- if(mEditor instanceof AnnotationEditor) {
-((AnnotationEditor)mEditor).addCasEditorInputListener(this);
svn commit: r1197545 - in /uima: sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/mai
Author: pkluegl
Date: Fri Nov 4 13:13:43 2011
New Revision: 1197545
URL: http://svn.apache.org/viewvc?rev=1197545&view=rev
Log:
UIMA-2273
The notification of views when the cas document is exchanged will now be
processed by a new listener and controlled by the AnnotationEditor in the
doSetInput method. Adapted known view. I hope I haven't missed any. The update
logic should be improved by using setInput (see comments on jira)...
Added:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditorInputListener.java
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyViewPage.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/testing/ui/views/EvaluationViewPage.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-caseditor/src/main/java/org/apache/uima/textmarker/caseditor/view/tree/AnnotationTreeContentProvider.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/DocumentUimaImpl.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocumentListener.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlineContentProviderBase.java
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyViewPage.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyViewPage.java?rev=1197545&r1=1197544&r2=1197545&view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyViewPage.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/apply/ApplyViewPage.java
Fri Nov 4 13:13:43 2011
@@ -19,15 +19,13 @@
package org.apache.uima.textmarker.explain.apply;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.caseditor.editor.AbstractAnnotationDocumentListener;
import org.apache.uima.caseditor.editor.AnnotationEditor;
import org.apache.uima.caseditor.editor.ICasDocument;
import org.apache.uima.caseditor.editor.ICasDocumentListener;
+import org.apache.uima.caseditor.editor.ICasEditorInputListener;
import org.apache.uima.textmarker.addons.TextMarkerAddonsPlugin;
import org.apache.uima.textmarker.explain.ExplainConstants;
import org.apache.uima.textmarker.explain.tree.ExplainTree;
@@ -45,7 +43,7 @@ import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.part.IPageSite;
import org.eclipse.ui.part.Page;
-public class ApplyViewPage extends Page implements ISelectionListener {
+public class ApplyViewPage extends Page implements ISelectionListener,
ICasEditorInputListener {
protected TreeViewer viewer;
@@ -123,41 +121,7 @@ public class ApplyViewPage extends Page
viewer.setInput(tree.getRoot());
getSite().setSelectionProvider(viewer);
getSite().getPage().addSelectionListener(this);
-
-listener = new AbstractAnnotationDocumentListener() {
-
- @Override
- public void changed() {
- }
-
- @Override
- public void viewChanged(String oldViewName, String newViewName) {
- }
-
- @Override
- protected void addedAnnotation(Collection annotations) {
- }
-
- @Override
- protected void removedAnnotation(Collection annotations) {
- }
-
- @Override
- protected void updatedAnnotation(Collection annotations) {
- }
-
- @Override
- public void casDocumentChanged(ICasDocument oldDocument, ICasDocument
newDocument) {
-document.removeChangeListener(this);
-document = newDocument;
-document.addChangeListener(this);
-ExplainTree tree = new ExplainTree(document.getCAS());
-view
