Author: pkluegl Date: Fri Aug 26 10:11:12 2016 New Revision: 1757812 URL: http://svn.apache.org/viewvc?rev=1757812&view=rev Log: no jira - some code clean up
Modified: uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AbstractTreeNode.java uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeContentProvider.java uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeLabelProvider.java uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeNode.java uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeViewDragListener.java uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeViewPage.java uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/ArrayFeatureTreeNode.java uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/FSFeatureTreeNode.java uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/FSTreeNode.java uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/IRootTreeNode.java uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/ITreeNode.java uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/PrimitiveFeatureTreeNode.java uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/ToolTipListener.java uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/TreeComparator.java uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/TypeOrderedRootTreeNode.java uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/TypeTreeNode.java Modified: uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AbstractTreeNode.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AbstractTreeNode.java?rev=1757812&r1=1757811&r2=1757812&view=diff ============================================================================== --- uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AbstractTreeNode.java (original) +++ uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AbstractTreeNode.java Fri Aug 26 10:11:12 2016 @@ -22,8 +22,6 @@ package org.apache.uima.ruta.caseditor.v import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.Iterator; -import java.util.LinkedList; public abstract class AbstractTreeNode implements ITreeNode { @@ -40,38 +38,27 @@ public abstract class AbstractTreeNode i children = new ArrayList<ITreeNode>(); } + @Override public void addChild(ITreeNode child) { children.add(child); } + @Override public ITreeNode[] getChildren() { return children.toArray(new ITreeNode[] {}); } - public Iterator<ITreeNode> getChildrenIterator() { - return children.iterator(); - } - + @Override public ITreeNode getParent() { return parent; } + @Override public boolean hasChildren() { return children.size() > 0; } - public void getNodes(LinkedList<ITreeNode> list) { - Iterator<ITreeNode> iter = getChildrenIterator(); - - while (iter.hasNext()) { - ITreeNode node = iter.next(); - - list.add(node); - - node.getNodes(list); - } - } - + @Override public void sort(Comparator<ITreeNode> cp) { Collections.sort(children, cp); } Modified: uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeContentProvider.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeContentProvider.java?rev=1757812&r1=1757811&r2=1757812&view=diff ============================================================================== --- uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeContentProvider.java (original) +++ uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeContentProvider.java Fri Aug 26 10:11:12 2016 @@ -48,6 +48,7 @@ public class AnnotationTreeContentProvid editor.addCasEditorInputListener(this); } + @Override public void dispose() { document.removeChangeListener(this); editor.removeCasEditorInputListener(this); @@ -58,6 +59,7 @@ public class AnnotationTreeContentProvid * * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang. Object) */ + @Override public Object[] getChildren(Object element) { if (element instanceof ITreeNode) return ((ITreeNode) element).getChildren(); @@ -69,6 +71,7 @@ public class AnnotationTreeContentProvid * * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object ) */ + @Override public Object getParent(Object element) { if (element instanceof ITreeNode) return ((ITreeNode) element).getParent(); @@ -81,6 +84,7 @@ public class AnnotationTreeContentProvid * * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang. Object) */ + @Override public boolean hasChildren(Object element) { return (element instanceof ITreeNode) && ((ITreeNode) element).hasChildren(); } @@ -90,6 +94,7 @@ public class AnnotationTreeContentProvid * * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java .lang.Object) */ + @Override public Object[] getElements(Object inputElement) { if (inputElement instanceof IRootTreeNode) return ((IRootTreeNode) inputElement).getChildren(); @@ -97,6 +102,7 @@ public class AnnotationTreeContentProvid return null; } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { // changed(); } @@ -104,6 +110,7 @@ public class AnnotationTreeContentProvid @Override public void changed() { Display.getDefault().syncExec(new Runnable() { + @Override public void run() { page.reloadTree(); } @@ -131,12 +138,9 @@ public class AnnotationTreeContentProvid } + @Override public void casDocumentChanged(IEditorInput oldInput, ICasDocument oldDocument, IEditorInput newInput, ICasDocument newDocument) { -// document.removeChangeListener(this); -// document = newDocument; -// document.addChangeListener(this); -// changed(); } } Modified: uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeLabelProvider.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeLabelProvider.java?rev=1757812&r1=1757811&r2=1757812&view=diff ============================================================================== --- uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeLabelProvider.java (original) +++ uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeLabelProvider.java Fri Aug 26 10:11:12 2016 @@ -61,9 +61,6 @@ public class AnnotationTreeLabelProvider String name = ((ITreeNode) element).getName(); if (name != null) { - // TODO reactive html stuff - // name = ParserUtils.trimSpacesBeginEnd( - // ParserUtils.trimAllTags(Translate.decode(name), false), ""); name = name.replaceAll("[\\n]", "").replaceAll("[\\r]", ""); } if (element instanceof TypeTreeNode) { Modified: uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeNode.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeNode.java?rev=1757812&r1=1757811&r2=1757812&view=diff ============================================================================== --- uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeNode.java (original) +++ uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeNode.java Fri Aug 26 10:11:12 2016 @@ -37,6 +37,7 @@ public class AnnotationTreeNode extends super(parent, annotation, parentTypes); } + @Override public AnnotationFS getAnnotation() { return (AnnotationFS) fs; } @@ -46,6 +47,7 @@ public class AnnotationTreeNode extends return getAnnotation().getCoveredText(); } + @Override public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { if (FSTreeNode.class.equals(adapter)) { Modified: uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeViewDragListener.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeViewDragListener.java?rev=1757812&r1=1757811&r2=1757812&view=diff ============================================================================== --- uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeViewDragListener.java (original) +++ uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeViewDragListener.java Fri Aug 26 10:11:12 2016 @@ -31,12 +31,14 @@ public class AnnotationTreeViewDragListe this.viewer = viewer; } + @Override public void dragFinished(DragSourceEvent event) { if (!event.doit) return; } + @Override public void dragSetData(DragSourceEvent event) { IStructuredSelection selection = (IStructuredSelection) viewer.getSelection(); Object[] list = selection.toList().toArray(); @@ -49,6 +51,7 @@ public class AnnotationTreeViewDragListe } } + @Override public void dragStart(DragSourceEvent event) { event.doit = !viewer.getSelection().isEmpty(); } Modified: uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeViewPage.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeViewPage.java?rev=1757812&r1=1757811&r2=1757812&view=diff ============================================================================== --- uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeViewPage.java (original) +++ uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/AnnotationTreeViewPage.java Fri Aug 26 10:11:12 2016 @@ -100,6 +100,7 @@ public class AnnotationTreeViewPage exte public class TreeViewAnnotationStyleChangeListener extends AnnotationStyleChangeListener { + @Override public void annotationStylesChanged(Collection<AnnotationStyle> styles) { for (AnnotationStyle annotationStyle : styles) { String annotation = annotationStyle.getAnnotation(); @@ -130,7 +131,7 @@ public class AnnotationTreeViewPage exte private class ShowTypesWithoutAnnotations extends Action { public ShowTypesWithoutAnnotations() { - super("Show Types Without Annotations", Action.AS_CHECK_BOX); + super("Show Types Without Annotations", IAction.AS_CHECK_BOX); setChecked(isTreeWithTypesWithoutAnnotations()); } @@ -202,6 +203,7 @@ public class AnnotationTreeViewPage exte KeyListener checkSelectedKeyListener = new KeyAdapter() { + @Override public void keyPressed(KeyEvent keyEvent) { int keyCode = keyEvent.keyCode; if (keyCode == SWT.CR || keyCode == SWT.LF || keyCode == SWT.KEYPAD_CR) { @@ -221,7 +223,6 @@ public class AnnotationTreeViewPage exte filterTypeTextField.addListener(SWT.KeyUp, this); filterTypeTextField.addListener(SWT.MouseUp, this); filterTypeTextField.addListener(SWT.Modify, this); - // TODO only for 3.3 see pom filterTypeTextField.setMessage("Only types with..."); filterTypeTextField.addKeyListener(checkSelectedKeyListener); @@ -235,7 +236,6 @@ public class AnnotationTreeViewPage exte filterCoveredTextTextField.addListener(SWT.KeyUp, this); filterCoveredTextTextField.addListener(SWT.MouseUp, this); filterCoveredTextTextField.addListener(SWT.Modify, this); - // TODO only for 3.3 see pom filterCoveredTextTextField.setMessage("Only annotations with..."); filterCoveredTextTextField.addKeyListener(checkSelectedKeyListener); @@ -267,8 +267,6 @@ public class AnnotationTreeViewPage exte @Override public void keyPressed(KeyEvent e) { int keyCode = e.keyCode; - // TODO refactor to actions with key bindings: ... - // // backspace or delete: delete annotations if (keyCode == SWT.BS || keyCode == SWT.DEL) { deleteSelectedAnnotations(); @@ -313,12 +311,6 @@ public class AnnotationTreeViewPage exte editor.addAnnotationListener(this); if (!useSelection) { reloadTree(); - - // TODO auto-check all - // if (RutaCasEditorPlugin.getDefault().getPreferenceStore().getBoolean("AlwaysCheckAll")) { - // checkAll(); - // } - } } @@ -340,7 +332,6 @@ public class AnnotationTreeViewPage exte createActionUncheckAll.setImageDescriptor(RutaCasEditorPlugin .getImageDescriptor("/icons/lightbulb_off.png")); toolBarManager.add(createActionUncheckAll); - // if (!useSelection) { IAction showTypesWithoutAnnotations = new ShowTypesWithoutAnnotations(); menuManager.add(showTypesWithoutAnnotations); @@ -350,16 +341,8 @@ public class AnnotationTreeViewPage exte /** * Unchecks all types of the typesystem so that they are not highlighted anymore. * - * TODO use more efficient implementation since UIMA 2.5.1 setShownAnnotationType!s! */ public void uncheckAll() { - // Collection<Type> shownAnnotationTypes = new - // ArrayList<Type>(editor.getShownAnnotationTypes()); - // Iterator<Type> typeIterator = shownAnnotationTypes.iterator(); - // while (typeIterator.hasNext()) { - // Type type = (Type) typeIterator.next(); - // editor.setShownAnnotationType(type, false); - // } editor.setShownAnnotationTypes(new LinkedList<Type>()); getTreeViewer().getTree().deselectAll(); } @@ -367,11 +350,10 @@ public class AnnotationTreeViewPage exte /** * Checks all visible types of the tree to be highlighted. * - * TODO use more efficient implementation since UIMA 2.5.1 setShownAnnotationType!s! */ public void checkAllVisible() { TypeSystem ts = editor.getDocument().getCAS().getTypeSystem(); - Type documentAnnotationType = ts.getType("uima.tcas.DocumentAnnotation"); + Type documentAnnotationType = ts.getType(CAS.TYPE_NAME_DOCUMENT_ANNOTATION); List<Type> selectedTypes = new LinkedList<Type>(); for (TreeItem i : getTreeViewer().getTree().getItems()) { Object e = i.getData(); @@ -379,7 +361,6 @@ public class AnnotationTreeViewPage exte TypeTreeNode typeTreeNode = (TypeTreeNode) e; Type type = typeTreeNode.getType(); if (!documentAnnotationType.equals(type)) { - // editor.setShownAnnotationType(type, true); selectedTypes.add(type); } } @@ -436,12 +417,11 @@ public class AnnotationTreeViewPage exte * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse * .jface.viewers.DoubleClickEvent) */ + @Override public void doubleClick(DoubleClickEvent event) { if (event.getSelection() != null && event.getSelection() instanceof ITreeSelection) { Object treeNode = ((ITreeSelection) event.getSelection()).getFirstElement(); if (treeNode instanceof AnnotationTreeNode) { - // FeatureStructureSelectionProvider provider = - // ((FeatureStructureSelectionProvider)editor.getSelectionProvider(); } else if (treeNode instanceof TypeTreeNode) { editor.setAnnotationMode(((TypeTreeNode) treeNode).getType()); } @@ -453,8 +433,8 @@ public class AnnotationTreeViewPage exte * * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(org.eclipse.swt .events.MouseEvent) */ + @Override public void mouseDoubleClick(MouseEvent e) { - // TODO } @@ -529,83 +509,8 @@ public class AnnotationTreeViewPage exte * * @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events .MouseEvent) */ + @Override public void mouseDown(final MouseEvent mouseEvent) { - // TODO popup menu deactivated - // if (mouseEvent.button == 3) { - // Display display = Display.getCurrent(); - // Menu menu = new Menu(display.getActiveShell(), SWT.POP_UP); - // MenuItem itemFgC = new MenuItem(menu, SWT.PUSH); - // - // itemFgC.setText("Change Font Color"); - // itemFgC.addListener(SWT.Selection, new Listener() { - // public void handleEvent(Event e) { - // TreeItem item = treeView.getTree().getItem(new Point(mouseEvent.x, mouseEvent.y)); - // - // if (item != null && item.getData() instanceof ITreeNode) { - // Type type = ((ITreeNode) item.getData()).getType(); - // ColorDialog cd = new ColorDialog(Display.getCurrent().getActiveShell()); - // cd.setRGB(casData.getForegroundColor(type).getRGB()); - // - // RGB rgb = cd.open(); - // - // if (rgb != null) - // casData.setForegroundColor(type, new Color(Display.getCurrent(), rgb)); - // } - // } - // }); - // - // MenuItem itemBgC = new MenuItem(menu, SWT.PUSH); - // itemBgC.setText("Change Background Color"); - // itemBgC.addListener(SWT.Selection, new Listener() { - // public void handleEvent(Event e) { - // TreeItem item = treeView.getTree().getItem(new Point(mouseEvent.x, mouseEvent.y)); - // - // if (item != null && item.getData() instanceof ITreeNode) { - // Type type = ((ITreeNode) item.getData()).getType(); - // - // ColorDialog cd = new ColorDialog(Display.getCurrent().getActiveShell()); - // cd.setRGB(casData.getBackgroundColor(type).getRGB()); - // - // RGB rgb = cd.open(); - // - // if (rgb != null) - // casData.setBackgroundColor(type, new Color(Display.getCurrent(), rgb)); - // } - // } - // }); - // - // TreeItem item = treeView.getTree().getItem(new Point(mouseEvent.x, mouseEvent.y)); - // if (item != null && item.getData() instanceof FeatureTreeNode) { - // itemBgC.setEnabled(false); - // itemFgC.setEnabled(false); - // } - // - // new MenuItem(menu, SWT.SEPARATOR); - // - // MenuItem itemDelA = new MenuItem(menu, SWT.PUSH); - // itemDelA.setText("Delete selected Items"); - // itemDelA.addListener(SWT.Selection, new Listener() { - // public void handleEvent(Event e) { - // deleteSelectedAnnotations(); - // } - // }); - // - // itemDelA.setEnabled(false); - // TreeItem[] items = treeView.getTree().getSelection(); - // for (TreeItem ti : items) - // if (!(ti.getData() instanceof FeatureTreeNode)) { - // itemDelA.setEnabled(true); - // break; - // } - // - // menu.setVisible(true); - // - // while (!menu.isDisposed() && menu.isVisible()) { - // if (!display.readAndDispatch()) - // display.sleep(); - // } - // menu.dispose(); - // } } /* @@ -613,6 +518,7 @@ public class AnnotationTreeViewPage exte * * @seeorg.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events. MouseEvent) */ + @Override public void mouseUp(MouseEvent e) { } @@ -712,6 +618,7 @@ public class AnnotationTreeViewPage exte return root; } + @Override public void selectionChanged(IWorkbenchPart part, ISelection selection) { if (!useSelection) return; @@ -721,6 +628,7 @@ public class AnnotationTreeViewPage exte } } + @Override public void handleEvent(Event event) { if ((event.widget == filterTypeTextField || event.widget == filterCoveredTextTextField) && event.type == SWT.Modify) { @@ -772,6 +680,7 @@ public class AnnotationTreeViewPage exte } } + @Override public void checkStateChanged(CheckStateChangedEvent event) { Object element = event.getElement(); boolean checked = event.getChecked(); @@ -786,10 +695,12 @@ public class AnnotationTreeViewPage exte } } + @Override public void annotationModeChanged(Type newMode) { getTreeViewer().setGrayed(new TypeTreeNode(newMode), true); } + @Override public void showAnnotationsChanged(Collection<Type> shownAnnotationTypes) { List<TypeTreeNode> nodes = toNodes(shownAnnotationTypes); getTreeViewer().setCheckedElements(nodes.toArray()); Modified: uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/ArrayFeatureTreeNode.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/ArrayFeatureTreeNode.java?rev=1757812&r1=1757811&r2=1757812&view=diff ============================================================================== --- uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/ArrayFeatureTreeNode.java (original) +++ uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/ArrayFeatureTreeNode.java Fri Aug 26 10:11:12 2016 @@ -21,8 +21,6 @@ package org.apache.uima.ruta.caseditor.v import java.util.ArrayList; import java.util.Comparator; -import java.util.Iterator; -import java.util.LinkedList; import org.apache.uima.cas.Feature; import org.apache.uima.cas.Type; @@ -47,33 +45,32 @@ public class ArrayFeatureTreeNode implem this.children = new ArrayList<ITreeNode>(); } + @Override public void addChild(ITreeNode child) { this.children.add(child); } + @Override public ITreeNode[] getChildren() { return this.children.toArray(new ITreeNode[] {}); } - public Iterator<ITreeNode> getChildrenIterator() { - return this.children.iterator(); - } - + @Override public String getName() { return f.getShortName() + ": " + value; } - public void getNodes(LinkedList<ITreeNode> list) { - } - + @Override public ITreeNode getParent() { return parent; } + @Override public Type getType() { return f.getRange(); } + @Override public boolean hasChildren() { if (children.size() > 0) { return true; @@ -89,10 +86,13 @@ public class ArrayFeatureTreeNode implem return value; } + @Override public void sort(Comparator<ITreeNode> cp) { // nothing to do } + @Override + @SuppressWarnings("unchecked") public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { if (ArrayFeatureTreeNode.class.equals(adapter)) { Modified: uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/FSFeatureTreeNode.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/FSFeatureTreeNode.java?rev=1757812&r1=1757811&r2=1757812&view=diff ============================================================================== --- uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/FSFeatureTreeNode.java (original) +++ uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/FSFeatureTreeNode.java Fri Aug 26 10:11:12 2016 @@ -42,6 +42,7 @@ public class FSFeatureTreeNode extends F this.feature = feature; } + @Override public AnnotationFS getAnnotation() { return (AnnotationFS) fs; } @@ -51,6 +52,7 @@ public class FSFeatureTreeNode extends F return feature.getShortName() + ": " + getAnnotation().getCoveredText(); } + @Override public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { if (FSTreeNode.class.equals(adapter)) { return this; Modified: uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/FSTreeNode.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/FSTreeNode.java?rev=1757812&r1=1757811&r2=1757812&view=diff ============================================================================== --- uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/FSTreeNode.java (original) +++ uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/FSTreeNode.java Fri Aug 26 10:11:12 2016 @@ -50,10 +50,12 @@ public class FSTreeNode extends Abstract parentTypes.pop(); } + @Override public String getName() { return fs.getType().getShortName(); } + @Override public Type getType() { return fs.getType(); } @@ -113,6 +115,8 @@ public class FSTreeNode extends Abstract return frequency < 2; } + @Override + @SuppressWarnings("unchecked") public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { if (FSTreeNode.class.equals(adapter)) { return this; Modified: uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/IRootTreeNode.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/IRootTreeNode.java?rev=1757812&r1=1757811&r2=1757812&view=diff ============================================================================== --- uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/IRootTreeNode.java (original) +++ uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/IRootTreeNode.java Fri Aug 26 10:11:12 2016 @@ -19,21 +19,11 @@ package org.apache.uima.ruta.caseditor.view.tree; -import java.util.LinkedList; - import org.apache.uima.cas.FeatureStructure; -import org.apache.uima.cas.Type; -import org.apache.uima.cas.text.AnnotationFS; public interface IRootTreeNode extends ITreeNode { public void insertFS(FeatureStructure annotation, boolean withParents); - public LinkedList<ITreeNode> getNodes(); - - public LinkedList<ITreeNode> getNodes(Type type); - - public LinkedList<ITreeNode> getNodes(AnnotationFS annot); - public void sort(); } Modified: uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/ITreeNode.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/ITreeNode.java?rev=1757812&r1=1757811&r2=1757812&view=diff ============================================================================== --- uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/ITreeNode.java (original) +++ uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/ITreeNode.java Fri Aug 26 10:11:12 2016 @@ -20,8 +20,6 @@ package org.apache.uima.ruta.caseditor.view.tree; import java.util.Comparator; -import java.util.Iterator; -import java.util.LinkedList; import org.apache.uima.cas.Type; import org.eclipse.core.runtime.IAdaptable; @@ -32,8 +30,6 @@ public interface ITreeNode extends IAdap public ITreeNode[] getChildren(); - public Iterator<ITreeNode> getChildrenIterator(); - public String getName(); public ITreeNode getParent(); @@ -42,7 +38,5 @@ public interface ITreeNode extends IAdap public Type getType(); - public void getNodes(LinkedList<ITreeNode> list); - public void sort(Comparator<ITreeNode> cp); } Modified: uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/PrimitiveFeatureTreeNode.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/PrimitiveFeatureTreeNode.java?rev=1757812&r1=1757811&r2=1757812&view=diff ============================================================================== --- uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/PrimitiveFeatureTreeNode.java (original) +++ uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/PrimitiveFeatureTreeNode.java Fri Aug 26 10:11:12 2016 @@ -21,8 +21,6 @@ package org.apache.uima.ruta.caseditor.v import java.util.ArrayList; import java.util.Comparator; -import java.util.Iterator; -import java.util.LinkedList; import org.apache.uima.cas.Feature; import org.apache.uima.cas.Type; @@ -44,33 +42,33 @@ public class PrimitiveFeatureTreeNode im this.children = new ArrayList<ITreeNode>(); } + @Override public void addChild(ITreeNode child) { this.children.add(child); } + @Override public ITreeNode[] getChildren() { return this.children.toArray(new ITreeNode[] {}); } - public Iterator<ITreeNode> getChildrenIterator() { - return this.children.iterator(); - } - + @Override public String getName() { return f.getShortName() + ": " + value; } - public void getNodes(LinkedList<ITreeNode> list) { - } + @Override public ITreeNode getParent() { return parent; } + @Override public Type getType() { return f.getRange(); } + @Override public boolean hasChildren() { if (children.size() > 0) { return true; @@ -86,10 +84,13 @@ public class PrimitiveFeatureTreeNode im return value; } + @Override public void sort(Comparator<ITreeNode> cp) { // nothing to do } + @Override + @SuppressWarnings("unchecked") public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { if (PrimitiveFeatureTreeNode.class.equals(adapter)) { Modified: uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/ToolTipListener.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/ToolTipListener.java?rev=1757812&r1=1757811&r2=1757812&view=diff ============================================================================== --- uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/ToolTipListener.java (original) +++ uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/ToolTipListener.java Fri Aug 26 10:11:12 2016 @@ -53,6 +53,7 @@ public class ToolTipListener implements * * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets .Event) */ + @Override public void handleEvent(Event event) { switch (event.type) { case SWT.Dispose: @@ -82,9 +83,6 @@ public class ToolTipListener implements } else if (item.getData() instanceof TypeTreeNode) { TypeTreeNode ttn = (TypeTreeNode) item.getData(); text = "Type: " + ttn.getName(); - // TODO would be nice to show the description of the type, too - // however, that seems to require the TypeDescription object - // Type type = ttn.getType(); } if (tip != null && !tip.isDisposed()) tip.dispose(); Modified: uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/TreeComparator.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/TreeComparator.java?rev=1757812&r1=1757811&r2=1757812&view=diff ============================================================================== --- uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/TreeComparator.java (original) +++ uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/TreeComparator.java Fri Aug 26 10:11:12 2016 @@ -26,6 +26,7 @@ public class TreeComparator implements j * * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) */ + @Override public int compare(ITreeNode o1, ITreeNode o2) { return o1.getName().compareToIgnoreCase(o2.getName()); } Modified: uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/TypeOrderedRootTreeNode.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/TypeOrderedRootTreeNode.java?rev=1757812&r1=1757811&r2=1757812&view=diff ============================================================================== --- uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/TypeOrderedRootTreeNode.java (original) +++ uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/TypeOrderedRootTreeNode.java Fri Aug 26 10:11:12 2016 @@ -20,8 +20,6 @@ package org.apache.uima.ruta.caseditor.view.tree; import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; import java.util.Map; import java.util.Stack; @@ -37,20 +35,16 @@ public class TypeOrderedRootTreeNode ext super(); } + @Override public String getName() { return null; } + @Override public Type getType() { return null; } - /** - * Gets a tree node for a type from cache; may create a new tree node. - * - * @param type - * @return - */ public TypeTreeNode getTreeNode(Type type) { TypeTreeNode typeTreeNode = typeMap.get(type); if (typeTreeNode == null) { @@ -61,8 +55,8 @@ public class TypeOrderedRootTreeNode ext return typeTreeNode; } + @Override public void insertFS(FeatureStructure fs, boolean withParents) { - // TODO hotfix for explanation types... Type type = fs.getType(); if (type.getShortName().equals("RutaBasic") || type.getShortName().equals("DebugBlockApply") || type.getShortName().equals("DebugMatchedRuleMatch") @@ -95,62 +89,13 @@ public class TypeOrderedRootTreeNode ext return new FSTreeNode(parent, fs); } - public LinkedList<ITreeNode> getNodes() { - LinkedList<ITreeNode> list = new LinkedList<ITreeNode>(); - getNodes(list); - return list; - } - - public LinkedList<ITreeNode> getNodes(Type type) { - Iterator<ITreeNode> iter = getChildrenIterator(); - - LinkedList<ITreeNode> list = new LinkedList<ITreeNode>(); - - while (iter.hasNext()) { - TypeTreeNode typeNode = (TypeTreeNode) iter.next(); - - if (typeNode.getType().equals(type)) { - Iterator<ITreeNode> children = typeNode.getChildrenIterator(); - - list.add(typeNode); - - while (children.hasNext()) - list.add(children.next()); - } - } - - return list; - } - - public LinkedList<ITreeNode> getNodes(AnnotationFS annot) { - Iterator<ITreeNode> iter = getChildrenIterator(); - - LinkedList<ITreeNode> list = new LinkedList<ITreeNode>(); - - while (iter.hasNext()) { - TypeTreeNode typeNode = (TypeTreeNode) iter.next(); - - if (typeNode.getType().equals(annot.getType())) { - Iterator<ITreeNode> children = typeNode.getChildrenIterator(); - - while (children.hasNext()) { - AnnotationTreeNode node = (AnnotationTreeNode) children.next(); - - if (node.getAnnotation().equals(annot)) { - list.add(node); - return list; - } - } - } - } - - return list; - } - + @Override public void sort() { sort(new TreeComparator()); } + @Override + @SuppressWarnings("unchecked") public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { if (TypeTreeNode.class.equals(adapter)) { Modified: uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/TypeTreeNode.java URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/TypeTreeNode.java?rev=1757812&r1=1757811&r2=1757812&view=diff ============================================================================== --- uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/TypeTreeNode.java (original) +++ uima/ruta/trunk/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/tree/TypeTreeNode.java Fri Aug 26 10:11:12 2016 @@ -34,10 +34,12 @@ public class TypeTreeNode extends Abstra this.type = type; } + @Override public String getName() { return type.getName(); } + @Override public Type getType() { return type; } @@ -57,6 +59,8 @@ public class TypeTreeNode extends Abstra return type.hashCode(); } + @Override + @SuppressWarnings("unchecked") public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { if (TypeTreeNode.class.equals(adapter)) {