svn commit: r1848161 [1/3] - in /uima/uv3/uimaj-v3/trunk: uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/ uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searc
Author: joern Date: Tue Dec 4 15:09:45 2018 New Revision: 1848161 URL: http://svn.apache.org/viewvc?rev=1848161=rev Log: UIMA-5920: Refactor the CAS Editor to use java 8 features Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePlugin.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferencePage.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorPerspectiveFactory.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorPreferencePage.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/NlpProject.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/WorkspaceResourceDialog.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/TypeSystemSearchStrategyFactory.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/DocumentImportStructureProvider.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizard.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizardPage.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/CasEditorPlugin.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/Images.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/DefaultColors.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpus.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializer.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractAnnotationDocumentListener.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocumentListener.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferencePage.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorSelection.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorView.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationSelectionListener.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyleChangeListener.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ArrayValue.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProviderFactory.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CustomInformationControl.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/DocumentUimaImpl.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelection.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelectionProvider.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src
svn commit: r1848161 [3/3] - in /uima/uv3/uimaj-v3/trunk: uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/ uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searc
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/FloatCellEditorValidator.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/FloatCellEditorValidator.java?rev=1848161=1848160=1848161=diff
==
---
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/FloatCellEditorValidator.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/FloatCellEditorValidator.java
Tue Dec 4 15:09:45 2018
@@ -48,4 +48,4 @@ class FloatCellEditorValidator implement
return null;
}
-}
\ No newline at end of file
+}
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/IntegerCellEditorValidator.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/IntegerCellEditorValidator.java?rev=1848161=1848160=1848161=diff
==
---
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/IntegerCellEditorValidator.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/IntegerCellEditorValidator.java
Tue Dec 4 15:09:45 2018
@@ -48,4 +48,4 @@ class IntegerCellEditorValidator impleme
return null;
}
-}
\ No newline at end of file
+}
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/LongCellEditorValidator.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/LongCellEditorValidator.java?rev=1848161=1848160=1848161=diff
==
---
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/LongCellEditorValidator.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/LongCellEditorValidator.java
Tue Dec 4 15:09:45 2018
@@ -47,4 +47,4 @@ public class LongCellEditorValidator imp
return null;
}
-}
\ No newline at end of file
+}
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/ShortCellEditorValidator.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/ShortCellEditorValidator.java?rev=1848161=1848160=1848161=diff
==
---
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/ShortCellEditorValidator.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/ShortCellEditorValidator.java
Tue Dec 4 15:09:45 2018
@@ -49,3 +49,4 @@ public class ShortCellEditorValidator im
return null;
}
}
+
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserView.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserView.java?rev=1848161=1848160=1848161=diff
==
---
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserView.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserView.java
Tue Dec 4 15:09:45 2018
@@ -42,23 +42,17 @@ public final class FeatureStructureBrows
super("The instance view is currently not available.");
}
- /* (non-Javadoc)
- * @see
org.apache.uima.caseditor.editor.CasEditorView#doCreatePage(org.apache.uima.caseditor.editor.ICasEditor)
- */
@Override
protected IPageBookViewPage doCreatePage(ICasEditor editor) {
IPageBookViewPage result = null;
- ICasDocument document = editor.getDocument();
+ICasDocument document = editor.getDocument();
- if (document != null) {
- FeatureStructureBrowserViewPage page = new
FeatureStructureBrowserViewPage(
- editor);
+if (document != null) {
+ result = new
svn commit: r1848161 [2/3] - in /uima/uv3/uimaj-v3/trunk: uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/ uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searc
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java?rev=1848161=1848160=1848161=diff
==
---
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java
Tue Dec 4 15:09:45 2018
@@ -53,11 +53,11 @@ public abstract class CasEditorView exte
/** The editor listener map. */
private Map editorListenerMap =
- new HashMap();
+ new HashMap<>();
/** The document listener map. */
private Map documentListenerMap =
- new HashMap();
+ new HashMap<>();
/**
* Instantiates a new cas editor view.
@@ -84,10 +84,7 @@ public abstract class CasEditorView exte
protected boolean isRecreatePageOnCASViewSwitch() {
return false;
}
-
- /* (non-Javadoc)
- * @see
org.eclipse.ui.part.PageBookView#createDefaultPage(org.eclipse.ui.part.PageBook)
- */
+
@Override
protected IPage createDefaultPage(PageBook book) {
MessagePage page = new MessagePage();
@@ -129,10 +126,7 @@ public abstract class CasEditorView exte
casViewPageBookedPage.setCASViewPage(null);
}
}
-
- /* (non-Javadoc)
- * @see
org.eclipse.ui.part.PageBookView#doCreatePage(org.eclipse.ui.IWorkbenchPart)
- */
+
@Override
protected final PageRec doCreatePage(final IWorkbenchPart part) {
@@ -197,17 +191,11 @@ public abstract class CasEditorView exte
return result;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.part.PageBookView#getBootstrapPart()
- */
@Override
protected IWorkbenchPart getBootstrapPart() {
return getSite().getPage().getActiveEditor();
}
- /* (non-Javadoc)
- * @see
org.eclipse.ui.part.PageBookView#doDestroyPage(org.eclipse.ui.IWorkbenchPart,
org.eclipse.ui.part.PageBookView.PageRec)
- */
@Override
protected void doDestroyPage(IWorkbenchPart part, PageRec pageRecord) {
@@ -231,9 +219,6 @@ public abstract class CasEditorView exte
pageRecord.dispose();
}
- /* (non-Javadoc)
- * @see
org.eclipse.ui.part.PageBookView#isImportant(org.eclipse.ui.IWorkbenchPart)
- */
@Override
protected boolean isImportant(IWorkbenchPart part) {
// only interested in annotation editors
@@ -249,10 +234,7 @@ public abstract class CasEditorView exte
public void partBroughtToTop(IWorkbenchPart part) {
partActivated(part);
}
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.part.PageBookView#dispose()
- */
+
@Override
public void dispose() {
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java?rev=1848161=1848160=1848161=diff
==
---
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java
Tue Dec 4 15:09:45 2018
@@ -19,7 +19,6 @@
package org.apache.uima.caseditor.editor;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
@@ -84,13 +83,10 @@ public class CasEditorViewPage extends P
IActionBars actionBars = getSite().getActionBars();
actionBars.clearGlobalActionHandlers();
-Map newActionHandlers = subActionBar
-.getGlobalActionHandlers();
+Map newActionHandlers = subActionBar.getGlobalActionHandlers();
if (newActionHandlers != null) {
- Set keys = newActionHandlers.entrySet();
- Iterator iter = keys.iterator();
- while (iter.hasNext()) {
-Map.Entry entry = (Map.Entry) iter.next();
+ Set keys = newActionHandlers.entrySet();
+ for (Map.Entry entry : keys) {
actionBars.setGlobalActionHandler((String) entry.getKey(),
(IAction) entry.getValue());
}
@@ -98,18 +94,12 @@ public class CasEditorViewPage extends P
}
// These are called from the outside, even if the page is not active ...
- /* (non-Javadoc)
- * @see
org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
// this leads to the processing of events which should not be processed!
@Override
public void addSelectionChangedListener(ISelectionChangedListener listener) {
selectionChangedListeners.add(listener);
}
- /* (non-Javadoc)
- * @see
svn commit: r1848160 - in /uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src: main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java test/java/org/apache/uima/caseditor/core/model/dotcorpus/Ann
Author: joern
Date: Tue Dec 4 15:04:02 2018
New Revision: 1848160
URL: http://svn.apache.org/viewvc?rev=1848160=rev
Log:
UIMA-5925: Fix null error in AnnotationStyle.equals
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyleTest.java
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java?rev=1848160=1848159=1848160=diff
==
---
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java
Tue Dec 4 15:04:02 2018
@@ -22,6 +22,7 @@ package org.apache.uima.caseditor.editor
import java.awt.Color;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import org.apache.uima.caseditor.core.model.DefaultColors;
import org.eclipse.jface.preference.IPreferenceStore;
@@ -209,9 +210,8 @@ public final class AnnotationStyle {
} else if (object instanceof AnnotationStyle) {
AnnotationStyle style = (AnnotationStyle) object;
- boolean isConfigEqual = configuration == style.configuration ||
- (configuration != null ? false :
configuration.equals(style.configuration));
-
+ boolean isConfigEqual = Objects.equals(configuration,
style.configuration);
+
isEqual = annotation.equals(style.annotation) &&
this.style.equals(style.style)
&& color.equals(style.color) && layer == style.layer &&
isConfigEqual;
} else {
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyleTest.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyleTest.java?rev=1848160=1848159=1848160=diff
==
---
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyleTest.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/test/java/org/apache/uima/caseditor/core/model/dotcorpus/AnnotationStyleTest.java
Tue Dec 4 15:04:02 2018
@@ -19,13 +19,14 @@
package org.apache.uima.caseditor.core.model.dotcorpus;
-import static org.junit.Assert.assertEquals;
-
import java.awt.Color;
import org.apache.uima.caseditor.editor.AnnotationStyle;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
/**
* Unit test for the {@link AnnotationStyle} class.
*/
@@ -42,6 +43,11 @@ public class AnnotationStyleTest {
255, 255, 0), 0);
assertEquals(a, b);
+
+AnnotationStyle c = new AnnotationStyle("testType",
AnnotationStyle.Style.BRACKET, new Color(
+255, 255, 0), 0, "config");
+
+assertNotEquals(a, c);
}
/**
svn commit: r1847831 - /uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java
Author: joern
Date: Fri Nov 30 15:08:36 2018
New Revision: 1847831
URL: http://svn.apache.org/viewvc?rev=1847831=rev
Log:
UIMA-5913: Fix NPE in AnnotationOutline.dispose
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java?rev=1847831=1847830=1847831=diff
==
---
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java
Fri Nov 30 15:08:36 2018
@@ -439,13 +439,11 @@ public final class AnnotationOutline ext
*/
@Override
public void dispose() {
-
-super.dispose();
-
getSite().setSelectionProvider(null);
getSite().getPage().removeSelectionListener(this);
-
editor.removeAnnotationListener(editorChangeListener);
+
+super.dispose();
}
/**
svn commit: r1504508 - /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Author: joern
Date: Thu Jul 18 16:16:26 2013
New Revision: 1504508
URL: http://svn.apache.org/r1504508
Log:
UIMA-3086 Checks if a one time use type system was selected by user before just
using a remembered type system.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java?rev=1504508r1=1504507r2=1504508view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Thu Jul 18 16:16:26 2013
@@ -239,7 +239,7 @@ public class DefaultCasDocumentProvider
IPreferenceStore prefStore =
CasEditorIdePlugin.getDefault().getPreferenceStore();
boolean useLastTypesystem = prefStore
.getBoolean(CasEditorIdePreferenceConstants.CAS_EDITOR_REMEMBER_TYPESYSTEM);
- if (useLastTypesystem) {
+ if (typeSystemFileString == null useLastTypesystem) {
typeSystemFileString = documentToTypeSystemMap
.get(document);
}
svn commit: r1479513 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Author: joern
Date: Mon May 6 10:38:24 2013
New Revision: 1479513
URL: http://svn.apache.org/r1479513
Log:
UIMA-2872 Fixed the logic to retrieve the annotation mode type from the
settings during initialization. If the annotation mode type can't be retrieved
it now reliably uses the default uima.tcas.Annotation type.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=1479513r1=1479512r2=1479513view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Mon May 6 10:38:24 2013
@@ -963,12 +963,18 @@ public final class AnnotationEditor exte
// TODO: Define constants for these settings!
- String lastModeTypeName =
sessionPreferences.getString(LastUsedModeType);
+ Type annotationModeType = getDocument().getType(
+ sessionPreferences.getString(LastUsedModeType));
- if (lastModeTypeName.length() == 0)
-lastModeTypeName = CAS.TYPE_NAME_ANNOTATION;
+ // Note: The type in the configuration might not exist anymore, or there
is
+ // no type stored yet, in these cases the built-in uima.tcas.Annotation
type is used.
+ // Not setting the annotation type will cause NPEs after the editor
opened.
- setAnnotationMode(getDocument().getType(lastModeTypeName));
+ if (annotationModeType == null) {
+ annotationModeType = getDocument().getType(CAS.TYPE_NAME_ANNOTATION);
+ }
+
+ setAnnotationMode(annotationModeType);
String lastActiveViewName =
sessionPreferences.getString(LastActiveCasViewName);
@@ -1071,6 +1077,10 @@ public final class AnnotationEditor exte
protected void setAnnotationMode(Type type) {
// TODO: check if this type is a subtype of Annotation
+if (type == null) {
+ throw new IllegalArgumentException(type must not be null!);
+}
+
mAnnotationMode = type;
highlight(0, 0);
svn commit: r1357482 - /uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java
Author: joern
Date: Thu Jul 5 07:32:22 2012
New Revision: 1357482
URL: http://svn.apache.org/viewvc?rev=1357482view=rev
Log:
UIMA-2409 Reverted back to revision 1037752.
Modified:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java
Modified:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java?rev=1357482r1=1357481r2=1357482view=diff
==
---
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java
(original)
+++
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java
Thu Jul 5 07:32:22 2012
@@ -111,21 +111,19 @@ public class CasCopier {
/**
* Does a deep copy of the contents of one CAS View into another CAS.
- * If a view with the same name as codeaDestCasView/code exists in the
destination CAS,
+ * If a view with the same name as codeaSrcCasView/code exists in the
destination CAS,
* then it will be the target of the copy. Otherwise, a new view will be
created with
* that name and will become the target of the copy. All FeatureStructures
that are indexed
* in the source CAS view will become indexed in the target view.
*
* @param aSrcCasView
* the CAS to copy from
- * @param aDestCasView
- * the destination CAS view
* @param aCopySofa
* if true, the sofa data and mimeType will be copied. If false
they will not.
*/
- public void copyCasView(CAS aSrcCasView, String aDestCasView, boolean
aCopySofa) {
+ public void copyCasView(CAS aSrcCasView, boolean aCopySofa) {
//get or create the target view
-CAS targetView = getOrCreateView(mDestCas, aDestCasView);
+CAS targetView = getOrCreateView(mDestCas, aSrcCasView.getViewName());
if (aCopySofa) {
// can't copy the SofaFS - just copy the sofa data and mime type
@@ -170,22 +168,6 @@ public class CasCopier {
}
/**
- * Does a deep copy of the contents of one CAS View into another CAS.
- * If a view with the same name as codeaSrcCasView/code exists in the
destination CAS,
- * then it will be the target of the copy. Otherwise, a new view will be
created with
- * that name and will become the target of the copy. All FeatureStructures
that are indexed
- * in the source CAS view will become indexed in the target view.
- *
- * @param aSrcCasView
- * the CAS to copy from
- * @param aCopySofa
- * if true, the sofa data and mimeType will be copied. If false
they will not.
- */
- public void copyCasView(CAS aSrcCasView, boolean aCopySofa) {
-copyCasView(aSrcCasView, aSrcCasView.getViewName(), aCopySofa);
- }
-
- /**
* For long lists, and other structures, the straight-forward impl with
recursion can
* nest too deep, causing a Java failure - out of stack space.
*
svn commit: r1342246 - /uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java
Author: joern
Date: Thu May 24 13:21:02 2012
New Revision: 1342246
URL: http://svn.apache.org/viewvc?rev=1342246view=rev
Log:
UIMA-2409 Added new copyCasView method where the destination view name can be
specified.
Modified:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java
Modified:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java?rev=1342246r1=1342245r2=1342246view=diff
==
---
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java
(original)
+++
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java
Thu May 24 13:21:02 2012
@@ -111,19 +111,21 @@ public class CasCopier {
/**
* Does a deep copy of the contents of one CAS View into another CAS.
- * If a view with the same name as codeaSrcCasView/code exists in the
destination CAS,
+ * If a view with the same name as codeaDestCasView/code exists in the
destination CAS,
* then it will be the target of the copy. Otherwise, a new view will be
created with
* that name and will become the target of the copy. All FeatureStructures
that are indexed
* in the source CAS view will become indexed in the target view.
*
* @param aSrcCasView
* the CAS to copy from
+ * @param aDestCasView
+ * the destination CAS view
* @param aCopySofa
* if true, the sofa data and mimeType will be copied. If false
they will not.
*/
- public void copyCasView(CAS aSrcCasView, boolean aCopySofa) {
+ public void copyCasView(CAS aSrcCasView, String aDestCasView, boolean
aCopySofa) {
//get or create the target view
-CAS targetView = getOrCreateView(mDestCas, aSrcCasView.getViewName());
+CAS targetView = getOrCreateView(mDestCas, aDestCasView);
if (aCopySofa) {
// can't copy the SofaFS - just copy the sofa data and mime type
@@ -168,6 +170,22 @@ public class CasCopier {
}
/**
+ * Does a deep copy of the contents of one CAS View into another CAS.
+ * If a view with the same name as codeaSrcCasView/code exists in the
destination CAS,
+ * then it will be the target of the copy. Otherwise, a new view will be
created with
+ * that name and will become the target of the copy. All FeatureStructures
that are indexed
+ * in the source CAS view will become indexed in the target view.
+ *
+ * @param aSrcCasView
+ * the CAS to copy from
+ * @param aCopySofa
+ * if true, the sofa data and mimeType will be copied. If false
they will not.
+ */
+ public void copyCasView(CAS aSrcCasView, boolean aCopySofa) {
+copyCasView(aSrcCasView, aSrcCasView.getViewName(), aCopySofa);
+ }
+
+ /**
* For long lists, and other structures, the straight-forward impl with
recursion can
* nest too deep, causing a Java failure - out of stack space.
*
svn commit: r1208387 - /uima/uimaj/trunk/README
Author: joern Date: Wed Nov 30 11:27:48 2011 New Revision: 1208387 URL: http://svn.apache.org/viewvc?rev=1208387view=rev Log: UIMA-2292 Added information about Cas Editor and the new launcher plugin. Version was updated to 2.4.0 Modified: uima/uimaj/trunk/README Modified: uima/uimaj/trunk/README URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/README?rev=1208387r1=1208386r2=1208387view=diff == --- uima/uimaj/trunk/README (original) +++ uima/uimaj/trunk/README Wed Nov 30 11:27:48 2011 @@ -22,31 +22,33 @@ Look for the result in the two artifacts For more details, please see http://uima.apache.org/building-uima.html -What's New in 2.3.1 +What's New in 2.4.0 --- CAS Editor -- - The Cas Editor received a few important enhancements aimed at making it - the preferred editor and viewer for CAS files inside a UIMA project. - It is now possible to open CAS files from any location within an - eclipse workspace. - - Based on feedback from our users the Cas Editor received a number of - usability enhancements and bug fixes. - - A new view to show the annotation colors and visualization style was added. - The view interacts with the editor and can be used to define which - kind of annotations are displayed. - - There is now a new annotation style to display features values in between - the text lines. This is especially useful to show Part-Of-Speech tags, - entity categories or a stemming. - - There have been a couple of minor improvements: the editor context menu - now shows keyboard shortcuts, and it is possible to choose the encoding - and resulting CAS format when importing a text file. - + The Cas Editor received a few important enhancements to make it + extensible by user provided plugins. It is now possible to save + generic preferences based on a type system scope and the Cas Editor + was split into two parts to allow the integration into RCP applications. + + Support for Cas Editor projects is now removed, existing Cas Editor + projects will be migrated automatically. Before this happens a dialog + ask for confirmation. + + There have been a couple of minor improvements: Adding of annotations + to a CAS is now much faster, reusing of Annotation Editor instances is + now possible, CAS file changes can now be detected and the changed file + is shown in the editor, many things are now remembered after a dialog + is reopened or an editor is reopened. + + Eclipse Analysis Engine Launcher Plugin + --- + We added a new launcher plugin to run and debug Analysis Engines directly + from Eclipse. The plugin can load input CASes in the XCAS or XMI format + from a specified folder and then processes them with the Analysis Engine. + The files can optionally be written to an output folder for inspection + with the Cas Editor. Plain text input files are supported as well. Build -
svn commit: r1208405 - /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Author: joern
Date: Wed Nov 30 12:38:09 2011
New Revision: 1208405
URL: http://svn.apache.org/viewvc?rev=1208405view=rev
Log:
UIMA-2293 File changes are only processed if source is not an Cas Editor save
action.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java?rev=1208405r1=1208404r2=1208405view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Wed Nov 30 12:38:09 2011
@@ -98,7 +98,9 @@ public class DefaultCasDocumentProvider
if (delta.getKind() == IResourceDelta.REMOVED) {
handleElementDeleted(fileInput);
} else if (delta.getKind() == IResourceDelta.CHANGED) {
- handleElementChanged(fileInput);
+
+ if (isFileChangeTrackingEnabled)
+handleElementChanged(fileInput);
}
}
}
@@ -171,6 +173,8 @@ public class DefaultCasDocumentProvider
* while the editor is open.
*/
private MapString, PreferenceStore typeSystemPreferences = new
HashMapString, PreferenceStore();
+
+ private boolean isFileChangeTrackingEnabled = true;
// UIMA-2245 Remove this method together with the migration code below one
day
private String getStyleFileForTypeSystem(String typeSystemFile) {
@@ -456,8 +460,15 @@ public class DefaultCasDocumentProvider
documentImpl.serialize(outStream);
InputStream stream = new ByteArrayInputStream(outStream.toByteArray());
-
-file.setContents(stream, true, false, null);
+
+isFileChangeTrackingEnabled = false;
+
+try {
+ file.setContents(stream, true, false, null);
+}
+finally {
+ isFileChangeTrackingEnabled = true;
+}
}
}
svn commit: r1208431 - in /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor: CasEditorView.java styleview/AnnotationStyleViewPage.java
Author: joern
Date: Wed Nov 30 13:55:59 2011
New Revision: 1208431
URL: http://svn.apache.org/viewvc?rev=1208431view=rev
Log:
UIMA-2293 Now always the correct view page is accessed.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java?rev=1208431r1=1208430r2=1208431view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java
Wed Nov 30 13:55:59 2011
@@ -49,8 +49,6 @@ public abstract class CasEditorView exte
private final String editorNotAvailableMessage;
- private CasEditorViewPage casViewPageBookedPage;
-
private MapICasEditor, ICasEditorInputListener editorListenerMap =
new HashMapICasEditor, ICasEditorInputListener();
@@ -91,7 +89,7 @@ public abstract class CasEditorView exte
// Will be recreated on view switch (need a flag to disable that) and input
cas switch
protected abstract IPageBookViewPage doCreatePage(ICasEditor editor);
- private void createViewPage(ICasEditor editor) {
+ private void createViewPage( CasEditorViewPage casViewPageBookedPage,
ICasEditor editor) {
IPageBookViewPage page = doCreatePage(editor);
if (page != null) {
@@ -116,12 +114,14 @@ public abstract class CasEditorView exte
if (part instanceof ICasEditor) {
final ICasEditor editor = (ICasEditor) part;
+ final CasEditorViewPage casViewPageBookedPage = new
CasEditorViewPage(editorNotAvailableMessage);
+
if (editor.getDocument() != null) {
ICasDocumentListener documentListener = new AbstractDocumentListener()
{
@Override
public void viewChanged(String oldViewName, String newViewName) {
if (isRecreatePageOnCASViewSwitch()) {
- createViewPage(editor);
+ createViewPage(casViewPageBookedPage, editor);
}
}
};
@@ -137,7 +137,7 @@ public abstract class CasEditorView exte
public void casDocumentChanged(IEditorInput oldInput, ICasDocument
oldDocument,
IEditorInput newInput, ICasDocument newDocument) {
- createViewPage(editor);
+ createViewPage(casViewPageBookedPage, editor);
ICasDocumentListener changeListener =
documentListenerMap.get(editor);
@@ -151,16 +151,17 @@ public abstract class CasEditorView exte
}
};
-
+ editorListenerMap.put(editor, inputListener);
editor.addCasEditorInputListener(inputListener);
- casViewPageBookedPage = new CasEditorViewPage(editorNotAvailableMessage);
+ // BUG: This does not work!
+
initPage(casViewPageBookedPage);
casViewPageBookedPage.createControl(getPageBook());
- createViewPage(editor);
+ createViewPage(casViewPageBookedPage, editor);
result = new PageRec(editor, casViewPageBookedPage);
}
@@ -214,6 +215,7 @@ public abstract class CasEditorView exte
@Override
public void dispose() {
+
for (Map.EntryICasEditor, ICasEditorInputListener entry :
editorListenerMap.entrySet()) {
entry.getKey().removeCasEditorInputListener(entry.getValue());
@@ -231,8 +233,8 @@ public abstract class CasEditorView exte
documentListenerMap.clear();
-if (casViewPageBookedPage != null)
- casViewPageBookedPage.dispose();
+//if (casViewPageBookedPage != null)
+// casViewPageBookedPage.dispose();
super.dispose();
}
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java?rev=1208431r1=1208430r2=1208431view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java
Wed Nov 30 13:55:59 2011
@@ -362,7 +362,7 @@ class AnnotationStyleViewPage extends Pa
IPreferenceStore store =
editor.getCasDocumentProvider
svn commit: r1208445 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java
Author: joern Date: Wed Nov 30 14:15:49 2011 New Revision: 1208445 URL: http://svn.apache.org/viewvc?rev=1208445view=rev Log: No jira, removed 2 lines of commented code. Modified: uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java Modified: uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java?rev=1208445r1=1208444r2=1208445view=diff == --- uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java (original) +++ uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java Wed Nov 30 14:15:49 2011 @@ -233,9 +233,6 @@ public abstract class CasEditorView exte documentListenerMap.clear(); -//if (casViewPageBookedPage != null) -// casViewPageBookedPage.dispose(); - super.dispose(); } }
svn commit: r1205767 - in /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor: CasEditorViewPage.java editview/EditViewPage.java outline/AnnotationOutline.java
Author: joern
Date: Thu Nov 24 09:41:58 2011
New Revision: 1205767
URL: http://svn.apache.org/viewvc?rev=1205767view=rev
Log:
UIMA-2225 Fixed selection processing when selection comes from wrong editor.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.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/outline/AnnotationOutline.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java?rev=1205767r1=1205766r2=1205767view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java
Thu Nov 24 09:41:58 2011
@@ -60,6 +60,7 @@ public class CasEditorViewPage extends P
this.notAvailableMessage = notAvailableMessage;
}
+ @SuppressWarnings(rawtypes)
private void refreshActionHandlers() {
IActionBars actionBars = getSite().getActionBars();
@@ -78,6 +79,8 @@ public class CasEditorViewPage extends P
}
}
+ // These are called from the outside, even if the page is not active ...
+ // this leads to the processing of events which should not be processed!
public void addSelectionChangedListener(ISelectionChangedListener listener) {
selectionChangedListeners.add(listener);
}
@@ -142,6 +145,7 @@ public class CasEditorViewPage extends P
page.createControl(book);
casViewPage = page;
+// Note: If page is in background event listening must be disabled!
ISelectionProvider selectionProvider =
page.getSite().getSelectionProvider();
selectionProvider.addSelectionChangedListener(new
ISelectionChangedListener() {
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java?rev=1205767r1=1205766r2=1205767view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java
Thu Nov 24 09:41:58 2011
@@ -775,16 +775,18 @@ final class EditViewPage extends Page im
public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-if (selection instanceof IStructuredSelection) {
-
- FeatureStructureSelection fsSelection = new FeatureStructureSelection(
- (IStructuredSelection) selection);
-
- if (fsSelection.size() == 1 !pinAction.isChecked()) {
-
-// filter out selection which are cause by this view itself
-if (editView != part) {
- viewer.setInput(fsSelection.toList().get(0));
+if (getSite().getPage().getActiveEditor() == editor) {
+ if (selection instanceof IStructuredSelection) {
+
+FeatureStructureSelection fsSelection = new FeatureStructureSelection(
+(IStructuredSelection) selection);
+
+if (fsSelection.size() == 1 !pinAction.isChecked()) {
+
+ // filter out selection which are cause by this view itself
+ if (editView != part) {
+viewer.setInput(fsSelection.toList().get(0));
+ }
}
}
}
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java?rev=1205767r1=1205766r2=1205767view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java
Thu Nov 24 09:41:58 2011
@@ -385,7 +385,7 @@ public final class AnnotationOutline ext
}
}
-if (isForeignSelection) {
+if (isForeignSelection getSite().getPage().getActiveEditor() == editor)
{
if (selection instanceof StructuredSelection) {
AnnotationSelection annotations = new
AnnotationSelection((StructuredSelection) selection);
svn commit: r1203148 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java
Author: joern
Date: Thu Nov 17 10:58:40 2011
New Revision: 1203148
URL: http://svn.apache.org/viewvc?rev=1203148view=rev
Log:
UIMA-2225 The PageBook should not point to the disposed widget when
updateActionBars is called.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java?rev=1203148r1=1203147r2=1203148view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java
Thu Nov 17 10:58:40 2011
@@ -150,7 +150,7 @@ public class CasEditorViewPage extends P
}
});
-subActionBar = (SubActionBars) (getSite().getActionBars());
+subActionBar = (SubActionBars) casViewPage.getSite().getActionBars();
casViewPage.setActionBars(subActionBar);
@@ -163,6 +163,7 @@ public class CasEditorViewPage extends P
}
else {
book.showPage(messageText);
+getSite().getActionBars().updateActionBars();
}
}
}
@@ -172,8 +173,6 @@ public class CasEditorViewPage extends P
if (book != null casViewPage != null) {
casViewPage.dispose();
subActionBar.dispose();
-
- getSite().getActionBars().updateActionBars();
}
casViewPage = page;
svn commit: r1202756 - in /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor: CasEditorViewPage.java editview/EditViewPage.java outline/AnnotationOutline.java outline
Author: joern
Date: Wed Nov 16 16:03:55 2011
New Revision: 1202756
URL: http://svn.apache.org/viewvc?rev=1202756view=rev
Log:
UIMA-2225 More fixes to action bar and selection provider handling.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.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/outline/AnnotationOutline.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlinePageBook.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java?rev=1202756r1=1202755r2=1202756view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java
Wed Nov 16 16:03:55 2011
@@ -19,30 +19,117 @@
package org.apache.uima.caseditor.editor;
-import org.apache.uima.caseditor.CasEditorPlugin;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.core.runtime.SafeRunner;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.util.SafeRunnable;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.SubActionBars;
import org.eclipse.ui.part.IPageBookViewPage;
import org.eclipse.ui.part.Page;
import org.eclipse.ui.part.PageBook;
-public class CasEditorViewPage extends Page {
+public class CasEditorViewPage extends Page implements ISelectionProvider {
+
+ private ListenerList selectionChangedListeners = new ListenerList();
private final String notAvailableMessage;
protected PageBook book;
- private IPageBookViewPage casViewPage;
+ protected IPageBookViewPage casViewPage;
+ private SubActionBars subActionBar;
+
private Text messageText;
protected CasEditorViewPage(String notAvailableMessage) {
this.notAvailableMessage = notAvailableMessage;
}
+ private void refreshActionHandlers() {
+
+IActionBars actionBars = getSite().getActionBars();
+actionBars.clearGlobalActionHandlers();
+
+Map newActionHandlers = subActionBar
+.getGlobalActionHandlers();
+if (newActionHandlers != null) {
+ Set keys = newActionHandlers.entrySet();
+ Iterator iter = keys.iterator();
+ while (iter.hasNext()) {
+Map.Entry entry = (Map.Entry) iter.next();
+actionBars.setGlobalActionHandler((String) entry.getKey(),
+(IAction) entry.getValue());
+ }
+}
+ }
+
+ public void addSelectionChangedListener(ISelectionChangedListener listener) {
+selectionChangedListeners.add(listener);
+ }
+
+ public void removeSelectionChangedListener(ISelectionChangedListener
listener) {
+selectionChangedListeners.remove(listener);
+ }
+
+ public void selectionChanged(final SelectionChangedEvent event) {
+
+for (Object listener : selectionChangedListeners.getListeners()) {
+
+ final ISelectionChangedListener selectionChangedListener =
+ (ISelectionChangedListener) listener;
+
+ SafeRunner.run(new SafeRunnable() {
+public void run() {
+ selectionChangedListener.selectionChanged(event);
+}
+ });
+}
+ }
+
+ public ISelection getSelection() {
+if (casViewPage != null casViewPage.getSite().getSelectionProvider() !=
null) {
+ return casViewPage.getSite().getSelectionProvider().getSelection();
+}
+else {
+ return StructuredSelection.EMPTY;
+}
+ }
+
+ public void setSelection(ISelection selection) {
+if (casViewPage != null casViewPage.getSite().getSelectionProvider() !=
null) {
+ casViewPage.getSite().getSelectionProvider().setSelection(selection);
+}
+ }
+
+ @Override
+ public void createControl(Composite parent) {
+book = new PageBook(parent, SWT.NONE);
+
+messageText = new Text(book, SWT.WRAP | SWT.READ_ONLY);
+messageText.setBackground(parent.getShell().getBackground());
+messageText.setText
svn commit: r1200796 - in /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor: CasEditorView.java CasEditorViewPage.java
Author: joern
Date: Fri Nov 11 10:03:59 2011
New Revision: 1200796
URL: http://svn.apache.org/viewvc?rev=1200796view=rev
Log:
UIMA-2225 New Cas Editor View
Added:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java
(with props)
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java
(with props)
Added:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java?rev=1200796view=auto
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java
(added)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java
Fri Nov 11 10:03:59 2011
@@ -0,0 +1,231 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.uima.caseditor.editor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.uima.cas.CAS;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.part.IPage;
+import org.eclipse.ui.part.IPageBookViewPage;
+import org.eclipse.ui.part.MessagePage;
+import org.eclipse.ui.part.PageBook;
+import org.eclipse.ui.part.PageBookView;
+
+/**
+ * Base class for views which show information about the {@link CAS} opened
+ * in the editor.
+ * p
+ * The view page created with {@link #doCreatePage(ICasEditor)} will be
disposed
+ * and re-created on every Cas Editor input change or CAS view change.
+ * p
+ * In the case the view should no be re-created on a CAS view change
+ * {@link #isRecreatePageOnCASViewSwitch()} must be overridden and return
false.
+ *
+ */
+public abstract class CasEditorView extends PageBookView {
+
+ private final String editorNotAvailableMessage;
+
+ private CasEditorViewPage casViewPageBookedPage;
+
+ private MapICasEditor, ICasEditorInputListener editorListenerMap =
+ new HashMapICasEditor, ICasEditorInputListener();
+
+ private MapICasEditor, ICasDocumentListener documentListenerMap =
+ new HashMapICasEditor, ICasDocumentListener();
+
+ public CasEditorView(String editorNotAvailableMessage) {
+this.editorNotAvailableMessage = editorNotAvailableMessage;
+ }
+
+ /**
+ * Implementors should overwrite if they want that. Default is false.
+ * p
+ * Note:br
+ * The implementation uses the ICasDocumentListener.viewChanged event
+ * to recognize view changes. If the view implementation also listens for
+ * this event the view might already be disposed when the listener is called.
+ * It is therefore strongly recommended either to listen for the event and
+ * update the view or don't list for the event and rely on a page
re-creation.
+ *
+ * @return true if page should be disposed/re-created on CAS view change,
+ * or false if not.
+ */
+ protected boolean isRecreatePageOnCASViewSwitch() {
+return false;
+ }
+
+ @Override
+ protected IPage createDefaultPage(PageBook book) {
+MessagePage page = new MessagePage();
+initPage(page);
+page.createControl(book);
+page.setMessage(editorNotAvailableMessage);
+return page;
+ }
+
+ // Creates a new page if document is available and CAS view is compatible
+ // Will be recreated on view switch (need a flag to disable that) and input
cas switch
+ protected abstract IPageBookViewPage doCreatePage(ICasEditor editor);
+
+ private void createViewPage(ICasEditor editor) {
+
+IPageBookViewPage page = doCreatePage(editor);
+if (page != null) {
+ initPage(page);
+ casViewPageBookedPage.setCASViewPage(page);
+}
+else {
+ casViewPageBookedPage.setCASViewPage(null);
+}
+ }
+
+ @Override
+ protected final PageRec doCreatePage(final IWorkbenchPart part) {
+
+PageRec result = null;
+
+if (part instanceof ICasEditor) {
+ final ICasEditor editor = (ICasEditor) part
svn commit: r1200797 - in /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor: editview/ fsview/ outline/ styleview/
Author: joern
Date: Fri Nov 11 10:06:09 2011
New Revision: 1200797
URL: http://svn.apache.org/viewvc?rev=1200797view=rev
Log:
UIMA-2225 Rolled back changes which have been done in UIMA-2273. And updated
views to use new Cas Editor view.
Added:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlinePageBook.java
(with props)
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/CreateFeatureStructureDialog.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.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/FeatureStructureBrowserView.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/AnnotationOutline.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/ModeSensitiveContentProvider.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlineContentProviderBase.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/TypeGroupedContentProvider.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleView.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/CreateFeatureStructureDialog.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/CreateFeatureStructureDialog.java?rev=1200797r1=1200796r2=1200797view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/CreateFeatureStructureDialog.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/CreateFeatureStructureDialog.java
Fri Nov 11 10:06:09 2011
@@ -169,7 +169,7 @@ public class CreateFeatureStructureDialo
typeSelection = new TypeCombo(typePanel);
typeSelection.setInput(superType, typeSystem, filterTypes);
-
+
selectedType = typeSelection.getType();
// maybe consider to show the type of the array and disable the selector
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java?rev=1200797r1=1200796r2=1200797view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java
Fri Nov 11 10:06:09 2011
@@ -19,14 +19,16 @@
package org.apache.uima.caseditor.editor.editview;
-import org.apache.uima.caseditor.editor.AnnotationEditorView;
+import org.apache.uima.caseditor.editor.CasEditorView;
import org.apache.uima.caseditor.editor.ICasDocument;
import org.apache.uima.caseditor.editor.ICasEditor;
+import org.eclipse.ui.part.IPageBookViewPage;
/**
* TODO: add javadoc here
*/
-public final class EditView extends AnnotationEditorView {
+public final class EditView extends CasEditorView {
+
/**
* The ID of the feature structure view.
*/
@@ -36,20 +38,18 @@ public final class EditView extends Anno
public EditView() {
super(The edit view is currently not available.);
}
-
+
@Override
- protected PageRec doCreatePage(ICasEditor editor) {
+ protected IPageBookViewPage doCreatePage(ICasEditor editor) {
- PageRec result = null;
+ IPageBookViewPage result = null;
ICasDocument document = editor.getDocument();
if (document != null) {
EditViewPage page = new EditViewPage(this, editor,
document);
- initPage(page);
- page.createControl(getPageBook());
- result = new PageRec(editor, page);
+ result = page
svn commit: r1200798 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Author: joern
Date: Fri Nov 11 10:08:33 2011
New Revision: 1200798
URL: http://svn.apache.org/viewvc?rev=1200798view=rev
Log:
UIMA-2225 Updated to use new outline view and SafeRunner to send out input
change event.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=1200798r1=1200797r2=1200798view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Fri Nov 11 10:08:33 2011
@@ -53,6 +53,7 @@ import org.apache.uima.caseditor.editor.
import org.apache.uima.caseditor.editor.contextmenu.ModeMenu;
import org.apache.uima.caseditor.editor.contextmenu.ShowAnnotationsMenu;
import org.apache.uima.caseditor.editor.outline.AnnotationOutline;
+import org.apache.uima.caseditor.editor.outline.OutlinePageBook;
import org.apache.uima.caseditor.editor.util.AnnotationComparator;
import org.apache.uima.caseditor.editor.util.AnnotationSelection;
import org.apache.uima.caseditor.editor.util.FeatureStructureTransfer;
@@ -60,6 +61,8 @@ import org.apache.uima.caseditor.editor.
import org.apache.uima.caseditor.editor.util.StrictTypeConstraint;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.core.runtime.SafeRunner;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ContributionItem;
import org.eclipse.jface.action.IAction;
@@ -83,6 +86,7 @@ import org.eclipse.jface.text.source.ISo
import org.eclipse.jface.text.source.SourceViewer;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.jface.util.SafeRunnable;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.SelectionChangedEvent;
@@ -543,11 +547,11 @@ public final class AnnotationEditor exte
/**
* The outline page belonging to this editor.
*/
- private IContentOutlinePage mOutlinePage;
+ private OutlinePageBook mOutlinePage = new OutlinePageBook();
private SetIAnnotationEditorModifyListener mEditorListener = new
HashSetIAnnotationEditorModifyListener();
- private SetICasEditorInputListener mEditorInputListener = new
HashSetICasEditorInputListener();;
+ private ListenerList mEditorInputListener = new ListenerList();
/**
* TODO: Do we really need this position variable ?
@@ -574,8 +578,6 @@ public final class AnnotationEditor exte
private CasDocumentProvider casDocumentProvider;
-
-
/**
* Creates an new AnnotationEditor object.
*/
@@ -606,10 +608,6 @@ public final class AnnotationEditor exte
public Object getAdapter(@SuppressWarnings(rawtypes) Class adapter) {
if (IContentOutlinePage.class.equals(adapter) getDocument() != null) {
- if (mOutlinePage == null) {
-mOutlinePage = new AnnotationOutline(this);
- }
-
return mOutlinePage;
}
else if (CAS.class.equals(adapter) getDocument() != null) {
@@ -800,9 +798,9 @@ public final class AnnotationEditor exte
}
@Override
- protected void doSetInput(IEditorInput input) throws CoreException {
-IEditorInput oldInput = getEditorInput();
-ICasDocument oldDocument = getDocument();
+ protected void doSetInput(final IEditorInput input) throws CoreException {
+final IEditorInput oldInput = getEditorInput();
+final ICasDocument oldDocument = getDocument();
// Unregister the editor listeners on the old input
// TODO: Should we make methods to encapsulate the register/unregister
code?
@@ -814,7 +812,7 @@ public final class AnnotationEditor exte
removePropertyChangeListener(mAnnotationStyleListener);
mAnnotationStyleListener = null;
}
-
+
super.doSetInput(input);
if (CasEditorPlugin.getDefault().
@@ -833,6 +831,9 @@ public final class AnnotationEditor exte
if (getDocument() != null) {
+ AnnotationOutline outline = new AnnotationOutline(this);
+ mOutlinePage.setCASViewPage(outline);
+
shownAnnotationTypes.clear();
// Synchronize shown types with the editor
@@ -864,7 +865,7 @@ public final class AnnotationEditor exte
// must be synchronized now
initiallySynchronizeUI();
-
+
// Views which fetch content from the editors document still believe
// the editor document
svn commit: r1200799 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocumentListener.java
Author: joern
Date: Fri Nov 11 10:09:19 2011
New Revision: 1200799
URL: http://svn.apache.org/viewvc?rev=1200799view=rev
Log:
UIMA-2225 Added more methods.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocumentListener.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocumentListener.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocumentListener.java?rev=1200799r1=1200798r2=1200799view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocumentListener.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocumentListener.java
Fri Nov 11 10:09:19 2011
@@ -29,6 +29,9 @@ import org.apache.uima.cas.FeatureStruct
*/
public abstract class AbstractDocumentListener implements ICasDocumentListener
{
+ public void added(CollectionFeatureStructure newFeatureStructure) {
+ }
+
/**
* Forwards the call.
*/
@@ -40,6 +43,9 @@ public abstract class AbstractDocumentLi
added(structures);
}
+ public void removed(CollectionFeatureStructure deletedFeatureStructure) {
+ }
+
/**
* Forwards the call.
*/
@@ -51,6 +57,9 @@ public abstract class AbstractDocumentLi
removed(structures);
}
+ public void updated(CollectionFeatureStructure featureStructure) {
+ }
+
/**
* Forwards the call.
*/
@@ -61,4 +70,10 @@ public abstract class AbstractDocumentLi
updated(structures);
}
+
+ public void changed() {
+ }
+
+ public void viewChanged(String oldViewName, String newViewName) {
+ }
}
\ No newline at end of file
svn commit: r1200246 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java
Author: joern
Date: Thu Nov 10 09:51:09 2011
New Revision: 1200246
URL: http://svn.apache.org/viewvc?rev=1200246view=rev
Log:
UIMA-2281 Now uses SafeRunner to broadcast events.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java?rev=1200246r1=1200245r2=1200246view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java
Thu Nov 10 09:51:09 2011
@@ -21,10 +21,11 @@ package org.apache.uima.caseditor.editor
import java.util.Collection;
import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
import org.apache.uima.cas.FeatureStructure;
+import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.core.runtime.SafeRunner;
+import org.eclipse.jface.util.SafeRunnable;
/**
* Abstract base class for document implementations.
@@ -33,7 +34,7 @@ public abstract class AbstractDocument i
/**
* Contains the change listener objects.
*/
- private SetICasDocumentListener mListener = new
HashSetICasDocumentListener();
+ private ListenerList mListener = new ListenerList();
/**
* Registers a change listener.
@@ -58,9 +59,16 @@ public abstract class AbstractDocument i
*
* @param annotation
*/
- protected void fireAddedFeatureStructure(FeatureStructure annotation) {
-for (ICasDocumentListener listener : mListener) {
- listener.added(annotation);
+ protected void fireAddedFeatureStructure(final FeatureStructure annotation) {
+
+for (Object listener : mListener.getListeners()) {
+ final ICasDocumentListener documentListener = (ICasDocumentListener)
listener;
+
+ SafeRunner.run(new SafeRunnable() {
+public void run() {
+ documentListener.added(annotation);
+}
+ });
}
}
@@ -69,9 +77,16 @@ public abstract class AbstractDocument i
*
* @param annotations
*/
- protected void fireAddedFeatureStructure(Collection? extends
FeatureStructure annotations) {
-for (ICasDocumentListener listener : mListener) {
- listener.added(Collections.unmodifiableCollection(annotations));
+ protected void fireAddedFeatureStructure(final Collection? extends
FeatureStructure annotations) {
+for (Object listener : mListener.getListeners()) {
+
+ final ICasDocumentListener documentListener = (ICasDocumentListener)
listener;
+
+ SafeRunner.run(new SafeRunnable() {
+public void run() {
+
documentListener.added(Collections.unmodifiableCollection(annotations));
+}
+ });
}
}
@@ -80,9 +95,16 @@ public abstract class AbstractDocument i
*
* @param annotation
*/
- protected void fireRemovedFeatureStructure(FeatureStructure annotation) {
-for (ICasDocumentListener listener : mListener) {
- listener.removed(annotation);
+ protected void fireRemovedFeatureStructure(final FeatureStructure
annotation) {
+for (Object listener : mListener.getListeners()) {
+
+ final ICasDocumentListener documentListener = (ICasDocumentListener)
listener;
+
+ SafeRunner.run(new SafeRunnable() {
+public void run() {
+ documentListener.removed(annotation);
+}
+ });
}
}
@@ -91,9 +113,16 @@ public abstract class AbstractDocument i
*
* @param annotations
*/
- protected void fireRemovedFeatureStructure(Collection? extends
FeatureStructure annotations) {
-for (ICasDocumentListener listener : mListener) {
- listener.removed(Collections.unmodifiableCollection(annotations));
+ protected void fireRemovedFeatureStructure(final Collection? extends
FeatureStructure annotations) {
+for (Object listener : mListener.getListeners()) {
+
+ final ICasDocumentListener documentListener = (ICasDocumentListener)
listener;
+
+ SafeRunner.run(new SafeRunnable() {
+public void run() {
+
documentListener.removed(Collections.unmodifiableCollection(annotations));
+}
+ });
}
}
@@ -102,9 +131,16 @@ public abstract class AbstractDocument i
*
* @param annotation
*/
- protected void fireUpdatedFeatureStructure(FeatureStructure annotation) {
-for (ICasDocumentListener listener : mListener) {
- listener.updated(annotation);
+ protected void fireUpdatedFeatureStructure(final FeatureStructure
annotation) {
+for (Object listener : mListener.getListeners()) {
+
+ final ICasDocumentListener
svn commit: r1199197 - in /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor: ./ action/ editview/ fsview/ outline/
Author: joern Date: Tue Nov 8 11:38:37 2011 New Revision: 1199197 URL: http://svn.apache.org/viewvc?rev=1199197view=rev Log: UIMA-2273 updated actions to not remember the document, otherwise it will be old document after an input change. Modified: 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/action/DeleteFeatureStructureAction.java uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/LowerLeftAnnotationSideAction.java uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/LowerRightAnnotationSideAction.java uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/MergeAnnotationAction.java uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/WideLeftAnnotationSideAction.java uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/WideRightAnnotationSideAction.java uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/CreateFeatureStructureDialog.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/fsview/TypeCombo.java uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java Modified: uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=1199197r1=1199196r2=1199197view=diff == --- uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java (original) +++ uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java Tue Nov 8 11:38:37 2011 @@ -1547,7 +1547,7 @@ public final class AnnotationEditor exte // create delete action DeleteFeatureStructureAction deleteAnnotationAction = new DeleteFeatureStructureAction( -getDocument()); +this); deleteAnnotationAction.setText(Delete Annotation); getSite().getSelectionProvider().addSelectionChangedListener(deleteAnnotationAction); @@ -1569,25 +1569,25 @@ public final class AnnotationEditor exte setAction(ITextEditorActionConstants.FIND, findAnnotateAction); // Lower left side of annotation action -LowerLeftAnnotationSideAction lowerLeftAnnotationSideAction = new LowerLeftAnnotationSideAction(getDocument()); +LowerLeftAnnotationSideAction lowerLeftAnnotationSideAction = new LowerLeftAnnotationSideAction(this); lowerLeftAnnotationSideAction.setActionDefinitionId(LowerLeftAnnotationSideAction.ID); setAction(LowerLeftAnnotationSideAction.ID, lowerLeftAnnotationSideAction); getSite().getSelectionProvider().addSelectionChangedListener(lowerLeftAnnotationSideAction); // Wide left side of annotation action -WideLeftAnnotationSideAction wideLeftAnnotationSide = new WideLeftAnnotationSideAction(getDocument()); +WideLeftAnnotationSideAction wideLeftAnnotationSide = new WideLeftAnnotationSideAction(this); wideLeftAnnotationSide.setActionDefinitionId(WideLeftAnnotationSideAction.ID); setAction(WideLeftAnnotationSideAction.ID, wideLeftAnnotationSide); getSite().getSelectionProvider().addSelectionChangedListener(wideLeftAnnotationSide); // Lower right side of annotation -LowerRightAnnotationSideAction lowerRightAnnotationSideAction = new LowerRightAnnotationSideAction(getDocument()); +LowerRightAnnotationSideAction lowerRightAnnotationSideAction = new LowerRightAnnotationSideAction(this); lowerRightAnnotationSideAction.setActionDefinitionId(LowerRightAnnotationSideAction.ID); setAction(LowerRightAnnotationSideAction.ID, lowerRightAnnotationSideAction); getSite().getSelectionProvider().addSelectionChangedListener(lowerRightAnnotationSideAction); // Wide right side of annotation -WideRightAnnotationSideAction wideRightAnnotationSideAction = new WideRightAnnotationSideAction(getDocument()); +WideRightAnnotationSideAction wideRightAnnotationSideAction = new WideRightAnnotationSideAction(this); wideRightAnnotationSideAction.setActionDefinitionId(WideRightAnnotationSideAction.ID); setAction(WideRightAnnotationSideAction.ID, wideRightAnnotationSideAction); getSite().getSelectionProvider().addSelectionChangedListener(wideRightAnnotationSideAction); Modified: uima/uimaj/trunk/uimaj-ep-cas
svn commit: r1199199 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java
Author: joern Date: Tue Nov 8 11:39:32 2011 New Revision: 1199199 URL: http://svn.apache.org/viewvc?rev=1199199view=rev Log: UIMA-2273 updated actions to not remember the document, otherwise it will be old document after an input change. Modified: uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java Modified: uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java?rev=1199199r1=1199198r2=1199199view=diff == --- uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java (original) +++ uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java Tue Nov 8 11:39:32 2011 @@ -140,8 +140,8 @@ class FindAnnotateDialog extends Dialog typeData.horizontalAlignment = SWT.LEFT; typeLabel.setLayoutData(typeData); -typeField = new TypeCombo(panel, - document.getCAS().getTypeSystem().getType(CAS.TYPE_NAME_ANNOTATION), +typeField = new TypeCombo(panel); + typeField.setInput(document.getCAS().getTypeSystem().getType(CAS.TYPE_NAME_ANNOTATION), document.getCAS().getTypeSystem()); typeField.select(modeType);
svn commit: r1199205 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Author: joern
Date: Tue Nov 8 11:53:27 2011
New Revision: 1199205
URL: http://svn.apache.org/viewvc?rev=1199205view=rev
Log:
UIMA-2273 Unregisters old listeners when input is changed.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=1199205r1=1199204r2=1199205view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Tue Nov 8 11:53:27 2011
@@ -803,6 +803,18 @@ public final class AnnotationEditor exte
protected void doSetInput(IEditorInput input) throws CoreException {
IEditorInput oldInput = getEditorInput();
ICasDocument oldDocument = getDocument();
+
+// Unregister the editor listeners on the old input
+// TODO: Should we make methods to encapsulate the register/unregister
code?
+if (oldDocument != null) {
+ oldDocument.removeChangeListener(mAnnotationSynchronizer);
+ mAnnotationSynchronizer = null;
+
+ getCasDocumentProvider().getTypeSystemPreferenceStore(getEditorInput()).
+ removePropertyChangeListener(mAnnotationStyleListener);
+ mAnnotationStyleListener = null;
+}
+
super.doSetInput(input);
if (CasEditorPlugin.getDefault().
svn commit: r1199272 - in /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline: ModeSensitiveContentProvider.java OutlineContentProviderBase.java TypeGroupedCon
Author: joern
Date: Tue Nov 8 15:00:58 2011
New Revision: 1199272
URL: http://svn.apache.org/viewvc?rev=1199272view=rev
Log:
UIMA-2273 Clears the outline if there is incorrect input.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/ModeSensitiveContentProvider.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlineContentProviderBase.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/TypeGroupedContentProvider.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/ModeSensitiveContentProvider.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/ModeSensitiveContentProvider.java?rev=1199272r1=1199271r2=1199272view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/ModeSensitiveContentProvider.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/ModeSensitiveContentProvider.java
Tue Nov 8 15:00:58 2011
@@ -99,12 +99,17 @@ class ModeSensitiveContentProvider exten
public void changed() {
+if (mInputDocument != null) {
CollectionAnnotationFS annotations =
mEditor.getDocument().getAnnotations(
mEditor.getAnnotationMode());
mAnnotationNodeList = annotations != null ? new
AnnotationTreeNodeList(mEditor.getDocument(),
annotations) : null;
-
+}
+else {
+ mAnnotationNodeList = null;
+}
+
Display.getDefault().syncExec(new Runnable() {
public void run() {
viewer.refresh();
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlineContentProviderBase.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlineContentProviderBase.java?rev=1199272r1=1199271r2=1199272view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlineContentProviderBase.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlineContentProviderBase.java
Tue Nov 8 15:00:58 2011
@@ -74,9 +74,14 @@ abstract class OutlineContentProviderBas
((ICasDocument) newInput).addChangeListener(this);
mInputDocument = (ICasDocument) newInput;
-
- changed();
}
+else {
+ mInputDocument = null;
+}
+
+// Also called when input document is null,
+// case must be handled
+changed();
}
/**
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/TypeGroupedContentProvider.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/TypeGroupedContentProvider.java?rev=1199272r1=1199271r2=1199272view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/TypeGroupedContentProvider.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/TypeGroupedContentProvider.java
Tue Nov 8 15:00:58 2011
@@ -150,36 +150,38 @@ public class TypeGroupedContentProvider
public void changed() {
nameAnnotationTypeNodeMap.clear();
- TypeSystem typeSystem = mInputDocument.getCAS().getTypeSystem();
-
- ListType types = typeSystem.getProperlySubsumedTypes(
- typeSystem.getType(CAS.TYPE_NAME_ANNOTATION));
-
- types.add(typeSystem.getType(CAS.TYPE_NAME_ANNOTATION));
-
- for (Type type : types) {
-
- AnnotationTypeTreeNode typeNode = new
AnnotationTypeTreeNode(type);
-
- nameAnnotationTypeNodeMap.put(type.getName(), typeNode);
-
- CAS cas = mInputDocument.getCAS();
-
- AnnotationIndexAnnotationFS index =
cas.getAnnotationIndex(type);
-
- for (FSIteratorAnnotationFS it = index.iterator();
it.hasNext(); ) {
- AnnotationFS annotation = it.next();
-
- if (annotation.getType().equals(type)) {
- typeNode.add(new
AnnotationTreeNode
svn commit: r1199283 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Author: joern
Date: Tue Nov 8 15:23:54 2011
New Revision: 1199283
URL: http://svn.apache.org/viewvc?rev=1199283view=rev
Log:
UIMA-2273 Checks for null document when disposing views.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=1199283r1=1199282r2=1199283view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Tue Nov 8 15:23:54 2011
@@ -1620,8 +1620,11 @@ public final class AnnotationEditor exte
CasDocumentProvider provider = getCasDocumentProvider();
-if (provider != null)
-
provider.getTypeSystemPreferenceStore(getEditorInput()).removePropertyChangeListener(mAnnotationStyleListener);
+if (provider != null) {
+ IPreferenceStore store =
provider.getTypeSystemPreferenceStore(getEditorInput());
+ if (store != null)
+store.removePropertyChangeListener(mAnnotationStyleListener);
+}
if (preferenceStoreChangeListener != null)
CasEditorPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(preferenceStoreChangeListener);
svn commit: r1199299 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java
Author: joern
Date: Tue Nov 8 15:47:57 2011
New Revision: 1199299
URL: http://svn.apache.org/viewvc?rev=1199299view=rev
Log:
UIMA-2273 Added missing null document check.
Modified:
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/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=1199299r1=1199298r2=1199299view=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
Tue Nov 8 15:47:57 2011
@@ -354,6 +354,8 @@ public final class FeatureStructureBrows
mCasEditor = editor;
+mCasEditor.addCasEditorInputListener(this);
+
mDeleteAction = new DeleteFeatureStructureAction(editor);
mSelectAllAction = new SelectAllAction();
@@ -435,13 +437,11 @@ public final class FeatureStructureBrows
typeComboData.grabExcessHorizontalSpace = true;
typeCombo.setLayoutData(typeComboData);
-
-final IPreferenceStore store =
mCasEditor.getCasDocumentProvider().getSessionPreferenceStore(
-mCasEditor.getEditorInput());
-
typeCombo.addListener(new ITypePaneListener() {
public void typeChanged(Type newType) {
+IPreferenceStore store =
mCasEditor.getCasDocumentProvider().getSessionPreferenceStore(
+mCasEditor.getEditorInput());
store.setValue(LAST_SELECTED_FS_TYPE, newType.getName());
}
});
@@ -527,22 +527,33 @@ public final class FeatureStructureBrows
mInstanceComposite.setFocus();
}
+ @Override
+ public void dispose() {
+super.dispose();
+
+mCasEditor.removeCasEditorInputListener(this);
+ }
+
public void casDocumentChanged(IEditorInput oldInput, ICasDocument
oldDocument,
IEditorInput newInput, ICasDocument newDocument) {
-
typeCombo.setInput(newDocument.getCAS().getTypeSystem().getType(CAS.TYPE_NAME_TOP),
-newDocument.getCAS().getTypeSystem(), filterTypes);
-
-final IPreferenceStore store =
mCasEditor.getCasDocumentProvider().getSessionPreferenceStore(
-mCasEditor.getEditorInput());
-
-Type lastUsedType =
newDocument.getType(store.getString(LAST_SELECTED_FS_TYPE));
-
-if (lastUsedType != null) {
- typeCombo.select(lastUsedType);
+if (newDocument != null) {
+
typeCombo.setInput(newDocument.getCAS().getTypeSystem().getType(CAS.TYPE_NAME_TOP),
+ newDocument.getCAS().getTypeSystem(), filterTypes);
+
+ final IPreferenceStore store =
mCasEditor.getCasDocumentProvider().getSessionPreferenceStore(newInput);
+
+ Type lastUsedType =
newDocument.getType(store.getString(LAST_SELECTED_FS_TYPE));
+
+ if (lastUsedType != null) {
+typeCombo.select(lastUsedType);
+ }
+
+ if (lastUsedType != null)
+mFSList.setInput(lastUsedType);
+}
+else {
+ // clear combo?!
}
-
-if (lastUsedType != null)
- mFSList.setInput(lastUsedType);
}
}
svn commit: r1198711 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java
Author: joern
Date: Mon Nov 7 12:34:00 2011
New Revision: 1198711
URL: http://svn.apache.org/viewvc?rev=1198711view=rev
Log:
UIMA-2273 Now checks for null and removed duplicate refresh call.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java
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=1198711r1=1198710r2=1198711view=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
Mon Nov 7 12:34:00 2011
@@ -246,11 +246,14 @@ final class FeatureStructureContentProvi
}
public void casDocumentChanged(ICasDocument oldDocument, ICasDocument
newDocument) {
-oldDocument.removeChangeListener(this);
+if (oldDocument != null)
+ oldDocument.removeChangeListener(this);
+
mDocument = newDocument;
-mDocument.addChangeListener(this);
+
+if (mDocument != null)
+ mDocument.addChangeListener(this);
+
viewer.setInput(null);
-viewer.refresh();
}
-
}
\ No newline at end of file
svn commit: r1198714 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java
Author: joern Date: Mon Nov 7 12:42:15 2011 New Revision: 1198714 URL: http://svn.apache.org/viewvc?rev=1198714view=rev Log: UIMA-2276 Now sets the input correctly to the remeberd type. Modified: 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/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=1198714r1=1198713r2=1198714view=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 Mon Nov 7 12:42:15 2011 @@ -476,6 +476,9 @@ public final class FeatureStructureBrows }); getSite().setSelectionProvider(mFSList); + +if (lastUsedType != null) + mFSList.setInput(lastUsedType); } /**
svn commit: r1198756 - in /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor: AnnotationEditor.java styleview/AnnotationStyleViewPage.java
Author: joern
Date: Mon Nov 7 14:40:09 2011
New Revision: 1198756
URL: http://svn.apache.org/viewvc?rev=1198756view=rev
Log:
UIMA-2273 Moved input changed notifcation after code which updates the
Annotation Editor itself.
Modified:
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/styleview/AnnotationStyleViewPage.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=1198756r1=1198755r2=1198756view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Mon Nov 7 14:40:09 2011
@@ -805,8 +805,6 @@ public final class AnnotationEditor exte
protected void doSetInput(IEditorInput input) throws CoreException {
ICasDocument oldDocument = getDocument();
super.doSetInput(input);
-ICasDocument newDocument = getDocument();
-fireCasDocumentChanged(oldDocument, newDocument);
if (CasEditorPlugin.getDefault().
getAndClearShowMigrationDialogFlag()) {
@@ -822,9 +820,10 @@ public final class AnnotationEditor exte
});
}
-
if (getDocument() != null) {
-
+
+ shownAnnotationTypes.clear();
+
// Synchronize shown types with the editor
String shownTypesString =
getCasDocumentProvider().getSessionPreferenceStore(input).getString(LastShownTypes);
@@ -868,6 +867,9 @@ public final class AnnotationEditor exte
}
}
}
+
+ICasDocument newDocument = getDocument();
+fireCasDocumentChanged(oldDocument, newDocument);
}
private void fireCasDocumentChanged(ICasDocument oldDocument, ICasDocument
newDocument) {
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java?rev=1198756r1=1198755r2=1198756view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java
Mon Nov 7 14:40:09 2011
@@ -106,12 +106,12 @@ class AnnotationStyleViewPage extends Pa
annotationTypes = null;
}
-
- Display.getDefault().syncExec(new Runnable() {
-public void run() {
- treeViewer.refresh();
-}
- });
+ treeViewer.refresh();
+// Display.getDefault().syncExec(new Runnable() {
+//public void run() {
+// treeViewer.refresh();
+//}
+// });
}
public Object[] getElements(Object inputElement) {
@@ -225,6 +225,11 @@ class AnnotationStyleViewPage extends Pa
return selectedNodes;
}
+ private void setCheckBoxes() {
+
treeViewer.setCheckedElements(typesToNodes(editor.getShownAnnotationTypes(),
editor));
+treeViewer.setGrayed(new AnnotationTypeNode(editor,
editor.getAnnotationMode()), true);
+ }
+
@Override
public void createControl(Composite parent) {
@@ -281,10 +286,6 @@ class AnnotationStyleViewPage extends Pa
}
};
-
treeViewer.setCheckedElements(typesToNodes(editor.getShownAnnotationTypes(),
editor));
-
-treeViewer.setGrayed(new AnnotationTypeNode(editor,
editor.getAnnotationMode()), true);
-
treeViewer.addCheckStateListener(new ICheckStateListener() {
public void checkStateChanged(CheckStateChangedEvent event) {
@@ -378,8 +379,10 @@ class AnnotationStyleViewPage extends Pa
}
public void casDocumentChanged(ICasDocument oldDocument, ICasDocument
newDocument) {
-if (newDocument != null)
+if (newDocument != null) {
treeViewer.setInput(newDocument.getCAS().getTypeSystem());
+ setCheckBoxes();
+}
else
treeViewer.setInput(null);
svn commit: r1198767 - in /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor: ./ editview/ fsview/ outline/ styleview/
Author: joern
Date: Mon Nov 7 15:05:43 2011
New Revision: 1198767
URL: http://svn.apache.org/viewvc?rev=1198767view=rev
Log:
UIMA-2273 input change listener now also gets the old and new editor input,
which is needed for views whcih listen for type system preference changes.
Modified:
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/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
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=1198767r1=1198766r2=1198767view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Mon Nov 7 15:05:43 2011
@@ -803,6 +803,7 @@ public final class AnnotationEditor exte
@Override
protected void doSetInput(IEditorInput input) throws CoreException {
+IEditorInput oldInput = getEditorInput();
ICasDocument oldDocument = getDocument();
super.doSetInput(input);
@@ -869,13 +870,10 @@ public final class AnnotationEditor exte
}
ICasDocument newDocument = getDocument();
-fireCasDocumentChanged(oldDocument, newDocument);
- }
-
- private void fireCasDocumentChanged(ICasDocument oldDocument, ICasDocument
newDocument) {
+
if (mEditorInputListener != null) {
for (ICasEditorInputListener listener : mEditorInputListener)
-listener.casDocumentChanged(oldDocument, newDocument);
+listener.casDocumentChanged(oldInput, oldDocument, input, newDocument);
}
}
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=1198767r1=1198766r2=1198767view=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
Mon Nov 7 15:05:43 2011
@@ -38,6 +38,7 @@ import org.apache.uima.caseditor.editor.
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorInput;
final class FeatureStructureContentProvider extends AbstractDocumentListener
implements
ITreeContentProvider, ICasEditorInputListener {
@@ -245,7 +246,7 @@ final class FeatureStructureContentProvi
}
}
- public void casDocumentChanged(ICasDocument oldDocument, ICasDocument
newDocument) {
+ public void casDocumentChanged(IEditorInput oldInput, ICasDocument
oldDocument, IEditorInput newInput, ICasDocument newDocument) {
if (oldDocument != null)
oldDocument.removeChangeListener(this);
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=1198767r1=1198766r2=1198767view=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
Mon Nov 7 15:05:43 2011
@@ -58,6 +58,7 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.part.Page;
@@ -69,7 +70,7 @@ public final class FeatureStructureBrows
private static
svn commit: r1198769 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditorInputListener.java
Author: joern
Date: Mon Nov 7 15:08:37 2011
New Revision: 1198769
URL: http://svn.apache.org/viewvc?rev=1198769view=rev
Log:
UIMA-2273 input change listener now also gets the old and new editor input,
which is needed for views whcih listen for type system preference changes.
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=1198769r1=1198768r2=1198769view=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
Mon Nov 7 15:08:37 2011
@@ -19,6 +19,8 @@
package org.apache.uima.caseditor.editor;
+import org.eclipse.ui.IEditorInput;
+
public interface ICasEditorInputListener {
/**
@@ -32,6 +34,6 @@ public interface ICasEditorInputListener
* @param newDocument
* - the new, current document {@link ICasDocument}.
*/
- void casDocumentChanged(ICasDocument oldDocument, ICasDocument newDocument);
+ void casDocumentChanged(IEditorInput oldInput, ICasDocument oldDocument,
IEditorInput newInput, ICasDocument newDocument);
}
svn commit: r1198791 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TokenDrawingStrategy.java
Author: joern
Date: Mon Nov 7 16:10:04 2011
New Revision: 1198791
URL: http://svn.apache.org/viewvc?rev=1198791view=rev
Log:
UIMA-2279 Improved performance of rendering code.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TokenDrawingStrategy.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TokenDrawingStrategy.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TokenDrawingStrategy.java?rev=1198791r1=1198790r2=1198791view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TokenDrawingStrategy.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TokenDrawingStrategy.java
Mon Nov 7 16:10:04 2011
@@ -30,15 +30,11 @@ import org.eclipse.swt.graphics.Rectangl
public class TokenDrawingStrategy implements IDrawingStrategy {
private static final int BRACKET_WIDTH = 5;
- private static boolean isWhitespace(StyledText textWidget, int offset) {
+ private static boolean isWhitespace(String text, int offset) {
-String characterString = textWidget.getText(offset, offset);
+char character = text.charAt(offset);
-if (characterString.trim().length() == 0) {
- return true;
-}
-
-return false;
+return Character.isWhitespace(character);
}
public void draw(Annotation annotation, GC gc, StyledText textWidget, int
offset, int length,
@@ -46,7 +42,6 @@ public class TokenDrawingStrategy implem
if (length 0) {
if (annotation instanceof EclipseAnnotationPeer) {
AnnotationFS annotationFS = ((EclipseAnnotationPeer)
annotation).getAnnotationFS();
-
if (gc != null) {
Rectangle bounds = textWidget.getTextBounds(offset, offset + length
- 1);
@@ -54,7 +49,7 @@ public class TokenDrawingStrategy implem
boolean isDrawOpenBracket = annotationFS.getBegin() == offset;
// and no space before offset
- if (isDrawOpenBracket offset 1 !isWhitespace(textWidget,
offset - 1)) {
+ if (isDrawOpenBracket offset 1
!isWhitespace(annotationFS.getCAS().getDocumentText(), offset - 1)) {
gc.drawLine(bounds.x, bounds.y + bounds.height - 1, bounds.x +
BRACKET_WIDTH, bounds.y
+ bounds.height - 1);
@@ -66,7 +61,7 @@ public class TokenDrawingStrategy implem
boolean isDrawCloseBracket = annotationFS.getEnd() == offset +
length;
// and no space after offset
if (isDrawCloseBracket offset + length
textWidget.getText().length()
- !isWhitespace(textWidget, offset + length)) {
+ !isWhitespace(annotationFS.getCAS().getDocumentText(),
offset + length)) {
gc.drawLine(bounds.x + bounds.width, bounds.y + bounds.height - 1,
bounds.x
+ bounds.width - BRACKET_WIDTH, bounds.y + bounds.height -
1);
svn commit: r1198793 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Author: joern
Date: Mon Nov 7 16:10:31 2011
New Revision: 1198793
URL: http://svn.apache.org/viewvc?rev=1198793view=rev
Log:
UIMA-2279 painter is now disabled when a lot of annotations are added or
removed.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=1198793r1=1198792r2=1198793view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Mon Nov 7 16:10:31 2011
@@ -294,7 +294,9 @@ public final class AnnotationEditor exte
annotation.getEnd() - annotation.getBegin()));
}
+ mPainter.deactivate(true);
annotationModel.replaceAnnotations(null, addAnnotationMap);
+ mPainter.paint(IPainter.CONFIGURATION);
}
/**
@@ -321,7 +323,9 @@ public final class AnnotationEditor exte
removeAnnotations[removeAnnotationsIndex++] = new
EclipseAnnotationPeer(annotation);
}
+ mPainter.deactivate(true);
annotationModel.replaceAnnotations(removeAnnotations, null);
+ mPainter.paint(IPainter.CONFIGURATION);
}
/**
@@ -350,8 +354,6 @@ public final class AnnotationEditor exte
public void viewChanged(String oldViewName, String newViewName) {
// TODO: Currently do nothing ...
}
-
-
}
/**
svn commit: r1196990 - /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml
Author: joern Date: Thu Nov 3 08:18:31 2011 New Revision: 1196990 URL: http://svn.apache.org/viewvc?rev=1196990view=rev Log: UIMA-2277 Cas Editor Perspective is not fixed anymore. Modified: uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml Modified: uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml?rev=1196990r1=1196989r2=1196990view=diff == --- uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml (original) +++ uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml Thu Nov 3 08:18:31 2011 @@ -50,7 +50,7 @@ extension point=org.eclipse.ui.perspectives perspective class=org.apache.uima.caseditor.ide.CasEditorPerspectiveFactory - fixed=true icon=icons/svgicons/corpus.png + fixed=false icon=icons/svgicons/corpus.png id=org.apache.uima.caseditor.perspective.NLP name=Cas Editor /perspective /extension
svn commit: r1196994 - in /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor: outline/AnnotationOutline.java styleview/AnnotationStyleViewPage.java
Author: joern Date: Thu Nov 3 08:46:13 2011 New Revision: 1196994 URL: http://svn.apache.org/viewvc?rev=1196994view=rev Log: UIMA-2265 Views which are using this listener are now correctly removing their listener in their dispose method. Modified: uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java Modified: uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java?rev=1196994r1=1196993r2=1196994view=diff == --- uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java (original) +++ uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java Thu Nov 3 08:46:13 2011 @@ -105,6 +105,8 @@ public final class AnnotationOutline ext } } + private IAnnotationEditorModifyListener editorChangeListener; + private OutlineStyles style = OutlineStyles.TYPE; private Composite mOutlineComposite; @@ -144,8 +146,8 @@ public final class AnnotationOutline ext changeAnnotationMode(); -// TODO: create a listener interface ... for editor listener -editor.addAnnotationListener(new EditorListener()); +editorChangeListener = new EditorListener(); +editor.addAnnotationListener(editorChangeListener); DragSource source = new DragSource(mTableViewer.getTree(), DND.DROP_COPY); @@ -395,5 +397,7 @@ public final class AnnotationOutline ext // remove selection listener getSite().getWorkbenchWindow().getSelectionService().removeSelectionListener(this); + +editor.removeAnnotationListener(editorChangeListener); } } Modified: uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java?rev=1196994r1=1196993r2=1196994view=diff == --- uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java (original) +++ uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java Thu Nov 3 08:46:13 2011 @@ -361,5 +361,7 @@ class AnnotationStyleViewPage extends Pa editor.getCasDocumentProvider().getTypeSystemPreferenceStore( editor.getEditorInput()).removePropertyChangeListener(changeListener); + +editor.removeAnnotationListener(editorListener); } }
svn commit: r1197012 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/
Author: joern
Date: Thu Nov 3 09:20:38 2011
New Revision: 1197012
URL: http://svn.apache.org/viewvc?rev=1197012view=rev
Log:
UIMA-2271 Changes are rolled back because the annotation drawing code does not
work correctly when word wrappigns are enabled.
Modified:
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/AnnotationEditorPreferenceConstants.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferencePage.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java?rev=1197012r1=1197011r2=1197012view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
Thu Nov 3 09:20:38 2011
@@ -40,11 +40,37 @@ class AnnotationDocument extends Documen
private ICasDocument mDocument;
+ private int lineLengthHint;
+
+ public AnnotationDocument() {
+IPreferenceStore prefStore =
CasEditorPlugin.getDefault().getPreferenceStore();
+lineLengthHint =
prefStore.getInt(AnnotationEditorPreferenceConstants.EDITOR_LINE_LENGTH_HINT);
+
+if (lineLengthHint == 0)
+ lineLengthHint = 80;
+ }
+
+ private String transformText(String text) {
+ if (lineLengthHint != 0 text != null) {
+ return wrapWords(text, lineLengthHint);
+ } else {
+ if (text != null)
+ return text;
+ else
+ return ;
+ }
+ }
+
/**
* Call is forwarded to the set document.
*
* @return the text
*/
+ private String getText() {
+
+String text = getCAS().getDocumentText();
+return transformText(text);
+ }
/**
* Notifies listener about a document change.
*/
@@ -54,13 +80,17 @@ class AnnotationDocument extends Documen
fireDocumentChanged(ev);
}
+// public void setLineLengthHint(int lineLengthHint) {
+//this.lineLengthHint = lineLengthHint;
+// }
+
/**
* @param element
*/
public void setDocument(ICasDocument element) {
mDocument = element;
-set(getCAS().getDocumentText());
+set(getText());
}
public ICasDocument getDocument() {
@@ -232,7 +262,7 @@ class AnnotationDocument extends Documen
// but without sending out notifications.
// The stop and resume notification methods do not yield
// the desired effect
- String text = getCAS().getView(viewName).getDocumentText();
+ String text =
transformText(getCAS().getView(viewName).getDocumentText());
getStore().set(text);
getTracker().set(text);
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=1197012r1=1197011r2=1197012view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Thu Nov 3 09:20:38 2011
@@ -630,12 +630,6 @@ public final class AnnotationEditor exte
sourceViewer.addPainter(mPainter);
-// UIMA-2271: Set word wrap based on the preferences
-IPreferenceStore preferences =
CasEditorPlugin.getDefault().getPreferenceStore();
-
-sourceViewer.getTextWidget().setWordWrap(preferences.getBoolean(
-
AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_ENABLE_WORD_WRAP));
-
return sourceViewer;
}
@@ -746,32 +740,24 @@ public final class AnnotationEditor exte
// Retrieve font size from preference store, default is 15
IPreferenceStore prefStore =
CasEditorPlugin.getDefault().getPreferenceStore();
-int textSize = prefStore.getInt(
-AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_TEXT_SIZE);
-
-// TODO: We should use a preference initialize instead ...
+int textSize =
prefStore.getInt(AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_TEXT_SIZE
svn commit: r1197026 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java
Author: joern
Date: Thu Nov 3 09:42:19 2011
New Revision: 1197026
URL: http://svn.apache.org/viewvc?rev=1197026view=rev
Log:
No jira, replaced for loop with a while loop. The index i was not used at all
in the loop.
Modified:
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/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=1197026r1=1197025r2=1197026view=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
Thu Nov 3 09:42:19 2011
@@ -91,7 +91,7 @@ public final class FeatureStructureBrows
LinkedListModelFeatureStructure featureStrucutreList = new
LinkedListModelFeatureStructure();
- for (int i = 0; strictTypeIterator.hasNext(); i++) {
+ while (strictTypeIterator.hasNext()) {
featureStrucutreList.add(new ModelFeatureStructure(mDocument,
strictTypeIterator.next()));
}
svn commit: r1197029 - in /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline: AnnotationTreeNode.java AnnotationTypeTreeNode.java
Author: joern
Date: Thu Nov 3 09:48:03 2011
New Revision: 1197029
URL: http://svn.apache.org/viewvc?rev=1197029view=rev
Log:
No jira, added suppress warning annotations for raw type.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNode.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTypeTreeNode.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNode.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNode.java?rev=1197029r1=1197028r2=1197029view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNode.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNode.java
Thu Nov 3 09:48:03 2011
@@ -80,7 +80,7 @@ public class AnnotationTreeNode implemen
mChildren.buildTree();
}
- public Object getAdapter(Class adapter) {
+ public Object getAdapter(@SuppressWarnings(rawtypes) Class adapter) {
// TODO:
// use ModelFeatureStructure
// create a AdapterFactory which just calls the
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTypeTreeNode.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTypeTreeNode.java?rev=1197029r1=1197028r2=1197029view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTypeTreeNode.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTypeTreeNode.java
Thu Nov 3 09:48:03 2011
@@ -53,7 +53,7 @@ class AnnotationTypeTreeNode implements
annotations.remove(annotation);
}
- public Object getAdapter(Class adapter) {
+ public Object getAdapter(@SuppressWarnings(rawtypes) Class adapter) {
if (Type.class.equals(adapter)) {
return type;
svn commit: r1197031 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationTypeNode.java
Author: joern
Date: Thu Nov 3 09:49:10 2011
New Revision: 1197031
URL: http://svn.apache.org/viewvc?rev=1197031view=rev
Log:
No jira, added suppress warning annotations for raw type.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationTypeNode.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationTypeNode.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationTypeNode.java?rev=1197031r1=1197030r2=1197031view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationTypeNode.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationTypeNode.java
Thu Nov 3 09:49:10 2011
@@ -59,7 +59,7 @@ public class AnnotationTypeNode implemen
return type.hashCode();
}
- public Object getAdapter(Class adapter) {
+ public Object getAdapter(@SuppressWarnings(rawtypes) Class adapter) {
if (AnnotationTypeNode.class.equals(adapter)) {
return this;
svn commit: r1197033 - in /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor: ArrayValue.java FeatureValue.java ModelFeatureStructure.java
Author: joern
Date: Thu Nov 3 09:51:36 2011
New Revision: 1197033
URL: http://svn.apache.org/viewvc?rev=1197033view=rev
Log:
No jira, added suppress warning annotations for raw type.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ArrayValue.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ModelFeatureStructure.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ArrayValue.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ArrayValue.java?rev=1197033r1=1197032r2=1197033view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ArrayValue.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ArrayValue.java
Thu Nov 3 09:51:36 2011
@@ -128,7 +128,7 @@ public class ArrayValue implements IAdap
}
}
- public Object getAdapter(Class adapter) {
+ public Object getAdapter(@SuppressWarnings(rawtypes) Class adapter) {
if (FeatureStructure.class.equals(adapter)) {
if (arrayFS instanceof ArrayFS) {
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java?rev=1197033r1=1197032r2=1197033view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java
Thu Nov 3 09:51:36 2011
@@ -61,7 +61,7 @@ public final class FeatureValue implemen
return mStructure.getFeatureValue(mFeature);
}
- public Object getAdapter(Class adapter) {
+ public Object getAdapter(@SuppressWarnings(rawtypes) Class adapter) {
if (AnnotationFS.class.equals(adapter)) {
if (getValue() instanceof AnnotationFS) {
return getValue();
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ModelFeatureStructure.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ModelFeatureStructure.java?rev=1197033r1=1197032r2=1197033view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ModelFeatureStructure.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ModelFeatureStructure.java
Thu Nov 3 09:51:36 2011
@@ -86,7 +86,7 @@ public class ModelFeatureStructure imple
return structres;
}
- public Object getAdapter(Class adapter) {
+ public Object getAdapter(@SuppressWarnings(rawtypes) Class adapter) {
if (FeatureStructure.class.equals(adapter)) {
return getStructre();
} else if (AnnotationFS.class.equals(adapter) getStructre() instanceof
AnnotationFS) {
svn commit: r1197036 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Author: joern
Date: Thu Nov 3 09:57:42 2011
New Revision: 1197036
URL: http://svn.apache.org/viewvc?rev=1197036view=rev
Log:
No jira, fixed warnings.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=1197036r1=1197035r2=1197036view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Thu Nov 3 09:57:42 2011
@@ -85,7 +85,6 @@ import org.eclipse.jface.util.IPropertyC
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.SWT;
@@ -600,8 +599,7 @@ public final class AnnotationEditor exte
* @return an adapter or null
*/
@Override
- @SuppressWarnings(unchecked)
- public Object getAdapter(Class adapter) {
+ public Object getAdapter(@SuppressWarnings(rawtypes) Class adapter) {
if (IContentOutlinePage.class.equals(adapter) getDocument() != null) {
if (mOutlinePage == null) {
svn commit: r1197037 - /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizardPage.java
Author: joern
Date: Thu Nov 3 09:58:50 2011
New Revision: 1197037
URL: http://svn.apache.org/viewvc?rev=1197037view=rev
Log:
No jira, added suppress warning annotations for raw type.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizardPage.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizardPage.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizardPage.java?rev=1197037r1=1197036r2=1197037view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizardPage.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizardPage.java
Thu Nov 3 09:58:50 2011
@@ -200,7 +200,7 @@ final class ImportDocumentWizardPage ext
/**
* Removes selected elements from the file table viewer.
*/
- @SuppressWarnings(unchecked)
+ @SuppressWarnings(rawtypes)
public void widgetSelected(SelectionEvent e) {
IStructuredSelection selection = (IStructuredSelection)
fileTable.getSelection();
svn commit: r1196520 - in /uima/uimaj/trunk/uimaj-ep-cas-editor-ide: ./ src/main/java/org/apache/uima/caseditor/ide/ src/main/java/org/apache/uima/caseditor/ide/wizards/
Author: joern
Date: Wed Nov 2 09:34:44 2011
New Revision: 1196520
URL: http://svn.apache.org/viewvc?rev=1196520view=rev
Log:
UIMA-2179 Import wizard now uses pref store to save language and last used
encodings.
Added:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceConstants.java
(with props)
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceInitializer.java
(with props)
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizard.java
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizardPage.java
Modified: uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml?rev=1196520r1=1196519r2=1196520view=diff
==
--- uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml Wed Nov 2 09:34:44 2011
@@ -89,4 +89,11 @@
name=UIMA Annotation Editor
/page
/extension
+
+extension
+ point=org.eclipse.core.runtime.preferences
+initializer
+
class=org.apache.uima.caseditor.ide.CasEditorIdePreferenceInitializer
+/initializer
+ /extension
/plugin
Added:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceConstants.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceConstants.java?rev=1196520view=auto
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceConstants.java
(added)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceConstants.java
Wed Nov 2 09:34:44 2011
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.uima.caseditor.ide;
+
+public class CasEditorIdePreferenceConstants {
+
+ public static final String STRING_DELIMITER = ;;
+
+ public static final String CAS_IMPORT_WIZARD_LAST_USED_LANG =
+ CAS_IMPORT_WIZARD_LAST_USED_LANG;
+
+ public static final String CAS_IMPORT_WIZARD_LAST_USED_ENCODINGS =
CAS_IMPORT_WIZARD_ENCODINGS;
+}
Propchange:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceConstants.java
--
svn:mime-type = text/plain
Added:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceInitializer.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceInitializer.java?rev=1196520view=auto
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceInitializer.java
(added)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferenceInitializer.java
Wed Nov 2 09:34:44 2011
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS
svn commit: r1187266 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/
Author: joern
Date: Fri Oct 21 09:46:06 2011
New Revision: 1187266
URL: http://svn.apache.org/viewvc?rev=1187266view=rev
Log:
UIMA-2271 Replaced line length hint word wrapping with proper word wrapping.
Added:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceConstants.java
(with props)
Modified:
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/AnnotationEditorPreferenceInitializer.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferencePage.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java?rev=1187266r1=1187265r2=1187266view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
Fri Oct 21 09:46:06 2011
@@ -40,37 +40,11 @@ class AnnotationDocument extends Documen
private ICasDocument mDocument;
- private int lineLengthHint;
-
- public AnnotationDocument() {
-IPreferenceStore prefStore =
CasEditorPlugin.getDefault().getPreferenceStore();
-lineLengthHint =
prefStore.getInt(AnnotationEditorPreferencePage.EDITOR_LINE_LENGTH_HINT);
-
-if (lineLengthHint == 0)
- lineLengthHint = 80;
- }
-
- private String transformText(String text) {
- if (lineLengthHint != 0 text != null) {
- return wrapWords(text, lineLengthHint);
- } else {
- if (text != null)
- return text;
- else
- return ;
- }
- }
-
/**
* Call is forwarded to the set document.
*
* @return the text
*/
- private String getText() {
-
-String text = getCAS().getDocumentText();
-return transformText(text);
- }
/**
* Notifies listener about a document change.
*/
@@ -80,17 +54,13 @@ class AnnotationDocument extends Documen
fireDocumentChanged(ev);
}
-// public void setLineLengthHint(int lineLengthHint) {
-//this.lineLengthHint = lineLengthHint;
-// }
-
/**
* @param element
*/
public void setDocument(ICasDocument element) {
mDocument = element;
-set(getText());
+set(getCAS().getDocumentText());
}
public ICasDocument getDocument() {
@@ -262,7 +232,7 @@ class AnnotationDocument extends Documen
// but without sending out notifications.
// The stop and resume notification methods do not yield
// the desired effect
- String text =
transformText(getCAS().getView(viewName).getDocumentText());
+ String text = getCAS().getView(viewName).getDocumentText();
getStore().set(text);
getTracker().set(text);
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=1187266r1=1187265r2=1187266view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Fri Oct 21 09:46:06 2011
@@ -630,6 +630,12 @@ public final class AnnotationEditor exte
sourceViewer.addPainter(mPainter);
+// UIMA-2271: Set word wrap based on the preferences
+IPreferenceStore preferences =
CasEditorPlugin.getDefault().getPreferenceStore();
+
+sourceViewer.getTextWidget().setWordWrap(preferences.getBoolean(
+
AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_ENABLE_WORD_WRAP));
+
return sourceViewer;
}
@@ -740,24 +746,32 @@ public final class AnnotationEditor exte
// Retrieve font size from preference store, default is 15
IPreferenceStore prefStore =
CasEditorPlugin.getDefault().getPreferenceStore();
-int textSize =
prefStore.getInt(AnnotationEditorPreferencePage.EDITOR_TEXT_SIZE);
+int textSize = prefStore.getInt(
+AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_TEXT_SIZE);
+
+// TODO: We should use a preference initialize instead ...
if (textSize 0) {
setTextSize(textSize
svn commit: r1186674 - in /uima/uimaj/trunk: uimaj-ep-cas-editor-ide/schema/org.apache.uima.caseditor.ide.searchstrategy.exsd uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.editor.exsd
Author: joern Date: Thu Oct 20 09:00:10 2011 New Revision: 1186674 URL: http://svn.apache.org/viewvc?rev=1186674view=rev Log: No jira, added AL header. Modified: uima/uimaj/trunk/uimaj-ep-cas-editor-ide/schema/org.apache.uima.caseditor.ide.searchstrategy.exsd uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.editor.exsd Modified: uima/uimaj/trunk/uimaj-ep-cas-editor-ide/schema/org.apache.uima.caseditor.ide.searchstrategy.exsd URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/schema/org.apache.uima.caseditor.ide.searchstrategy.exsd?rev=1186674r1=1186673r2=1186674view=diff == --- uima/uimaj/trunk/uimaj-ep-cas-editor-ide/schema/org.apache.uima.caseditor.ide.searchstrategy.exsd (original) +++ uima/uimaj/trunk/uimaj-ep-cas-editor-ide/schema/org.apache.uima.caseditor.ide.searchstrategy.exsd Thu Oct 20 09:00:10 2011 @@ -1,5 +1,24 @@ ?xml version='1.0' encoding='UTF-8'? -!-- Schema file written by PDE -- + +!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + License); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +-- + schema targetNamespace=org.apache.uima.caseditor.ide xmlns=http://www.w3.org/2001/XMLSchema; annotation appInfo Modified: uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.editor.exsd URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.editor.exsd?rev=1186674r1=1186673r2=1186674view=diff == --- uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.editor.exsd (original) +++ uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.editor.exsd Thu Oct 20 09:00:10 2011 @@ -1,5 +1,24 @@ ?xml version='1.0' encoding='UTF-8'? -!-- Schema file written by PDE -- + +!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + License); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +-- + schema targetNamespace=org.apache.uima.caseditor.editor xmlns=http://www.w3.org/2001/XMLSchema; annotation appinfo
svn commit: r1185601 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Author: joern
Date: Tue Oct 18 12:02:02 2011
New Revision: 1185601
URL: http://svn.apache.org/viewvc?rev=1185601view=rev
Log:
UIMA-2265 Added a method to remove a registerd annotation listener.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=1185601r1=1185600r2=1185601view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Tue Oct 18 12:02:02 2011
@@ -1196,6 +1196,10 @@ public final class AnnotationEditor exte
public void addAnnotationListener(IAnnotationEditorModifyListener listener) {
mEditorListener.add(listener);
}
+
+ public void removeAnnotationListener(IAnnotationEditorModifyListener
listener) {
+mEditorListener.remove(listener);
+ }
/**
* Returns the selection.
svn commit: r1185150 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Author: joern
Date: Mon Oct 17 13:10:37 2011
New Revision: 1185150
URL: http://svn.apache.org/viewvc?rev=1185150view=rev
Log:
UIMA-2263 Added a method which returns the offset of the caret.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=1185150r1=1185149r2=1185150view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Mon Oct 17 13:10:37 2011
@@ -1276,6 +1276,15 @@ public final class AnnotationEditor exte
return selection;
}
+ /**
+ * Returns the caret position relative to the start of the text.
+ *
+ * @return
+ */
+ public int getCaretOffset() {
+return getSourceViewer().getTextWidget().getCaretOffset();
+ }
+
public void showView(String viewName) {
// TODO: Check if set view is compatible .. if not display some message!
svn commit: r1183294 - in /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor: AnnotationEditor.java AnnotationEditorSelection.java
Author: joern
Date: Fri Oct 14 10:57:11 2011
New Revision: 1183294
URL: http://svn.apache.org/viewvc?rev=1183294view=rev
Log:
UIMA-2260 Annotation Editor now sends out a selection object which implements
both, ITextSelection and IStructuredSelection.
Added:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorSelection.java
(with props)
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=1183294r1=1183293r2=1183294view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Fri Oct 14 10:57:11 2011
@@ -69,6 +69,7 @@ import org.eclipse.jface.action.Separato
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.IPainter;
+import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.text.Position;
import org.eclipse.jface.text.information.InformationPresenter;
import org.eclipse.jface.text.source.Annotation;
@@ -84,6 +85,7 @@ import org.eclipse.jface.util.IPropertyC
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.SWT;
@@ -717,7 +719,8 @@ public final class AnnotationEditor exte
// can be detected
getSourceViewer().getSelectionProvider().addSelectionChangedListener(new
ISelectionChangedListener() {
public void selectionChanged(SelectionChangedEvent event) {
-refreshSelection();
+mFeatureStructureSelectionProvider.setSelection(new
AnnotationEditorSelection((ITextSelection) event.getSelection(),
+new
StructuredSelection(ModelFeatureStructure.create(getDocument(),
getSelectedAnnotations();
}
});
Added:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorSelection.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorSelection.java?rev=1183294view=auto
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorSelection.java
(added)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorSelection.java
Fri Oct 14 10:57:11 2011
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.uima.caseditor.editor;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.jface.text.ITextSelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+
+class AnnotationEditorSelection implements ITextSelection,
IStructuredSelection {
+
+ private ITextSelection textSelection;
+
+ private IStructuredSelection structuredSelection;
+
+ AnnotationEditorSelection(ITextSelection textSelection, IStructuredSelection
structuredSelection) {
+this.textSelection = textSelection;
+this.structuredSelection = structuredSelection;
+ }
+
+ public int getOffset() {
+return textSelection.getOffset();
+ }
+
+ public int getLength() {
+return textSelection.getLength();
+ }
+
+ public int getStartLine() {
+return textSelection.getStartLine();
+ }
+
+ public int getEndLine() {
+return textSelection.getEndLine();
+ }
+
+ public String getText() {
+return textSelection.getText
svn commit: r1183331 - /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Author: joern
Date: Fri Oct 14 12:37:26 2011
New Revision: 1183331
URL: http://svn.apache.org/viewvc?rev=1183331view=rev
Log:
UIMA-2261 Session preferences are now serialized and stored as persistent
property on type system file.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java?rev=1183331r1=1183330r2=1183331view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Fri Oct 14 12:37:26 2011
@@ -23,6 +23,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.Charset;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -52,9 +53,12 @@ import org.eclipse.core.runtime.CoreExce
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceStore;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
@@ -116,6 +120,38 @@ public class DefaultCasDocumentProvider
}
}
+ private class SaveSessionPreferencesTrigger implements
IPropertyChangeListener {
+private Object element;
+
+SaveSessionPreferencesTrigger(Object element) {
+ this.element = element;
+}
+
+public void propertyChange(PropertyChangeEvent event) {
+ IResource tsFile = ResourcesPlugin.getWorkspace().getRoot()
+ .findMember((getTypesystemId(element)));
+
+ PreferenceStore prefStore = (PreferenceStore)
getSessionPreferenceStore(element);
+
+ ByteArrayOutputStream prefBytes = new ByteArrayOutputStream();
+ try {
+prefStore.save(prefBytes, );
+ } catch (IOException e) {
+CasEditorIdePlugin.log(e);
+ }
+
+ try {
+tsFile.setPersistentProperty(
+new QualifiedName(, CAS_EDITOR_SESSION_PROPERTIES),
+new String(prefBytes.toByteArray(), Charset.forName(UTF-8)));
+ } catch (CoreException e) {
+CasEditorIdePlugin.log(e);
+ }
+}
+ }
+
+ private static final String CAS_EDITOR_SESSION_PROPERTIES =
CAS_EDITOR_SESSION_PROPERTIES;
+
/**
* This map resolved an opened document to its associated style object id.
*
@@ -282,6 +318,28 @@ public class DefaultCasDocumentProvider
documentToTypeSystemMap.put(casFile.getFullPath().toPortableString(),
typeSystemFile.getFullPath().toPortableString());
+
+IPreferenceStore store =
sessionPreferenceStores.get(getTypesystemId(element));
+
+if (store == null) {
+ PreferenceStore newStore = new PreferenceStore();
+ sessionPreferenceStores.put(getTypesystemId(element), newStore);
+ newStore.addPropertyChangeListener(new
SaveSessionPreferencesTrigger(element));
+
+ String sessionPreferenceString =
typeSystemFile.getPersistentProperty(
+ new QualifiedName(, CAS_EDITOR_SESSION_PROPERTIES));
+
+ if (sessionPreferenceString != null) {
+try {
+ newStore.load(new ByteArrayInputStream(
+
sessionPreferenceString.getBytes(Charset.forName(UTF-8;
+} catch (IOException e) {
+ CasEditorPlugin.log(e);
+}
+ }
+}
+
+
// TODO:
// Preferences are bound to the type system
// Changed in one place, then it should change in all places
@@ -426,16 +484,7 @@ public class DefaultCasDocumentProvider
@Override
public IPreferenceStore getSessionPreferenceStore(Object element) {
-
-// lookup one, and if it does not exist create a new one, and put it!
-IPreferenceStore store =
sessionPreferenceStores.get(getTypesystemId(element));
-
-if (store == null) {
- store = new PreferenceStore();
- sessionPreferenceStores.put(getTypesystemId(element), store);
-}
-
-return store;
+return sessionPreferenceStores.get
svn commit: r1183366 - /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Author: joern
Date: Fri Oct 14 14:17:43 2011
New Revision: 1183366
URL: http://svn.apache.org/viewvc?rev=1183366view=rev
Log:
UIMA-2261 Session preferences are now serialized and stored as persistent
property on type system file.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java?rev=1183366r1=1183365r2=1183366view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Fri Oct 14 14:17:43 2011
@@ -143,10 +143,13 @@ public class DefaultCasDocumentProvider
try {
tsFile.setPersistentProperty(
new QualifiedName(, CAS_EDITOR_SESSION_PROPERTIES),
-new String(prefBytes.toByteArray(), Charset.forName(UTF-8)));
+new String(prefBytes.toByteArray(), UTF-8));
} catch (CoreException e) {
CasEditorIdePlugin.log(e);
}
+ catch(IOException e) {
+CasEditorIdePlugin.log(e);
+ }
}
}
@@ -332,7 +335,7 @@ public class DefaultCasDocumentProvider
if (sessionPreferenceString != null) {
try {
newStore.load(new ByteArrayInputStream(
-
sessionPreferenceString.getBytes(Charset.forName(UTF-8;
+ sessionPreferenceString.getBytes(UTF-8)));
} catch (IOException e) {
CasEditorPlugin.log(e);
}
svn commit: r1181670 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.java
Author: joern
Date: Tue Oct 11 09:36:10 2011
New Revision: 1181670
URL: http://svn.apache.org/viewvc?rev=1181670view=rev
Log:
UIMA-2245 Moved methods below instance variables. Removed an unused instance
variable.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.java?rev=1181670r1=1181669r2=1181670view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.java
Tue Oct 11 09:36:10 2011
@@ -53,21 +53,14 @@ public abstract class CasDocumentProvide
}
}
+ /**
+ * Error status code to indicate that a type system is not available.
+ */
public static final int TYPE_SYSTEM_NOT_AVAILABLE_STATUS_CODE = 12;
private SetIElementStateListener elementStateListeners =
new HashSetIElementStateListener();
- private SetIAnnotationStyleListener annotationStyleListeners =
- new HashSetIAnnotationStyleListener();
-
- protected ElementInfo createElementInfo(Object element) {
-return new ElementInfo(element);
- }
-
- protected void disposeElementInfo(Object element, ElementInfo info) {
- }
-
/**
* The method {@link #createDocument(Object)} put error status objects for
the given element in
* this map, if something with document creation goes wrong.
@@ -76,6 +69,13 @@ public abstract class CasDocumentProvide
*/
protected MapObject, IStatus elementErrorStatus = new HashMapObject,
IStatus();
+ protected ElementInfo createElementInfo(Object element) {
+return new ElementInfo(element);
+ }
+
+ protected void disposeElementInfo(Object element, ElementInfo info) {
+ }
+
/**
* Creates the a new {@link AnnotationDocument} from the given {@link
IEditorInput} element.
* For all other elements null is returned.
svn commit: r1181714 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine: BasicEngine.xml BasicTypeSystem.xml InternalTypeSystem.xml Modifier
Author: joern Date: Tue Oct 11 11:12:26 2011 New Revision: 1181714 URL: http://svn.apache.org/viewvc?rev=1181714view=rev Log: UIMA-2237 Added new files provided by Peter Klügl. These files could not be added via the provided patch for some reason. Added: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml (with props) uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicTypeSystem.xml (with props) uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/InternalTypeSystem.xml (with props) uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/Modifier.xml (with props) uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/SourceDocumentInformation.xml (with props) uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TypePrioritites.xml (with props) Added: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml?rev=1181714view=auto == --- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml (added) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml Tue Oct 11 11:12:26 2011 @@ -0,0 +1,225 @@ +?xml version=1.0 encoding=UTF-8? +!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + License); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +-- + +analysisEngineDescription xmlns=http://uima.apache.org/resourceSpecifier; + frameworkImplementationorg.apache.uima.java/frameworkImplementation + primitivetrue/primitive + annotatorImplementationNameorg.apache.uima.textmarker.engine.TextMarkerEngine/annotatorImplementationName + analysisEngineMetaData +nameBasicEngine/name +description/ +version1.0/version +vendor/ +configurationParameters searchStrategy=language_fallback + configurationParameter +nameseeders/name +typeString/type +multiValuedtrue/multiValued +mandatoryfalse/mandatory + /configurationParameter + configurationParameter +namedebug/name +typeBoolean/type +multiValuedfalse/multiValued +mandatoryfalse/mandatory + /configurationParameter + configurationParameter +nameadditionalScripts/name +typeString/type +multiValuedtrue/multiValued +mandatoryfalse/mandatory + /configurationParameter + configurationParameter +nameprofile/name +typeBoolean/type +multiValuedfalse/multiValued +mandatoryfalse/mandatory + /configurationParameter + configurationParameter +namedebugWithMatches/name +typeBoolean/type +multiValuedfalse/multiValued +mandatoryfalse/mandatory + /configurationParameter + configurationParameter +namestatistics/name +typeBoolean/type +multiValuedfalse/multiValued +mandatoryfalse/mandatory + /configurationParameter + configurationParameter +nameadditionalEngines/name +typeString/type +multiValuedtrue/multiValued +mandatoryfalse/mandatory + /configurationParameter + configurationParameter +nameadditionalExtensions/name +typeString/type +multiValuedtrue/multiValued +mandatoryfalse/mandatory + /configurationParameter + configurationParameter +namedebugOnlyFor/name +typeString/type +multiValuedtrue/multiValued +mandatoryfalse/mandatory + /configurationParameter + configurationParameter +namescriptEncoding/name +typeString/type +multiValuedfalse/multiValued +mandatoryfalse/mandatory
svn commit: r1181718 - in /uima/uimaj/trunk: uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/ uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ uimaj-ep-cas-edito
Author: joern
Date: Tue Oct 11 11:29:27 2011
New Revision: 1181718
URL: http://svn.apache.org/viewvc?rev=1181718view=rev
Log:
UIMA-2245 Added session preferences to replace the editor annotation status
object.
Removed:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/EditorAnnotationStatus.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.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/CasDocumentProvider.java
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/contextmenu/ShowAnnotationsMenu.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java?rev=1181718r1=1181717r2=1181718view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Tue Oct 11 11:29:27 2011
@@ -39,7 +39,6 @@ import org.apache.uima.caseditor.editor.
import org.apache.uima.caseditor.editor.CasDocumentProvider;
import org.apache.uima.caseditor.editor.DocumentFormat;
import org.apache.uima.caseditor.editor.DocumentUimaImpl;
-import org.apache.uima.caseditor.editor.EditorAnnotationStatus;
import org.apache.uima.caseditor.editor.ICasDocument;
import org.apache.uima.caseditor.editor.ICasEditor;
import org.eclipse.core.resources.IFile;
@@ -125,7 +124,7 @@ public class DefaultCasDocumentProvider
*/
private MapString, String documentToTypeSystemMap = new HashMapString,
String();
- private MapString, EditorAnnotationStatus sharedEditorStatus = new
HashMapString, EditorAnnotationStatus();
+ private MapString, IPreferenceStore sessionPreferenceStores = new
HashMapString, IPreferenceStore();
/**
* This map resolves a type system to a style. It is used to cache type
system
@@ -425,21 +424,18 @@ public class DefaultCasDocumentProvider
return typeSystemPreferences.get(getPreferenceFileForTypeSystem(tsId));
}
- // TODO: How to move these two methods away?
@Override
- protected EditorAnnotationStatus getEditorAnnotationStatus(Object element) {
-EditorAnnotationStatus status =
sharedEditorStatus.get(getTypesystemId(element));
-
-if (status == null)
- status = new EditorAnnotationStatus(CAS.TYPE_NAME_ANNOTATION, null,
CAS.NAME_DEFAULT_SOFA);
-
-return status;
- }
+ public IPreferenceStore getSessionPreferenceStore(Object element) {
+
+// lookup one, and if it does not exist create a new one, and put it!
+IPreferenceStore store =
sessionPreferenceStores.get(getTypesystemId(element));
+
+if (store == null) {
+ store = new PreferenceStore();
+ sessionPreferenceStores.put(getTypesystemId(element), store);
+}
- @Override
- protected void setEditorAnnotationStatus(Object element,
- EditorAnnotationStatus editorAnnotationStatus) {
-sharedEditorStatus.put(getTypesystemId(element), editorAnnotationStatus);
+return store;
}
void setTypeSystem(String document, String typeSystem) {
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=1181718r1=1181717r2=1181718view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Tue Oct 11 11:29:27 2011
@@ -601,7 +601,6 @@ public final class AnnotationEditor exte
@SuppressWarnings(unchecked)
public Object getAdapter(Class adapter) {
-
if (IContentOutlinePage.class.equals(adapter) getDocument() != null) {
if (mOutlinePage == null) {
mOutlinePage = new AnnotationOutline(this);
@@ -808,7 +807,9 @@ public final class AnnotationEditor exte
if (getDocument() != null) {
// Synchronize shown types with the editor
- CollectionString shownTypes =
getCasDocumentProvider().getShownTypes(input);
+ String shownTypesString
svn commit: r1181779 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/TextDocumentProvider.java
Author: joern
Date: Tue Oct 11 13:39:14 2011
New Revision: 1181779
URL: http://svn.apache.org/viewvc?rev=1181779view=rev
Log:
UIMA-2253 Fixed handling when type system could not be find.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/TextDocumentProvider.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/TextDocumentProvider.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/TextDocumentProvider.java?rev=1181779r1=1181778r2=1181779view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/TextDocumentProvider.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/TextDocumentProvider.java
Tue Oct 11 13:39:14 2011
@@ -77,10 +77,14 @@ class TextDocumentProvider extends Abstr
protected IDocument createDocument(Object element) throws CoreException {
ICasDocument casDocument = documentProvider.createDocument(element);
-AnnotationDocument document = new AnnotationDocument();
-document.setDocument(casDocument);
-
-return document;
+if (casDocument != null) {
+ AnnotationDocument document = new AnnotationDocument();
+ document.setDocument(casDocument);
+ return document;
+}
+else {
+ return null;
+}
}
@Override
svn commit: r1181792 - /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Author: joern
Date: Tue Oct 11 14:09:07 2011
New Revision: 1181792
URL: http://svn.apache.org/viewvc?rev=1181792view=rev
Log:
UIMA-2247 Changed selection listener, now it is listening for source viewer
selection changes.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=1181792r1=1181791r2=1181792view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Tue Oct 11 14:09:07 2011
@@ -711,17 +711,15 @@ public final class AnnotationEditor exte
// When a single character is selected with a double click the selection
// changes but the caret does not.
// A press on enter now fails to create an annotation.
-getSourceViewer().getTextWidget().addSelectionListener(new
SelectionListener() {
-
- public void widgetSelected(SelectionEvent e) {
-refreshSelection();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- // This method is never called!
- }
- });
+// UIMA-2247:
+// Changed again to ensure that also selection from the find dialog
+// can be detected
+getSourceViewer().getSelectionProvider().addSelectionChangedListener(new
ISelectionChangedListener() {
+ public void selectionChanged(SelectionChangedEvent event) {
+refreshSelection();
+ }
+});
DragSource dragSource = new DragSource(getSourceViewer().getTextWidget(),
DND.DROP_COPY);
@@ -1517,7 +1515,7 @@ public final class AnnotationEditor exte
annotationContextEditAction.setActionDefinitionId(ITextEditorActionDefinitionIds.QUICK_ASSIST);
setAction(ITextEditorActionDefinitionIds.QUICK_ASSIST,
annotationContextEditAction);
-// create find annotate action
+// Create find annotate action
FindAnnotateAction findAnnotateAction = new FindAnnotateAction(this,
getSourceViewer().getFindReplaceTarget());
findAnnotateAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.FIND_REPLACE);
setAction(ITextEditorActionConstants.FIND, findAnnotateAction);
svn commit: r1180872 - in /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor: editor/ editor/styleview/ ui/property/
Author: joern
Date: Mon Oct 10 10:59:39 2011
New Revision: 1180872
URL: http://svn.apache.org/viewvc?rev=1180872view=rev
Log:
UIMA-2245 Moved annotation style settigns methods to the Annotation Editor (and
away form the Cas Document Provider) and defined a new storage format for an
Annotation Style.
Modified:
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/AnnotationStyle.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/property/EditorAnnotationPropertyPage.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=1180872r1=1180871r2=1180872view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Mon Oct 10 10:59:39 2011
@@ -446,7 +446,7 @@ public final class AnnotationEditor exte
// ask document provider for this
// getAnnotation must be added to cas document provider
-AnnotationStyle style =
getCasDocumentProvider().getAnnotationStyle(getEditorInput(),
+AnnotationStyle style = getAnnotationStyle(
eclipseAnnotation.getAnnotationFS().getType());
return style.getLayer();
@@ -1046,6 +1046,41 @@ public final class AnnotationEditor exte
}
/**
+ * Retrieves an codeAnnotationStyle/code from the underlying storage.
+ *
+ * @param element
+ * @param type
+ * @return
+ */
+ public AnnotationStyle getAnnotationStyle(Type type) {
+if (type == null)
+ throw new IllegalArgumentException(type parameter must not be null!);
+
+IPreferenceStore prefStore = getCasDocumentProvider().
+getTypeSystemPreferenceStore(getEditorInput());
+
+return AnnotationStyle.getAnnotationStyleFromStore(prefStore,
type.getName());
+ }
+
+
+ /**
+ * Sets an annotation style.
+ *
+ * Note: Internal usage only!
+ *
+ * @param element
+ * @param style
+ */
+ // TODO: Disk must be accessed for every changed annotation style
+ // add a second method which can take all changed styles
+ public void setAnnotationStyle(AnnotationStyle style) {
+IPreferenceStore prefStore =
getCasDocumentProvider().getTypeSystemPreferenceStore(getEditorInput());
+AnnotationStyle.putAnnotatationStyleToStore(prefStore, style);
+
+getCasDocumentProvider().saveTypeSystemPreferenceStore(getEditorInput());
+ }
+
+ /**
* Set the shown annotation status of a type.
*
* @param type
@@ -1053,7 +1088,7 @@ public final class AnnotationEditor exte
* it not shown
*/
private void showAnnotationType(Type type, boolean isVisible) {
-AnnotationStyle style =
getCasDocumentProvider().getAnnotationStyle(getEditorInput(), type);
+AnnotationStyle style = getAnnotationStyle(type);
if (isVisible) {
@@ -1086,8 +1121,7 @@ public final class AnnotationEditor exte
boolean isKeepLineSpacing = false;
for(Type shownType : shownAnnotationTypes) {
- AnnotationStyle potentialTagStyle =
-getCasDocumentProvider().getAnnotationStyle(getEditorInput(),
shownType);
+ AnnotationStyle potentialTagStyle = getAnnotationStyle(shownType);
if (AnnotationStyle.Style.TAG.equals(potentialTagStyle.getStyle())) {
isKeepLineSpacing = true;
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java?rev=1180872r1=1180871r2=1180872view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java
Mon Oct 10 10:59:39 2011
@@ -20,6 +20,10 @@
package org.apache.uima.caseditor.editor;
import java.awt.Color;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.jface.preference.IPreferenceStore;
/**
@@ -212,4 +216,123 @@ public final class
svn commit: r1180883 - /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Author: joern
Date: Mon Oct 10 11:42:45 2011
New Revision: 1180883
URL: http://svn.apache.org/viewvc?rev=1180883view=rev
Log:
UIMA-2245 Moved annotation style settigns methods to the Annotation Editor (and
away form the Cas Document Provider) and defined a new storage format for an
Annotation Style.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java?rev=1180883r1=1180882r2=1180883view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Mon Oct 10 11:42:45 2011
@@ -239,7 +239,7 @@ public class DefaultCasDocumentProvider
if (dotCorpus != null) {
tsPrefStore = new PreferenceStore(prefFile.getName());
for (AnnotationStyle style : dotCorpus.getAnnotationStyles()) {
- putAnnotatationStyleToStore(tsPrefStore, style);
+ AnnotationStyle.putAnnotatationStyleToStore(tsPrefStore,
style);
}
for (String shownType : dotCorpus.getShownTypes()) {
@@ -273,7 +273,7 @@ public class DefaultCasDocumentProvider
// TODO: Settings defaults must be moved to the AnnotationEditor
for (AnnotationStyle style : newStyles) {
- putAnnotatationStyleToStore(tsPrefStore, style);
+ AnnotationStyle.putAnnotatationStyleToStore(tsPrefStore, style);
}
}
@@ -382,7 +382,8 @@ public class DefaultCasDocumentProvider
return null;
}
- private void savePreferences(Object element) {
+ @Override
+ public void saveTypeSystemPreferenceStore(Object element) {
String prefereceFileId =
getPreferenceFileForTypeSystem(getTypesystemId(element));
PreferenceStore preferences = typeSystemPreferences.get(prefereceFileId);
@@ -423,26 +424,6 @@ public class DefaultCasDocumentProvider
return typeSystemPreferences.get(getPreferenceFileForTypeSystem(tsId));
}
-
- // TODO: Disk must be accessed for every changed annotation style
- // add a second method which can take all changed styles
- @Override
- public void setAnnotationStyle(Object element, AnnotationStyle style) {
-super.setAnnotationStyle(element, style);
-savePreferences(element);
- }
-
- @Override
- protected void addShownType(Object element, Type type) {
-super.addShownType(element, type);
-savePreferences(element);
- }
-
- @Override
- protected void removeShownType(Object element, Type type) {
-super.removeShownType(element, type);
-savePreferences(element);
- }
// TODO: How to move these two methods away?
@Override
svn commit: r1181164 - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/ uimaj-ep-textmarker-engine/desc/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/ uimaj
Author: joern Date: Mon Oct 10 19:39:00 2011 New Revision: 1181164 URL: http://svn.apache.org/viewvc?rev=1181164view=rev Log: UIMA-2237 Applied patch UIMA-2237-2.patch from Peter Klügl. Look at the issue for further details. Added: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/AnnotationWriter.java (with props) uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/AnnotationWriter.xml (with props) uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/StyleMapCreator.java (with props) uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/StyleMapCreator.xml (with props) uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/XMIWriter.java (with props) uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/XMIWriter.xml (with props) Removed: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/BasicEngine.xml uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/BasicTypeSystem.xml uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/Modifier.xml uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/SourceDocumentInformation.xml uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/TypePrioritites.xml uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/BasicEngine.xml uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/BasicTypeSystem.xml uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/InternalTypeSystem.xml uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/Modifier.xml uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/SourceDocumentInformation.xml uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/TypePrioritites.xml Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.classpath uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/StyleMapFactory.java uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TextMarkerModifier.java uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/java/org/apache/uima/textmarker/TextMarkerTestUtils.java uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/builder/TextMarkerSimpleBuilder.java uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/launching/TextMarkerInterpreterRunner.java uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/ui/wizards/TextMarkerProjectCreationWizard.java Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.classpath URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.classpath?rev=1181164r1=1181163r2=1181164view=diff == --- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.classpath (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.classpath Mon Oct 10 19:39:00 2011 @@ -6,7 +6,6 @@ classpathentry kind=con path=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6/ classpathentry kind=con path=org.eclipse.pde.core.requiredPlugins/ classpathentry kind=src path=src/main/java/ - classpathentry kind=src path=desc/ classpathentry kind=src path=src/test/java/ classpathentry kind=src path=src/test/resources/ classpathentry kind=output path=bin/ Added: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/AnnotationWriter.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/AnnotationWriter.java?rev=1181164view=auto == --- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine
svn commit: r1179580 - in /uima/uimaj/trunk: uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java uimaj-ep-cas-editor/src/main/java/org/apache/uima/cased
Author: joern
Date: Thu Oct 6 11:33:35 2011
New Revision: 1179580
URL: http://svn.apache.org/viewvc?rev=1179580view=rev
Log:
UIMA-2245 Moved code to save settings to preference store up to
CasDocumentProvider.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java?rev=1179580r1=1179579r2=1179580view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Thu Oct 6 11:33:35 2011
@@ -19,17 +19,14 @@
package org.apache.uima.caseditor.ide;
-import java.awt.Color;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.Type;
@@ -39,7 +36,6 @@ import org.apache.uima.caseditor.core.mo
import org.apache.uima.caseditor.core.model.dotcorpus.DotCorpus;
import org.apache.uima.caseditor.core.model.dotcorpus.DotCorpusSerializer;
import org.apache.uima.caseditor.editor.AnnotationStyle;
-import org.apache.uima.caseditor.editor.AnnotationStyle.Style;
import org.apache.uima.caseditor.editor.CasDocumentProvider;
import org.apache.uima.caseditor.editor.DocumentFormat;
import org.apache.uima.caseditor.editor.DocumentUimaImpl;
@@ -156,66 +152,7 @@ public class DefaultCasDocumentProvider
return styleId;
}
- private void putAnnotatationStyleToStore(IPreferenceStore store,
AnnotationStyle style) {
-
-Color color = new Color(style.getColor().getRed(),
style.getColor().getGreen(),
-style.getColor().getBlue());
-
-// TODO: Define appendixes in constants ...
-store.putValue(style.getAnnotation() + .style.color,
Integer.toString(color.getRGB()));
-store.putValue(style.getAnnotation() + .style.strategy,
style.getStyle().toString());
-store.putValue(style.getAnnotation() + .style.layer,
Integer.toString(style.getLayer()));
-
-if (style.getConfiguration() != null)
- store.putValue(style.getAnnotation() + .style.config,
style.getConfiguration());
- }
-
- // method to get annotation style from pref store
- private AnnotationStyle getAnnotationStyleFromStore(IPreferenceStore store,
String typeName) {
-
-AnnotationStyle.Style style = AnnotationStyle.Style.UNDERLINE;
-
-String styleString = store.getString(typeName + .style.strategy);
-if (styleString.length() != 0) {
- // TODO: Might throw exception, catch it and use default!
- try {
-style = AnnotationStyle.Style.valueOf(styleString);
- }
- catch (IllegalArgumentException e) {
- }
-}
-
-Color color = Color.RED;
-
-String colorString = store.getString(typeName + .style.color);
-if (colorString.length() != 0) {
- try {
-int colorInteger = Integer.parseInt(colorString);
-color = new Color(colorInteger);
- }
- catch (NumberFormatException e) {
- }
-}
-
-int layer = 0;
-
-String layerString = store.getString(typeName + .style.layer);
-
-if (layerString.length() != 0) {
- try {
-layer = Integer.parseInt(layerString);
- }
- catch (NumberFormatException e) {
- }
-}
-
-String configuration = store.getString(typeName + .style.config);
-
-if (configuration.length() != 0)
- configuration = null;
-
-return new AnnotationStyle(typeName, style, color, layer, configuration);
- }
+
private CollectionAnnotationStyle
getConfiguredAnnotationStyles(IPreferenceStore store, TypeSystem types) {
@@ -334,6 +271,7 @@ public class DefaultCasDocumentProvider
CollectionAnnotationStyle newStyles =
DefaultColors.assignColors(ts, defaultStyles);
+// TODO: Settings defaults must be moved to the AnnotationEditor
for (AnnotationStyle style : newStyles) {
putAnnotatationStyleToStore(tsPrefStore, style);
}
@@ -444,12 +382,6 @@ public class DefaultCasDocumentProvider
return null;
}
- private IPreferenceStore getPreferences(Object element) {
-String tsId = getTypesystemId
svn commit: r1179193 - in /uima/uimaj/trunk: uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java uimaj-ep-cas-editor/src/main/java/org/apache/uima/cased
Author: joern
Date: Wed Oct 5 12:19:29 2011
New Revision: 1179193
URL: http://svn.apache.org/viewvc?rev=1179193view=rev
Log:
UIMA-2245 Added method to retrieve type system preference store.
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java?rev=1179193r1=1179192r2=1179193view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Wed Oct 5 12:19:29 2011
@@ -486,6 +486,11 @@ public class DefaultCasDocumentProvider
}
@Override
+ public IPreferenceStore getTypeSystemPreferenceStore(Object element) {
+return getPreferences(element);
+ }
+
+ @Override
public AnnotationStyle getAnnotationStyle(Object element, Type type) {
if (type == null)
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.java?rev=1179193r1=1179192r2=1179193view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.java
Wed Oct 5 12:19:29 2011
@@ -29,6 +29,7 @@ import org.apache.uima.cas.Type;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.texteditor.IElementStateListener;
@@ -86,6 +87,8 @@ public abstract class CasDocumentProvide
return elementErrorStatus.get(element);
}
+ public abstract IPreferenceStore getTypeSystemPreferenceStore(Object
element);
+
/**
* Retrieves an codeAnnotationStyle/code from the underlying storage.
*
svn commit: r1178888 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain: element/ElementTreeLabelProvider.java tree/ExplainTree.java
Author: joern
Date: Tue Oct 4 18:09:31 2011
New Revision: 117
URL: http://svn.apache.org/viewvc?rev=117view=rev
Log:
UIMA-2234 Dynamic anchoring of rule elements. Patch from Peter Klügl applied.
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/element/ElementTreeLabelProvider.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/tree/ExplainTree.java
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/element/ElementTreeLabelProvider.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/element/ElementTreeLabelProvider.java?rev=117r1=1178887r2=117view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/element/ElementTreeLabelProvider.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/element/ElementTreeLabelProvider.java
Tue Oct 4 18:09:31 2011
@@ -71,15 +71,18 @@ public class ElementTreeLabelProvider ex
Type type = ts.getType(ExplainConstants.RULE_ELEMENT_MATCHES_TYPE);
FeatureStructure fs = debugNode.getFeatureStructure();
Feature f = type.getFeatureByBaseName(ExplainTree.ELEMENT);
-if (f != null) {
+Feature fanchor = type.getFeatureByBaseName(ExplainTree.RULE_ANCHOR);
+if (f != null fanchor != null) {
String v = fs.getStringValue(f);
- return v;
+ String ruleAnchor = fs.getBooleanValue(fanchor) ? ' : ;
+ return ruleAnchor + v;
}
} else if (element instanceof RuleElementMatchNode) {
FeatureStructure fs = debugNode.getFeatureStructure();
if (fs instanceof AnnotationFS) {
String s = ((AnnotationFS) fs).getCoveredText();
s = s.replaceAll([\\n\\r], );
+
return s;
}
} else if (element instanceof ConditionNode) {
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/tree/ExplainTree.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/tree/ExplainTree.java?rev=117r1=1178887r2=117view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/tree/ExplainTree.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-addons/src/main/java/org/apache/uima/textmarker/explain/tree/ExplainTree.java
Tue Oct 4 18:09:31 2011
@@ -58,6 +58,8 @@ public class ExplainTree {
public static final String ELEMENT = element;
+ public static final String RULE_ANCHOR = ruleAnchor;
+
public static final String TIME = time;
private IExplainTreeNode root;
svn commit: r1176323 - /uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/RemoteLauncher.java
Author: joern
Date: Tue Sep 27 10:55:39 2011
New Revision: 1176323
URL: http://svn.apache.org/viewvc?rev=1176323view=rev
Log:
UIMA-2240 Now calls collectionProcessComplete after processing input documents
is finished.
Modified:
uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/RemoteLauncher.java
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=1176323r1=1176322r2=1176323view=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
Tue Sep 27 10:55:39 2011
@@ -37,6 +37,7 @@ import org.apache.uima.resource.Resource
import org.apache.uima.util.FileUtils;
import org.apache.uima.util.XMLInputSource;
import org.apache.uima.util.XMLSerializer;
+import org.apache.uima.util.impl.ProcessTrace_impl;
import org.xml.sax.SAXException;
/**
@@ -339,6 +340,7 @@ public class RemoteLauncher {
findAndProcessFiles(inputResource, fileFilter, ae, cas);
+ae.collectionProcessComplete(new ProcessTrace_impl());
ae.destroy();
}
}
svn commit: r1175828 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide: ./ src/main/java/org/apache/uima/textmarker/ide/core/parser/ src/main/java/org/apache/uima/textmarker/ide/formatter/ s
Author: joern
Date: Mon Sep 26 12:32:07 2011
New Revision: 1175828
URL: http://svn.apache.org/viewvc?rev=1175828view=rev
Log:
UIMA-2235 Applied patch from Peter Klügl. All observed bugs are fixed.
Validator was not activated due to missing extension. Formatter does not delete
new language elements anymore. Visitor correctly traverses composed elements
now.
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/plugin.xml
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormattedPrinter.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ComposedRuleElement.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ScriptFactory.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/TextMarkerAction.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/TextMarkerLogAction.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/TextMarkerRule.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/TextMarkerRuleElement.java
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/plugin.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/plugin.xml?rev=1175828r1=1175827r2=1175828view=diff
==
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/plugin.xml (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/plugin.xml Mon Sep 26
12:32:07 2011
@@ -1437,5 +1437,21 @@ under the License.
class=org.apache.uima.textmarker.ide.ui.DefaultTextMarkerSemanticHighlightingExtension
/highlightingExtension
/extension
-
+ extension
+ point=org.eclipse.dltk.validators.core.validator
+ validatorType
+class=org.apache.uima.textmarker.ide.validator.CheckValidator
+id=org.apache.uima.textmarker.ide.validator.checkvalidator
+nature=org.apache.uima.textmarker.ide.nature
+ /validatorType
+ /extension
+ extension
+ point=org.eclipse.dltk.core.buildParticipant
+ buildParticipant
+class=org.apache.uima.textmarker.ide.validator.CheckValidator
+id=org.apache.uima.textmarker.ide.validator.Checker
+name=TextMarker Validator
+nature=org.apache.uima.textmarker.ide.nature
+ /buildParticipant
+ /extension
/plugin
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g?rev=1175828r1=1175827r2=1175828view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
Mon Sep 26 12:32:07 2011
@@ -582,7 +582,7 @@ ruleElementComposed returns [ComposedRul
|(ruleElements)=res = ruleElements)
RPAREN q = quantifierPart? (LCURLY c = conditions? (THEN a = actions)?
RCURLY)?
- {re = ScriptFactory.createComposedRuleElement(res, q, c, a,
$blockDeclaration::env);}
+ {re = ScriptFactory.createComposedRuleElement(res, q, c, a,
disjunctive,$blockDeclaration::env);}
;
ruleElementType returns [TextMarkerRuleElement re = null]
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.java?rev=1175828r1=1175827r2=1175828view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser
svn commit: r1174094 - /uima/sandbox/trunk/TextMarker/uimaj-ep-cev/src/main/java/org/apache/uima/cev/editor/CEVViewer.java
Author: joern
Date: Thu Sep 22 12:40:22 2011
New Revision: 1174094
URL: http://svn.apache.org/viewvc?rev=1174094view=rev
Log:
UIMA-2207 New implementation of the rule inference.
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-cev/src/main/java/org/apache/uima/cev/editor/CEVViewer.java
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-cev/src/main/java/org/apache/uima/cev/editor/CEVViewer.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-cev/src/main/java/org/apache/uima/cev/editor/CEVViewer.java?rev=1174094r1=1174093r2=1174094view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-cev/src/main/java/org/apache/uima/cev/editor/CEVViewer.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-cev/src/main/java/org/apache/uima/cev/editor/CEVViewer.java
Thu Sep 22 12:40:22 2011
@@ -333,7 +333,7 @@ public class CEVViewer extends MultiPage
each.viewChanged(activeCASData);
}
}
-for (ICEVView each : views.values()) {
+for (ICEVView each : new ArrayListICEVView(views.values())) {
each.viewChanged(newPageIndex);
}
for (ICEVEditor each : editors.values()) {
svn commit: r1174096 [1/3] - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide: core/parser/ formatter/ parser/ast/
Author: joern
Date: Thu Sep 22 12:42:30 2011
New Revision: 1174096
URL: http://svn.apache.org/viewvc?rev=1174096view=rev
Log:
UIMA-2207 New implementation of the rule inference.
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormattedPrinter.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ComposedRuleElement.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ScriptFactory.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/TextMarkerRuleElement.java
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g?rev=1174096r1=1174095r2=1174096view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g
Thu Sep 22 12:42:30 2011
@@ -26,7 +26,7 @@ options {
* under the License.
*/
-package org.apache.uima.textmarker.ide.core.parsers;
+package org.apache.uima.textmarker.ide.core.parser;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -72,10 +72,10 @@ import org.apache.uima.textmarker.ide.pa
import org.apache.uima.textmarker.ide.parser.ast.TextMarkerRule;
import org.apache.uima.textmarker.ide.parser.ast.TextMarkerRuleElement;
import org.apache.uima.textmarker.ide.parser.ast.TextMarkerScriptBlock;
-import org.apache.uima.textmarker.ide.parser.ast.actions.TextMarkerAction;
-import
org.apache.uima.textmarker.ide.parser.ast.conditions.TextMarkerCondition;
-import
org.apache.uima.textmarker.ide.parser.ast.declarations.TextMarkerFeatureDeclaration;
-import
org.apache.uima.textmarker.ide.parser.ast.declarations.TextMarkerPackageDeclaration;
+import org.apache.uima.textmarker.ide.parser.ast.TextMarkerAction;
+import org.apache.uima.textmarker.ide.parser.ast.TextMarkerCondition;
+import org.apache.uima.textmarker.ide.parser.ast.TextMarkerFeatureDeclaration;
+import org.apache.uima.textmarker.ide.parser.ast.TextMarkerPackageDeclaration;
}
@parser::members {
@@ -570,9 +570,19 @@ ruleElement returns [Expression re = nul
;
ruleElementComposed returns [ComposedRuleElement re = null]
+@init{
+ boolean disjunctive = false;
+}
:
- LPAREN res = ruleElements RPAREN q = quantifierPart
- {re = ScriptFactory.createComposedRuleElement(res, q,
$blockDeclaration::env);}
+ LPAREN
+
+ ((ruleElementType VBAR)= re1 = ruleElementType {disjunctive = true;
res = new ArrayListExpression(); res.add(re1);}
+ VBAR re2 = ruleElementType {res.add(re2);}
+ (VBAR re3 = ruleElementType {res.add(re3);})*
+|(ruleElements)=res = ruleElements)
+
+ RPAREN q = quantifierPart? (LCURLY c = conditions? (THEN a = actions)?
RCURLY)?
+ {re = ScriptFactory.createComposedRuleElement(res, q, c, a,
$blockDeclaration::env);}
;
ruleElementType returns [TextMarkerRuleElement re = null]
svn commit: r1174096 [3/3] - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide: core/parser/ formatter/ parser/ast/
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens?rev=1174096r1=1174095r2=1174096view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens
Thu Sep 22 12:42:30 2011
@@ -14,11 +14,11 @@ LOGN=99
NOT=64
Identifier=122
ACTION=92
-CLEAR=74
NOTEQUAL=147
-ENDSWITH=63
-DOUBLELIST=95
+CLEAR=74
VBAR=139
+DOUBLELIST=95
+ENDSWITH=63
RPAREN=124
CREATE=32
GREATER=142
@@ -31,8 +31,8 @@ TYPELIST=97
LESS=141
REGEXP=26
GET=69
-UNMARK=55
PARTOF=23
+UNMARK=55
LAST=19
COMMENT=152
REMOVEDUPLICATE=67
@@ -85,8 +85,8 @@ BlockString=82
IntString=85
HexDigit=106
COLOR=36
-POSITION=25
LPAREN=123
+POSITION=25
IF=29
AT=130
LogLevel=77
@@ -95,9 +95,9 @@ THEN=75
FILL=34
COMMA=133
IS=61
-GETLIST=70
-REPLACE=45
AMPER=140
+REPLACE=45
+GETLIST=70
EQUAL=146
GATHER=33
INLIST=17
@@ -107,44 +107,44 @@ GETFEATURE=54
DOT=131
ListIdentifier=6
PARTOFNEQ=24
-ADD=65
BOOLEANLIST=93
+ADD=65
MARKTABLE=43
HexLiteral=108
XOR=103
-MARK=39
PERCENT=144
-PackageString=79
+MARK=39
PARSE=31
+PackageString=79
OldColor=78
-MERGE=68
MARKLAST=44
+MERGE=68
CONTEXTCOUNT=13
BEFORE=59
EXEC=51
-AFTER=60
MINUS=136
+AFTER=60
DecimalLiteral=109
-TRUE=104
SEMI=134
+TRUE=104
FEATURE=30
SymbolString=90
-StringString=87
-StringLiteral=116
COLON=132
+StringLiteral=116
+StringString=87
SCORE=27
QUESTION=145
UnicodeEscape=118
-STARTSWITH=62
RCURLY=128
+STARTSWITH=62
ASSIGN=52
TOTALCOUNT=15
DECLARE=9
-ISINTAG=18
DocComment=4
+ISINTAG=18
MOFN=20
-SETFEATURE=53
OctalEscape=119
+SETFEATURE=53
DoubleString=86
CIRCUMFLEX=129
ALT_NOTEQUAL=148
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormattedPrinter.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormattedPrinter.java?rev=1174096r1=1174095r2=1174096view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormattedPrinter.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/formatter/TextMarkerFormattedPrinter.java
Thu Sep 22 12:42:30 2011
@@ -522,8 +522,8 @@ public class TextMarkerFormattedPrinter
*/
private void appendRuleElement(TextMarkerRuleElement ruleEl) {
append(ruleEl.getHead());
-ListExpression conditions = ruleEl.getConditions();
-ListExpression actions = ruleEl.getActions();
+ListTextMarkerCondition conditions = ruleEl.getConditions();
+ListTextMarkerAction actions = ruleEl.getActions();
// don't print {-} for empty rule elements
// print Quantifiers
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ComposedRuleElement.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ComposedRuleElement.java?rev=1174096r1=1174095r2=1174096view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ComposedRuleElement.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/parser/ast/ComposedRuleElement.java
Thu Sep 22 12:42:30 2011
@@ -15,11 +15,10 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.uima.textmarker.ide.parser.ast;
-import java.util.ArrayList;
import java.util.List;
import org.eclipse.dltk.ast.ASTVisitor;
@@ -29,22 +28,14 @@ import org.eclipse.dltk.ast.expressions.
public class ComposedRuleElement extends TextMarkerRuleElement {
ListExpression elements;
- private ListExpression quantifierExpressions;
-
public ComposedRuleElement(int start, int end, ListExpression elements,
- ListExpression quantifierExpressions) {
-super(start, end);
+ ListExpression quantifierExpressions, ListTextMarkerCondition
conditionExpressions,
+ ListTextMarkerAction actionExpressions) {
+super(start, end,
svn commit: r1174099 [8/8] - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker: ./ action/ condition/ constraint/ engine/ parser/ resource/ rule/ ru
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugScriptApply.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugScriptApply.java?rev=1174099r1=1174098r2=1174099view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugScriptApply.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugScriptApply.java
Thu Sep 22 12:49:48 2011
@@ -10,8 +10,8 @@ import org.apache.uima.jcas.cas.TOP_Type
/**
- * Updated by JCasGen Tue Aug 09 16:26:13 CEST 2011
- * XML source:
D:/work/workspace-uima2/uimaj-ep-textmarker-engine/desc/BasicTypeSystem.xml
+ * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * XML source:
D:/work/workspace-uima3/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml
* @generated */
public class DebugScriptApply extends ProfiledAnnotation {
/** @generated
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugScriptApply_Type.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugScriptApply_Type.java?rev=1174099r1=1174098r2=1174099view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugScriptApply_Type.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugScriptApply_Type.java
Thu Sep 22 12:49:48 2011
@@ -13,7 +13,7 @@ import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
/**
- * Updated by JCasGen Tue Aug 09 16:26:13 CEST 2011
+ * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
* @generated */
public class DebugScriptApply_Type extends ProfiledAnnotation_Type {
/** @generated */
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/EvalAnnotation.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/EvalAnnotation.java?rev=1174099r1=1174098r2=1174099view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/EvalAnnotation.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/EvalAnnotation.java
Thu Sep 22 12:49:48 2011
@@ -10,8 +10,8 @@ import org.apache.uima.jcas.tcas.Annotat
/**
- * Updated by JCasGen Tue Aug 09 16:26:13 CEST 2011
- * XML source:
D:/work/workspace-uima2/uimaj-ep-textmarker-engine/desc/BasicTypeSystem.xml
+ * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * XML source:
D:/work/workspace-uima3/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml
* @generated */
public class EvalAnnotation extends Annotation {
/** @generated
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/EvalAnnotation_Type.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/EvalAnnotation_Type.java?rev=1174099r1=1174098r2=1174099view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/EvalAnnotation_Type.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/EvalAnnotation_Type.java
Thu Sep 22 12:49:48 2011
@@ -14,7 +14,7 @@ import org.apache.uima.jcas.JCasRegistry
import org.apache.uima.jcas.tcas.Annotation_Type;
/**
- * Updated by JCasGen Tue Aug 09 16:26:13 CEST 2011
+ * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
* @generated */
public class EvalAnnotation_Type extends Annotation_Type {
/** @generated */
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalseNegative.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalseNegative.java?rev=1174099r1=1174098r2=1174099view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalseNegative.java
(original)
+++
svn commit: r1174101 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine: ./ desc/ src/test/ src/test/java/ src/test/java/org/ src/test/java/org/apache/ src/test/java/org/apache/uima/ src/t
Author: joern Date: Thu Sep 22 12:54:30 2011 New Revision: 1174101 URL: http://svn.apache.org/viewvc?rev=1174101view=rev Log: UIMA-2207 New implementation of the rule inference. Added: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/java/ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/java/org/ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/java/org/apache/ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/java/org/apache/uima/ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/java/org/apache/uima/textmarker/ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/java/org/apache/uima/textmarker/QuantifierTest1.java (with props) uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/java/org/apache/uima/textmarker/QuantifierTest2.java (with props) uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/java/org/apache/uima/textmarker/RuleInferenceTest.java (with props) uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/java/org/apache/uima/textmarker/TextMarkerTestUtils.java (with props) uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/resources/ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/resources/org/ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/resources/org/apache/ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/resources/org/apache/uima/ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/resources/org/apache/uima/textmarker/ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/resources/org/apache/uima/textmarker/QuantifierTest1.tm uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/resources/org/apache/uima/textmarker/QuantifierTest1.txt (with props) uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/resources/org/apache/uima/textmarker/QuantifierTest2.tm uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/resources/org/apache/uima/textmarker/QuantifierTest2.txt (with props) uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/resources/org/apache/uima/textmarker/RuleInferenceTest.tm uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/resources/org/apache/uima/textmarker/RuleInferenceTest.txt (with props) Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.classpath uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.classpath URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.classpath?rev=1174101r1=1174100r2=1174101view=diff == --- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.classpath (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/.classpath Thu Sep 22 12:54:30 2011 @@ -7,5 +7,7 @@ classpathentry kind=con path=org.eclipse.pde.core.requiredPlugins/ classpathentry kind=src path=src/main/java/ classpathentry kind=src path=desc/ + classpathentry kind=src path=src/test/java/ + classpathentry kind=src path=src/test/resources/ classpathentry kind=output path=bin/ /classpath Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml?rev=1174101r1=1174100r2=1174101view=diff == --- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml Thu Sep 22 12:54:30 2011 @@ -1,22 +1,4 @@ ?xml version=1.0 encoding=UTF-8? -!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - License); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. --- typeSystemDescription xmlns
svn commit: r1163581 - in /uima/uimaj/trunk: uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/ uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ uimaj-ep-cas-edito
Author: joern
Date: Wed Aug 31 11:31:45 2011
New Revision: 1163581
URL: http://svn.apache.org/viewvc?rev=1163581view=rev
Log:
UIMA- CasDocumentProvider is now used by the text DocumentProvider to
manage CASes.
Added:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/TextDocumentProvider.java
(with props)
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.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/CasDocumentProvider.java
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/styleview/AnnotationStyleViewPage.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/property/EditorAnnotationPropertyPage.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java?rev=1163581r1=1163580r2=1163581view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Wed Aug 31 11:31:45 2011
@@ -34,12 +34,12 @@ import org.apache.uima.caseditor.CasEdit
import org.apache.uima.caseditor.core.model.DefaultColors;
import org.apache.uima.caseditor.core.model.dotcorpus.DotCorpus;
import org.apache.uima.caseditor.core.model.dotcorpus.DotCorpusSerializer;
-import org.apache.uima.caseditor.editor.AnnotationDocument;
import org.apache.uima.caseditor.editor.AnnotationStyle;
import org.apache.uima.caseditor.editor.CasDocumentProvider;
import org.apache.uima.caseditor.editor.DocumentFormat;
import org.apache.uima.caseditor.editor.DocumentUimaImpl;
import org.apache.uima.caseditor.editor.EditorAnnotationStatus;
+import org.apache.uima.caseditor.editor.ICasDocument;
import org.apache.uima.caseditor.editor.ICasEditor;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
@@ -53,7 +53,6 @@ import org.eclipse.core.runtime.IProgres
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.IDocument;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
@@ -106,12 +105,12 @@ public class DefaultCasDocumentProvider
}
}
- private class FileElementInfo extends ElementInfo {
+ private static class FileElementInfo extends ElementInfo {
private DeleteElementListener deleteListener;
FileElementInfo(ElementInfo info) {
- super(info.fDocument, info.fModel);
+ super(info.element);
}
}
@@ -143,7 +142,7 @@ public class DefaultCasDocumentProvider
}
@Override
- protected IDocument createDocument(Object element) throws CoreException {
+ protected ICasDocument createDocument(Object element) throws CoreException {
if (element instanceof FileEditorInput) {
FileEditorInput fileInput = (FileEditorInput) element;
@@ -256,12 +255,9 @@ public class DefaultCasDocumentProvider
}
}
-AnnotationDocument document = new AnnotationDocument();
-document.setDocument(doc);
-
elementErrorStatus.remove(element);
-return document;
+return doc;
}
else {
@@ -285,20 +281,19 @@ public class DefaultCasDocumentProvider
}
@Override
- protected void doSaveDocument(IProgressMonitor monitor, Object element,
IDocument document,
+ protected void doSaveDocument(IProgressMonitor monitor, Object element,
ICasDocument document,
boolean overwrite) throws CoreException {
-fireElementStateChanging(element);
+//fireElementStateChanging(element);
if (element instanceof FileEditorInput) {
FileEditorInput fileInput = (FileEditorInput) element;
IFile file = fileInput.getFile();
- if (document instanceof AnnotationDocument) {
+ if (document instanceof DocumentUimaImpl) {
-AnnotationDocument annotationDocument = (AnnotationDocument) document;
-DocumentUimaImpl documentImpl = (DocumentUimaImpl)
annotationDocument.getDocument();
+DocumentUimaImpl
svn commit: r1163176 - in /uima/uimaj/trunk: uimaj-ep-cas-editor-ide/ uimaj-ep-cas-editor/schema/ uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ uimaj-ep-cas-editor/src/main/java/org/apa
Author: joern Date: Tue Aug 30 11:40:00 2011 New Revision: 1163176 URL: http://svn.apache.org/viewvc?rev=1163176view=rev Log: UIMA-2219 Document provider is now choosen based on IEditorInput Modified: uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.editor.exsd uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/CasEditorPlugin.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/CasDocumentProviderFactory.java Modified: uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml?rev=1163176r1=1163175r2=1163176view=diff == --- uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml (original) +++ uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml Tue Aug 30 11:40:00 2011 @@ -101,12 +101,14 @@ id=org.apache.uima.caseditor.TypeSystemLocationPropertyPage /page /extension - extension - point=org.apache.uima.caseditor.editor + extension point=org.apache.uima.caseditor.editor provider - class=org.apache.uima.caseditor.ide.DefaultCasDocumentProvider + id=org.apache.uima.caseditor.ide.DefaultCasDocumentProvider + class=org.apache.uima.caseditor.ide.DefaultCasDocumentProvider + inputType=org.eclipse.ui.IFileEditorInput /provider /extension + extension point=org.eclipse.ui.preferencePages page class=org.apache.uima.caseditor.editor.AnnotationEditorPreferencePage Modified: uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.editor.exsd URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.editor.exsd?rev=1163176r1=1163175r2=1163176view=diff == --- uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.editor.exsd (original) +++ uima/uimaj/trunk/uimaj-ep-cas-editor/schema/org.apache.uima.caseditor.editor.exsd Tue Aug 30 11:40:00 2011 @@ -1,25 +1,5 @@ ?xml version='1.0' encoding='UTF-8'? - -!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - License); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. --- - - +!-- Schema file written by PDE -- schema targetNamespace=org.apache.uima.caseditor.editor xmlns=http://www.w3.org/2001/XMLSchema; annotation appinfo @@ -72,13 +52,30 @@ attribute name=class type=string use=required annotation documentation - + the qualified name of the document provider class /documentation appinfo meta.attribute kind=java basedOn=org.apache.uima.caseditor.editor.CasDocumentProvider:/ /appinfo /annotation /attribute + attribute name=id type=string use=required +annotation + documentation + the unique id of this provider + /documentation +/annotation + /attribute + attribute name=inputType type=string use=required +annotation + documentation + a qualified editor input class name + /documentation + appinfo + meta.attribute kind=java basedOn=:org.eclipse.ui.IEditorInput/ + /appinfo +/annotation + /attribute /complexType /element Modified: uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/CasEditorPlugin.java URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/CasEditorPlugin.java?rev=1163176r1=1163175r2=1163176view=diff == --- uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor
svn commit: r1163188 - in /uima/uimaj/trunk: uimaj-ep-cas-editor-ide/plugin.xml uimaj-ep-cas-editor/plugin.xml
Author: joern Date: Tue Aug 30 12:40:23 2011 New Revision: 1163188 URL: http://svn.apache.org/viewvc?rev=1163188view=rev Log: UIMA-2220 Moved view extension point declarations back Modified: uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml uima/uimaj/trunk/uimaj-ep-cas-editor/plugin.xml Modified: uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml?rev=1163188r1=1163187r2=1163188view=diff == --- uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml (original) +++ uima/uimaj/trunk/uimaj-ep-cas-editor-ide/plugin.xml Tue Aug 30 12:40:23 2011 @@ -23,34 +23,6 @@ plugin extension-point id=org.apache.uima.caseditor.editor name=DocumentProvider schema=schema/org.apache.uima.caseditor.editor.exsd/ - extension point=org.eclipse.ui.views - category id=org.apache.uima.caseditor.ui.views name=UIMA Cas Editor / - - view id=org.apache.uima.caseditor.editview - name=Edit View - class=org.apache.uima.caseditor.editor.editview.EditView - icon=icons/svgicons/explorer.png - category=org.apache.uima.caseditor.ui.views / - - view id=org.apache.uima.caseditor.editview2 - name=Edit View - class=org.apache.uima.caseditor.editor.editview.EditView - icon=icons/svgicons/explorer.png - category=org.apache.uima.caseditor.ui.views / - - view id=org.apache.uima.caseditor.fsview - name=FeatureStructure View - class=org.apache.uima.caseditor.editor.fsview.FeatureStructureBrowserView - icon=icons/svgicons/fsview.png - category=org.apache.uima.caseditor.ui.views / - - view id=org.apache.uima.caseditor.styleview - name=Annotation Styles - class=org.apache.uima.caseditor.editor.styleview.AnnotationStyleView - icon=icons/svgicons/fsview.png - category=org.apache.uima.caseditor.ui.views / - /extension - extension point=org.eclipse.core.resources.natures id=NLPProject name=UIMA Cas Editor Nature runtime Modified: uima/uimaj/trunk/uimaj-ep-cas-editor/plugin.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/plugin.xml?rev=1163188r1=1163187r2=1163188view=diff == --- uima/uimaj/trunk/uimaj-ep-cas-editor/plugin.xml (original) +++ uima/uimaj/trunk/uimaj-ep-cas-editor/plugin.xml Tue Aug 30 12:40:23 2011 @@ -69,6 +69,35 @@ /initializer /extension + extension point=org.eclipse.ui.views + category id=org.apache.uima.caseditor.ui.views name=UIMA Cas Editor / + + view id=org.apache.uima.caseditor.editview + name=Edit View + class=org.apache.uima.caseditor.editor.editview.EditView + icon=icons/svgicons/explorer.png + category=org.apache.uima.caseditor.ui.views / + + !-- Consider using allowMultiple=true instead of defining it twice-- + view id=org.apache.uima.caseditor.editview2 + name=Edit View + class=org.apache.uima.caseditor.editor.editview.EditView + icon=icons/svgicons/explorer.png + category=org.apache.uima.caseditor.ui.views / + + view id=org.apache.uima.caseditor.fsview + name=FeatureStructure View + class=org.apache.uima.caseditor.editor.fsview.FeatureStructureBrowserView + icon=icons/svgicons/fsview.png + category=org.apache.uima.caseditor.ui.views / + + view id=org.apache.uima.caseditor.styleview + name=Annotation Styles + class=org.apache.uima.caseditor.editor.styleview.AnnotationStyleView + icon=icons/svgicons/fsview.png + category=org.apache.uima.caseditor.ui.views / + /extension + extension point=org.eclipse.ui.commands category
svn commit: r1159176 - /uima/addons/trunk/Lucas/src/main/java/org/apache/uima/lucas/indexer/IndexWriterProviderImpl.java
Author: joern
Date: Thu Aug 18 11:34:19 2011
New Revision: 1159176
URL: http://svn.apache.org/viewvc?rev=1159176view=rev
Log:
UIMA-2215 Mistakenly used getBoolean insetad of parseBoolean
Modified:
uima/addons/trunk/Lucas/src/main/java/org/apache/uima/lucas/indexer/IndexWriterProviderImpl.java
Modified:
uima/addons/trunk/Lucas/src/main/java/org/apache/uima/lucas/indexer/IndexWriterProviderImpl.java
URL:
http://svn.apache.org/viewvc/uima/addons/trunk/Lucas/src/main/java/org/apache/uima/lucas/indexer/IndexWriterProviderImpl.java?rev=1159176r1=1159175r2=1159176view=diff
==
---
uima/addons/trunk/Lucas/src/main/java/org/apache/uima/lucas/indexer/IndexWriterProviderImpl.java
(original)
+++
uima/addons/trunk/Lucas/src/main/java/org/apache/uima/lucas/indexer/IndexWriterProviderImpl.java
Thu Aug 18 11:34:19 2011
@@ -145,7 +145,7 @@ public class IndexWriterProviderImpl imp
private boolean getCreateIndexOrDefault(Properties properties) {
String createIndexAsString = properties.getProperty(CREATE_INDEX_PROPERTY);
if (createIndexAsString != null) {
- return Boolean.getBoolean(createIndexAsString);
+ return Boolean.parseBoolean(createIndexAsString);
}
else {
// Thats the default before this property was introduced
svn commit: r1158897 - /uima/addons/trunk/Lucas/src/main/java/org/apache/uima/lucas/indexer/IndexWriterProviderImpl.java
Author: joern
Date: Wed Aug 17 20:39:38 2011
New Revision: 1158897
URL: http://svn.apache.org/viewvc?rev=1158897view=rev
Log:
UIMA-2215 The create flag for the IndexWriter is now configurable via the
properties file.
Modified:
uima/addons/trunk/Lucas/src/main/java/org/apache/uima/lucas/indexer/IndexWriterProviderImpl.java
Modified:
uima/addons/trunk/Lucas/src/main/java/org/apache/uima/lucas/indexer/IndexWriterProviderImpl.java
URL:
http://svn.apache.org/viewvc/uima/addons/trunk/Lucas/src/main/java/org/apache/uima/lucas/indexer/IndexWriterProviderImpl.java?rev=1158897r1=1158896r2=1158897view=diff
==
---
uima/addons/trunk/Lucas/src/main/java/org/apache/uima/lucas/indexer/IndexWriterProviderImpl.java
(original)
+++
uima/addons/trunk/Lucas/src/main/java/org/apache/uima/lucas/indexer/IndexWriterProviderImpl.java
Wed Aug 17 20:39:38 2011
@@ -42,8 +42,9 @@ public class IndexWriterProviderImpl imp
public static final String USE_COMPOUND_FILE_FORMAT_PROPERTY =
useCompoundFileFormat;
public static final String RAMBUFFER_SIZE_PROPERTY = RAMBufferSize;
public static final String INDEX_PATH_PROPERTY = indexPath;
+ public static final String CREATE_INDEX_PROPERTY = createIndex;
public static final String MAX_FIELD_LENGTH_PROPERTY = maxFieldLength;
- private static final String UNIQUE_INDEX_PROPERTY = uniqueIndex;
+ public static final String UNIQUE_INDEX_PROPERTY = uniqueIndex;
private static SetInteger randomNumbers = new HashSetInteger();
@@ -61,7 +62,10 @@ public class IndexWriterProviderImpl imp
indexPath = createUniqueIndexPath(indexPath);
MaxFieldLength maxFieldLength = getMaxFieldLengthOrDefault(properties);
-createIndexWriter(indexPath, maxFieldLength);
+
+boolean createIndex = getCreateIndexOrDefault(properties);
+
+createIndexWriter(indexPath, maxFieldLength, createIndex);
Double ramBufferSize = getRAMBufferSizeOrDefault(properties);
Boolean useCompoundFileFormat = getUseCompoundFormatOrDefault(properties);
@@ -138,9 +142,20 @@ public class IndexWriterProviderImpl imp
}
}
- private void createIndexWriter(String indexPath, MaxFieldLength
maxFieldLength) throws ResourceInitializationException {
+ private boolean getCreateIndexOrDefault(Properties properties) {
+String createIndexAsString = properties.getProperty(CREATE_INDEX_PROPERTY);
+if (createIndexAsString != null) {
+ return Boolean.getBoolean(createIndexAsString);
+}
+else {
+ // Thats the default before this property was introduced
+ return true;
+}
+ }
+
+ private void createIndexWriter(String indexPath, MaxFieldLength
maxFieldLength, boolean create) throws ResourceInitializationException {
try {
- indexWriter = new IndexWriter(indexPath, new StandardAnalyzer(), true,
maxFieldLength);
+ indexWriter = new IndexWriter(indexPath, new StandardAnalyzer(), create,
maxFieldLength);
} catch (CorruptIndexException e) {
throw new ResourceInitializationException(e);
} catch (LockObtainFailedException e) {
svn commit: r1157033 - /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/
Author: joern Date: Fri Aug 12 10:21:41 2011 New Revision: 1157033 URL: http://svn.apache.org/viewvc?rev=1157033view=rev Log: UIMA-2206 Created new project folders Added: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/
svn commit: r1157040 [10/23] - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine: ./ .settings/ META-INF/ desc/ lib/ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apach
Added:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarker.g
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarker.g?rev=1157040view=auto
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarker.g
(added)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarker.g
Fri Aug 12 10:44:04 2011
@@ -0,0 +1,1791 @@
+grammar TextMarker;
+
+options {
+ language = Java;
+}
+
+tokens {
+ DocComment;
+ Annotation;
+ ListIdentifier;
+}
+
+@lexer::header {
+ package org.apache.uima.textmarker.parser;
+}
+
+@parser::header {
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+
+package org.apache.uima.textmarker.parser;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+
+import org.antlr.runtime.BaseRecognizer;
+import org.antlr.runtime.BitSet;
+import org.antlr.runtime.DFA;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.FailedPredicateException;
+import org.antlr.runtime.IntStream;
+import org.antlr.runtime.MismatchedSetException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.Parser;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.RecognizerSharedState;
+import org.antlr.runtime.Token;
+import org.antlr.runtime.TokenStream;
+import org.apache.uima.cas.CAS;
+import org.apache.uima.cas.CASException;
+import org.apache.uima.cas.Type;
+import org.apache.uima.jcas.tcas.DocumentAnnotation;
+
+import org.apache.uima.textmarker.action.AbstractTextMarkerAction;
+import org.apache.uima.textmarker.action.ActionFactory;
+import org.apache.uima.textmarker.condition.AbstractTextMarkerCondition;
+import org.apache.uima.textmarker.condition.ConditionFactory;
+import org.apache.uima.textmarker.TextMarkerBlock;
+import org.apache.uima.textmarker.TextMarkerModule;
+import org.apache.uima.textmarker.TextMarkerScriptBlock;
+import org.apache.uima.textmarker.TextMarkerScriptFactory;
+import org.apache.uima.textmarker.TextMarkerStatement;
+import org.apache.uima.textmarker.expression.bool.BooleanExpression;
+import org.apache.uima.textmarker.expression.ExpressionFactory;
+import org.apache.uima.textmarker.expression.resource.WordListExpression;
+import org.apache.uima.textmarker.expression.number.NumberExpression;
+import org.apache.uima.textmarker.expression.string.StringExpression;
+import org.apache.uima.textmarker.expression.resource.WordTableExpression;
+import org.apache.uima.textmarker.expression.TextMarkerExpression;
+import org.apache.uima.textmarker.expression.type.TypeExpression;
+import org.apache.uima.textmarker.extensions.TextMarkerExternalFactory;
+import org.apache.uima.textmarker.rule.ComposedRuleElement;
+import org.apache.uima.textmarker.rule.RuleElement;
+import org.apache.uima.textmarker.rule.TextMarkerRule;
+import org.apache.uima.textmarker.rule.TextMarkerRuleElement;
+import org.apache.uima.textmarker.rule.quantifier.RuleElementQuantifier;
+}
+@lexer::members {
+ public int implicitLineJoiningLevel = 0;
+ public int startPos=-1;
+ public void emitErrorMessage(String msg) {
+ }
+}
+@parser::members {
+private List vars = new ArrayList();
+private int level = 0;
+private TextMarkerScriptFactory factory = new TextMarkerScriptFactory();
+private TextMarkerExternalFactory external;
+
+
+public void setExternalFactory(TextMarkerExternalFactory factory) {
+ external = factory;
+}
+
+public void emitErrorMessage(String msg) {
+ System.out.println(msg);
+ }
+ public void reportError(RecognitionException e) {
+ System.out.println(e);
+ }
+
+ //public void addVariable(String var, IntStream input) throws
NoViableAltException {
+ // if(!vars.contains(var)) {
+ // vars.add(var);
+ // } else {
+ //
svn commit: r1154212 - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker: console/ internal/launching/ launching/
Author: joern Date: Fri Aug 5 13:49:39 2011 New Revision: 1154212 URL: http://svn.apache.org/viewvc?rev=1154212view=rev Log: UIMA-2201 Removed empty packages Removed: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/console/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/internal/launching/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/launching/
svn commit: r1153805 [2/2] - in /uima/sandbox/trunk/TextMarker: org.apache.uima.tm.cev.feature/ org.apache.uima.tm.cev.html.feature/ org.apache.uima.tm.cev/META-INF/ org.apache.uima.tm.cev/src/main/ja
Modified:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/src/main/java/org/apache/uima/tm/textruler/whisk/generic/Whisk.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/src/main/java/org/apache/uima/tm/textruler/whisk/generic/Whisk.java?rev=1153805r1=1153804r2=1153805view=diff
==
---
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/src/main/java/org/apache/uima/tm/textruler/whisk/generic/Whisk.java
(original)
+++
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/src/main/java/org/apache/uima/tm/textruler/whisk/generic/Whisk.java
Thu Aug 4 09:31:37 2011
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.uima.tm.textruler.whisk.generic;
@@ -60,7 +60,7 @@ public class Whisk extends TextRulerBasi
public final static float STANDARD_ERROR_THRESHOLD = 0.1f;
- public final static String STANDARD_POSTAG_ROOTTYPE =
de.uniwue.ml.ML.postag;
+ public final static String STANDARD_POSTAG_ROOTTYPE =
org.apache.uima.tm.ml.ML.postag;
TextRulerRuleList ruleList;
@@ -78,9 +78,8 @@ public class Whisk extends TextRulerBasi
private MapString, TextRulerStatisticsCollector cachedTestedRuleStatistics
= new HashMapString, TextRulerStatisticsCollector();
- public Whisk(String inputDir, String prePropTmFile, String tmpDir,
- String[] slotNames, SetString filterSet,
- TextRulerLearnerDelegate delegate) {
+ public Whisk(String inputDir, String prePropTmFile, String tmpDir, String[]
slotNames,
+ SetString filterSet, TextRulerLearnerDelegate delegate) {
super(inputDir, prePropTmFile, tmpDir, slotNames, filterSet, delegate);
}
@@ -120,14 +119,12 @@ public class Whisk extends TextRulerBasi
ruleList = new TextRulerRuleList();
coveredExamples = new HashSetTextRulerExample();
-sendStatusUpdateToDelegate(Creating examples...,
-TextRulerLearnerState.ML_RUNNING, false);
+sendStatusUpdateToDelegate(Creating examples...,
TextRulerLearnerState.ML_RUNNING, false);
for (int i = 0; i slotNames.length; i++) {
TextRulerTarget target = new TextRulerTarget(slotNames[i], this);
exampleDocuments.createExamplesForTarget(target);
- TextRulerExampleDocument[] docs = exampleDocuments
- .getSortedDocumentsInCacheOptimizedOrder();
+ TextRulerExampleDocument[] docs =
exampleDocuments.getSortedDocumentsInCacheOptimizedOrder();
allExamplesCount = exampleDocuments.getAllPositiveExamples().size();
@@ -145,13 +142,12 @@ public class Whisk extends TextRulerBasi
// break;
// else
if (newRule != null
- (newRule.getCoveringStatistics().getCoveredNegativesCount()
== 00 || newRule
-.getLaplacian() = errorThreshold)) {
+
(newRule.getCoveringStatistics().getCoveredNegativesCount() == 00 || newRule
+.getLaplacian() = errorThreshold)) {
ruleList.addRule(newRule);
- coveredExamples.addAll(newRule.getCoveringStatistics()
- .getCoveredPositiveExamples());
- sendStatusUpdateToDelegate(New Rule added...,
- TextRulerLearnerState.ML_RUNNING, true);
+
coveredExamples.addAll(newRule.getCoveringStatistics().getCoveredPositiveExamples());
+ sendStatusUpdateToDelegate(New Rule added...,
TextRulerLearnerState.ML_RUNNING,
+ true);
}
}
}
@@ -163,32 +159,30 @@ public class Whisk extends TextRulerBasi
cachedTestedRuleStatistics.clear();
}
- protected WhiskRule growRule(TextRulerExampleDocument doc,
- TextRulerExample example) {
-sendStatusUpdateToDelegate(Creating new rule from seed...,
-TextRulerLearnerState.ML_RUNNING, false);
+ protected WhiskRule growRule(TextRulerExampleDocument doc, TextRulerExample
example) {
+sendStatusUpdateToDelegate(Creating new rule from seed...,
TextRulerLearnerState.ML_RUNNING,
+false);
WhiskRule theRule = new WhiskRule(this, example.getTarget(), example);
int numberOfSlotsInTag = example.getAnnotations().length;
for (int i = 0; i numberOfSlotsInTag; i++)
theRule.getPatterns().add(new TextRulerSlotPattern());
-sendStatusUpdateToDelegate(Creating new rule: anchoring...,
-TextRulerLearnerState.ML_RUNNING, false);
+sendStatusUpdateToDelegate(Creating new rule: anchoring...,
TextRulerLearnerState.ML_RUNNING,
+false);
for (int i = 0; i numberOfSlotsInTag; i++) {
theRule = anchor(theRule, doc, example, i);
if (shouldAbort())
return null;
}
-sendStatusUpdateToDelegate(Creating new rule:
svn commit: r1153896 - in /uima/sandbox/trunk/TextMarker: org.apache.uima.tm.cev.html/ org.apache.uima.tm.cev/ org.apache.uima.tm.cev/META-INF/ org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/
Author: joern Date: Thu Aug 4 14:51:55 2011 New Revision: 1153896 URL: http://svn.apache.org/viewvc?rev=1153896view=rev Log: Applied UIMA-2201 patch. TextMarker IDE functionality missing due to renaming Added: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/console/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/launching/ Removed: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/console/TextMarkerConsoleConstants.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/console/TextMarkerConsoleUtil.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/console/TextMarkerInterpreter.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/internal/launching/GenericTextMarkerInstall.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/internal/launching/GenericTextMarkerInstallType.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/internal/launching/JavaLocalApplicationLaunchConfigurationDelegate.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/internal/launching/JavaLocalApplicationTabGroup.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/internal/launching/TextMarkerInterpreterRunner.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/internal/launching/builtins.tm uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/launching/IConfigurableRunner.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/launching/ITextMarkerInterpreterRunnerConfig.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/launching/TextMarkerDebuggingEngineSelector.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/launching/TextMarkerLaunchConfigurationConstants.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/launching/TextMarkerLaunchConfigurationDelegate.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/launching/TextMarkerLaunchingPlugin.java Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html/build.properties uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/META-INF/MANIFEST.MF uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/build.properties uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/searchStrategy/AllXmlInProjectStrategy.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/build.properties uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/plugin.xml uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/build.properties uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsole.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsoleFactory.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launcher/TextMarkerLaunchShortcut.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/preferences/TextMarkerConsolePreferenceInitializer.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/preferences/TextMarkerConsolePreferences.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/build.properties uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/build.properties uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/src/main/java/org/apache/uima/tm/dltk/debugger/TextMarkerDebuggerRunner.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/src/main/java/org/apache/uima/tm/dltk/debugger/preferences/TextMarkerDebuggerPreferencePage.java
svn commit: r1153367 - /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java
Author: joern
Date: Wed Aug 3 07:13:45 2011
New Revision: 1153367
URL: http://svn.apache.org/viewvc?rev=1153367view=rev
Log:
UIMA-2195 Applied patch to comment a constant which does not exist in eclipse
3.7
Modified:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java
Modified:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java?rev=1153367r1=1153366r2=1153367view=diff
==
---
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java
(original)
+++
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java
Wed Aug 3 07:13:45 2011
@@ -8,6 +8,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.uima.tm.dltk.textmarker.launching.TextMarkerLaunchingPlugin;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@@ -74,8 +75,6 @@ import org.eclipse.ui.model.WorkbenchCon
import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.eclipse.ui.views.navigator.ResourceSorter;
-import org.apache.uima.tm.dltk.textmarker.launching.TextMarkerLaunchingPlugin;
-
/**
* Launch configuration tab used to specify the location a launch
configuration is stored in,
* whether it should appear in the favorites list, and perspective switching
behavior for an
@@ -171,8 +170,8 @@ public class TextMarkerCommonTab extends
public void createControl(Composite parent) {
Composite comp = new Composite(parent, SWT.NONE);
setControl(comp);
-PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(),
-IDebugHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_COMMON_TAB);
+PlatformUI.getWorkbench().getHelpSystem()
+.setHelp(getControl(),
IDebugHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_COMMON_TAB);
comp.setLayout(new GridLayout(2, true));
comp.setFont(parent.getFont());
@@ -248,8 +247,8 @@ public class TextMarkerCommonTab extends
/**
* Creates the component set for the capture output composite
*
- * @param data.parent
- * the parent to add this component to
+ * @param data
+ * .parent the parent to add this component to
*/
private void test() {
@@ -780,7 +779,8 @@ public class TextMarkerCommonTab extends
private boolean validateEncoding() {
if (fAltEncodingButton.getSelection()) {
if (fEncodingCombo.getSelectionIndex() == -1) {
-
setErrorMessage(LaunchConfigurationsMessages.CommonTab_No_Encoding_Selected);
+// TODO constant was removed in Eclipse 3.7, find a substitute
+//
setErrorMessage(LaunchConfigurationsMessages.CommonTab_No_Encoding_Selected);
return false;
}
}
@@ -878,8 +878,8 @@ public class TextMarkerCommonTab extends
if (fUseDltkRadio.getSelection()) {
configuration.setAttribute(DebugPlugin.ATTR_CAPTURE_OUTPUT, (String)
null);
-
configuration.setAttribute(ScriptLaunchConfigurationConstants.ATTR_DLTK_CONSOLE_ID,
Long
- .toString(System.currentTimeMillis()));
+
configuration.setAttribute(ScriptLaunchConfigurationConstants.ATTR_DLTK_CONSOLE_ID,
+ Long.toString(System.currentTimeMillis()));
IFileHandle proxyFile;
try {
IExecutionEnvironment exeEnv = (IExecutionEnvironment)
EnvironmentManager
svn commit: r1153372 - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/src/main: java/ src/
Author: joern Date: Wed Aug 3 07:40:08 2011 New Revision: 1153372 URL: http://svn.apache.org/viewvc?rev=1153372view=rev Log: UIMA-2197 Renamed source folder Added: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/src/main/java/ - copied from r1153371, uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/src/main/src/ Removed: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/src/main/src/
svn commit: r1153373 - in /uima/sandbox/trunk/TextMarker: org.apache.uima.tm.textruler.whisk/.classpath org.apache.uima.tm.textruler.wien/.classpath
Author: joern Date: Wed Aug 3 07:41:53 2011 New Revision: 1153373 URL: http://svn.apache.org/viewvc?rev=1153373view=rev Log: UIMA-2197 Fixed source folders. Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/.classpath uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.wien/.classpath Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/.classpath URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/.classpath?rev=1153373r1=1153372r2=1153373view=diff == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/.classpath (original) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/.classpath Wed Aug 3 07:41:53 2011 @@ -1,6 +1,6 @@ ?xml version=1.0 encoding=UTF-8? classpath - classpathentry kind=src path=src/main/src/ + classpathentry kind=src path=src/main/java/ classpathentry kind=con path=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6/ classpathentry kind=con path=org.eclipse.pde.core.requiredPlugins/ classpathentry kind=output path=bin/ Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.wien/.classpath URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.wien/.classpath?rev=1153373r1=1153372r2=1153373view=diff == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.wien/.classpath (original) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.wien/.classpath Wed Aug 3 07:41:53 2011 @@ -1,6 +1,6 @@ ?xml version=1.0 encoding=UTF-8? classpath - classpathentry kind=src path=src/src/main/java/ + classpathentry kind=src path=src/main/java/ classpathentry kind=con path=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6/ classpathentry kind=con path=org.eclipse.pde.core.requiredPlugins/ classpathentry kind=output path=bin/
svn commit: r1153375 - in /uima/sandbox/trunk/TextMarker: org.apache.uima.tm.cev/plugin.xml org.apache.uima.tm.dltk.core/plugin.xml
Author: joern Date: Wed Aug 3 07:44:40 2011 New Revision: 1153375 URL: http://svn.apache.org/viewvc?rev=1153375view=rev Log: UIMA-2191 fixed extension points to outdated namespace Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/plugin.xml uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/plugin.xml Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/plugin.xml URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/plugin.xml?rev=1153375r1=1153374r2=1153375view=diff == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/plugin.xml (original) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/plugin.xml Wed Aug 3 07:44:40 2011 @@ -14,48 +14,48 @@ icon=icons/cevViewer.png contributorClass=org.apache.uima.tm.cev.editor.CEVViewerContributor class=org.apache.uima.tm.cev.editor.CEVViewer -id=de.uniwue.tm.cev.editor.CEVViewer +id=org.apache.uima.tm.cev.editor.CEVViewer /editor /extension extension point=org.eclipse.ui.views category -id=de.uniwue.tm.cev.views +id=org.apache.uima.tm.cev.views name=CEV /category view -category=de.uniwue.tm.cev.views +category=org.apache.uima.tm.cev.views class=org.apache.uima.tm.cev.views.selection.CEVSelectionView icon=icons/views.png -id=de.uniwue.tm.cev.views.selection +id=org.apache.uima.tm.cev.views.selection name=Selection /view view -category=de.uniwue.tm.cev.views +category=org.apache.uima.tm.cev.views class=org.apache.uima.tm.cev.views.annotationBrowser.CEVAnnotationBrowserView icon=icons/views.png -id=de.uniwue.tm.cev.views.annotationBrowser +id=org.apache.uima.tm.cev.views.annotationBrowser name=Annotation Browser /view view -category=de.uniwue.tm.cev.views +category=org.apache.uima.tm.cev.views class=org.apache.uima.tm.cev.views.editor.CEVAnnotationEditorView icon=icons/edit.png -id=de.uniwue.tm.cev.views.editor +id=org.apache.uima.tm.cev.views.editor name=Annotation Editor /view view -category=de.uniwue.tm.cev.views +category=org.apache.uima.tm.cev.views class=org.apache.uima.tm.cev.views.palette.CEVAnnotationMarkerPaletteView icon=icons/edit.png -id=de.uniwue.tm.cev.views.palette +id=org.apache.uima.tm.cev.views.palette name=Marker Palette /view view -category=de.uniwue.tm.cev.views +category=org.apache.uima.tm.cev.views class=org.apache.uima.tm.cev.views.fsBrowser.CEVFSBrowserView icon=icons/views.png -id=de.uniwue.tm.cev.views.fsBrowser +id=org.apache.uima.tm.cev.views.fsBrowser name=FS only Browser /view /extension @@ -69,75 +69,75 @@ point=org.eclipse.ui.preferencePages page class=org.apache.uima.tm.cev.preferences.CEVViewerTreeViewPreferencePage -id=de.uniwue.tm.cev.preferences.CEVViewerTreeViewPreferencePage + id=org.apache.uima.tm.cev.preferences.CEVViewerTreeViewPreferencePage name=CEV /page page - category=de.uniwue.tm.cev.preferences.CEVViewerTreeViewPreferencePage + category=org.apache.uima.tm.cev.preferences.CEVViewerTreeViewPreferencePage class=org.apache.uima.tm.cev.preferences.CEVViewerAnnotationFilterPreferencePage - id=de.uniwue.tm.cev.preferences.CEVViewerAnnotationFilterPreferencePage + id=org.apache.uima.tm.cev.preferences.CEVViewerAnnotationFilterPreferencePage name=Annotation Filter /page /extension extension - point=de.uniwue.tm.cev.cevEditors + point=org.apache.uima.tm.cev.cevEditors editor -factory=de.uniwue.tm.cev.views.editor.CEVAnnotationEditorFactory -id=de.uniwue.tm.textmarker.cev.extension.editor + factory=org.apache.uima.tm.cev.views.editor.CEVAnnotationEditorFactory +id=org.apache.uima.tm.textmarker.cev.extension.editor priority=0 -viewId=de.uniwue.tm.cev.views.editor +viewId=org.apache.uima.tm.cev.views.editor /editor editor - factory=de.uniwue.tm.cev.views.palette.CEVAnnotationMarkerPaletteFactory -id=de.uniwue.tm.textmarker.cev.extension.palette + factory=org.apache.uima.tm.cev.views.palette.CEVAnnotationMarkerPaletteFactory +id=org.apache.uima.tm.textmarker.cev.extension.palette
svn commit: r1153541 - in /uima/sandbox/trunk/TextMarker: org.apache.uima.tm.cev.feature/ org.apache.uima.tm.cev.html/ org.apache.uima.tm.cev.html/src/main/java/org/apache/uima/tm/cev/html/ org.apache
Author: joern Date: Wed Aug 3 15:31:51 2011 New Revision: 1153541 URL: http://svn.apache.org/viewvc?rev=1153541view=rev Log: UIMA-2189 Applied patch that adds AL 2.0 headers Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.feature/build.properties uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.feature/feature.xml uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html/build.properties uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html/plugin.xml uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html/src/main/java/org/apache/uima/tm/cev/html/CEVHTMLPlugin.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html/src/main/java/org/apache/uima/tm/cev/html/artifactViewer/CEVDataHtmlExtension.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html/src/main/java/org/apache/uima/tm/cev/html/artifactViewer/HTMLVisitor.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html/src/main/java/org/apache/uima/tm/cev/html/artifactViewer/HtmlArtifactViewer.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html/src/main/java/org/apache/uima/tm/cev/html/artifactViewer/HtmlArtifactViewerFactory.java Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.feature/build.properties URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.feature/build.properties?rev=1153541r1=1153540r2=1153541view=diff == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.feature/build.properties (original) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.feature/build.properties Wed Aug 3 15:31:51 2011 @@ -1 +1,20 @@ +# *** +# * Licensed to the Apache Software Foundation (ASF) under one +# * or more contributor license agreements. See the NOTICE file +# * distributed with this work for additional information +# * regarding copyright ownership. The ASF licenses this file +# * to you under the Apache License, Version 2.0 (the +# * License); you may not use this file except in compliance +# * with the License. You may obtain a copy of the License at +# * +# * http://www.apache.org/licenses/LICENSE-2.0 +# * +# * Unless required by applicable law or agreed to in writing, +# * software distributed under the License is distributed on an +# * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# * KIND, either express or implied. See the License for the +# * specific language governing permissions and limitations +# * under the License. +# *** + bin.includes = feature.xml Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.feature/feature.xml URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.feature/feature.xml?rev=1153541r1=1153540r2=1153541view=diff == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.feature/feature.xml (original) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.feature/feature.xml Wed Aug 3 15:31:51 2011 @@ -1,4 +1,23 @@ ?xml version=1.0 encoding=UTF-8? +!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +License); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +-- + feature id=de.uniwue.tm.cev.feature label=CEV Feature Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html/build.properties URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html/build.properties?rev=1153541r1=1153540r2=1153541view=diff == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html/build.properties (original) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html/build.properties Wed Aug 3 15:31:51 2011 @@ -1,3 +1,22 @@ +# *** +# * Licensed to the Apache Software Foundation (ASF) under one +# * or more contributor license agreements. See the NOTICE file +# * distributed with this work for additional information +# * regarding copyright ownership. The ASF licenses
svn commit: r1153543 [4/4] - in /uima/sandbox/trunk/TextMarker: org.apache.uima.tm.dltk.antlr/ org.apache.uima.tm.dltk.core/ org.apache.uima.tm.dltk.core/schema/ org.apache.uima.tm.dltk.core/src/main/
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerImportExpression.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerImportExpression.java?rev=1153543r1=1153542r2=1153543view=diff == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerImportExpression.java (original) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerImportExpression.java Wed Aug 3 15:38:33 2011 @@ -1,6 +1,22 @@ -/** +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - */ + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +*/ + package org.apache.uima.tm.dltk.parser.ast.expressions; import org.eclipse.dltk.ast.expressions.ExpressionConstants; Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerInnerListExpression.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerInnerListExpression.java?rev=1153543r1=1153542r2=1153543view=diff == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerInnerListExpression.java (original) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerInnerListExpression.java Wed Aug 3 15:38:33 2011 @@ -1,6 +1,22 @@ -/** +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - */ + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +*/ + package org.apache.uima.tm.dltk.parser.ast.expressions; import org.apache.uima.tm.dltk.parser.ast.TMExpressionConstants; Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerListExpression.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerListExpression.java?rev=1153543r1=1153542r2=1153543view=diff == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerListExpression.java (original) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerListExpression.java Wed Aug 3 15:38:33 2011 @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software
svn commit: r1153545 - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger: ./ src/main/java/org/apache/uima/tm/dltk/debugger/ src/main/java/org/apache/uima/tm/dltk/debugger/preferences
Author: joern Date: Wed Aug 3 15:43:27 2011 New Revision: 1153545 URL: http://svn.apache.org/viewvc?rev=1153545view=rev Log: UIMA-2189 Applied patch that adds AL 2.0 headers Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/build.properties uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/plugin.properties uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/plugin.xml uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/src/main/java/org/apache/uima/tm/dltk/debugger/TextMarkerDebuggerPlugin.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/src/main/java/org/apache/uima/tm/dltk/debugger/TextMarkerDebuggerRunner.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/src/main/java/org/apache/uima/tm/dltk/debugger/TextMarkerDebuggerRunnerFactory.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/src/main/java/org/apache/uima/tm/dltk/debugger/preferences/PreferenceMessages.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/src/main/java/org/apache/uima/tm/dltk/debugger/preferences/PreferenceMessages.properties uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/src/main/java/org/apache/uima/tm/dltk/debugger/preferences/TextMarkerDebuggerPreferencePage.java Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/build.properties URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/build.properties?rev=1153545r1=1153544r2=1153545view=diff == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/build.properties (original) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/build.properties Wed Aug 3 15:43:27 2011 @@ -1,3 +1,22 @@ +# *** +# * Licensed to the Apache Software Foundation (ASF) under one +# * or more contributor license agreements. See the NOTICE file +# * distributed with this work for additional information +# * regarding copyright ownership. The ASF licenses this file +# * to you under the Apache License, Version 2.0 (the +# * License); you may not use this file except in compliance +# * with the License. You may obtain a copy of the License at +# * +# * http://www.apache.org/licenses/LICENSE-2.0 +# * +# * Unless required by applicable law or agreed to in writing, +# * software distributed under the License is distributed on an +# * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# * KIND, either express or implied. See the License for the +# * specific language governing permissions and limitations +# * under the License. +# *** + source.. = src/ output.. = bin/ bin.includes = META-INF/,\ Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/plugin.properties URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/plugin.properties?rev=1153545r1=1153544r2=1153545view=diff == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/plugin.properties (original) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/plugin.properties Wed Aug 3 15:43:27 2011 @@ -1,3 +1,22 @@ +# *** +# * Licensed to the Apache Software Foundation (ASF) under one +# * or more contributor license agreements. See the NOTICE file +# * distributed with this work for additional information +# * regarding copyright ownership. The ASF licenses this file +# * to you under the Apache License, Version 2.0 (the +# * License); you may not use this file except in compliance +# * with the License. You may obtain a copy of the License at +# * +# * http://www.apache.org/licenses/LICENSE-2.0 +# * +# * Unless required by applicable law or agreed to in writing, +# * software distributed under the License is distributed on an +# * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# * KIND, either express or implied. See the License for the +# * specific language governing permissions and limitations +# * under the License. +# *** + pluginProvider=University of Wuerzburg pluginName=Dynamic Languages Toolkit TextMarker debugging engine @@ -5,4 +24,4 @@ PreferencePage.name = TextMarker PropertyPage.name = TextMarker DebuggingEngine.name = TextMarker debugging engine -DebuggingEngine.description = TextMarker debugging engine \ No newline at end of file +DebuggingEngine.description = TextMarker debugging engine Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/plugin.xml URL: http://svn.apache.org/viewvc/uima
svn commit: r1153548 - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter: ./ src/main/java/org/apache/uima/tm/dltk/formatter/ src/main/java/org/apache/uima/tm/dltk/formatter/internal
Author: joern Date: Wed Aug 3 15:45:45 2011 New Revision: 1153548 URL: http://svn.apache.org/viewvc?rev=1153548view=rev Log: UIMA-2189 Applied patch that adds AL 2.0 headers Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/build.properties uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/plugin.xml uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/TextMarkerFormatter.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/TextMarkerFormatterConstants.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/TextMarkerFormatterFactory.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/internal/Messages.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/internal/TextMarkerFormattedPrinter.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/internal/TextMarkerFormatterContext.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/internal/TextMarkerFormatterPlugin.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/internal/TextMarkerFormatterPreferenceInitializer.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/internal/messages.properties uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/Messages.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/TextMarkerFormatterBlankLinesPage.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/TextMarkerFormatterIndentationTabPage.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/TextMarkerFormatterLineWrappingPage.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/TextMarkerFormatterModifyDialog.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/src/main/java/org/apache/uima/tm/dltk/formatter/preferences/messages.properties Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/build.properties URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/build.properties?rev=1153548r1=1153547r2=1153548view=diff == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/build.properties (original) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/build.properties Wed Aug 3 15:45:45 2011 @@ -1,3 +1,22 @@ +# *** +# * Licensed to the Apache Software Foundation (ASF) under one +# * or more contributor license agreements. See the NOTICE file +# * distributed with this work for additional information +# * regarding copyright ownership. The ASF licenses this file +# * to you under the Apache License, Version 2.0 (the +# * License); you may not use this file except in compliance +# * with the License. You may obtain a copy of the License at +# * +# * http://www.apache.org/licenses/LICENSE-2.0 +# * +# * Unless required by applicable law or agreed to in writing, +# * software distributed under the License is distributed on an +# * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# * KIND, either express or implied. See the License for the +# * specific language governing permissions and limitations +# * under the License. +# *** + source.. = src/ output.. = bin/ bin.includes = plugin.xml,\ Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/plugin.xml URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/plugin.xml?rev=1153548r1=1153547r2=1153548view=diff == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/plugin.xml (original) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/plugin.xml Wed Aug 3 15:45:45 2011 @@ -1,4 +1,23 @@ ?xml version=1.0 encoding=UTF-8? +!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed
svn commit: r1153549 - in /uima/sandbox/trunk/TextMarker: org.apache.uima.tm.textmarker.feature/ org.apache.uima.tm.textmarker.query/ org.apache.uima.tm.textmarker.query/src/main/java/org/apache/uima/
Author: joern Date: Wed Aug 3 15:48:34 2011 New Revision: 1153549 URL: http://svn.apache.org/viewvc?rev=1153549view=rev Log: UIMA-2189 Applied patch that adds AL 2.0 headers Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.feature/build.properties uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.feature/feature.xml uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/build.properties uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/plugin.xml uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/src/main/java/org/apache/uima/tm/textmarker/query/QueryPlugin.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/src/main/java/org/apache/uima/tm/textmarker/query/QuerySearchStrategy.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/src/main/java/org/apache/uima/tm/textmarker/query/QuerySearchStrategyFactory.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/src/main/java/org/apache/uima/tm/textmarker/query/ui/BasicEngine.xml uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/src/main/java/org/apache/uima/tm/textmarker/query/ui/BasicTypeSystem.xml uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/src/main/java/org/apache/uima/tm/textmarker/query/ui/ExportActionHandler.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/src/main/java/org/apache/uima/tm/textmarker/query/ui/InternalTypeSystem.xml uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/src/main/java/org/apache/uima/tm/textmarker/query/ui/QueryActionHandler.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/src/main/java/org/apache/uima/tm/textmarker/query/ui/QueryComposite.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/src/main/java/org/apache/uima/tm/textmarker/query/ui/QueryResult.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/src/main/java/org/apache/uima/tm/textmarker/query/ui/QueryResultContentProvider.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/src/main/java/org/apache/uima/tm/textmarker/query/ui/QueryResultLabelProvider.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/src/main/java/org/apache/uima/tm/textmarker/query/ui/QueryView.java uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/src/main/java/org/apache/uima/tm/textmarker/query/ui/ResultListDialog.java Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.feature/build.properties URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.feature/build.properties?rev=1153549r1=1153548r2=1153549view=diff == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.feature/build.properties (original) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.feature/build.properties Wed Aug 3 15:48:34 2011 @@ -1 +1,20 @@ +# *** +# * Licensed to the Apache Software Foundation (ASF) under one +# * or more contributor license agreements. See the NOTICE file +# * distributed with this work for additional information +# * regarding copyright ownership. The ASF licenses this file +# * to you under the Apache License, Version 2.0 (the +# * License); you may not use this file except in compliance +# * with the License. You may obtain a copy of the License at +# * +# * http://www.apache.org/licenses/LICENSE-2.0 +# * +# * Unless required by applicable law or agreed to in writing, +# * software distributed under the License is distributed on an +# * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# * KIND, either express or implied. See the License for the +# * specific language governing permissions and limitations +# * under the License. +# *** + bin.includes = feature.xml Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.feature/feature.xml URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.feature/feature.xml?rev=1153549r1=1153548r2=1153549view=diff == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.feature/feature.xml (original) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.feature/feature.xml Wed Aug 3 15:48:34 2011 @@ -1,4 +1,23 @@ ?xml version=1.0 encoding=UTF-8? +!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under
svn commit: r1153557 [2/2] - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler: ./ schema/ src/main/java/org/apache/uima/tm/textruler/ src/main/java/org/apache/uima/tm/textruler/core/ src
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/src/main/java/org/apache/uima/tm/textruler/ui/TextRulerView.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/src/main/java/org/apache/uima/tm/textruler/ui/TextRulerView.java?rev=1153557r1=1153556r2=1153557view=diff == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/src/main/java/org/apache/uima/tm/textruler/ui/TextRulerView.java (original) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/src/main/java/org/apache/uima/tm/textruler/ui/TextRulerView.java Wed Aug 3 16:02:13 2011 @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +*/ + package org.apache.uima.tm.textruler.ui; import java.io.File; Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/src/main/java/org/apache/uima/tm/textruler/ui/TextRulerViewComposite.java URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/src/main/java/org/apache/uima/tm/textruler/ui/TextRulerViewComposite.java?rev=1153557r1=1153556r2=1153557view=diff == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/src/main/java/org/apache/uima/tm/textruler/ui/TextRulerViewComposite.java (original) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/src/main/java/org/apache/uima/tm/textruler/ui/TextRulerViewComposite.java Wed Aug 3 16:02:13 2011 @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +*/ + package org.apache.uima.tm.textruler.ui; import java.io.File;
svn commit: r1153559 [3/3] - in /uima/sandbox/trunk/TextMarker: org.apache.uima.tm.textmarker.testing/ org.apache.uima.tm.textmarker.testing/schema/ org.apache.uima.tm.textmarker.testing/src/main/java
Modified:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/convert/ConvertSyntaxParser.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/convert/ConvertSyntaxParser.java?rev=1153559r1=1153558r2=1153559view=diff
==
---
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/convert/ConvertSyntaxParser.java
(original)
+++
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/convert/ConvertSyntaxParser.java
Wed Aug 3 16:06:29 2011
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+
// $ANTLR 3.1.2
D:\\work\\workspace-tm\\org.apache.uima.tm.textmarker.ui.utils\\src\\de\\uniwue\\tm\\textmarker\\ui\\convert\\ConvertSyntax.g
2009-08-17 15:43:13
package org.apache.uima.tm.textmarker.ui.convert;
@@ -8509,4 +8528,4 @@ public class ConvertSyntaxParser extends
public static final BitSet
FOLLOW_externalNumberFunction_in_synpred10_ConvertSyntax3174 = new BitSet(
new long[] { 0x0002L });
-}
\ No newline at end of file
+}
Modified:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/twl/MultiTWLConverterHandler.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/twl/MultiTWLConverterHandler.java?rev=1153559r1=1153558r2=1153559view=diff
==
---
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/twl/MultiTWLConverterHandler.java
(original)
+++
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/twl/MultiTWLConverterHandler.java
Wed Aug 3 16:06:29 2011
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+
package org.apache.uima.tm.textmarker.ui.twl;
import java.io.File;
Modified:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/twl/TWLConverterHandler.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/twl/TWLConverterHandler.java?rev=1153559r1=1153558r2=1153559view=diff
==
---
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/twl/TWLConverterHandler.java
(original)
+++
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/twl/TWLConverterHandler.java
Wed Aug 3 16:06:29 2011
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use
svn commit: r1153113 - in /uima/sandbox/trunk/TextMarker: org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/ org.apache.uima.tm.dltk.debug.ui/src/main/java/org
Author: joern
Date: Tue Aug 2 13:21:08 2011
New Revision: 1153113
URL: http://svn.apache.org/viewvc?rev=1153113view=rev
Log:
UIMA-2195 Fixed broken imports
Modified:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsole.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsoleFactory.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launcher/TextMarkerLaunchShortcut.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/preferences/TextMarkerConsolePreferenceInitializer.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/ui/preferences/TextMarkerConsolePreferences.java
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/META-INF/MANIFEST.MF
Modified:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsole.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsole.java?rev=1153113r1=1153112r2=1153113view=diff
==
---
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsole.java
(original)
+++
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsole.java
Tue Aug 2 13:21:08 2011
@@ -2,7 +2,7 @@ package org.apache.uima.tm.dltk.internal
import org.eclipse.dltk.console.ui.ScriptConsole;
-import org.apache.uima.tm.dltk.console.TextMarkerInterpreter;
+import org.apache.uima.tm.dltk.textmarker.console.TextMarkerInterpreter;
public class TextMarkerConsole extends ScriptConsole {
public static final String CONSOLE_TYPE = tm_console;
Modified:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsoleFactory.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsoleFactory.java?rev=1153113r1=1153112r2=1153113view=diff
==
---
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsoleFactory.java
(original)
+++
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/console/ui/TextMarkerConsoleFactory.java
Tue Aug 2 13:21:08 2011
@@ -8,8 +8,8 @@ import org.eclipse.dltk.console.ui.Scrip
import org.eclipse.dltk.console.ui.ScriptConsoleFactoryBase;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.apache.uima.tm.dltk.console.TextMarkerConsoleConstants;
-import org.apache.uima.tm.dltk.console.TextMarkerInterpreter;
+import org.apache.uima.tm.dltk.textmarker.console.TextMarkerConsoleConstants;
+import org.apache.uima.tm.dltk.textmarker.console.TextMarkerInterpreter;
import org.apache.uima.tm.dltk.internal.debug.ui.TextMarkerDebugUIPlugin;
public class TextMarkerConsoleFactory extends ScriptConsoleFactoryBase
implements
Modified:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java?rev=1153113r1=1153112r2=1153113view=diff
==
---
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java
(original)
+++
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java
Tue Aug 2 13:21:08 2011
@@ -74,7 +74,7 @@ import org.eclipse.ui.model.WorkbenchCon
import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.eclipse.ui.views.navigator.ResourceSorter;
-import org.apache.uima.tm.dltk.launching.TextMarkerLaunchingPlugin;
+import
svn commit: r1152750 - /uima/sandbox/trunk/TextMarker/
Author: joern Date: Mon Aug 1 12:13:46 2011 New Revision: 1152750 URL: http://svn.apache.org/viewvc?rev=1152750view=rev Log: UIMA-2172 Created folder for TextMarker contribution Added: uima/sandbox/trunk/TextMarker/
svn commit: r1152762 - in /uima/sandbox/trunk/TextMarker: org.apache.uima.tm.cev.feature/ org.apache.uima.tm.cev.html.feature/ org.apache.uima.tm.cev.html/ org.apache.uima.tm.cev/ org.apache.uima.tm.d
Author: joern Date: Mon Aug 1 13:23:21 2011 New Revision: 1152762 URL: http://svn.apache.org/viewvc?rev=1152762view=rev Log: UIMA-2172 Share TextMarker projects Added: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.feature/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html.feature/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.cev.extensions/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.feature/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.testing/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.lp2/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.rapier/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.wien/
svn commit: r1152781 - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr: ./ .classpath .project LICENSE.html META-INF/ META-INF/MANIFEST.MF antlr-3.1.3.jar build.properties
Author: joern Date: Mon Aug 1 13:59:08 2011 New Revision: 1152781 URL: http://svn.apache.org/viewvc?rev=1152781view=rev Log: UIMA-2172 Initial commit of the TextMarker contribution. Added: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.classpath (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.project (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/LICENSE.html (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/META-INF/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/META-INF/MANIFEST.MF (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/antlr-3.1.3.jar (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/build.properties (with props) Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/ (props changed) Propchange: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/ -- --- svn:ignore (added) +++ svn:ignore Mon Aug 1 13:59:08 2011 @@ -0,0 +1 @@ +.settings Added: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.classpath URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.classpath?rev=1152781view=auto == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.classpath (added) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.classpath Mon Aug 1 13:59:08 2011 @@ -0,0 +1,7 @@ +?xml version=1.0 encoding=UTF-8? +classpath + classpathentry kind=con path=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6/ + classpathentry kind=con path=org.eclipse.pde.core.requiredPlugins/ + classpathentry exported=true kind=lib path=antlr-3.1.3.jar sourcepath=D:/work/ANTLR/antlr-3.1.3/ + classpathentry kind=output path=bin/ +/classpath Propchange: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.classpath -- svn:executable = * Propchange: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.classpath -- svn:mime-type = text/plain Added: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.project URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.project?rev=1152781view=auto == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.project (added) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.project Mon Aug 1 13:59:08 2011 @@ -0,0 +1,28 @@ +?xml version=1.0 encoding=UTF-8? +projectDescription + nameorg.apache.uima.tm.dltk.antlr/name + comment/comment + projects + /projects + buildSpec + buildCommand + nameorg.eclipse.jdt.core.javabuilder/name + arguments + /arguments + /buildCommand + buildCommand + nameorg.eclipse.pde.ManifestBuilder/name + arguments + /arguments + /buildCommand + buildCommand + nameorg.eclipse.pde.SchemaBuilder/name + arguments + /arguments + /buildCommand + /buildSpec + natures + natureorg.eclipse.pde.PluginNature/nature + natureorg.eclipse.jdt.core.javanature/nature + /natures +/projectDescription Propchange: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.project -- svn:executable = * Propchange: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.project -- svn:mime-type = text/plain Added: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/LICENSE.html URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/LICENSE.html?rev=1152781view=auto == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/LICENSE.html (added) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/LICENSE.html Mon Aug 1 13:59:08 2011 @@ -0,0 +1,18 @@ +html +body +bfont size=+1ANTLR 3 License/font/bbrbr +i[The BSD License]/ibr +Copyright (c) 2003-2007, Terence Parrbr +All rights reserved. + +p +Redistribution and use in source and binary forms, with or without modification
svn commit: r1152783 [12/12] - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core: ./ META-INF/ bin/ schema/ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/
Added:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerVariableReference.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerVariableReference.java?rev=1152783view=auto
==
---
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerVariableReference.java
(added)
+++
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerVariableReference.java
Mon Aug 1 14:06:27 2011
@@ -0,0 +1,36 @@
+/**
+ *
+ */
+package org.apache.uima.tm.dltk.parser.ast.expressions;
+
+import org.apache.uima.tm.dltk.parser.ast.TMTypeConstants;
+import org.eclipse.dltk.ast.references.VariableReference;
+
+
+/**
+ * @author Martin Toepfer
+ *
+ */
+public class TextMarkerVariableReference extends VariableReference {
+ private int typeId;
+
+ /**
+ * @param start
+ * @param end
+ * @param name
+ * @param typedId
+ * raw type id from {@link TMTypeConstants}
+ */
+ public TextMarkerVariableReference(int start, int end, String name, int
typedId) {
+super(start, end, name);
+this.typeId = typedId;
+ }
+
+ public int getType() {
+return this.typeId;
+ }
+
+ public void setType(int type) {
+this.typeId = type;
+ }
+}
Propchange:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerVariableReference.java
--
svn:executable = *
Propchange:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerVariableReference.java
--
svn:mime-type = text/plain
svn commit: r1152785 - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug: ./ META-INF/ bin/ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/a
Author: joern Date: Mon Aug 1 14:09:56 2011 New Revision: 1152785 URL: http://svn.apache.org/viewvc?rev=1152785view=rev Log: UIMA-2172 Initial commit of the TextMarker contribution. Added: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.classpath (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.project (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/META-INF/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/META-INF/MANIFEST.MF (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/bin/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/build.properties (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/plugin.properties (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/plugin.xml (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/dltk/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/dltk/internal/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/dltk/internal/debug/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/dltk/internal/debug/TextMarkerDebugConstants.java (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/dltk/internal/debug/TextMarkerDebugPlugin.java (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/dltk/internal/debug/TextMarkerDebugPreferenceInitializer.java (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/dltk/internal/debug/TextMarkerDebugPreferences.java (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/dltk/internal/debug/TextMarkerTypeFactory.java (with props) Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/ (props changed) Propchange: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/ -- --- svn:ignore (added) +++ svn:ignore Mon Aug 1 14:09:56 2011 @@ -0,0 +1 @@ +.settings Added: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.classpath URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.classpath?rev=1152785view=auto == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.classpath (added) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.classpath Mon Aug 1 14:09:56 2011 @@ -0,0 +1,7 @@ +?xml version=1.0 encoding=UTF-8? +classpath + classpathentry kind=src path=src/main/java/ + classpathentry kind=con path=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6/ + classpathentry kind=con path=org.eclipse.pde.core.requiredPlugins/ + classpathentry kind=output path=bin/ +/classpath Propchange: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.classpath -- svn:executable = * Propchange: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.classpath -- svn:mime-type = text/plain Added: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.project URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.project?rev=1152785view=auto == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.project (added) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.project Mon Aug 1 14:09:56 2011 @@ -0,0 +1,28 @@ +?xml version=1.0 encoding=UTF-8? +projectDescription + nameorg.apache.uima.tm.dltk.debug/name + comment/comment + projects + /projects + buildSpec + buildCommand + nameorg.eclipse.jdt.core.javabuilder/name
svn commit: r1152792 [10/10] - in /uima/sandbox/trunk/TextMarker: org.apache.uima.tm.textruler.lp2/ org.apache.uima.tm.textruler.lp2/META-INF/ org.apache.uima.tm.textruler.lp2/bin/ org.apache.uima.tm.
Added:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/src/main/java/org/apache/uima/tm/textruler/ui/TextRulerViewComposite.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/src/main/java/org/apache/uima/tm/textruler/ui/TextRulerViewComposite.java?rev=1152792view=auto
==
---
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/src/main/java/org/apache/uima/tm/textruler/ui/TextRulerViewComposite.java
(added)
+++
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/src/main/java/org/apache/uima/tm/textruler/ui/TextRulerViewComposite.java
Mon Aug 1 14:21:12 2011
@@ -0,0 +1,856 @@
+package org.apache.uima.tm.textruler.ui;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.uima.UIMAFramework;
+import org.apache.uima.resource.metadata.TypeDescription;
+import org.apache.uima.resource.metadata.TypeSystemDescription;
+import org.apache.uima.tm.textruler.TextRulerPlugin;
+import org.apache.uima.tm.textruler.core.TextRulerToolkit;
+import org.apache.uima.tm.textruler.extension.TextRulerController;
+import org.apache.uima.tm.textruler.extension.TextRulerLearnerController;
+import org.apache.uima.util.FileUtils;
+import org.apache.uima.util.InvalidXMLException;
+import org.apache.uima.util.XMLInputSource;
+import org.apache.uima.util.XMLizable;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.CheckboxTableViewer;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.DropTarget;
+import org.eclipse.swt.dnd.DropTargetAdapter;
+import org.eclipse.swt.dnd.DropTargetEvent;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+
+
+public class TextRulerViewComposite extends org.eclipse.swt.widgets.Composite {
+
+ public class DefaultLabelProvider extends LabelProvider implements
ITableLabelProvider {
+
+private final String type;
+
+public DefaultLabelProvider(String type) {
+ super();
+ this.type = type;
+}
+
+public String getColumnText(Object obj, int index) {
+ return getText(obj);
+}
+
+public Image getColumnImage(Object obj, int index) {
+ return getImage(obj);
+}
+
+@Override
+public Image getImage(Object obj) {
+ if (type.equals(SlotTypes)) {
+return images.get(information);
+ } else if (type.equals(FilterTypes)) {
+return images.get(feature);
+ } else if (type.equals(learner)) {
+return images.get(learner);
+ }
+ return
PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_ELEMENT);
+}
+ }
+
+ private CheckboxTableViewer algListViewer;
+
+ private AddRemoveList slotTypes;
+
+ private AddRemoveList filterTypes;
+
+ private Button skipPreButton;
+
+ private Button dirButton;
+
+ // private Composite configArea;
+
+ private ArrayListLearnerConfigurator configurators;
+
+ private Label globalStatusLabel;
+
+ private Label label2;
+
+ private Label label1;
+
+ private Text inputDirectoryText;
+
+ private Label methodsLabel;
+
+ private Label filtersLabel;
+
+ private TextRulerView textRulerView;
+
+ private Button fileChooseButton;
+
+ private static Text preFileText;
+
+ private Label label3;
+
+ private HashMapString, Image images;
+
+ private Text additionalDirectoryText;
+
+ private Button additionalButton;
+
+ private Label label4;
+
+ private Label label5;
+
+ private Text testDirectoryText;
+
+ private Button testButton;
+
+ private Button showTestsButton;
+
+ public class ListContentProvider implements IStructuredContentProvider {
+public void inputChanged(Viewer v, Object oldInput, Object newInput) {
+}
+
+public void dispose() {
+}
+
+public Object[] getElements(Object parent) {
+ return
svn commit: r1152804 [15/15] - in /uima/sandbox/trunk/TextMarker: org.apache.uima.tm.dltk.debug.ui/ org.apache.uima.tm.dltk.debug.ui/META-INF/ org.apache.uima.tm.dltk.debug.ui/bin/ org.apache.uima.tm.
Added:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerTypeChecker.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerTypeChecker.java?rev=1152804view=auto
==
---
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerTypeChecker.java
(added)
+++
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerTypeChecker.java
Mon Aug 1 14:37:34 2011
@@ -0,0 +1,594 @@
+package org.apache.uima.tm.dltk.validator;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.Stack;
+
+import org.apache.uima.UIMAFramework;
+import org.apache.uima.resource.ResourceManager;
+import org.apache.uima.resource.metadata.TypeDescription;
+import org.apache.uima.resource.metadata.TypeSystemDescription;
+import org.apache.uima.tm.dltk.core.TextMarkerCorePreferences;
+import org.apache.uima.tm.dltk.core.TextMarkerPlugin;
+import org.apache.uima.tm.dltk.internal.core.builder.TextMarkerProjectUtils;
+import org.apache.uima.tm.dltk.parser.ast.TMStatementConstants;
+import org.apache.uima.tm.dltk.parser.ast.TMTypeConstants;
+import org.apache.uima.tm.dltk.parser.ast.TextMarkerBlock;
+import org.apache.uima.tm.dltk.parser.ast.TextMarkerImportStatement;
+import
org.apache.uima.tm.dltk.parser.ast.declarations.TextMarkerDeclareDeclarationsStatement;
+import
org.apache.uima.tm.dltk.parser.ast.declarations.TextMarkerFeatureDeclaration;
+import
org.apache.uima.tm.dltk.parser.ast.declarations.TextMarkerPackageDeclaration;
+import
org.apache.uima.tm.dltk.parser.ast.declarations.TextMarkerTypeDeclaration;
+import
org.apache.uima.tm.dltk.parser.ast.declarations.TextMarkerVariableDeclaration;
+import
org.apache.uima.tm.dltk.parser.ast.expressions.TextMarkerVariableReference;
+import org.apache.uima.util.InvalidXMLException;
+import org.apache.uima.util.XMLInputSource;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Preferences;
+import org.eclipse.dltk.ast.ASTNode;
+import org.eclipse.dltk.ast.ASTVisitor;
+import org.eclipse.dltk.ast.declarations.MethodDeclaration;
+import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
+import org.eclipse.dltk.ast.expressions.Expression;
+import org.eclipse.dltk.ast.references.SimpleReference;
+import org.eclipse.dltk.ast.statements.Statement;
+import org.eclipse.dltk.compiler.problem.IProblem;
+import org.eclipse.dltk.compiler.problem.IProblemReporter;
+import org.eclipse.dltk.core.IModelElement;
+import org.eclipse.dltk.core.IScriptProject;
+import org.eclipse.dltk.core.ISourceModule;
+import org.eclipse.dltk.core.builder.IBuildContext;
+import org.eclipse.dltk.core.builder.IBuildParticipant;
+import org.eclipse.dltk.core.builder.IBuildParticipantExtension;
+import org.eclipse.dltk.core.builder.ISourceLineTracker;
+
+
+public class TextMarkerTypeChecker implements IBuildParticipant,
IBuildParticipantExtension {
+
+ /**
+ * @author Martin Toepfer
+ *
+ */
+ private class TypeCheckerVisitor extends ASTVisitor {
+private final StackString blocks;
+
+private final SetString typeVariables;
+
+private final SetString otherVariables;
+
+private IProblemReporter rep;
+
+private ISourceModule currentFile;
+
+private ISourceLineTracker linetracker;
+
+private SetString completeTypes;
+
+private SetString shortTypes;
+
+private TextMarkerCheckerProblemFactory problemFactory;
+
+private String packageName;
+
+private TypeSystemDescription description;
+
+// private TypeSystem ts;
+
+private SetString otherTypes;
+
+private SetString finalTypes;
+
+private boolean reportWarningOnShortNames;
+
+public TypeCheckerVisitor(IProblemReporter rep, ISourceLineTracker
linetracker,
+ISourceModule curFile, SetString completeTypes, SetString
shortTypes) {
+ this.problemFactory = new
TextMarkerCheckerProblemFactory(curFile.getElementName(),
+ linetracker);
+ this.linetracker = linetracker;
+ this.rep = rep;
+ this.typeVariables = new HashSetString();
+ this.otherVariables = new HashSetString();
+ this.blocks = new StackString();
+ this.packageName = ;
+ this.currentFile = curFile;
+ this.completeTypes = completeTypes;
+ this.shortTypes = shortTypes;
+ this.otherTypes = new HashSetString();
+
svn commit: r1152816 - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine: ./ META-INF/ desc/ lib/ metadata/
Author: joern Date: Mon Aug 1 15:05:54 2011 New Revision: 1152816 URL: http://svn.apache.org/viewvc?rev=1152816view=rev Log: UIMA-2172 Initial commit of the TextMarker contribution. Added: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/META-INF/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/META-INF/MANIFEST.MF (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/build.properties (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/BasicEngine.xml (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/BasicTypeSystem.xml (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/InternalTypeSystem.xml (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/Modifier.xml (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/SourceDocumentInformation.xml (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/TypePrioritites.xml (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/lib/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/lib/commons-collections-3.2.1.jar (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/lib/uima-document-annotation.jar (with props) uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/metadata/ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/metadata/install.xml (with props) Added: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/META-INF/MANIFEST.MF?rev=1152816view=auto == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/META-INF/MANIFEST.MF (added) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/META-INF/MANIFEST.MF Mon Aug 1 15:05:54 2011 @@ -0,0 +1,38 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: TextMarker Engine Plugin +Bundle-SymbolicName: org.apache.uima.tm.textmarker.engine +Bundle-Version: 1.0.0.qualifier +Bundle-ClassPath: ., + lib/uima-document-annotation.jar, + lib/commons-collections-3.2.1.jar +Export-Package: org.apache.uima.tm.textmarker.action, + org.apache.uima.tm.textmarker.batch, + org.apache.uima.tm.textmarker.condition, + org.apache.uima.tm.textmarker.engine, + org.apache.uima.tm.textmarker.kernel, + org.apache.uima.tm.textmarker.kernel.constraint, + org.apache.uima.tm.textmarker.kernel.expression, + org.apache.uima.tm.textmarker.kernel.expression.bool, + org.apache.uima.tm.textmarker.kernel.expression.list, + org.apache.uima.tm.textmarker.kernel.expression.number, + org.apache.uima.tm.textmarker.kernel.expression.string, + org.apache.uima.tm.textmarker.kernel.expression.type, + org.apache.uima.tm.textmarker.kernel.extensions, + org.apache.uima.tm.textmarker.kernel.rule, + org.apache.uima.tm.textmarker.kernel.rule.quantifier, + org.apache.uima.tm.textmarker.kernel.type, + org.apache.uima.tm.textmarker.kernel.visitor, + org.apache.uima.tm.textmarker.parser, + org.apache.uima.tm.textmarker.resource, + org.apache.uima.tm.textmarker.resource.trie, + org.apache.uima.tm.textmarker.seed, + org.apache.uima.tm.textmarker.utils, + org.apache.uima.tm.textmarker.verbalize, + org.apache.uima.tm.type +Require-Bundle: org.apache.uima.tm.dltk.antlr, + org.apache.uima.runtime;bundle-version=2.3.0 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-Vendor: University of Würzburg +Eclipse-BuddyPolicy: registered +Eclipse-RegisterBuddy: org.apache.uima.runtime Propchange: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/META-INF/MANIFEST.MF -- svn:executable = * Propchange: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/META-INF/MANIFEST.MF -- svn:mime-type = text/plain Added: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/build.properties URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/build.properties?rev=1152816view=auto == --- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/build.properties (added) +++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/build.properties Mon Aug 1 15:05:54 2011 @@ -0,0 +1,6 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF
svn commit: r1152819 [2/2] - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src: ./ main/ main/java/ main/java/org/ main/java/org/apache/ main/java/org/apache/uima/ main/java/o
Added:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/type/PERIOD_Type.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/type/PERIOD_Type.java?rev=1152819view=auto
==
---
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/type/PERIOD_Type.java
(added)
+++
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/type/PERIOD_Type.java
Mon Aug 1 15:08:26 2011
@@ -0,0 +1,60 @@
+/* First created by JCasGen Tue Apr 08 18:30:34 CEST 2008 */
+package org.apache.uima.tm.type;
+
+import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.Type;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.FSGenerator;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
+
+/**
+ * Updated by JCasGen Thu Apr 24 17:12:22 CEST 2008
+ *
+ * @generated
+ */
+public class PERIOD_Type extends SENTENCEEND_Type {
+ /** @generated */
+ @Override
+ protected FSGenerator getFSGenerator() {
+return fsGenerator;
+ }
+
+ /** @generated */
+ private final FSGenerator fsGenerator = new FSGenerator() {
+public FeatureStructure createFS(int addr, CASImpl cas) {
+ if (PERIOD_Type.this.useExistingInstance) {
+// Return eq fs instance if already created
+FeatureStructure fs = PERIOD_Type.this.jcas.getJfsFromCaddr(addr);
+if (null == fs) {
+ fs = new PERIOD(addr, PERIOD_Type.this);
+ PERIOD_Type.this.jcas.putJfsFromCaddr(addr, fs);
+ return fs;
+}
+return fs;
+ } else
+return new PERIOD(addr, PERIOD_Type.this);
+}
+ };
+
+ /** @generated */
+ public final static int typeIndexID = PERIOD.typeIndexID;
+
+ /**
+ * @generated
+ * @modifiable
+ */
+ public final static boolean featOkTst =
JCasRegistry.getFeatOkTst(org.apache.uima.tm.type.PERIOD);
+
+ /**
+ * initialize variables to correspond with Cas Type and Features
+ *
+ * @generated
+ */
+ public PERIOD_Type(JCas jcas, Type casType) {
+super(jcas, casType);
+casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl) this.casType,
getFSGenerator());
+
+ }
+}
Propchange:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/type/PERIOD_Type.java
--
svn:executable = *
Propchange:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/type/PERIOD_Type.java
--
svn:mime-type = text/plain
Added:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/type/PM.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/type/PM.java?rev=1152819view=auto
==
---
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/type/PM.java
(added)
+++
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/type/PM.java
Mon Aug 1 15:08:26 2011
@@ -0,0 +1,73 @@
+/* First created by JCasGen Tue Apr 08 18:30:34 CEST 2008 */
+package org.apache.uima.tm.type;
+
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.jcas.cas.TOP_Type;
+
+/**
+ * Updated by JCasGen Thu Apr 24 17:12:22 CEST 2008 XML source:
+ *
C:/work/workspace-tm/org.apache.uima.tm.textmarker.engine/desc/BasicTypeSystem.xml
+ *
+ * @generated
+ */
+public class PM extends ANY {
+ /**
+ * @generated
+ * @ordered
+ */
+ public final static int typeIndexID = JCasRegistry.register(PM.class);
+
+ /**
+ * @generated
+ * @ordered
+ */
+ public final static int type = typeIndexID;
+
+ /** @generated */
+ @Override
+ public int getTypeIndexID() {
+return typeIndexID;
+ }
+
+ /**
+ * Never called. Disable default constructor
+ *
+ * @generated
+ */
+ protected PM() {
+ }
+
+ /**
+ * Internal - constructor used by generator
+ *
+ * @generated
+ */
+ public PM(int addr, TOP_Type type) {
+super(addr, type);
+readObject();
+ }
+
+ /** @generated */
+ public PM(JCas jcas) {
+super(jcas);
+readObject();
+ }
+
+ /** @generated */
+ public PM(JCas jcas, int begin, int end) {
+super(jcas);
+setBegin(begin);
+setEnd(end);
+readObject();
+ }
+
+ /**
+ * !-- begin-user-doc -- Write your own initialization here !--
end-user-doc --
+ *
+ * @generated
