You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by jo...@apache.org on 2011/08/03 11:45:19 UTC
svn commit: r1153411 [2/2] - in /uima/sandbox/trunk/TextMarker:
org.apache.uima.tm.cev.html/src/main/java/org/apache/uima/tm/cev/html/artifactViewer/
org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/
org.apache.uima.tm.cev/src/main/java/org/...
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/data/tree/CEVTypeOrderedRootTreeNode.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/data/tree/CEVTypeOrderedRootTreeNode.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/data/tree/CEVTypeOrderedRootTreeNode.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/data/tree/CEVTypeOrderedRootTreeNode.java Wed Aug 3 09:45:08 2011
@@ -9,9 +9,6 @@ import org.apache.uima.cas.text.Annotati
public class CEVTypeOrderedRootTreeNode extends CEVAbstractTreeNode implements ICEVRootTreeNode {
- /**
- * Konstruktor
- */
public CEVTypeOrderedRootTreeNode() {
super();
}
@@ -38,11 +35,11 @@ public class CEVTypeOrderedRootTreeNode
* (non-Javadoc)
*
* @see
- * org.apache.uima.tm.cev.data.tree.ICEVRootTreeNode#insertAnnotation(org.apache.uima.cas.text.AnnotationFS
- * )
+ * org.apache.uima.tm.cev.data.tree.ICEVRootTreeNode#insertAnnotation(org.apache.uima.cas.text
+ * .AnnotationFS )
*/
public void insertFS(FeatureStructure fs) {
- // TODO hotfix...
+ // TODO hotfix for explanation types...
if (fs.getType().getShortName().equals("DebugBlockApply")
|| fs.getType().getShortName().equals("DebugMatchedRuleMatch")
|| fs.getType().getShortName().equals("DebugFailedRuleMatch")
@@ -54,9 +51,6 @@ public class CEVTypeOrderedRootTreeNode
Iterator<ICEVTreeNode> iter = getChildrenIterator();
- // pruefen ob Typ schon im Baum existiert, wenn ja Annotation da
- // einhaengen und
- // Methode verlassen
while (iter.hasNext()) {
CEVTypeTreeNode typeNode = (CEVTypeTreeNode) iter.next();
@@ -67,11 +61,9 @@ public class CEVTypeOrderedRootTreeNode
}
}
- // Type-Node erzeugen
CEVTypeTreeNode typeNode = new CEVTypeTreeNode(this, fs.getType());
addChild(typeNode);
- // Annotation-Node erzeugen
CEVFSTreeNode node = createFSNode(typeNode, fs);
typeNode.addChild(node);
}
@@ -104,11 +96,9 @@ public class CEVTypeOrderedRootTreeNode
LinkedList<ICEVTreeNode> list = new LinkedList<ICEVTreeNode>();
- // Typ suchen
while (iter.hasNext()) {
CEVTypeTreeNode typeNode = (CEVTypeTreeNode) iter.next();
- // wenn Typ gefunden, Liste fuellen
if (typeNode.getType().equals(type)) {
Iterator<ICEVTreeNode> children = typeNode.getChildrenIterator();
@@ -126,22 +116,20 @@ public class CEVTypeOrderedRootTreeNode
* (non-Javadoc)
*
* @see
- * org.apache.uima.tm.cev.data.tree.ICEVRootTreeNode#getNodes(org.apache.uima.cas.text.AnnotationFS)
+ * org.apache.uima.tm.cev.data.tree.ICEVRootTreeNode#getNodes(org.apache.uima.cas.text.AnnotationFS
+ * )
*/
public LinkedList<ICEVTreeNode> getNodes(AnnotationFS annot) {
Iterator<ICEVTreeNode> iter = getChildrenIterator();
LinkedList<ICEVTreeNode> list = new LinkedList<ICEVTreeNode>();
- // ueber alle Knoten
while (iter.hasNext()) {
CEVTypeTreeNode typeNode = (CEVTypeTreeNode) iter.next();
- // Annotation gefunden
if (typeNode.getType().equals(annot.getType())) {
Iterator<ICEVTreeNode> children = typeNode.getChildrenIterator();
- // ueber die Kinder
while (children.hasNext()) {
CEVAnnotationTreeNode node = (CEVAnnotationTreeNode) children.next();
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/data/tree/CEVTypeTreeNode.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/data/tree/CEVTypeTreeNode.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/data/tree/CEVTypeTreeNode.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/data/tree/CEVTypeTreeNode.java Wed Aug 3 09:45:08 2011
@@ -2,34 +2,14 @@ package org.apache.uima.tm.cev.data.tree
import org.apache.uima.cas.Type;
-/**
- * Ein Node fuer einen Type
- *
- * @author Marco Nehmeier
- */
public class CEVTypeTreeNode extends CEVAbstractTreeNode {
- // der Typ
private Type type;
- /**
- * Konstruktor
- *
- * @param type
- * Type
- */
public CEVTypeTreeNode(Type type) {
this(null, type);
}
- /**
- * Konstruktor
- *
- * @param parent
- * Elternknoten
- * @param type
- * Type
- */
public CEVTypeTreeNode(ICEVTreeNode parent, Type type) {
super(parent);
this.type = type;
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/data/tree/ICEVTreeNode.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/data/tree/ICEVTreeNode.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/data/tree/ICEVTreeNode.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/data/tree/ICEVTreeNode.java Wed Aug 3 09:45:08 2011
@@ -6,76 +6,23 @@ import java.util.LinkedList;
import org.apache.uima.cas.Type;
-/**
- * Interface fuer eine TreeNode fuer die Anzeige von Typen/Annotationen in den Views
- *
- * @author Marco Nehmeier
- */
public interface ICEVTreeNode {
- /**
- * Fuegt ein Node als Kind hinzu
- *
- * @param child
- * Node
- */
public void addChild(ICEVTreeNode child);
- /**
- * Gibt alle Kindknoten zurueck
- *
- * @return Nodes
- */
public ICEVTreeNode[] getChildren();
- /**
- * Gibt einen Iterator ueber die Kinder zurueck
- *
- * @return Iterator
- */
public Iterator<ICEVTreeNode> getChildrenIterator();
- /**
- * Gibt die Stringrep. des Nodes zurueck
- *
- * @return Stringrep.
- */
public String getName();
- /**
- * Gibt den Eltern-Node zurueck
- *
- * @return Node
- */
public ICEVTreeNode getParent();
- /**
- * Sind Kinder vorhanden?
- *
- * @return Kinder ja/nein
- */
public boolean hasChildren();
- /**
- * Gibt den Typ zurueck
- *
- * @return Typ
- */
public Type getType();
- /**
- * Fuellt eine Liste mit allen Nodes aus dem (Teil)Baum in In-Order-Reihenfolge
- *
- * @param list
- * Liste
- */
public void getNodes(LinkedList<ICEVTreeNode> list);
- /**
- * Sortiert die Kinder anhand eines Comparators
- *
- * @param cp
- * Comparator
- */
public void sort(Comparator<ICEVTreeNode> cp);
}
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/dialog/CEVCollectionContentProvider.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/dialog/CEVCollectionContentProvider.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/dialog/CEVCollectionContentProvider.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/dialog/CEVCollectionContentProvider.java Wed Aug 3 09:45:08 2011
@@ -5,15 +5,6 @@ import java.util.Collection;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.Viewer;
-/**
- * Implementierung eines StructuredContentProviders fuer den Auswahldialog fuer das Typsystem beim
- * Oeffnen eines XMI-Files
- *
- * @author Marco Nehmeier
- *
- * @param <T>
- * Collection
- */
public class CEVCollectionContentProvider<T extends Collection<?>> implements
IStructuredContentProvider {
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/editor/CEVViewer.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/editor/CEVViewer.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/editor/CEVViewer.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/editor/CEVViewer.java Wed Aug 3 09:45:08 2011
@@ -55,27 +55,15 @@ import org.eclipse.ui.part.FileEditorInp
import org.eclipse.ui.part.MultiPageEditorPart;
import org.xml.sax.SAXException;
-
-/**
- * CEVViewer
- *
- * Eclipse-Plugin zum Anzeigen, Analysieren und Editieren von CAS-Annotationen in HTML-Seiten
- *
- * @author Marco Nehmeier, Peter Klügl
- */
public class CEVViewer extends MultiPageEditorPart implements IResourceChangeListener,
ICEVAnnotationListener, MouseListener, SelectionListener {
- // die TabFolder der jeweiligen CAS-Views
private CTabFolder[] folderArray;
- // CAS-Dokument
private CEVDocument casDocument;
- // aktiver View
private CEVData activeCASData;
- // dirty
private boolean dirty;
private Map<Class<?>, ICEVView> views;
@@ -96,9 +84,6 @@ public class CEVViewer extends MultiPage
private List<Type> initialVisibleTypes;
- /**
- * Erzeugt den CEVViewer
- */
public CEVViewer() {
super();
ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
@@ -111,9 +96,6 @@ public class CEVViewer extends MultiPage
artifactViewerFactories = CEVPlugin.getArtifactViewerFactories();
}
- /**
- * Erzeugt die einzelnen Seiten im MultiPageEditor
- */
@Override
protected void createPages() {
if (casDocument == null) {
@@ -176,7 +158,6 @@ public class CEVViewer extends MultiPage
@Override
public void doSave(IProgressMonitor monitor) {
CAS newCas = casDocument.getMainCas();
- // TODO enable ArtifactModifier stuff again
List<ArtifactModifier> modifiers = new ArrayList<ArtifactModifier>();
for (Integer eachIndex : casViews.keySet()) {
for (ICEVArtifactViewer each : casViews.get(eachIndex)) {
@@ -205,7 +186,6 @@ public class CEVViewer extends MultiPage
}
}
try {
- // Serialisieren und wegspeichern
IFile iFile = ((FileEditorInput) getEditorInput()).getFile();
File file = iFile.getLocation().toFile();
XmlCasSerializer.serialize(newCas, new FileOutputStream(file));
@@ -213,7 +193,6 @@ public class CEVViewer extends MultiPage
} catch (Exception e) {
CEVPlugin.error(e);
}
- // nicht mehr dirty
setDirty(false);
}
@@ -249,15 +228,6 @@ public class CEVViewer extends MultiPage
}
}
- // Job job = new Job("Initialize CAS") {
- // protected IStatus run(IProgressMonitor monitor) {
- // monitor.done();
- // return Status.OK_STATUS;
- // }
- //
- // };
- // CEVPlugin.schedule(job, getSite());
-
initialVisibleTypes = new ArrayList<Type>();
if (casDocument != null) {
Map<String, StyleMapEntry> styleMap = casDocument.getStyleMap();
@@ -276,14 +246,6 @@ public class CEVViewer extends MultiPage
getSite().getPage().closeEditor(CEVViewer.this, false);
}
- /**
- * CAS-File einlesen
- *
- * @param inputFile
- * Input-File
- * @throws PartInitException
- * Exception
- */
private void createCAS(FileEditorInput inputFile) throws PartInitException {
this.inputFile = inputFile;
try {
@@ -331,20 +293,11 @@ public class CEVViewer extends MultiPage
return dirty;
}
- /**
- * Dirty setzen
- *
- * @param dirty
- * Dirty
- */
public void setDirty(boolean dirty) {
this.dirty = dirty;
firePropertyChange(PROP_DIRTY);
}
- /**
- * Aktuallisiert den Browser oder das TextWidget wenn die Seiten gewechselt werden
- */
/*
* (non-Javadoc)
*
@@ -368,12 +321,6 @@ public class CEVViewer extends MultiPage
each.viewChanged(newPageIndex);
}
- // for (Entry<String, StyleMapEntry> each : casDocument.getStyleMap().entrySet()) {
- // Type type = casDocument.getMainCas().getTypeSystem().getType(each.getKey());
- // if (type != null) {
- // annotationStateChanged(type);
- // }
- // }
}
/*
@@ -392,7 +339,7 @@ public class CEVViewer extends MultiPage
final CEVViewer t = this;
Display display = Display.getCurrent();
if (display == null) {
- // [FIXME]
+ // [FIXME] get correct display or replace code
display = getEditorSite().getWorkbenchWindow().getShell().getDisplay();
// display = activeText.getDisplay();
@@ -579,7 +526,6 @@ public class CEVViewer extends MultiPage
* .apache.uima.cas.Type)
*/
public void colorChanged(Type type) {
- // Farbe hat sich geaendert
annotationStateChanged(type);
}
@@ -603,12 +549,6 @@ public class CEVViewer extends MultiPage
setDirty(true);
}
- /**
- * Zu einer Annotation springen
- *
- * @param annot
- * Annotation
- */
public void moveToAnnotation(AnnotationFS annot) {
int activePage = getActivePage();
int selectionIndex = folderArray[activePage].getSelectionIndex();
@@ -617,12 +557,6 @@ public class CEVViewer extends MultiPage
}
- /**
- * Selektion auf der SelektionPage anzeigen
- *
- * @param pos
- * Offset
- */
public void showSelection(int pos) {
for (ICEVView each : views.values()) {
each.newSelection(pos);
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/editor/CEVViewerContributor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/editor/CEVViewerContributor.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/editor/CEVViewerContributor.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/editor/CEVViewerContributor.java Wed Aug 3 09:45:08 2011
@@ -5,27 +5,14 @@ import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
import org.eclipse.ui.texteditor.ITextEditor;
-/**
- * MultiPageEditorActionBarContributor fuer das CEV-Plugin
- *
- * @author Marco Nehmeier
- */
public class CEVViewerContributor extends MultiPageEditorActionBarContributor {
private IEditorPart activeEditorPart;
- /**
- * Konstruktor
- */
public CEVViewerContributor() {
super();
}
- /**
- * Gibt die reg. Action zurueck
- *
- * @return IAction oder null.
- */
protected IAction getAction(ITextEditor editor, String actionID) {
return (editor == null ? null : editor.getAction(actionID));
}
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/preferences/CEVAnnotationFilterEditor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/preferences/CEVAnnotationFilterEditor.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/preferences/CEVAnnotationFilterEditor.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/preferences/CEVAnnotationFilterEditor.java Wed Aug 3 09:45:08 2011
@@ -6,27 +6,8 @@ import org.eclipse.jface.window.Window;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
-/**
- * ListEditor fuer Filterung der Annotationen
- *
- * Ein Filterstring wird in RegEx editiert. Die einzelnen Filterstrings werden mit "|" (oder in
- * RegEx) zusammengefuegt und in den Preferences gespeichert
- *
- * @author Marco Nehmeier
- *
- */
public class CEVAnnotationFilterEditor extends ListEditor {
- /**
- * Konstruktor
- *
- * @param name
- * Name
- * @param labelText
- * Labletext
- * @param parent
- * Uebergeordnetes Composite
- */
public CEVAnnotationFilterEditor(String name, String labelText, Composite parent) {
super(name, labelText, parent);
}
@@ -40,7 +21,6 @@ public class CEVAnnotationFilterEditor e
protected String createList(String[] items) {
StringBuffer strBuffer = new StringBuffer();
- // Strings mit "|" zusammenhaengen
for (int i = 0; i < items.length; i++) {
strBuffer.append(items[i]);
if (i < items.length - 1)
@@ -57,7 +37,6 @@ public class CEVAnnotationFilterEditor e
*/
@Override
protected String getNewInputObject() {
- // Inputdialog zum eingeben des Strings
InputDialog dlg = new InputDialog(Display.getCurrent().getActiveShell(), "Annotation Type",
"Enter Annotation Type Name", null, null);
if (dlg.open() == Window.OK) {
@@ -74,7 +53,6 @@ public class CEVAnnotationFilterEditor e
*/
@Override
protected String[] parseString(String stringList) {
- // bei den "|" aufspliten
return stringList.split("\\|");
}
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/preferences/CEVPreferenceConstants.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/preferences/CEVPreferenceConstants.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/preferences/CEVPreferenceConstants.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/preferences/CEVPreferenceConstants.java Wed Aug 3 09:45:08 2011
@@ -1,39 +1,24 @@
package org.apache.uima.tm.cev.preferences;
-/**
- * Konstanten fuer die Preferences
- *
- * @author Marco Nehmeier
- *
- */
public class CEVPreferenceConstants {
- // Anntotation-Filter
public static final String P_ANNOTATION_FILTER = "annotationFilter";
- // Annotation-Repr.
public static final String P_ANNOTATION_REPR = "annotationRpr";
- // HTML
public static final String P_ANNOTATION_REPR_HTML = "html";
- // Text
public static final String P_ANNOTATION_REPR_TEXT = "text";
- // Werte fuer Repr.
public static final String[][] P_ANNOTATION_REPR_VALUES = new String[][] {
{ "&HTML", P_ANNOTATION_REPR_HTML }, { "&Text", P_ANNOTATION_REPR_TEXT } };
- // Baumordnung
public static final String P_ANNOTATION_BROWSER_TREE_ORDER = "annotationBrowserTreeOrder";
- // Typ
public static final String P_ANNOTATION_BROWSER_TREE_ORDER_TYPE = "type";
- // Annot
public static final String P_ANNOTATION_BROWSER_TREE_ORDER_ANNOT = "annot";
- // Werte fuer Baumordnung
public static final String[][] P_ANNOTATION_BROWSER_TREE_ORDER_VALUE = new String[][] {
{ "&Type Ordered", P_ANNOTATION_BROWSER_TREE_ORDER_TYPE },
{ "&Annotation Ordered", P_ANNOTATION_BROWSER_TREE_ORDER_ANNOT } };
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/preferences/CEVPreferenceInitializer.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/preferences/CEVPreferenceInitializer.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/preferences/CEVPreferenceInitializer.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/preferences/CEVPreferenceInitializer.java Wed Aug 3 09:45:08 2011
@@ -4,12 +4,6 @@ import org.apache.uima.tm.cev.CEVPlugin;
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * Setzt die Default-Werte bei den Preferences
- *
- * @author Marco Nehmeier
- */
public class CEVPreferenceInitializer extends AbstractPreferenceInitializer {
/*
@@ -22,11 +16,9 @@ public class CEVPreferenceInitializer ex
public void initializeDefaultPreferences() {
IPreferenceStore store = CEVPlugin.getDefault().getPreferenceStore();
- // Textrepresentation auf nur Text (HTML-Tags filtern)
store.setDefault(CEVPreferenceConstants.P_ANNOTATION_REPR,
CEVPreferenceConstants.P_ANNOTATION_REPR_TEXT);
- // Baumordnung nach Typen
store.setDefault(CEVPreferenceConstants.P_ANNOTATION_BROWSER_TREE_ORDER,
CEVPreferenceConstants.P_ANNOTATION_BROWSER_TREE_ORDER_TYPE);
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/preferences/CEVViewerAnnotationFilterPreferencePage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/preferences/CEVViewerAnnotationFilterPreferencePage.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/preferences/CEVViewerAnnotationFilterPreferencePage.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/preferences/CEVViewerAnnotationFilterPreferencePage.java Wed Aug 3 09:45:08 2011
@@ -5,26 +5,14 @@ import org.eclipse.jface.preference.Fiel
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * PreferencePage zum Einstellen von Filterfunktionen fuer die Annotationen
- *
- * @author Marco Nehmeier
- */
public class CEVViewerAnnotationFilterPreferencePage extends FieldEditorPreferencePage implements
IWorkbenchPreferencePage {
- /**
- * Konstruktor
- */
public CEVViewerAnnotationFilterPreferencePage() {
super(GRID);
setPreferenceStore(CEVPlugin.getDefault().getPreferenceStore());
}
- /**
- * Erzeugt die Editor-Felder
- */
@Override
public void createFieldEditors() {
addField(new CEVAnnotationFilterEditor(CEVPreferenceConstants.P_ANNOTATION_FILTER,
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/preferences/CEVViewerTreeViewPreferencePage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/preferences/CEVViewerTreeViewPreferencePage.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/preferences/CEVViewerTreeViewPreferencePage.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/preferences/CEVViewerTreeViewPreferencePage.java Wed Aug 3 09:45:08 2011
@@ -7,27 +7,14 @@ import org.eclipse.jface.preference.Radi
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * PreferencePage zum Einstellen der Baumordnung in den Views - nach Typ geordnet - nach Position
- * hierarchisch geordnet
- *
- * @author Marco Nehmeier
- */
public class CEVViewerTreeViewPreferencePage extends FieldEditorPreferencePage implements
IWorkbenchPreferencePage {
- /**
- * Konstruktor
- */
public CEVViewerTreeViewPreferencePage() {
super(GRID);
setPreferenceStore(CEVPlugin.getDefault().getPreferenceStore());
}
- /**
- * Erzeugt die Editor-Felder
- */
@Override
public void createFieldEditors() {
RadioGroupFieldEditor editor = new RadioGroupFieldEditor(
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/searchStrategy/CEVCollectionContentProvider.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/searchStrategy/CEVCollectionContentProvider.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/searchStrategy/CEVCollectionContentProvider.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/searchStrategy/CEVCollectionContentProvider.java Wed Aug 3 09:45:08 2011
@@ -5,15 +5,6 @@ import java.util.Collection;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.Viewer;
-/**
- * Implementierung eines StructuredContentProviders fuer den Auswahldialog fuer das Typsystem beim
- * Oeffnen eines XMI-Files
- *
- * @author Marco Nehmeier
- *
- * @param <T>
- * Collection
- */
public class CEVCollectionContentProvider<T extends Collection<?>> implements
IStructuredContentProvider {
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/CEVAnnotationTreeViewContentProvider.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/CEVAnnotationTreeViewContentProvider.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/CEVAnnotationTreeViewContentProvider.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/CEVAnnotationTreeViewContentProvider.java Wed Aug 3 09:45:08 2011
@@ -5,12 +5,6 @@ import org.apache.uima.tm.cev.data.tree.
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
-
-/**
- * ContentProvider fuer den TreeView
- *
- * @author Marco Nehmeier
- */
public class CEVAnnotationTreeViewContentProvider implements ITreeContentProvider {
/*
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/CEVAnnotationTreeViewDragListener.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/CEVAnnotationTreeViewDragListener.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/CEVAnnotationTreeViewDragListener.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/CEVAnnotationTreeViewDragListener.java Wed Aug 3 09:45:08 2011
@@ -7,7 +7,6 @@ import org.eclipse.jface.viewers.Structu
import org.eclipse.swt.dnd.DragSourceAdapter;
import org.eclipse.swt.dnd.DragSourceEvent;
-
public class CEVAnnotationTreeViewDragListener extends DragSourceAdapter {
private StructuredViewer viewer;
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/CEVAnnotationTreeViewLableProvider.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/CEVAnnotationTreeViewLableProvider.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/CEVAnnotationTreeViewLableProvider.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/CEVAnnotationTreeViewLableProvider.java Wed Aug 3 09:45:08 2011
@@ -15,54 +15,29 @@ import org.eclipse.swt.graphics.Image;
import org.htmlparser.util.ParserUtils;
import org.htmlparser.util.Translate;
-
-/**
- * LableProvider fuer den TreeView
- *
- * @author Marco Nehmeier
- */
public class CEVAnnotationTreeViewLableProvider extends LabelProvider implements ILabelProvider {
- // zugrundeliegende CASData
private CEVData casData;
- // Textrep
private boolean text_repr;
- /**
- * Konstruktor
- *
- * @param casData
- * CASData
- */
public CEVAnnotationTreeViewLableProvider(CEVData casData) {
this.casData = casData;
setTextRepr();
}
- /**
- * setzen der Textrep anhand der Preferences
- */
public void setTextRepr() {
IPreferenceStore store = CEVPlugin.getDefault().getPreferenceStore();
String repr = store.getString(CEVPreferenceConstants.P_ANNOTATION_REPR);
- // Text
if (repr.equals(CEVPreferenceConstants.P_ANNOTATION_REPR_TEXT))
text_repr = true;
- // mit HTML-Tags
else if (repr.equals(CEVPreferenceConstants.P_ANNOTATION_REPR_HTML))
text_repr = false;
else
text_repr = true;
}
- /**
- * aktuelle CAS setzen
- *
- * @param casData
- * CAS
- */
public void setCASData(CEVData casData) {
this.casData = casData;
}
@@ -101,8 +76,8 @@ public class CEVAnnotationTreeViewLableP
String name = ((ICEVTreeNode) element).getName();
if (name != null && text_repr) {
- name = ParserUtils.trimSpacesBeginEnd(ParserUtils
- .trimAllTags(Translate.decode(name), false), "");
+ name = ParserUtils.trimSpacesBeginEnd(
+ ParserUtils.trimAllTags(Translate.decode(name), false), "");
name = name.replaceAll("[\\n]", "").replaceAll("[\\r]", "");
}
if (element instanceof CEVTypeTreeNode) {
@@ -120,7 +95,6 @@ public class CEVAnnotationTreeViewLableP
} else if (element instanceof CEVTypeTreeNode) {
text += " [" + ((CEVTypeTreeNode) element).getChildren().length + "]";
} else {
- // System.out.println(text);
}
}
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/CEVAnnotationTreeViewPage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/CEVAnnotationTreeViewPage.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/CEVAnnotationTreeViewPage.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/CEVAnnotationTreeViewPage.java Wed Aug 3 09:45:08 2011
@@ -53,21 +53,10 @@ import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.ui.part.IPageSite;
import org.eclipse.ui.part.Page;
-
-/**
- * TreeViewPage mit ToolTip-Unterstuetzung
- *
- * @author Marco Nehmeier
- */
public abstract class CEVAnnotationTreeViewPage extends Page implements ICEVViewPage,
ICEVAnnotationListener, MouseListener, IDoubleClickListener, IPropertyChangeListener,
ICEVView, Listener {
- /**
- * ToolTip-Listener
- *
- * @author Marco Nehmeier
- */
private class ToolTipListener implements Listener {
private static final String TOOLTIP_TEXT_END = "\nEnd: ";
@@ -80,12 +69,6 @@ public abstract class CEVAnnotationTreeV
private Tree tree;
- /**
- * Konstruktor
- *
- * @param tree
- * zugrundeliegender Tree
- */
private ToolTipListener(Tree tree) {
this.tree = tree;
}
@@ -99,7 +82,6 @@ public abstract class CEVAnnotationTreeV
switch (event.type) {
case SWT.Dispose:
case SWT.KeyDown:
- // beim Verlassen Tip wieder freigeben
case SWT.MouseMove: {
if (tip == null)
break;
@@ -108,39 +90,29 @@ public abstract class CEVAnnotationTreeV
label = null;
break;
}
- // ToolTip anzeigen
case SWT.MouseHover: {
- // TreeItem bestimmen
TreeItem item = tree.getItem(new Point(event.x, event.y));
if (item != null && item.getData() instanceof CEVAnnotationTreeNode) {
- // Alten Tip freigeben
if (tip != null && !tip.isDisposed())
tip.dispose();
- // Tip erzeugen
tip = new Shell(Display.getCurrent().getActiveShell(), SWT.ON_TOP | SWT.NO_FOCUS
| SWT.TOOL);
- // Farben setzen
tip.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
FillLayout layout = new FillLayout();
layout.marginWidth = 2;
tip.setLayout(layout);
- // Lable
label = new Label(tip, SWT.NONE);
label.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_INFO_FOREGROUND));
label.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
AnnotationFS annot = ((CEVAnnotationTreeNode) item.getData()).getAnnotation();
- // Text setzten
- label
- .setText(TOOLTIP_TEXT_BEGIN + annot.getBegin() + TOOLTIP_TEXT_END
- + annot.getEnd());
+ label.setText(TOOLTIP_TEXT_BEGIN + annot.getBegin() + TOOLTIP_TEXT_END + annot.getEnd());
- // Zeichnen
Point size = tip.computeSize(SWT.DEFAULT, SWT.DEFAULT);
Rectangle rect = item.getBounds(0);
Point pt = tree.toDisplay(rect.x, rect.y);
@@ -168,14 +140,6 @@ public abstract class CEVAnnotationTreeV
private Composite overlay;
- /**
- * Konstruktor
- *
- * @param casView
- * CASViewer
- * @param casData
- * CASData
- */
public CEVAnnotationTreeViewPage(CEVViewer casView, CEVDocument casDocument, int index) {
super();
this.casView = casView;
@@ -208,7 +172,6 @@ public abstract class CEVAnnotationTreeV
layout.verticalSpacing = 0;
layout.marginWidth = 0;
layout.marginHeight = 0;
- // FillLayout layout = new FillLayout(SWT.VERTICAL);
overlay.setLayout(layout);
filterTextField = new Text(overlay, SWT.SINGLE | SWT.BORDER);
@@ -228,12 +191,10 @@ public abstract class CEVAnnotationTreeV
treeView.setContentProvider(new CEVAnnotationTreeViewContentProvider());
lableProvider = new CEVAnnotationTreeViewLableProvider(casData);
treeView.setLabelProvider(lableProvider);
- // Listender registrieren
treeView.addCheckStateListener(casData);
treeView.addDoubleClickListener(this);
treeView.getTree().addMouseListener(this);
- // ToolTip Listener
ToolTipListener tl = new ToolTipListener(treeView.getTree());
treeView.getTree().addListener(SWT.Dispose, tl);
@@ -269,20 +230,10 @@ public abstract class CEVAnnotationTreeV
return overlay;
}
- /**
- * Gibt den TreeView zurueck
- *
- * @return TreeView
- */
public CheckboxTreeViewer getTreeViewer() {
return treeView;
}
- /**
- * Gibt die CASData zurueck
- *
- * @return CASData
- */
public CEVData getCasData() {
return casData;
}
@@ -297,12 +248,6 @@ public abstract class CEVAnnotationTreeV
overlay.setFocus();
}
- /**
- * CAS-View hat sich geaendert
- *
- * @param index
- * Index des Views
- */
public void viewChanged(int newIndex) {
treeView.removeCheckStateListener(casData);
casData.removeAnnotationListener(this);
@@ -324,7 +269,6 @@ public abstract class CEVAnnotationTreeV
if (treeView.getInput() == null)
return;
- // Selektionen verwalten
Object input = treeView.getInput();
if (input instanceof ICEVRootTreeNode)
@@ -347,7 +291,6 @@ public abstract class CEVAnnotationTreeV
if (treeView.getInput() == null)
return;
- // Selektionen verwalten
Object input = treeView.getInput();
if (input instanceof ICEVRootTreeNode)
@@ -376,7 +319,6 @@ public abstract class CEVAnnotationTreeV
* .jface.viewers.DoubleClickEvent)
*/
public void doubleClick(DoubleClickEvent event) {
- // An Position im Dokument springen
if (event.getSelection() != null && event.getSelection() instanceof ITreeSelection) {
Object treeNode = ((ITreeSelection) event.getSelection()).getFirstElement();
if (treeNode instanceof CEVAnnotationTreeNode) {
@@ -410,7 +352,6 @@ public abstract class CEVAnnotationTreeV
TreeItem[] items = treeView.getTree().getSelection();
HashSet<AnnotationFS> annots = new HashSet<AnnotationFS>();
- // Annot selektieren
for (TreeItem it : items) {
if (it.getData() instanceof CEVAnnotationTreeNode) {
CEVAnnotationTreeNode annot = (CEVAnnotationTreeNode) it.getData();
@@ -427,7 +368,6 @@ public abstract class CEVAnnotationTreeV
}
}
- // Loeschen
casData.removeAnnotations(annots.toArray(new AnnotationFS[annots.size()]));
}
}
@@ -438,13 +378,11 @@ public abstract class CEVAnnotationTreeV
* @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events .MouseEvent)
*/
public void mouseDown(final MouseEvent mouseEvent) {
- // Kontext-Menue anzeigen
if (mouseEvent.button == 3) {
Display display = Display.getCurrent();
Menu menu = new Menu(display.getActiveShell(), SWT.POP_UP);
MenuItem itemFgC = new MenuItem(menu, SWT.PUSH);
- // Schriftfarbe
itemFgC.setText("Change Font Color");
itemFgC.addListener(SWT.Selection, new Listener() {
public void handleEvent(Event e) {
@@ -463,7 +401,6 @@ public abstract class CEVAnnotationTreeV
}
});
- // Hintergrundfarbe
MenuItem itemBgC = new MenuItem(menu, SWT.PUSH);
itemBgC.setText("Change Background Color");
itemBgC.addListener(SWT.Selection, new Listener() {
@@ -484,7 +421,6 @@ public abstract class CEVAnnotationTreeV
}
});
- // Nur wenn Typ oder Annotation ausgewaehlt Menupunkte anzeigen
TreeItem item = treeView.getTree().getItem(new Point(mouseEvent.x, mouseEvent.y));
if (item != null && item.getData() instanceof CEVFeatureTreeNode) {
itemBgC.setEnabled(false);
@@ -493,7 +429,6 @@ public abstract class CEVAnnotationTreeV
new MenuItem(menu, SWT.SEPARATOR);
- // Annot loeschen
MenuItem itemDelA = new MenuItem(menu, SWT.PUSH);
itemDelA.setText("Delete selected Items");
itemDelA.addListener(SWT.Selection, new Listener() {
@@ -502,8 +437,6 @@ public abstract class CEVAnnotationTreeV
}
});
- // Pruefen ob ueberhaupt etwas (Typ und/oder Annot) zum Loeschen
- // selektiert => anzeigen des Menupunktes
itemDelA.setEnabled(false);
TreeItem[] items = treeView.getTree().getSelection();
for (TreeItem ti : items)
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/CEVPageBookView.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/CEVPageBookView.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/CEVPageBookView.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/CEVPageBookView.java Wed Aug 3 09:45:08 2011
@@ -10,23 +10,10 @@ import org.eclipse.ui.part.MessagePage;
import org.eclipse.ui.part.PageBook;
import org.eclipse.ui.part.PageBookView;
-/**
- * Abstrakter PageBookView fuer den AnnotationBrowser und den SelectionView.
- *
- * @author Marco Nehmeier
- */
public abstract class CEVPageBookView extends PageBookView {
- /**
- * Text wenn kein View vom Editor zur Verfuegung gestellt wird.
- */
private static final String VIEW_IS_NOT_AVAILABLE = "View is not available.";
- // private PageRec last = null;
-
- /**
- * Defaultkonstruktor.
- */
public CEVPageBookView() {
super();
}
@@ -38,7 +25,6 @@ public abstract class CEVPageBookView ex
*/
@Override
protected IPage createDefaultPage(PageBook book) {
- // MessagePage wenn der View nicht zur Verfuegung steht
MessagePage page = new MessagePage();
initPage(page);
page.createControl(book);
@@ -46,15 +32,6 @@ public abstract class CEVPageBookView ex
return page;
}
- /**
- * Erzeugt die jeweilige Page
- *
- * @param part
- * zugrundeliegender WorkbenchPart
- * @param clazz
- * Klasse der Page
- * @return PageRec
- */
protected PageRec doCreatePage(IWorkbenchPart part, final Class<?> clazz) {
Object obj = ViewsPlugin.getAdapter(part, clazz, false);
if (obj instanceof ICEVViewPage) {
@@ -71,12 +48,6 @@ public abstract class CEVPageBookView ex
}
}
- //
- // public void dispose() {
- // last.dispose();
- // super.dispose();
- // }
-
/*
* (non-Javadoc)
*
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/ICEVViewPage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/ICEVViewPage.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/ICEVViewPage.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/ICEVViewPage.java Wed Aug 3 09:45:08 2011
@@ -2,10 +2,5 @@ package org.apache.uima.tm.cev.views;
import org.eclipse.ui.part.IPageBookViewPage;
-/**
- * Interface fuer die PageBookViews fuer Views von CASViewer
- *
- * @author Marco Nehmeier
- */
public interface ICEVViewPage extends IPageBookViewPage {
}
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/annotationBrowser/CEVAnnotationBrowserPage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/annotationBrowser/CEVAnnotationBrowserPage.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/annotationBrowser/CEVAnnotationBrowserPage.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/annotationBrowser/CEVAnnotationBrowserPage.java Wed Aug 3 09:45:08 2011
@@ -22,37 +22,17 @@ import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
-
-/**
- * Page fuer den AnnotationBrowserView
- *
- * @author Marco Nehmeier
- */
public class CEVAnnotationBrowserPage extends CEVAnnotationTreeViewPage implements
ICEVAnnotationBrowserPage {
- // Enum fuer den Zustand des Baums
private enum State {
- // Nach Anfangs und Endposition dern Annotation
- AnnotationOrdered,
- // Nach Annotations-Typen
- TypeOrdered
+ AnnotationOrdered, TypeOrdered
}
- // Zustand des Baums
private State state;
- // Icon der Action
private Image icon;
- /**
- * Konstruktor
- *
- * @param casView
- * CASViewer
- * @param casData
- * CASData
- */
public CEVAnnotationBrowserPage(CEVViewer casView, CEVDocument casDocument, int index) {
super(casView, casDocument, index);
}
@@ -67,7 +47,6 @@ public class CEVAnnotationBrowserPage ex
public void createControl(Composite parent) {
super.createControl(parent);
- // Annotationen im Baum anzeigen .... TypeOrdered und Zustand setzen
getTreeViewer().setInput(getCasData().getTypeOrderedTree(""));
getTreeViewer().getControl().addKeyListener(new KeyAdapter() {
@@ -91,9 +70,6 @@ public class CEVAnnotationBrowserPage ex
}
}
- /**
- * Baumordnung festlegen
- */
private void setTreeOrder() {
IPreferenceStore store = CEVPlugin.getDefault().getPreferenceStore();
String treeOrder = store.getString(CEVPreferenceConstants.P_ANNOTATION_BROWSER_TREE_ORDER);
@@ -106,64 +82,6 @@ public class CEVAnnotationBrowserPage ex
state = State.TypeOrdered;
}
- /**
- * Aus Performance-gruenden abgeschaltet
- */
- // /*
- // * (non-Javadoc)
- // *
- // * @see org.eclipse.ui.part.Page#setActionBars(org.eclipse.ui.IActionBars)
- // */
- // public void setActionBars(IActionBars actionBars) {
- // // Action zum Baumveraendern erzeugen
- // Action treeChangeAction = new Action() {
- // public void run() {
- // // Baum umsortieren
- // if (state == State.TypeOrdered) {
- // // getTreeViewer().setInput(getCasData().getAnnotationOrderedTree());
- // state = State.AnnotationOrdered;
- // } else if (state == State.AnnotationOrdered) {
- // // getTreeViewer().setInput(getCasData().getTypeOrderedTree());
- // state = State.TypeOrdered;
- // }
- //
- // // updateSelektion();
- // reloadTree();
- // }
- // };
- //
- // // ToolTip
- // treeChangeAction.setToolTipText("Change TreeView-Order");
- //
- // // Icon laden
- // InputStream in = getClass().getResourceAsStream(
- // "/icons/hierarchicalLayout.gif");
- // if (in != null) {
- // try {
- // icon = new Image(Display.getCurrent(), in);
- // } catch (SWTException e) {
- // if (e.code != SWT.ERROR_INVALID_IMAGE) {
- // throw e;
- // // fall through otherwise
- // }
- // } finally {
- // try {
- // in.close();
- // } catch (IOException e) {
- // }
- // }
- // }
- //
- // // Icon setzen
- // treeChangeAction.setImageDescriptor(
- // ImageDescriptor.createFromImage(icon));
- //
- // // Action in die ToolBar setzen
- // actionBars.getToolBarManager().add(treeChangeAction);
- // }
- /**
- * Selektion aktuallisieren
- */
private void updateSelection() {
// Selektionen aktuallisieren
Object input = getTreeViewer().getInput();
@@ -198,9 +116,6 @@ public class CEVAnnotationBrowserPage ex
reloadTree();
}
- /**
- * Baum neu laden
- */
private void reloadTree() {
if (state == State.TypeOrdered) {
getTreeViewer().setInput(getCasData().getTypeOrderedTree(manualTypeFilter));
@@ -217,7 +132,6 @@ public class CEVAnnotationBrowserPage ex
*/
@Override
public void dispose() {
- // Icon freigeben
if (icon != null)
icon.dispose();
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/editor/CEVAnnotationEditorPage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/editor/CEVAnnotationEditorPage.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/editor/CEVAnnotationEditorPage.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/editor/CEVAnnotationEditorPage.java Wed Aug 3 09:45:08 2011
@@ -48,7 +48,6 @@ import org.eclipse.ui.part.Page;
import org.htmlparser.util.ParserUtils;
import org.htmlparser.util.Translate;
-
public class CEVAnnotationEditorPage extends Page implements ICEVAnnotationEditorPage,
MouseListener, SelectionListener, IPropertyChangeListener, ICEVEditor, Listener {
@@ -109,28 +108,15 @@ public class CEVAnnotationEditorPage ext
private List<String> selected;
- /**
- * Konstruktor
- *
- * @param casView
- * CASViewer
- * @param casData
- * CASData
- */
public CEVAnnotationEditorPage(CEVViewer casView, CEVDocument casDocument, int index) {
super();
current = index;
- // Textrep. setzen
setTextRepr();
- // cas setzen
this.casDocument = casDocument;
selections = new ArrayList<Selection>();
}
- /**
- * Textdarstellung aus den Preferences auslesen
- */
private void setTextRepr() {
IPreferenceStore store = CEVPlugin.getDefault().getPreferenceStore();
String repr = store.getString(CEVPreferenceConstants.P_ANNOTATION_REPR);
@@ -166,18 +152,6 @@ public class CEVAnnotationEditorPage ext
FormData formData;
pane.setLayout(formLayout);
- /*
- * Label label = new Label(pane, SWT.CENTER); label.setText("Type:"); formData = new FormData();
- * formData.left = new FormAttachment(0, 5); formData.bottom = new FormAttachment(100, -5);
- * label.setLayoutData(formData);
- */
-
- /*
- * combo = new Combo(pane, SWT.READ_ONLY | SWT.DROP_DOWN); formData = new FormData();
- * formData.left = new FormAttachment(label, 5); formData.bottom = new FormAttachment(100, -5);
- * formData.width = 300; combo.setLayoutData(formData);
- */
-
createButton = new Button(pane, SWT.PUSH);
createButton.addSelectionListener(this);
createButton.setText("Create Annotations");
@@ -186,14 +160,6 @@ public class CEVAnnotationEditorPage ext
formData.bottom = new FormAttachment(100, -5);
createButton.setLayoutData(formData);
- /*
- * composite = new Composite(parent, SWT.NONE); GridLayout gridLayout = new GridLayout();
- * gridLayout.numColumns = 2; composite.setLayout(gridLayout); formData = new FormData();
- * formData.top = new FormAttachment(0, 0); formData.left = new FormAttachment(0, 0);
- * formData.right = new FormAttachment(100, 0); composite.setLayoutData(formData); GridData
- * gridData;
- */
-
SashForm sashForm2 = new SashForm(pane, SWT.HORIZONTAL);
formData = new FormData();
formData.top = new FormAttachment(0, 0);
@@ -218,23 +184,6 @@ public class CEVAnnotationEditorPage ext
textView = new StyledText(sashForm, SWT.READ_ONLY | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
textView.addMouseListener(this);
- // Label placeHolder = new Label(sashForm2, SWT.FILL);
- // placeHolder.setText("under construction");
-
- // sc = new ScrolledComposite(sashForm2, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- // compi = new Composite(sc, SWT.NONE);
- // compi.setLayout(new GridLayout());
- // // GridData gridData = new GridData();
- //
- // compi.addMouseListener(this);
- // sc.setExpandHorizontal(true);
- // sc.setExpandVertical(true);
- // sc.setMinSize(compi.computeSize(SWT.DEFAULT, SWT.DEFAULT));
- // sc.setContent(compi);
-
- // final int maxTitleLength = updateTypes();
- // updateControl(maxTitleLength);
-
selected = new ArrayList<String>();
types = new ArrayList<String>(Arrays.asList(getCurrentCEVData().getTypeNames()));
Collections.sort(types);
@@ -254,10 +203,6 @@ public class CEVAnnotationEditorPage ext
((GridData) typeTable.getLayoutData()).minimumHeight = 100;
typeFilterText.addListener(SWT.CHECK, this);
displayFilteredTypes("");
- //
- // Point computeSize = typeComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- // typeComposite.setSize(computeSize);
- // System.out.println(computeSize);
sashForm.setWeights(new int[] { 1, 1 });
sashForm2.setWeights(new int[] { 2, 1 });
@@ -309,12 +254,6 @@ public class CEVAnnotationEditorPage ext
return t;
}
- /**
- * CAS hat sich geaendert
- *
- * @param casData
- * CAS
- */
public void casDataChanged() {
table.removeAll();
selections.clear();
@@ -327,14 +266,6 @@ public class CEVAnnotationEditorPage ext
}
}
- /**
- * Selektion anzeigen
- *
- * @param start
- * Startpos
- * @param end
- * Endpos
- */
public void textSelected(int start, int end) {
String text = getCurrentCEVData().getDocumentText().substring(start, end);
@@ -354,31 +285,22 @@ public class CEVAnnotationEditorPage ext
text = getCurrentCEVData().getDocumentText().substring(start, end);
}
- // Selektion vermerken
selections.add(new Selection(start, end));
TableItem item = new TableItem(table, SWT.NONE);
- // Selektierten Text in Tabelle aufnehmen
- // und wenn noetig HTML-Tags filtern
if (text_repr)
text = ParserUtils.trimSpacesBeginEnd(ParserUtils.trimAllTags(Translate.decode(text), false),
"");
item.setText(text);
- // table.getColumn(0).pack();
}
- /**
- * Selektion anzeigen
- */
private void paintSelection() {
int index = table.getSelectionIndex();
- // Wenn in der Tabelle was ausgewaehlt
if (index >= 0) {
Selection sel = selections.get(index);
if (sel.getStart() >= 0 && sel.getStart() <= sel.getEnd()
&& sel.getEnd() < textView.getCharCount()) {
- // Stylerange anzeigen
textView.setStyleRanges(new int[] { sel.getStart(), sel.getEnd() - sel.getStart() },
new StyleRange[] { new StyleRange(sel.getStart(), sel.getEnd() - sel.getStart(),
Display.getCurrent().getSystemColor(SWT.COLOR_LIST_SELECTION_TEXT), Display
@@ -392,16 +314,10 @@ public class CEVAnnotationEditorPage ext
}
}
- /**
- * alle Selektionen loeschen
- */
private void clearAll() {
casDataChanged();
}
- /**
- * aktive Selektion entfernen
- */
private void deleteSelected() {
int index = table.getSelectionIndex();
@@ -467,12 +383,10 @@ public class CEVAnnotationEditorPage ext
* @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events .MouseEvent)
*/
public void mouseDown(MouseEvent event) {
- // rechte Maustaste in Tabelle => Kontextmenu
if (event.getSource() == table && event.button == 3) {
Display display = Display.getCurrent();
Menu menu = new Menu(display.getActiveShell(), SWT.POP_UP);
- // aktive Selektion loeschen
MenuItem itemFgDeleteSelected = new MenuItem(menu, SWT.PUSH);
itemFgDeleteSelected.setText("Delete Selection");
@@ -482,7 +396,6 @@ public class CEVAnnotationEditorPage ext
}
});
- // alle Selektionen loeschen
MenuItem itemFgClearAll = new MenuItem(menu, SWT.PUSH);
itemFgClearAll.setText("Clear All");
@@ -500,13 +413,10 @@ public class CEVAnnotationEditorPage ext
}
menu.dispose();
- // Selektion in der Detailansicht veraendern
} else if (event.getSource() == textView && event.button == 1 && table.getSelectionIndex() >= 0) {
Selection sel = selections.get(table.getSelectionIndex());
try {
- // Anhand der Mausposition feststellen ob Anfang oder Ender der
- // Selektion veraendert wird
int pos = textView.getOffsetAtLocation(new Point(event.x, event.y));
if (pos == sel.getStart())
dragState = Drag.start;
@@ -526,7 +436,6 @@ public class CEVAnnotationEditorPage ext
* @seeorg.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events. MouseEvent)
*/
public void mouseUp(MouseEvent event) {
- // Veraendern der Selektionen
if (event.getSource() == textView) {
if (event.button == 1 && dragState != Drag.none) {
Selection sel = selections.get(table.getSelectionIndex());
@@ -534,35 +443,29 @@ public class CEVAnnotationEditorPage ext
try {
int pos = textView.getOffsetAtLocation(new Point(event.x, event.y));
- // Start der Selektion wurde veraendert
if (dragState == Drag.start && pos >= 0 && pos < sel.getEnd()) {
sel.setStart(pos);
String text = getCurrentCEVData().getDocumentText().substring(sel.getStart(),
sel.getEnd());
- // HTML-Tags filtern
if (text_repr)
- text = ParserUtils.trimSpacesBeginEnd(ParserUtils.trimAllTags(Translate.decode(text),
- false), "");
+ text = ParserUtils.trimSpacesBeginEnd(
+ ParserUtils.trimAllTags(Translate.decode(text), false), "");
table.getItem(table.getSelectionIndex()).setText(text);
- // table.getColumn(0).pack();
- // Ender der Selektion wurde veraendert
} else if (dragState == Drag.end && pos > sel.getStart() && pos < textView.getCharCount()) {
sel.setEnd(pos);
String text = getCurrentCEVData().getDocumentText().substring(sel.getStart(),
sel.getEnd());
- // HTML-Tags filtern
if (text_repr)
- text = ParserUtils.trimSpacesBeginEnd(ParserUtils.trimAllTags(Translate.decode(text),
- false), "");
+ text = ParserUtils.trimSpacesBeginEnd(
+ ParserUtils.trimAllTags(Translate.decode(text), false), "");
table.getItem(table.getSelectionIndex()).setText(text);
- // table.getColumn(0).pack();
}
} catch (IllegalArgumentException e) {
}
@@ -588,14 +491,11 @@ public class CEVAnnotationEditorPage ext
* .events.SelectionEvent)
*/
public void widgetSelected(SelectionEvent e) {
- // Auswahl in der Tabelle
if (e.getSource() == table) {
dragState = Drag.none;
- // aktive Selektion anzeigen
paintSelection();
- // Annotationen erzeugen
} else if (e.getSource() == createButton) {
for (String each : selected) {
Type t = getCurrentCEVData().getCAS().getTypeSystem().getType(each);
@@ -605,23 +505,6 @@ public class CEVAnnotationEditorPage ext
}
}
- // Iterator<AnnotationTypeCheckButtonPanel> buttonIter = toggleButtons.listIterator();
- // while (buttonIter.hasNext()) {
- // AnnotationTypeCheckButtonPanel buttonPanel = buttonIter.next();
- // if (buttonPanel.getButton().getSelection() == true) {
- // }
- // }
- /*
- * Iterator<Type> iter = types.iterator();
- *
- * while (iter.hasNext()) { Type t = iter.next(); for (Selection s : selections)
- * casData.addAnnotation(t, s.getStart(), s.getEnd(), !iter.hasNext()); }
- */
- /*
- * Type t = casData.getTypeByIndex(combo.getSelectionIndex());
- *
- * for (Selection s : selections) casData.addAnnotation(t, s.getStart(), s.getEnd());
- */
clearAll();
}
@@ -639,69 +522,6 @@ public class CEVAnnotationEditorPage ext
}
}
- // private int updateTypes() {
- // // int maxTitleLength = 0;
- // // int size = casData.getTypeNames().length;
- // // for (int i =0; i < size; i++) {
- // // String typeName = casData.getTypeByIndex(i).getName();
- // // if (!(type.getName().startsWith(
- // // "de.uniwue.tm.textmarker.kernel.type")
- // // || type.getName().startsWith("de.uniwue.tm.type")
- // // || type.getName().startsWith("uima.cas") || type.getName()
- // // .startsWith("uima.tcas"))) {
- // // types.add(casData.getTypeByIndex(i));
- // // if (maxTitleLength < typeName.length()) {
- // // maxTitleLength = typeName.length();
- // // }
- // // }
- // //
- //
- // if (this.getCurrentCEVData() == null) {
- // return 0;
- // }
- // // Iterator ueber types holen
- // Iterator typeIterator = this.getCurrentCEVData().getCAS().getTypeSystem().getTypeIterator();
- // // maximale Titellaenge
- // int maxTitleLength = 0;
- // // Liste leeren und mit aktuellen, relevanten types neu befuellen, sowie
- // // laengsten titel finden:
- // types.clear();
- //
- // while (typeIterator.hasNext()) {
- // Type type = (Type) typeIterator.next();
- // if (!(type.getName().startsWith("de.uniwue.tm.textmarker.kernel.type")
- // || type.getName().startsWith("de.uniwue.tm.type")
- // || type.getName().startsWith("uima.cas") || type.getName().startsWith("uima.tcas"))) {
- // types.add(type);
- // // maxTitelSuche:
- // int typeShortName = type.getShortName().length();
- // if (typeShortName > maxTitleLength) {
- // maxTitleLength = typeShortName;
- // }
- // }
- //
- // }
- // // Liste sortieren
- // Collections.sort(types, new TypeComparator());
- // return maxTitleLength;
- // }
-
- // private void updateControl(int maxTitleLength) {
- // // toggleButton Liste leeren, vorsicht - richtig aushaengen
- // for (AnnotationTypeCheckButtonPanel it : toggleButtons) {
- // it.dispose();
- // }
- // toggleButtons.clear();
- // // button-liste neu erstellen
- // for (Iterator<Type> iterator = types.iterator(); iterator.hasNext();) {
- // toggleButtons.add(new AnnotationTypeCheckButtonPanel(compi, iterator.next(), maxTitleLength));
- // }
- // compi.layout(true);
- // sc.setContent(compi);
- // sc.setMinSize(compi.computeSize(SWT.DEFAULT, SWT.DEFAULT));
- //
- // }
-
protected CEVData getCurrentCEVData() {
return casDocument.getCASData(current);
}
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/editor/CEVAnnotationEditorView.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/editor/CEVAnnotationEditorView.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/editor/CEVAnnotationEditorView.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/editor/CEVAnnotationEditorView.java Wed Aug 3 09:45:08 2011
@@ -10,22 +10,10 @@ import org.eclipse.ui.part.MessagePage;
import org.eclipse.ui.part.PageBook;
import org.eclipse.ui.part.PageBookView;
-
-/**
- * CEVAnnotationEditorView des CASViewer
- *
- * @author Marco Nehmeier
- */
public class CEVAnnotationEditorView extends PageBookView {
- /**
- * Text wenn kein View vom Editor zur Verfuegung gestellt wird.
- */
private static final String VIEW_IS_NOT_AVAILABLE = "View is not available.";
- /**
- * Defaultkonstruktor.
- */
public CEVAnnotationEditorView() {
super();
}
@@ -37,7 +25,6 @@ public class CEVAnnotationEditorView ext
*/
@Override
protected IPage createDefaultPage(PageBook book) {
- // MessagePage wenn der View nicht zur Verfuegung steht
MessagePage page = new MessagePage();
initPage(page);
page.createControl(book);
@@ -52,14 +39,11 @@ public class CEVAnnotationEditorView ext
*/
@Override
protected PageRec doCreatePage(IWorkbenchPart part) {
- // vom Plugin holen
Object obj = ViewsPlugin.getAdapter(part, ICEVAnnotationEditorPage.class, false);
- // Wenn ICASViewPage
if (obj instanceof ICEVViewPage) {
ICEVViewPage page = (ICEVViewPage) obj;
- // Control erzeugen
page.createControl(getPageBook());
return new PageRec(part, page);
}
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/editor/ICEVAnnotationEditorPage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/editor/ICEVAnnotationEditorPage.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/editor/ICEVAnnotationEditorPage.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/editor/ICEVAnnotationEditorPage.java Wed Aug 3 09:45:08 2011
@@ -2,11 +2,6 @@ package org.apache.uima.tm.cev.views.edi
import org.apache.uima.tm.cev.views.ICEVViewPage;
-/**
- * Interface fuer eine EditorPage im CASViewer
- *
- * @author Marco Nehmeier
- */
public interface ICEVAnnotationEditorPage extends ICEVViewPage {
}
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/fsBrowser/CEVFSBrowserPage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/fsBrowser/CEVFSBrowserPage.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/fsBrowser/CEVFSBrowserPage.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/fsBrowser/CEVFSBrowserPage.java Wed Aug 3 09:45:08 2011
@@ -24,13 +24,10 @@ import org.eclipse.swt.widgets.Composite
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.part.Page;
-
public class CEVFSBrowserPage extends Page implements ICEVFSBrowserPage, ICEVView {
private Image icon;
- private CEVViewer casView;
-
private CEVDocument casDocument;
private CEVData casData;
@@ -41,7 +38,6 @@ public class CEVFSBrowserPage extends Pa
public CEVFSBrowserPage(CEVViewer casView, CEVDocument casDocument, int index) {
super();
- this.casView = casView;
this.casDocument = casDocument;
this.casData = casDocument.getCASData(index);
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/palette/CEVAnnotationMarkerPalettePage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/palette/CEVAnnotationMarkerPalettePage.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/palette/CEVAnnotationMarkerPalettePage.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/palette/CEVAnnotationMarkerPalettePage.java Wed Aug 3 09:45:08 2011
@@ -30,21 +30,9 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.part.IPageSite;
import org.eclipse.ui.part.Page;
-
-/**
- * CEVAnnotationMarkerPalettePage
- *
- * @author Martin Toepfer
- */
public class CEVAnnotationMarkerPalettePage extends Page implements
ICEVAnnotationMarkerPalettePage, ICEVEditor {
- /**
- * Wrapperklasse fuer Typ-Buttons.
- *
- * @author Felix
- *
- */
private class AnnotationTypeButtonPanel {
private Composite composite;
@@ -60,37 +48,19 @@ public class CEVAnnotationMarkerPaletteP
private static final int MAX_TITLE_LENGTH = 40;
- /**
- * Konstruktor.
- *
- * @param parent
- * @param type
- */
private AnnotationTypeButtonPanel(Composite parent, Type type) {
this(parent, type, MAX_TITLE_LENGTH);
}
- /**
- * Konstruktor.
- *
- * @param parent
- * @param type
- */
private AnnotationTypeButtonPanel(Composite parent, Type type, int maxTitleLenght) {
- // type merken
this.type = type;
- // composite zusammensetzen
composite = new Composite(parent, SWT.NULL | SWT.LEFT);
composite.setLayout(new RowLayout(SWT.HORIZONTAL));
- // toggleButton, text links ausrichten:
button = new Button(composite, SWT.TOGGLE | SWT.LEFT);
- // Text des Buttons setzen:
button.setText(type.getShortName());
final int width = BUTTON_WIDTH_OFFSET + maxTitleLenght * LETTER_WIDTH_FACTOR;
- // initiale breite setzen:
button.setLayoutData(new RowData(width, SWT.DEFAULT));
button.setAlignment(SWT.LEFT);
- // Farbe setzen
updateColor();
composite.layout(true);
@@ -99,9 +69,6 @@ public class CEVAnnotationMarkerPaletteP
private void updateColor() {
Color bgCol = new Color(composite.getDisplay(), getCurrentCEVData().getBackgroundColor(
this.type).getRGB());
- // TODO Vordergrundfarbe ungenutzt
- // Color fgCol = new Color(composite.getDisplay(), casData
- // .getForegroundColor(type).getRGB());
RGB[] rgbs = { bgCol.getRGB() };
ImageData imd = new ImageData(ICON_SIZE, ICON_SIZE, 8, new PaletteData(rgbs));
Image image = new Image(composite.getDisplay(), imd);
@@ -116,9 +83,6 @@ public class CEVAnnotationMarkerPaletteP
return this.type;
}
- /**
- * Referenzen loesen und zum geloeschtwerden vorbereiten.
- */
public void dispose() {
button.dispose();
composite.dispose();
@@ -127,12 +91,6 @@ public class CEVAnnotationMarkerPaletteP
}
- /**
- * Vergleichsklasse fuer Typen.
- *
- * @author Felix
- *
- */
private class TypeComparator implements Comparator<Type> {
public int compare(Type type0, Type type1) {
return type0.getShortName().compareToIgnoreCase(type1.getShortName());
@@ -140,12 +98,6 @@ public class CEVAnnotationMarkerPaletteP
}
- /**
- * Wrapperklasse fuer Typ-Buttons.
- *
- * @author Felix
- *
- */
private class AnnotationTypeCheckButtonPanel {
private Composite composite;
@@ -161,37 +113,19 @@ public class CEVAnnotationMarkerPaletteP
private static final int MAX_TITLE_LENGTH = 40;
- /**
- * Konstruktor.
- *
- * @param parent
- * @param type
- */
private AnnotationTypeCheckButtonPanel(Composite parent, Type type) {
this(parent, type, MAX_TITLE_LENGTH);
}
- /**
- * Konstruktor.
- *
- * @param parent
- * @param type
- */
private AnnotationTypeCheckButtonPanel(Composite parent, Type type, int maxTitleLenght) {
- // type merken
this.type = type;
- // composite zusammensetzen
composite = new Composite(parent, SWT.NULL | SWT.LEFT);
composite.setLayout(new RowLayout(SWT.HORIZONTAL));
- // toggleButton, text links ausrichten:
button = new Button(composite, SWT.TOGGLE | SWT.LEFT);
- // Text des Buttons setzen:
button.setText(type.getShortName());
final int width = BUTTON_WIDTH_OFFSET + maxTitleLenght * LETTER_WIDTH_FACTOR;
- // initiale breite setzen:
button.setLayoutData(new RowData(width, SWT.DEFAULT));
button.setAlignment(SWT.LEFT);
- // Farbe setzen
updateColor();
composite.layout(true);
@@ -203,9 +137,6 @@ public class CEVAnnotationMarkerPaletteP
backgroundColor = new Color(composite.getDisplay(), 128, 128, 128);
}
Color bgCol = new Color(composite.getDisplay(), backgroundColor.getRGB());
- // TODO Vordergrundfarbe ungenutzt
- // Color fgCol = new Color(composite.getDisplay(), casData
- // .getForegroundColor(type).getRGB());
RGB[] rgbs = { bgCol.getRGB() };
ImageData imd = new ImageData(ICON_SIZE, ICON_SIZE, 8, new PaletteData(rgbs));
Image image = new Image(composite.getDisplay(), imd);
@@ -220,9 +151,6 @@ public class CEVAnnotationMarkerPaletteP
return this.type;
}
- /**
- * Referenzen loesen und zum geloeschtwerden vorbereiten.
- */
public void dispose() {
button.dispose();
composite.dispose();
@@ -231,48 +159,27 @@ public class CEVAnnotationMarkerPaletteP
}
- // Scrolled Composite
private ScrolledComposite sc;
- // die ganze Komponente
private Composite pane;
- // zugrundeliegende Daten
private CEVDocument casDocument;
- // Typen-Liste
private List<Type> types;
- // ToggleButton-Liste
private List<AnnotationTypeCheckButtonPanel> toggleButtons = new ArrayList<AnnotationTypeCheckButtonPanel>();
private int current;
- /**
- * Konstruktor
- *
- * @param casView
- * CASViewer
- * @param casData
- * CASData
- */
public CEVAnnotationMarkerPalettePage(CEVViewer casView, CEVDocument casDocument, int index) {
super();
current = index;
- // cas setzen
this.casDocument = casDocument;
- // Als Listener fuer Changes an Annotationstypen anmelden
this.getCurrentCEVData().addAnnotationListener(this);
- // Typen-Liste initialisieren:
types = new ArrayList<Type>();
updateTypes();
}
- /**
- * Filters the selected / toggled Buttons.
- *
- * @return selected / toggled Buttons.
- */
public List<AnnotationTypeCheckButtonPanel> getToggledButtons() {
if (toggleButtons == null) {
return new ArrayList<AnnotationTypeCheckButtonPanel>();
@@ -286,40 +193,25 @@ public class CEVAnnotationMarkerPaletteP
return toggledButtons;
}
- /**
- * Erstellt die Button-Liste aus der types-Liste neu.<br>
- * In der Regel sollte vor Benutzung <i>updateTypes</i> aufgerufen werden.
- */
private void updateControl(int maxTitleLength) {
- // toggleButton Liste leeren, vorsicht - richtig aushaengen
for (AnnotationTypeCheckButtonPanel it : toggleButtons) {
it.dispose();
}
toggleButtons.clear();
- // button-liste neu erstellen
for (Iterator<Type> iterator = types.iterator(); iterator.hasNext();) {
toggleButtons.add(new AnnotationTypeCheckButtonPanel(pane, iterator.next(), maxTitleLength));
}
pane.layout(true);
sc.setContent(pane);
sc.setMinSize(pane.computeSize(SWT.DEFAULT, SWT.DEFAULT));
- // sc.layout(true);
}
- /**
- * Erstellt die Typenliste neu.<br>
- * Danach sollte in der Regel <i>updateControl</i> aufgerufen werden.
- */
private int updateTypes() {
if (this.getCurrentCEVData() == null) {
return 0;
}
- // Iterator ueber types holen
Iterator typeIterator = this.getCurrentCEVData().getCAS().getTypeSystem().getTypeIterator();
- // maximale Titellaenge
int maxTitleLength = 0;
- // Liste leeren und mit aktuellen, relevanten types neu befuellen, sowie
- // laengsten titel finden:
types.clear();
while (typeIterator.hasNext()) {
@@ -328,14 +220,12 @@ public class CEVAnnotationMarkerPaletteP
|| type.getName().startsWith("de.uniwue.tm.type")
|| type.getName().startsWith("uima.cas") || type.getName().startsWith("uima.tcas"))) {
types.add(type);
- // maxTitelSuche:
int typeShortName = type.getShortName().length();
if (typeShortName > maxTitleLength) {
maxTitleLength = typeShortName;
}
}
}
- // Liste sortieren
Collections.sort(types, new TypeComparator());
return maxTitleLength;
}
@@ -361,18 +251,15 @@ public class CEVAnnotationMarkerPaletteP
sc = new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER);
pane = new Composite(sc, SWT.NULL);
pane.setLayout(new RowLayout(SWT.VERTICAL));
- // Properties for the ScrolledComposite
sc.setExpandHorizontal(true);
sc.setExpandVertical(true);
sc.setContent(pane);
sc.setMinSize(pane.computeSize(SWT.DEFAULT, SWT.DEFAULT));
- // sorgt fuer aktuelle types-Liste und Buttons:
casDataChanged();
}
private void annotateAllForSelection(int start, int end) {
- // fuer alle aktivierten Typen Annotationen setzen:
List<AnnotationTypeCheckButtonPanel> toggledButtons = getToggledButtons();
for (AnnotationTypeCheckButtonPanel buttonP : toggledButtons) {
boolean update = toggledButtons.indexOf(buttonP) == toggledButtons.size() - 1;
@@ -387,18 +274,8 @@ public class CEVAnnotationMarkerPaletteP
getCurrentCEVData().addAnnotation(type, start, end, update);
}
- /**
- * CAS hat sich geaendert.<br>
- * Daten und GUI updaten.
- *
- * @param casData
- * CAS
- */
public void casDataChanged() {
- // casData updaten
- // types updaten und max.Titellaenge ermitteln
final int maxTitleLength = updateTypes();
- // Button-Liste updaten
updateControl(maxTitleLength);
}
@@ -440,7 +317,6 @@ public class CEVAnnotationMarkerPaletteP
* .apache.uima.cas.Type)
*/
public void annotationStateChanged(Type type) {
- // this.casDataChanged(casData);
}
protected CEVData getCurrentCEVData() {
@@ -474,7 +350,6 @@ public class CEVAnnotationMarkerPaletteP
* .uima.cas.text.AnnotationFS)
*/
public void annotationsAdded(List<AnnotationFS> annots) {
- // Annotationen uninteressant
}
/*
@@ -484,7 +359,6 @@ public class CEVAnnotationMarkerPaletteP
* .uima.cas.text.AnnotationFS)
*/
public void annotationsRemoved(List<AnnotationFS> annots) {
- // Annotationen uninteressant
}
/*
@@ -494,7 +368,6 @@ public class CEVAnnotationMarkerPaletteP
* .apache.uima.cas.text.AnnotationFS)
*/
public void annotationStateChanged(AnnotationFS annot) {
- // Annotationen uninteressant
}
public void textSelected(int start, int end) {
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/palette/CEVAnnotationMarkerPaletteView.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/palette/CEVAnnotationMarkerPaletteView.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/palette/CEVAnnotationMarkerPaletteView.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/palette/CEVAnnotationMarkerPaletteView.java Wed Aug 3 09:45:08 2011
@@ -10,22 +10,10 @@ import org.eclipse.ui.part.MessagePage;
import org.eclipse.ui.part.PageBook;
import org.eclipse.ui.part.PageBookView;
-
-/**
- * CEVAnnotationMarkerPaletteView des CASViewer
- *
- * @author Marco Nehmeier
- */
public class CEVAnnotationMarkerPaletteView extends PageBookView {
- /**
- * Text wenn kein View vom Editor zur Verfuegung gestellt wird.
- */
private static final String VIEW_IS_NOT_AVAILABLE = "View is not available.";
- /**
- * Defaultkonstruktor.
- */
public CEVAnnotationMarkerPaletteView() {
super();
}
@@ -37,7 +25,6 @@ public class CEVAnnotationMarkerPaletteV
*/
@Override
protected IPage createDefaultPage(PageBook book) {
- // MessagePage wenn der View nicht zur Verfuegung steht
MessagePage page = new MessagePage();
initPage(page);
page.createControl(book);
@@ -52,14 +39,11 @@ public class CEVAnnotationMarkerPaletteV
*/
@Override
protected PageRec doCreatePage(IWorkbenchPart part) {
- // vom Plugin holen
Object obj = ViewsPlugin.getAdapter(part, ICEVAnnotationMarkerPalettePage.class, false);
- // Wenn ICASViewPage
if (obj instanceof ICEVViewPage) {
ICEVViewPage page = (ICEVViewPage) obj;
- // Control erzeugen
page.createControl(getPageBook());
return new PageRec(part, page);
}
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/palette/ICEVAnnotationMarkerPalettePage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/palette/ICEVAnnotationMarkerPalettePage.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/palette/ICEVAnnotationMarkerPalettePage.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/palette/ICEVAnnotationMarkerPalettePage.java Wed Aug 3 09:45:08 2011
@@ -2,11 +2,6 @@ package org.apache.uima.tm.cev.views.pal
import org.apache.uima.tm.cev.views.ICEVViewPage;
-/**
- * Interface fuer eine EditorPage im CASViewer
- *
- * @author Martin Toepfer
- */
public interface ICEVAnnotationMarkerPalettePage extends ICEVViewPage {
}
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/selection/CEVSelectionPage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/selection/CEVSelectionPage.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/selection/CEVSelectionPage.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/selection/CEVSelectionPage.java Wed Aug 3 09:45:08 2011
@@ -14,25 +14,11 @@ import org.apache.uima.tm.cev.views.CEVA
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Event;
-
-/**
- * Page fuer einen SelectionView im CASViewer
- *
- * @author Marco Nehmeier
- */
public class CEVSelectionPage extends CEVAnnotationTreeViewPage implements ICEVSelectionPage,
ICEVAnnotationSelectionListener {
private int offset;
- /**
- * Konstruktor
- *
- * @param casView
- * CASViewer
- * @param casData
- * CASDatat
- */
public CEVSelectionPage(CEVViewer casView, CEVDocument casDocument, int index) {
super(casView, casDocument, index);
}
@@ -45,7 +31,6 @@ public class CEVSelectionPage extends CE
public void newSelection(int offset) {
this.offset = offset;
- // Selektionen im Tree aktualisieren
ICEVRootTreeNode annotationOrderedTree = getCasData().getAnnotationOrderedTree(offset,
manualTypeFilter);
getTreeViewer().setInput(annotationOrderedTree);
@@ -68,7 +53,6 @@ public class CEVSelectionPage extends CE
}
}
- // getTreeViewer().expandAll();
}
/*
@@ -80,7 +64,6 @@ public class CEVSelectionPage extends CE
@Override
public void annotationsAdded(List<AnnotationFS> annots) {
newSelection(offset);
- // getTreeViewer().getTree().removeAll();
}
/*
@@ -92,7 +75,6 @@ public class CEVSelectionPage extends CE
@Override
public void annotationsRemoved(List<AnnotationFS> annots) {
newSelection(offset);
- // getTreeViewer().getTree().removeAll();
}
public void handleEvent(Event event) {
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/selection/CEVSelectionView.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/selection/CEVSelectionView.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/selection/CEVSelectionView.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/selection/CEVSelectionView.java Wed Aug 3 09:45:08 2011
@@ -3,17 +3,8 @@ package org.apache.uima.tm.cev.views.sel
import org.apache.uima.tm.cev.views.CEVPageBookView;
import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * SelektionView fuer den CASViewer
- *
- * @author Marco Nehmeier
- */
public class CEVSelectionView extends CEVPageBookView {
- /**
- * Default-Konstruktor
- */
public CEVSelectionView() {
super();
}
@@ -25,7 +16,6 @@ public class CEVSelectionView extends CE
*/
@Override
protected PageRec doCreatePage(IWorkbenchPart part) {
- // Erzeugt die Page
return doCreatePage(part, ICEVSelectionPage.class);
}
}
Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/selection/ICEVSelectionPage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/selection/ICEVSelectionPage.java?rev=1153411&r1=1153410&r2=1153411&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/selection/ICEVSelectionPage.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/src/main/java/org/apache/uima/tm/cev/views/selection/ICEVSelectionPage.java Wed Aug 3 09:45:08 2011
@@ -2,10 +2,5 @@ package org.apache.uima.tm.cev.views.sel
import org.apache.uima.tm.cev.views.ICEVViewPage;
-/**
- * Interface fuer eine SelektionPage im CASViewer
- *
- * @author Marco Nehmeier
- */
public interface ICEVSelectionPage extends ICEVViewPage {
}