You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2016/11/13 16:13:18 UTC
svn commit: r1769512 [4/15] - in /uima/uimaj/branches/experiment-v3-jcas:
uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/
uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/
uimaj-ep-cas-editor/src/main/java/org/apache/uim...
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TokenDrawingStrategy.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TokenDrawingStrategy.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TokenDrawingStrategy.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TokenDrawingStrategy.java Sun Nov 13 16:13:16 2016
@@ -27,9 +27,22 @@ import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Rectangle;
+// TODO: Auto-generated Javadoc
+/**
+ * The Class TokenDrawingStrategy.
+ */
public class TokenDrawingStrategy implements IDrawingStrategy {
+
+ /** The Constant BRACKET_WIDTH. */
private static final int BRACKET_WIDTH = 5;
+ /**
+ * Checks if is whitespace.
+ *
+ * @param text the text
+ * @param offset the offset
+ * @return true, if is whitespace
+ */
private static boolean isWhitespace(String text, int offset) {
char character = text.charAt(offset);
@@ -37,6 +50,10 @@ public class TokenDrawingStrategy implem
return Character.isWhitespace(character);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.text.source.AnnotationPainter.IDrawingStrategy#draw(org.eclipse.jface.text.source.Annotation, org.eclipse.swt.graphics.GC, org.eclipse.swt.custom.StyledText, int, int, org.eclipse.swt.graphics.Color)
+ */
+ @Override
public void draw(Annotation annotation, GC gc, StyledText textWidget, int offset, int length,
Color color) {
if (length > 0) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/UnderlineDrawingStrategy.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/UnderlineDrawingStrategy.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/UnderlineDrawingStrategy.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/UnderlineDrawingStrategy.java Sun Nov 13 16:13:16 2016
@@ -27,6 +27,7 @@ import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
+// TODO: Auto-generated Javadoc
/**
* Draws an line under an annotation.
*/
@@ -35,13 +36,14 @@ public class UnderlineDrawingStrategy im
/**
* Draws a line under under a given annotation.
*
- * @param annotation
- * @param gc
- * @param textWidget
- * @param offset
- * @param length
- * @param color
+ * @param annotation the annotation
+ * @param gc the gc
+ * @param textWidget the text widget
+ * @param offset the offset
+ * @param length the length
+ * @param color the color
*/
+ @Override
public void draw(Annotation annotation, GC gc, StyledText textWidget, int offset, int length,
Color color) {
if (gc != null) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/context/AnnotationEditingControl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/context/AnnotationEditingControl.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/context/AnnotationEditingControl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/context/AnnotationEditingControl.java Sun Nov 13 16:13:16 2016
@@ -25,15 +25,16 @@ import org.eclipse.swt.layout.FillLayout
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
+// TODO: Auto-generated Javadoc
/**
- * TODO: add javadoch here
+ * TODO: add javadoch here.
*/
public class AnnotationEditingControl extends Composite {
/**
* Initializes the current instance.
*
- * @param parent
+ * @param parent the parent
*/
public AnnotationEditingControl(Composite parent) {
super(parent, SWT.NONE);
@@ -49,7 +50,7 @@ public class AnnotationEditingControl ex
/**
* Display this feature structure.
*
- * @param structure
+ * @param structure the structure
*/
public void displayFeatureStructure(FeatureStructure structure) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/context/AnnotationEditingControlCreator.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/context/AnnotationEditingControlCreator.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/context/AnnotationEditingControlCreator.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/context/AnnotationEditingControlCreator.java Sun Nov 13 16:13:16 2016
@@ -27,21 +27,23 @@ import org.eclipse.jface.text.IInformati
import org.eclipse.jface.text.IInformationControlCreator;
import org.eclipse.swt.widgets.Shell;
+// TODO: Auto-generated Javadoc
/**
- * TODO: add javadoc here
+ * TODO: add javadoc here.
*/
public class AnnotationEditingControlCreator implements IInformationControlCreator {
/**
* Creates the information control.
*
- * @param parent
- *
+ * @param parent the parent
* @return the new control
*/
+ @Override
public IInformationControl createInformationControl(Shell parent) {
final ICustomInformationControlContentHandler contentHandler = new ICustomInformationControlContentHandler() {
+ @Override
public void setInput(CustomInformationControl control, Object input) {
AnnotationEditingControl annotationEditControl = (AnnotationEditingControl) control
.getControl();
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/IModeMenuListener.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/IModeMenuListener.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/IModeMenuListener.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/IModeMenuListener.java Sun Nov 13 16:13:16 2016
@@ -21,12 +21,22 @@ package org.apache.uima.caseditor.editor
import org.apache.uima.cas.Type;
+// TODO: Auto-generated Javadoc
+/**
+ * The listener interface for receiving IModeMenu events.
+ * The class that is interested in processing a IModeMenu
+ * event implements this interface, and the object created
+ * with that class is registered with a component using the
+ * component's <code>addIModeMenuListener</code> method. When
+ * the IModeMenu event occurs, that object's appropriate
+ * method is invoked.
+ */
public interface IModeMenuListener {
/**
* Mode was changed to a new mode.
- *
- * @param newMode
+ *
+ * @param newMode the new mode
*/
void modeChanged(Type newMode);
}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/IShowAnnotationsListener.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/IShowAnnotationsListener.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/IShowAnnotationsListener.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/IShowAnnotationsListener.java Sun Nov 13 16:13:16 2016
@@ -23,6 +23,22 @@ import java.util.Collection;
import org.apache.uima.cas.Type;
+// TODO: Auto-generated Javadoc
+/**
+ * The listener interface for receiving IShowAnnotations events.
+ * The class that is interested in processing a IShowAnnotations
+ * event implements this interface, and the object created
+ * with that class is registered with a component using the
+ * component's <code>addIShowAnnotationsListener</code> method. When
+ * the IShowAnnotations event occurs, that object's appropriate
+ * method is invoked.
+ */
public interface IShowAnnotationsListener {
- void selectionChanged(Collection<Type> selection);
+
+ /**
+ * Selection changed.
+ *
+ * @param selection the selection
+ */
+ void selectionChanged(Collection<Type> selection);
}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ModeMenu.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ModeMenu.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ModeMenu.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ModeMenu.java Sun Nov 13 16:13:16 2016
@@ -32,34 +32,50 @@ import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.MenuItem;
+// TODO: Auto-generated Javadoc
/**
* Creates the mode context sub menu.
*/
public class ModeMenu extends TypeMenu {
+ /** The editor. */
private AnnotationEditor editor;
+ /** The listeners. */
private Set<IModeMenuListener> listeners = new HashSet<IModeMenuListener>();
/**
* Initializes a new instance.
*
- * @param typeSystem
- * @param editor
+ * @param typeSystem the type system
+ * @param editor the editor
*/
public ModeMenu(TypeSystem typeSystem, AnnotationEditor editor) {
super(typeSystem.getType(CAS.TYPE_NAME_ANNOTATION), typeSystem);
this.editor = editor;
}
+ /**
+ * Adds the listener.
+ *
+ * @param listener the listener
+ */
public void addListener(IModeMenuListener listener) {
listeners.add(listener);
}
+ /**
+ * Removes the listener.
+ *
+ * @param listener the listener
+ */
public void removeListener(IModeMenuListener listener) {
listeners.remove(listener);
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.caseditor.editor.contextmenu.TypeMenu#insertAction(org.apache.uima.cas.Type, org.eclipse.swt.widgets.Menu)
+ */
@Override
protected void insertAction(final Type type, Menu parentMenu) {
MenuItem actionItem = new MenuItem(parentMenu, SWT.CHECK);
@@ -69,6 +85,7 @@ public class ModeMenu extends TypeMenu {
actionItem.setSelection(true);
actionItem.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event e) {
for (IModeMenuListener listener : listeners) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ShowAnnotationsMenu.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ShowAnnotationsMenu.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ShowAnnotationsMenu.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ShowAnnotationsMenu.java Sun Nov 13 16:13:16 2016
@@ -34,11 +34,13 @@ import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.MenuItem;
+// TODO: Auto-generated Javadoc
/**
* Creates the show annotations context sub menu.
*/
public class ShowAnnotationsMenu extends TypeMenu {
+ /** The listeners. */
private Set<IShowAnnotationsListener> listeners = new HashSet<IShowAnnotationsListener>();
/**
@@ -56,9 +58,9 @@ public class ShowAnnotationsMenu extends
/**
* Initializes a new instance.
- *
- * @param typeSystem
- * @param shownTypes
+ *
+ * @param typeSystem the type system
+ * @param shownTypes the shown types
*/
public ShowAnnotationsMenu(TypeSystem typeSystem, Collection<Type> shownTypes) {
super(typeSystem.getType(CAS.TYPE_NAME_ANNOTATION), typeSystem);
@@ -68,14 +70,27 @@ public class ShowAnnotationsMenu extends
}
}
+ /**
+ * Adds the listener.
+ *
+ * @param listener the listener
+ */
public void addListener(IShowAnnotationsListener listener) {
listeners.add(listener);
}
+ /**
+ * Removes the listener.
+ *
+ * @param listener the listener
+ */
public void removeListener(IShowAnnotationsListener listener) {
listeners.remove(listener);
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.caseditor.editor.contextmenu.TypeMenu#insertAction(org.apache.uima.cas.Type, org.eclipse.swt.widgets.Menu)
+ */
@Override
protected void insertAction(final Type type, Menu parentMenu) {
final MenuItem actionItem = new MenuItem(parentMenu, SWT.CHECK);
@@ -93,7 +108,8 @@ public class ShowAnnotationsMenu extends
// TODO: move this to an action
// do not access mTypesToDisplay directly !!!
actionItem.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event e) {
+ @Override
+ public void handleEvent(Event e) {
if (actionItem.getSelection()) {
typesToDisplay.add(type);
@@ -106,6 +122,11 @@ public class ShowAnnotationsMenu extends
});
}
+ /**
+ * Gets the selected types.
+ *
+ * @return the selected types
+ */
public Collection<Type> getSelectedTypes() {
Collection<Type> selectedTypes = new LinkedList<Type>();
@@ -120,12 +141,21 @@ public class ShowAnnotationsMenu extends
return Collections.unmodifiableCollection(selectedTypes);
}
+ /**
+ * Fire changed.
+ */
private void fireChanged() {
for (IShowAnnotationsListener listener : listeners) {
listener.selectionChanged(getSelectedTypes());
}
}
+ /**
+ * Sets the selected type.
+ *
+ * @param type the type
+ * @param isShown the is shown
+ */
public void setSelectedType(Type type, boolean isShown) {
if (typesToDisplay.contains(type)) {
@@ -142,6 +172,11 @@ public class ShowAnnotationsMenu extends
}
}
+ /**
+ * Sets the selected types.
+ *
+ * @param types the new selected types
+ */
public void setSelectedTypes(Collection<Type> types) {
typesToDisplay = new HashSet<Type>();
@@ -154,6 +189,11 @@ public class ShowAnnotationsMenu extends
}
}
+ /**
+ * Sets the editor annotation mode.
+ *
+ * @param newMode the new editor annotation mode
+ */
public void setEditorAnnotationMode(Type newMode) {
if (typesToDisplay.contains(newMode)) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/TypeMenu.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/TypeMenu.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/TypeMenu.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/TypeMenu.java Sun Nov 13 16:13:16 2016
@@ -29,19 +29,23 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.MenuItem;
+// TODO: Auto-generated Javadoc
/**
* Abstract base class for menus which display the type hierarchy.
*/
abstract class TypeMenu extends ContributionItem {
+
+ /** The m parent type. */
private Type mParentType;
+ /** The m type system. */
private TypeSystem mTypeSystem;
/**
* Initializes a new instance.
*
- * @param parentType
- * @param typeSystem
+ * @param parentType the parent type
+ * @param typeSystem the type system
*/
TypeMenu(Type parentType, TypeSystem typeSystem) {
mParentType = parentType;
@@ -51,14 +55,21 @@ abstract class TypeMenu extends Contribu
/**
* Fills the menu with type entries.
*
- * @param menu
- * @param index
+ * @param menu the menu
+ * @param index the index
*/
@Override
public void fill(Menu menu, int index) {
fillTypeMenu(mParentType, menu, false);
}
+ /**
+ * Fill type menu.
+ *
+ * @param parentType the parent type
+ * @param parentMenu the parent menu
+ * @param isParentIncluded the is parent included
+ */
private void fillTypeMenu(Type parentType, Menu parentMenu,
boolean isParentIncluded) {
@@ -100,9 +111,9 @@ abstract class TypeMenu extends Contribu
/**
* Implementing classes must implement this method to insert
* actions into the type menu.
- *
- * @param type
- * @param parentMenu
+ *
+ * @param type the type
+ * @param parentMenu the parent menu
*/
protected abstract void insertAction(final Type type, Menu parentMenu);
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/CreateFeatureStructureDialog.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/CreateFeatureStructureDialog.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/CreateFeatureStructureDialog.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/CreateFeatureStructureDialog.java Sun Nov 13 16:13:16 2016
@@ -39,32 +39,48 @@ import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
+// TODO: Auto-generated Javadoc
+/**
+ * The Class CreateFeatureStructureDialog.
+ */
public class CreateFeatureStructureDialog extends IconAndMessageDialog {
+ /** The title. */
private final String title;
+ /** The size label. */
private Label sizeLabel;
+ /** The size text. */
private Text sizeText;
+ /** The array size. */
private int arraySize;
+ /** The type system. */
private final TypeSystem typeSystem;
+ /** The super type. */
private final Type superType;
+ /** The is array size displayed. */
private boolean isArraySizeDisplayed;
+ /** The type selection. */
private TypeCombo typeSelection;
+ /** The selected type. */
private Type selectedType;
+ /** The filter types. */
private Collection<Type> filterTypes;
/**
* Initializes a the current instance.
*
- * @param parentShell
+ * @param parentShell the parent shell
+ * @param superType the super type
+ * @param typeSystem the type system
*/
protected CreateFeatureStructureDialog(Shell parentShell, Type superType, TypeSystem typeSystem) {
@@ -98,11 +114,19 @@ public class CreateFeatureStructureDialo
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
+ */
@Override
protected void configureShell(Shell newShell) {
newShell.setText(title);
}
+ /**
+ * Enable size enter.
+ *
+ * @param parent the parent
+ */
private void enableSizeEnter(Composite parent) {
if (!isArraySizeDisplayed) {
@@ -122,6 +146,7 @@ public class CreateFeatureStructureDialo
sizeText.setLayoutData(sizeTextData);
sizeText.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent event) {
try {
arraySize = Integer.parseInt(sizeText.getText());
@@ -135,6 +160,9 @@ public class CreateFeatureStructureDialo
}
}
+ /**
+ * Disable size enter.
+ */
private void disableSizeEnter() {
if (isArraySizeDisplayed) {
@@ -144,6 +172,9 @@ public class CreateFeatureStructureDialo
}
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
+ */
@Override
protected Control createDialogArea(final Composite parent) {
@@ -181,6 +212,7 @@ public class CreateFeatureStructureDialo
typeSelection.setLayoutData(typeSelectionData);
typeSelection.addListener(new ITypePaneListener() {
+ @Override
public void typeChanged(Type newType) {
selectedType = newType;
@@ -202,21 +234,37 @@ public class CreateFeatureStructureDialo
return labelAndText;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
+ */
@Override
protected void createButtonsForButtonBar(Composite parent) {
createButton(parent, IDialogConstants.OK_ID, "Create", true);
createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.dialogs.IconAndMessageDialog#getImage()
+ */
@Override
protected Image getImage() {
return getShell().getDisplay().getSystemImage(SWT.ICON_QUESTION);
}
+ /**
+ * Gets the array size.
+ *
+ * @return the array size
+ */
int getArraySize() {
return arraySize;
}
+ /**
+ * Gets the type.
+ *
+ * @return the type
+ */
Type getType() {
return selectedType;
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java Sun Nov 13 16:13:16 2016
@@ -24,8 +24,9 @@ import org.apache.uima.caseditor.editor.
import org.apache.uima.caseditor.editor.ICasEditor;
import org.eclipse.ui.part.IPageBookViewPage;
+// TODO: Auto-generated Javadoc
/**
- * TODO: add javadoc here
+ * TODO: add javadoc here.
*/
public final class EditView extends CasEditorView {
@@ -33,12 +34,20 @@ public final class EditView extends CasE
* The ID of the feature structure view.
*/
public static final String ID = "org.apache.uima.caseditor.editview";
+
+ /** The Constant ID_2. */
public static final String ID_2 = "org.apache.uima.caseditor.editview2";
+ /**
+ * Instantiates a new edits the view.
+ */
public EditView() {
super("The edit view is currently not available.");
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.caseditor.editor.CasEditorView#doCreatePage(org.apache.uima.caseditor.editor.ICasEditor)
+ */
@Override
protected IPageBookViewPage doCreatePage(ICasEditor editor) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java Sun Nov 13 16:13:16 2016
@@ -85,6 +85,7 @@ import org.eclipse.ui.actions.ActionFact
import org.eclipse.ui.actions.BaseSelectionListenerAction;
import org.eclipse.ui.part.Page;
+// TODO: Auto-generated Javadoc
/**
* The {@link EditViewPage} provides basic editing support for {@link FeatureStructure}s.
* It shows always the selected {@link FeatureStructure}, but for editing a certain
@@ -98,11 +99,23 @@ import org.eclipse.ui.part.Page;
*/
final class EditViewPage extends Page implements ISelectionListener {
+ /**
+ * The Class ValueEditingSupport.
+ */
private final class ValueEditingSupport extends EditingSupport {
+
+ /**
+ * Instantiates a new value editing support.
+ *
+ * @param viewer the viewer
+ */
private ValueEditingSupport(ColumnViewer viewer) {
super(viewer);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)
+ */
@Override
protected boolean canEdit(Object element) {
@@ -133,6 +146,9 @@ final class EditViewPage extends Page im
}
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)
+ */
@Override
protected CellEditor getCellEditor(Object element) {
@@ -204,6 +220,9 @@ final class EditViewPage extends Page im
}
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)
+ */
@Override
protected Object getValue(Object element) {
@@ -238,6 +257,9 @@ final class EditViewPage extends Page im
}
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)
+ */
@Override
protected void setValue(Object element, Object value) {
@@ -286,14 +308,23 @@ final class EditViewPage extends Page im
}
+ /**
+ * The Class DeleteFeatureStructureValue.
+ */
final class DeleteFeatureStructureValue extends BaseSelectionListenerAction {
+ /**
+ * Instantiates a new delete feature structure value.
+ */
protected DeleteFeatureStructureValue() {
super("Delete");
setEnabled(false);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.action.Action#run()
+ */
@Override
public void run() {
IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
@@ -319,6 +350,9 @@ final class EditViewPage extends Page im
}
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
+ */
@Override
protected boolean updateSelection(IStructuredSelection selection) {
@@ -347,8 +381,14 @@ final class EditViewPage extends Page im
}
}
+ /**
+ * The Class CreateFeatureStructrueValue.
+ */
private final class CreateFeatureStructrueValue extends BaseSelectionListenerAction {
+ /**
+ * Instantiates a new creates the feature structrue value.
+ */
protected CreateFeatureStructrueValue() {
super("Create");
@@ -356,6 +396,13 @@ final class EditViewPage extends Page im
}
+ /**
+ * Creates the FS.
+ *
+ * @param type the type
+ * @param arraySize the array size
+ * @return the feature structure
+ */
FeatureStructure createFS(Type type, int arraySize) {
if (type.isPrimitive()) {
@@ -416,6 +463,9 @@ final class EditViewPage extends Page im
return fs;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.action.Action#run()
+ */
@Override
public void run() {
IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
@@ -500,6 +550,9 @@ final class EditViewPage extends Page im
}
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
+ */
@Override
protected boolean updateSelection(IStructuredSelection selection) {
@@ -529,21 +582,41 @@ final class EditViewPage extends Page im
}
}
+ /**
+ * The Class PinAction.
+ */
private static final class PinAction extends Action {
+
+ /**
+ * Instantiates a new pin action.
+ */
PinAction() {
super("PinAction", IAction.AS_CHECK_BOX);
}
}
+ /** The viewer. */
private TreeViewer viewer;
+ /** The document. */
private ICasDocument document;
+
+ /** The editor. */
private ICasEditor editor;
+ /** The pin action. */
private PinAction pinAction;
+ /** The edit view. */
private final EditView editView;
+ /**
+ * Instantiates a new edits the view page.
+ *
+ * @param editView the edit view
+ * @param editor the editor
+ * @param document the document
+ */
EditViewPage(EditView editView, ICasEditor editor, ICasDocument document) {
if (editView == null || document == null) {
@@ -556,6 +629,9 @@ final class EditViewPage extends Page im
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.part.Page#createControl(org.eclipse.swt.widgets.Composite)
+ */
@Override
public void createControl(Composite parent) {
@@ -593,6 +669,7 @@ final class EditViewPage extends Page im
viewer.addDropSupport(DND.DROP_COPY, typesDropSupport, new DropTargetListener() {
+ @Override
public void dragEnter(DropTargetEvent event) {
// only the FeatureStructureTransfer is supported
// set currentTransferType to FeatureStructureTransfer, if possible
@@ -604,12 +681,15 @@ final class EditViewPage extends Page im
}
}
+ @Override
public void dragLeave(DropTargetEvent event) {
}
+ @Override
public void dragOperationChanged(DropTargetEvent event) {
}
+ @Override
public void dragOver(DropTargetEvent event) {
// TODO: check range type during drag over, like its done in drop()
@@ -621,6 +701,7 @@ final class EditViewPage extends Page im
}
}
+ @Override
public void drop(DropTargetEvent event) {
if (FeatureStructureTransfer.getInstance().isSupportedType(event.currentDataType)) {
@@ -672,6 +753,7 @@ final class EditViewPage extends Page im
}
}
+ @Override
public void dropAccept(DropTargetEvent event) {
}
});
@@ -684,6 +766,7 @@ final class EditViewPage extends Page im
source.addDragListener(new DragSourceListener() {
TreeItem dragSourceItem = null;
+ @Override
public void dragStart(DragSourceEvent event) {
event.doit = false;
@@ -701,12 +784,14 @@ final class EditViewPage extends Page im
}
}
+ @Override
public void dragSetData(DragSourceEvent event) {
IAdaptable adaptable = (IAdaptable) dragSourceItem.getData();
event.data = adaptable.getAdapter(FeatureStructure.class);
}
+ @Override
public void dragFinished(DragSourceEvent event) {
// not needed
}
@@ -719,17 +804,25 @@ final class EditViewPage extends Page im
/**
* Retrieves the main control of the edit view.
+ *
+ * @return the control
*/
@Override
public Control getControl() {
return viewer.getControl();
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.part.Page#setFocus()
+ */
@Override
public void setFocus() {
viewer.getControl().setFocus();
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.part.Page#setActionBars(org.eclipse.ui.IActionBars)
+ */
@Override
public void setActionBars(IActionBars actionBars) {
// pin action
@@ -757,6 +850,10 @@ final class EditViewPage extends Page im
ActionFactory.DELETE.create(getSite().getWorkbenchWindow()));
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
+ */
+ @Override
public void selectionChanged(IWorkbenchPart part, ISelection selection) {
if (getSite().getPage().getActiveEditor() == editor) {
@@ -776,6 +873,9 @@ final class EditViewPage extends Page im
}
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.part.Page#dispose()
+ */
@Override
public void dispose() {
getSite().getPage().removeSelectionListener(this);
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureColumnLabelProvider.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureColumnLabelProvider.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureColumnLabelProvider.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureColumnLabelProvider.java Sun Nov 13 16:13:16 2016
@@ -25,7 +25,15 @@ import org.apache.uima.caseditor.editor.
import org.eclipse.jface.viewers.CellLabelProvider;
import org.eclipse.jface.viewers.ViewerCell;
+// TODO: Auto-generated Javadoc
+/**
+ * The Class FeatureColumnLabelProvider.
+ */
final class FeatureColumnLabelProvider extends CellLabelProvider {
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.CellLabelProvider#update(org.eclipse.jface.viewers.ViewerCell)
+ */
@Override
public void update(ViewerCell cell) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java Sun Nov 13 16:13:16 2016
@@ -37,13 +37,24 @@ import org.eclipse.jface.viewers.ITreeCo
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.widgets.Display;
+// TODO: Auto-generated Javadoc
+/**
+ * The Class FeatureStructureContentProvider.
+ */
final class FeatureStructureContentProvider extends AbstractDocumentListener
implements ITreeContentProvider {
+ /** The m document. */
private ICasDocument mDocument;
+ /** The viewer. */
private Viewer viewer;
+ /**
+ * Instantiates a new feature structure content provider.
+ *
+ * @param document the document
+ */
FeatureStructureContentProvider(ICasDocument document) {
if (document == null) {
@@ -53,6 +64,12 @@ final class FeatureStructureContentProvi
mDocument = document;
}
+ /**
+ * Array size.
+ *
+ * @param value the value
+ * @return the int
+ */
private int arraySize(FeatureStructure value) {
if (!value.getType().isArray()) {
@@ -80,6 +97,10 @@ final class FeatureStructureContentProvi
return size;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+ */
+ @Override
public Object[] getElements(Object inputElement) {
if (inputElement != null) {
@@ -115,16 +136,25 @@ final class FeatureStructureContentProvi
}
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+ */
+ @Override
public void dispose() {
if (mDocument != null)
mDocument.removeChangeListener(this);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+ */
+ @Override
public void inputChanged(final Viewer viewer, Object oldInput, Object newInput) {
this.viewer = viewer;
if (newInput != null) {
Display.getDefault().syncExec(new Runnable() {
+ @Override
public void run() {
viewer.refresh();
}
@@ -132,22 +162,39 @@ final class FeatureStructureContentProvi
}
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.caseditor.editor.AbstractDocumentListener#added(java.util.Collection)
+ */
+ @Override
public void added(Collection<FeatureStructure> newFeatureStructure) {
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.caseditor.editor.AbstractDocumentListener#viewChanged(java.lang.String, java.lang.String)
+ */
+ @Override
public void viewChanged(String oldViewName, String newViewName) {
changed();
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.caseditor.editor.AbstractDocumentListener#changed()
+ */
+ @Override
public void changed() {
Display.getDefault().syncExec(new Runnable() {
+ @Override
public void run() {
viewer.setInput(null);
}
});
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.caseditor.editor.AbstractDocumentListener#removed(java.util.Collection)
+ */
+ @Override
public void removed(Collection<FeatureStructure> deletedFeatureStructure) {
for(FeatureStructure fs : deletedFeatureStructure) {
if (viewer.getInput() == fs) {
@@ -158,8 +205,13 @@ final class FeatureStructureContentProvi
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.caseditor.editor.AbstractDocumentListener#updated(java.util.Collection)
+ */
+ @Override
public void updated(Collection<FeatureStructure> featureStructure) {
Display.getDefault().syncExec(new Runnable() {
+ @Override
public void run() {
viewer.setSelection(viewer.getSelection());
viewer.refresh();
@@ -167,6 +219,10 @@ final class FeatureStructureContentProvi
});
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
+ */
+ @Override
public Object[] getChildren(Object parentElement) {
if (parentElement instanceof FeatureValue) {
@@ -192,10 +248,20 @@ final class FeatureStructureContentProvi
}
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
+ */
+ @Override
public Object getParent(Object element) {
return null;
}
+ /**
+ * Checks for children.
+ *
+ * @param value the value
+ * @return true, if successful
+ */
private boolean hasChildren(FeatureStructure value) {
boolean result;
@@ -216,6 +282,10 @@ final class FeatureStructureContentProvi
return result;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
+ */
+ @Override
public boolean hasChildren(Object element) {
if (element instanceof FeatureValue) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/ValueColumnLabelProvider.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/ValueColumnLabelProvider.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/ValueColumnLabelProvider.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/ValueColumnLabelProvider.java Sun Nov 13 16:13:16 2016
@@ -28,11 +28,15 @@ import org.apache.uima.caseditor.editor.
import org.eclipse.jface.viewers.CellLabelProvider;
import org.eclipse.jface.viewers.ViewerCell;
+// TODO: Auto-generated Javadoc
/**
* Provides the labels for the edit view.
*/
final class ValueColumnLabelProvider extends CellLabelProvider {
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.CellLabelProvider#update(org.eclipse.jface.viewers.ViewerCell)
+ */
@Override
public void update(ViewerCell cell) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/ByteCellEditorValidator.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/ByteCellEditorValidator.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/ByteCellEditorValidator.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/ByteCellEditorValidator.java Sun Nov 13 16:13:16 2016
@@ -21,6 +21,7 @@ package org.apache.uima.caseditor.editor
import org.eclipse.jface.viewers.ICellEditorValidator;
+// TODO: Auto-generated Javadoc
/**
* This {@link ICellEditorValidator} validates {@link String} values which represents a {@link Byte}.
*
@@ -31,9 +32,10 @@ public class ByteCellEditorValidator imp
/**
* Checks if the given value is a valid {@link Byte}.
*
- * @param value
+ * @param value the value
* @return null if valid otherwise an error message
*/
+ @Override
public String isValid(Object value) {
assert value instanceof String;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/CellEditorValidatorFacotory.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/CellEditorValidatorFacotory.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/CellEditorValidatorFacotory.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/CellEditorValidatorFacotory.java Sun Nov 13 16:13:16 2016
@@ -24,10 +24,13 @@ import java.util.Map;
import org.eclipse.jface.viewers.ICellEditorValidator;
+// TODO: Auto-generated Javadoc
/**
- * TODO: add javadoc here
+ * TODO: add javadoc here.
*/
public class CellEditorValidatorFacotory {
+
+ /** The s validator map. */
private static Map<Class<?>, ICellEditorValidator> sValidatorMap =
new HashMap<Class<?>, ICellEditorValidator>();
@@ -39,6 +42,9 @@ public class CellEditorValidatorFacotory
sValidatorMap.put(Float.class, new FloatCellEditorValidator());
}
+ /**
+ * Instantiates a new cell editor validator facotory.
+ */
private CellEditorValidatorFacotory() {
// must not be instantiated
}
@@ -47,8 +53,7 @@ public class CellEditorValidatorFacotory
* Retrieves the appropriate {@link ICellEditorValidator} for the given class or none if not
* available.
*
- * @param type
- *
+ * @param type the type
* @return {@link ICellEditorValidator} or null
*/
public static ICellEditorValidator createValidator(Class<?> type) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/FloatCellEditorValidator.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/FloatCellEditorValidator.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/FloatCellEditorValidator.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/FloatCellEditorValidator.java Sun Nov 13 16:13:16 2016
@@ -21,6 +21,7 @@ package org.apache.uima.caseditor.editor
import org.eclipse.jface.viewers.ICellEditorValidator;
+// TODO: Auto-generated Javadoc
/**
* This {@link ICellEditorValidator} validates {@link String} values which represents a
* {@link Float}.
@@ -28,12 +29,14 @@ import org.eclipse.jface.viewers.ICellEd
* For validation {@link Float#parseFloat(String)} is used.
*/
class FloatCellEditorValidator implements ICellEditorValidator {
+
/**
* Checks if the given value is a valid {@link Float}.
*
- * @param value
+ * @param value the value
* @return null if valid otherwise an error message
*/
+ @Override
public String isValid(Object value) {
assert value instanceof String;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/IntegerCellEditorValidator.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/IntegerCellEditorValidator.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/IntegerCellEditorValidator.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/IntegerCellEditorValidator.java Sun Nov 13 16:13:16 2016
@@ -21,6 +21,7 @@ package org.apache.uima.caseditor.editor
import org.eclipse.jface.viewers.ICellEditorValidator;
+// TODO: Auto-generated Javadoc
/**
* This {@link ICellEditorValidator} validates {@link String} values which represents a
* {@link Integer}.
@@ -28,12 +29,14 @@ import org.eclipse.jface.viewers.ICellEd
* For validation {@link Integer#parseInt(String)} is used.
*/
class IntegerCellEditorValidator implements ICellEditorValidator {
+
/**
* Checks if the given value is a valid {@link Integer}.
*
- * @param value
+ * @param value the value
* @return null if valid otherwise an error message
*/
+ @Override
public String isValid(Object value) {
assert value instanceof String;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/LongCellEditorValidator.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/LongCellEditorValidator.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/LongCellEditorValidator.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/LongCellEditorValidator.java Sun Nov 13 16:13:16 2016
@@ -21,6 +21,7 @@ package org.apache.uima.caseditor.editor
import org.eclipse.jface.viewers.ICellEditorValidator;
+// TODO: Auto-generated Javadoc
/**
* This {@link ICellEditorValidator} validates {@link String} values which represents a {@link Long}.
*
@@ -31,9 +32,10 @@ public class LongCellEditorValidator imp
/**
* Checks if the given value is a valid {@link Long}.
*
- * @param value
+ * @param value the value
* @return null if valid otherwise an error message
*/
+ @Override
public String isValid(Object value) {
assert value instanceof String;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/ShortCellEditorValidator.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/ShortCellEditorValidator.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/ShortCellEditorValidator.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/ShortCellEditorValidator.java Sun Nov 13 16:13:16 2016
@@ -21,6 +21,7 @@ package org.apache.uima.caseditor.editor
import org.eclipse.jface.viewers.ICellEditorValidator;
+// TODO: Auto-generated Javadoc
/**
* This {@link ICellEditorValidator} validates {@link String} values which represents a
* {@link Short}.
@@ -32,9 +33,10 @@ public class ShortCellEditorValidator im
/**
* Checks if the given value is a valid {@link Short}.
*
- * @param value
+ * @param value the value
* @return null if valid otherwise an error message
*/
+ @Override
public String isValid(Object value) {
assert value instanceof String;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserView.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserView.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserView.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserView.java Sun Nov 13 16:13:16 2016
@@ -24,6 +24,7 @@ import org.apache.uima.caseditor.editor.
import org.apache.uima.caseditor.editor.ICasEditor;
import org.eclipse.ui.part.IPageBookViewPage;
+// TODO: Auto-generated Javadoc
/**
* The Feature Structure Browser View displays a list of feature structures which
* belong to the selected type.
@@ -34,10 +35,16 @@ public final class FeatureStructureBrows
*/
public static final String ID = "org.apache.uima.caseditor.fsview";
+ /**
+ * Instantiates a new feature structure browser view.
+ */
public FeatureStructureBrowserView() {
super("The instance view is currently not available.");
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.caseditor.editor.CasEditorView#doCreatePage(org.apache.uima.caseditor.editor.ICasEditor)
+ */
@Override
protected IPageBookViewPage doCreatePage(ICasEditor editor) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java Sun Nov 13 16:13:16 2016
@@ -60,24 +60,40 @@ import org.eclipse.ui.IActionBars;
import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.part.Page;
+// TODO: Auto-generated Javadoc
/**
* The actual view page which contains the ui code for this view.
*/
public final class FeatureStructureBrowserViewPage extends Page {
+ /** The Constant LAST_SELECTED_FS_TYPE. */
private static final String LAST_SELECTED_FS_TYPE = "lastSelectedFeatureStructureBrowserViewType";
+ /**
+ * The Class FeatureStructureTreeContentProvider.
+ */
final class FeatureStructureTreeContentProvider extends AbstractAnnotationDocumentListener
implements ITreeContentProvider {
+ /** The m document. */
private ICasDocument mDocument;
+ /** The m current type. */
private Type mCurrentType;
+ /**
+ * Instantiates a new feature structure tree content provider.
+ *
+ * @param document the document
+ */
FeatureStructureTreeContentProvider(ICasDocument document) {
mDocument = document;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+ */
+ @Override
public Object[] getElements(Object inputElement) {
if (mCurrentType == null) {
return new Object[] {};
@@ -103,11 +119,19 @@ public final class FeatureStructureBrows
return featureStructureArray;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+ */
+ @Override
public void dispose() {
if (mDocument != null)
mDocument.removeChangeListener(this);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+ */
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
if (oldInput != null) {
@@ -125,6 +149,7 @@ public final class FeatureStructureBrows
mDocument.addChangeListener(this);
Display.getDefault().syncExec(new Runnable() {
+ @Override
public void run() {
mFSList.refresh();
}
@@ -134,9 +159,10 @@ public final class FeatureStructureBrows
/**
* Retrieves children for a FeatureStrcuture and for FeatureValues if they have children.
*
- * @param parentElement
+ * @param parentElement the parent element
* @return the children
*/
+ @Override
public Object[] getChildren(Object parentElement) {
Collection<Object> childs = new LinkedList<Object>();
@@ -165,10 +191,18 @@ public final class FeatureStructureBrows
return childs.toArray();
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
+ */
+ @Override
public Object getParent(Object element) {
return null;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
+ */
+ @Override
public boolean hasChildren(Object element) {
if (element instanceof IAdaptable
&& ((IAdaptable) element).getAdapter(FeatureStructure.class) != null) {
@@ -204,6 +238,9 @@ public final class FeatureStructureBrows
}
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.caseditor.editor.AbstractAnnotationDocumentListener#addedAnnotation(java.util.Collection)
+ */
@Override
protected void addedAnnotation(Collection<AnnotationFS> annotations) {
@@ -217,12 +254,16 @@ public final class FeatureStructureBrows
}
Display.getDefault().syncExec(new Runnable() {
+ @Override
public void run() {
mFSList.add(featureStrucutreList.toArray());
}
});
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.caseditor.editor.AbstractAnnotationDocumentListener#added(java.util.Collection)
+ */
@Override
public void added(Collection<FeatureStructure> structres) {
final LinkedList<ModelFeatureStructure> featureStrucutreList =
@@ -235,12 +276,16 @@ public final class FeatureStructureBrows
}
Display.getDefault().syncExec(new Runnable() {
+ @Override
public void run() {
mFSList.add(featureStrucutreList.toArray());
}
});
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.caseditor.editor.AbstractAnnotationDocumentListener#removedAnnotation(java.util.Collection)
+ */
@Override
protected void removedAnnotation(Collection<AnnotationFS> annotations) {
@@ -254,6 +299,7 @@ public final class FeatureStructureBrows
}
Display.getDefault().syncExec(new Runnable() {
+ @Override
public void run() {
mFSList.remove(featureStrucutreList.toArray());
}
@@ -261,6 +307,9 @@ public final class FeatureStructureBrows
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.caseditor.editor.AbstractAnnotationDocumentListener#removed(java.util.Collection)
+ */
@Override
public void removed(Collection<FeatureStructure> structres) {
final LinkedList<ModelFeatureStructure> featureStrucutreList =
@@ -273,27 +322,46 @@ public final class FeatureStructureBrows
}
Display.getDefault().syncExec(new Runnable() {
+ @Override
public void run() {
mFSList.remove(featureStrucutreList.toArray());
}
});
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.caseditor.editor.AbstractAnnotationDocumentListener#updatedAnnotation(java.util.Collection)
+ */
@Override
protected void updatedAnnotation(Collection<AnnotationFS> annotations) {
// ignore
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.caseditor.editor.AbstractDocumentListener#viewChanged(java.lang.String, java.lang.String)
+ */
+ @Override
public void viewChanged(String oldViewName, String newViewName) {
changed();
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.caseditor.editor.AbstractDocumentListener#changed()
+ */
+ @Override
public void changed() {
mFSList.refresh();
}
}
+ /**
+ * The Class CreateAction.
+ */
private class CreateAction extends Action {
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.action.Action#run()
+ */
// TOOD: extract it and add setType(...)
@Override
public void run() {
@@ -313,7 +381,14 @@ public final class FeatureStructureBrows
}
}
+ /**
+ * The Class SelectAllAction.
+ */
private class SelectAllAction extends Action {
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.action.Action#run()
+ */
@Override
public void run() {
mFSList.getList().selectAll();
@@ -321,27 +396,35 @@ public final class FeatureStructureBrows
}
}
+ /** The m document. */
private ICasDocument mDocument;
+ /** The m cas editor. */
private ICasEditor mCasEditor;
+ /** The m FS list. */
private ListViewer mFSList;
+ /** The m instance composite. */
private Composite mInstanceComposite;
+ /** The m current type. */
private Type mCurrentType;
+ /** The m delete action. */
private DeleteFeatureStructureAction mDeleteAction;
+ /** The m select all action. */
private Action mSelectAllAction;
+ /** The filter types. */
private Collection<Type> filterTypes;
/**
* Initializes a new instance.
*
- * @param editor
+ * @param editor the editor
*/
public FeatureStructureBrowserViewPage(ICasEditor editor) {
@@ -396,6 +479,9 @@ public final class FeatureStructureBrows
filterTypes.add(ts.getType(CAS.TYPE_NAME_STRING_LIST));
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.part.Page#createControl(org.eclipse.swt.widgets.Composite)
+ */
@Override
public void createControl(Composite parent) {
mInstanceComposite = new Composite(parent, SWT.NONE);
@@ -445,6 +531,7 @@ public final class FeatureStructureBrows
typeCombo.addListener(new ITypePaneListener() {
+ @Override
public void typeChanged(Type newType) {
store.setValue(LAST_SELECTED_FS_TYPE, newType.getName());
}
@@ -463,6 +550,7 @@ public final class FeatureStructureBrows
mFSList.setUseHashlookup(true);
typeCombo.addListener(new ITypePaneListener() {
+ @Override
public void typeChanged(Type newType) {
mCurrentType = newType;
@@ -477,7 +565,7 @@ public final class FeatureStructureBrows
}
/**
- * Retrieves the control
+ * Retrieves the control.
*
* @return the control
*/
@@ -490,9 +578,9 @@ public final class FeatureStructureBrows
* Adds the following actions to the toolbar: {@link FeatureStructureBrowserViewPage.CreateAction}
* DeleteAction
*
- * @param menuManager
- * @param toolBarManager
- * @param statusLineManager
+ * @param menuManager the menu manager
+ * @param toolBarManager the tool bar manager
+ * @param statusLineManager the status line manager
*/
@Override
public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager,
@@ -508,9 +596,9 @@ public final class FeatureStructureBrows
}
/**
- * Sets global action handlers for: delete select all
+ * Sets global action handlers for: delete select all.
*
- * @param actionBars
+ * @param actionBars the new action bars
*/
@Override
public void setActionBars(IActionBars actionBars) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureLabelProvider.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureLabelProvider.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureLabelProvider.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureLabelProvider.java Sun Nov 13 16:13:16 2016
@@ -28,10 +28,16 @@ import org.eclipse.jface.viewers.ILabelP
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.swt.graphics.Image;
+// TODO: Auto-generated Javadoc
/**
* Provide the labels for the given {@link FeatureStructure}s.
*/
public final class FeatureStructureLabelProvider implements ILabelProvider {
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
+ */
+ @Override
public String getText(Object element) {
if (element instanceof FeatureValue) {
FeatureValue featureValue = (FeatureValue) element;
@@ -70,20 +76,40 @@ public final class FeatureStructureLabel
}
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
+ */
+ @Override
public Image getImage(Object element) {
return null;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
+ */
+ @Override
public boolean isLabelProperty(Object element, String property) {
return false;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
+ */
+ @Override
public void addListener(ILabelProviderListener listener) {
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
+ */
+ @Override
public void removeListener(ILabelProviderListener listener) {
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
+ */
+ @Override
public void dispose() {
}
}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/ITypePaneListener.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/ITypePaneListener.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/ITypePaneListener.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/ITypePaneListener.java Sun Nov 13 16:13:16 2016
@@ -21,14 +21,16 @@ package org.apache.uima.caseditor.editor
import org.apache.uima.cas.Type;
+// TODO: Auto-generated Javadoc
/**
* Notifies clients about type changes.
*/
public interface ITypePaneListener {
+
/**
* Called after the type was changed.
*
- * @param newType
+ * @param newType the new type
*/
void typeChanged(Type newType);
}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/TypeCombo.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/TypeCombo.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/TypeCombo.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/TypeCombo.java Sun Nov 13 16:13:16 2016
@@ -35,6 +35,7 @@ import org.eclipse.swt.layout.FillLayout
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
+// TODO: Auto-generated Javadoc
/**
* A combo box which contains UIMA Types.
*
@@ -43,14 +44,23 @@ import org.eclipse.swt.widgets.Composite
*/
public class TypeCombo extends Composite {
+ /** The listeners. */
private Set<ITypePaneListener> listeners = new HashSet<ITypePaneListener>();
+ /** The type system. */
private TypeSystem typeSystem;
+ /** The type combo. */
private Combo typeCombo;
+ /** The type name list. */
private List<String> typeNameList;
+ /**
+ * Instantiates a new type combo.
+ *
+ * @param parent the parent
+ */
public TypeCombo(Composite parent) {
super(parent, SWT.NONE);
@@ -59,6 +69,7 @@ public class TypeCombo extends Composite
typeCombo = new Combo(this, SWT.READ_ONLY | SWT.DROP_DOWN | SWT.BORDER);
typeCombo.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
Type newType = getType();
@@ -69,6 +80,13 @@ public class TypeCombo extends Composite
});
}
+ /**
+ * Sets the input.
+ *
+ * @param superType the super type
+ * @param typeSystem the type system
+ * @param filterTypes the filter types
+ */
public void setInput(Type superType, TypeSystem typeSystem,
Collection<Type> filterTypes) {
this.typeSystem = typeSystem;
@@ -90,6 +108,12 @@ public class TypeCombo extends Composite
typeCombo.select(0);
}
+ /**
+ * Sets the input.
+ *
+ * @param superType the super type
+ * @param typeSystem the type system
+ */
public void setInput(Type superType, TypeSystem typeSystem) {
setInput(superType, typeSystem, Collections.<Type>emptyList());
}
@@ -97,8 +121,8 @@ public class TypeCombo extends Composite
/**
* Selects the given type or does nothing if the
* type is not listed.
- *
- * @param type
+ *
+ * @param type the type
*/
public void select(Type type) {
Integer typeIndex = typeNameList.indexOf(type.getName());
@@ -118,10 +142,20 @@ public class TypeCombo extends Composite
return typeSystem.getType(typeCombo.getText());
}
+ /**
+ * Adds the listener.
+ *
+ * @param listener the listener
+ */
public void addListener(ITypePaneListener listener) {
listeners.add(listener);
}
+ /**
+ * Removes the listener.
+ *
+ * @param listener the listener
+ */
public void removeListener(ITypePaneListener listener) {
listeners.remove(listener);
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java Sun Nov 13 16:13:16 2016
@@ -65,6 +65,7 @@ import org.eclipse.ui.part.IPage;
import org.eclipse.ui.views.contentoutline.ContentOutline;
import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+// TODO: Auto-generated Javadoc
/**
* This outline view displays all <code>AnnotationFS</code>s of the current
* mode/type from the binded editor.
@@ -79,14 +80,19 @@ public final class AnnotationOutline ext
/**
* Called if the editor annotation mode was changed.
- *
- * @param newMode
+ *
+ * @param newMode the new mode
*/
+ @Override
public void annotationModeChanged(Type newMode) {
changeAnnotationMode();
mTableViewer.refresh();
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.caseditor.editor.IAnnotationEditorModifyListener#showAnnotationsChanged(java.util.Collection)
+ */
+ @Override
public void showAnnotationsChanged(Collection<Type> shownAnnotationTypes) {
mTableViewer.refresh();
}
@@ -106,12 +112,16 @@ public final class AnnotationOutline ext
}
}
+ /** The editor change listener. */
private IAnnotationEditorModifyListener editorChangeListener;
+ /** The style. */
private OutlineStyles style = OutlineStyles.TYPE;
+ /** The m outline composite. */
private Composite mOutlineComposite;
+ /** The m table viewer. */
private TreeViewer mTableViewer;
/**
@@ -132,7 +142,7 @@ public final class AnnotationOutline ext
/**
* Creates the outline table control.
*
- * @param parent
+ * @param parent the parent
*/
@Override
public void createControl(Composite parent) {
@@ -157,6 +167,7 @@ public final class AnnotationOutline ext
source.addDragListener(new DragSourceListener() {
TreeItem dragSourceItem = null;
+ @Override
public void dragStart(DragSourceEvent event) {
TreeItem[] selection = mTableViewer.getTree().getSelection();
@@ -168,12 +179,14 @@ public final class AnnotationOutline ext
}
}
+ @Override
public void dragSetData(DragSourceEvent event) {
IAdaptable adaptable = (IAdaptable) dragSourceItem.getData();
event.data = adaptable.getAdapter(FeatureStructure.class);
}
+ @Override
public void dragFinished(DragSourceEvent event) {
// not needed
}
@@ -192,9 +205,9 @@ public final class AnnotationOutline ext
/**
* Adds the these actions to the global action handler: {@link DeleteFeatureStructureAction}
- * SelectAllAction
+ * SelectAllAction.
*
- * @param actionBars
+ * @param actionBars the new action bars
*/
@Override
public void setActionBars(IActionBars actionBars) {
@@ -274,10 +287,20 @@ public final class AnnotationOutline ext
super.setActionBars(actionBars);
}
+ /**
+ * Current style.
+ *
+ * @return the outline styles
+ */
OutlineStyles currentStyle() {
return style;
}
+ /**
+ * Switch style.
+ *
+ * @param style the style
+ */
void switchStyle(OutlineStyles style) {
this.style = style;
@@ -303,11 +326,19 @@ public final class AnnotationOutline ext
mOutlineComposite.setFocus();
}
+ /**
+ * Change annotation mode.
+ */
private void changeAnnotationMode() {
mTableViewer.setInput(editor.getDocument());
mTableViewer.refresh();
}
+ /**
+ * Creates the table viewer.
+ *
+ * @param parent the parent
+ */
private void createTableViewer(Composite parent) {
int style = SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION;
@@ -370,6 +401,10 @@ public final class AnnotationOutline ext
// set input element here ... this is the document
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
+ */
+ @Override
public void selectionChanged(IWorkbenchPart part, ISelection selection) {
boolean isForeignSelection = true;
@@ -399,6 +434,9 @@ public final class AnnotationOutline ext
}
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.part.Page#dispose()
+ */
@Override
public void dispose() {
@@ -410,6 +448,11 @@ public final class AnnotationOutline ext
editor.removeAnnotationListener(editorChangeListener);
}
+ /**
+ * Gets the viewer.
+ *
+ * @return the viewer
+ */
Viewer getViewer() {
return mTableViewer;
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNode.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNode.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNode.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNode.java Sun Nov 13 16:13:16 2016
@@ -27,18 +27,30 @@ import org.apache.uima.caseditor.editor.
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IAdaptable;
+// TODO: Auto-generated Javadoc
/**
- * TODO: add javadoc here
+ * TODO: add javadoc here.
*/
public class AnnotationTreeNode implements IAdaptable {
+
+ /** The m parent. */
private AnnotationTreeNode mParent;
+ /** The m children. */
private final AnnotationTreeNodeList mChildren;
+ /** The m annotation. */
private final AnnotationFS mAnnotation;
+ /** The m document. */
private final ICasDocument mDocument;
+ /**
+ * Instantiates a new annotation tree node.
+ *
+ * @param document the document
+ * @param annotation the annotation
+ */
AnnotationTreeNode(ICasDocument document, AnnotationFS annotation) {
Assert.isNotNull(document);
mDocument = document;
@@ -49,14 +61,29 @@ public class AnnotationTreeNode implemen
mChildren = new AnnotationTreeNodeList(mDocument);
}
+ /**
+ * Gets the parent.
+ *
+ * @return the parent
+ */
AnnotationTreeNode getParent() {
return mParent;
}
+ /**
+ * Gets the children.
+ *
+ * @return the children
+ */
List<AnnotationTreeNode> getChildren() {
return mChildren.getElements();
}
+ /**
+ * Gets the annotation.
+ *
+ * @return the annotation
+ */
AnnotationFS getAnnotation() {
return mAnnotation;
}
@@ -64,7 +91,7 @@ public class AnnotationTreeNode implemen
/**
* Checks if the given node is completly contained by the current node instance.
*
- * @param node
+ * @param node the node
* @return true if completly contained otherwise false
*/
boolean isChild(AnnotationTreeNode node) {
@@ -72,6 +99,11 @@ public class AnnotationTreeNode implemen
&& getAnnotation().getEnd() >= node.getAnnotation().getEnd();
}
+ /**
+ * Adds the child.
+ *
+ * @param node the node
+ */
void addChild(AnnotationTreeNode node) {
node.mParent = this;
@@ -80,6 +112,10 @@ public class AnnotationTreeNode implemen
mChildren.buildTree();
}
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
+ */
+ @Override
public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
// TODO:
// use ModelFeatureStructure
@@ -94,6 +130,9 @@ public class AnnotationTreeNode implemen
}
}
+ /* (non-Javadoc)
+ * @see java.lang.Object#hashCode()
+ */
@Override
public int hashCode() {
@@ -106,6 +145,9 @@ public class AnnotationTreeNode implemen
return mAnnotation.hashCode();
}
+ /* (non-Javadoc)
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
@Override
public boolean equals(Object obj) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNodeList.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNodeList.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNodeList.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNodeList.java Sun Nov 13 16:13:16 2016
@@ -27,6 +27,7 @@ import java.util.List;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.caseditor.editor.ICasDocument;
+// TODO: Auto-generated Javadoc
/**
* The {@link AnnotationTreeNodeList} class can build a tree of
* {@link AnnotationTreeNode} objects.
@@ -37,14 +38,28 @@ import org.apache.uima.caseditor.editor.
* TODO: Rename this class
*/
public class AnnotationTreeNodeList {
+
+ /** The m elements. */
private List<AnnotationTreeNode> mElements = new ArrayList<AnnotationTreeNode>();
+ /** The m document. */
private ICasDocument mDocument;
+ /**
+ * Instantiates a new annotation tree node list.
+ *
+ * @param document the document
+ */
AnnotationTreeNodeList(ICasDocument document) {
mDocument = document;
}
+ /**
+ * Instantiates a new annotation tree node list.
+ *
+ * @param document the document
+ * @param annotations the annotations
+ */
AnnotationTreeNodeList(ICasDocument document, Collection<AnnotationFS> annotations) {
mDocument = document;
@@ -55,14 +70,29 @@ public class AnnotationTreeNodeList {
// buildTree();
}
+ /**
+ * Gets the elements.
+ *
+ * @return the elements
+ */
List<AnnotationTreeNode> getElements() {
return mElements;
}
+ /**
+ * Adds the.
+ *
+ * @param node the node
+ */
void add(AnnotationTreeNode node) {
mElements.add(node);
}
+ /**
+ * Removes the.
+ *
+ * @param node the node
+ */
void remove(AnnotationTreeNode node) {
if (mElements.contains(node)) {
// insert children in the list
@@ -75,6 +105,9 @@ public class AnnotationTreeNodeList {
mElements.remove(node);
}
+ /**
+ * Builds the tree.
+ */
void buildTree() {
for (Iterator<AnnotationTreeNode> it = mElements.iterator(); it.hasNext();) {
AnnotationTreeNode aNode = it.next();
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTypeTreeNode.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTypeTreeNode.java?rev=1769512&r1=1769511&r2=1769512&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTypeTreeNode.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTypeTreeNode.java Sun Nov 13 16:13:16 2016
@@ -25,6 +25,7 @@ import java.util.List;
import org.apache.uima.cas.Type;
import org.eclipse.core.runtime.IAdaptable;
+// TODO: Auto-generated Javadoc
/**
* The {@link AnnotationTreeNode} is used to group annotations
* by their type. Only the {@link TypeGroupedContentProvider} creates
@@ -32,28 +33,54 @@ import org.eclipse.core.runtime.IAdaptab
*/
class AnnotationTypeTreeNode implements IAdaptable {
+ /** The type. */
// annotation type
private Type type;
+ /** The annotations. */
private List<AnnotationTreeNode> annotations = new ArrayList<AnnotationTreeNode>();
+ /**
+ * Instantiates a new annotation type tree node.
+ *
+ * @param type the type
+ */
public AnnotationTypeTreeNode(Type type) {
this.type = type;
}
+ /**
+ * Adds the.
+ *
+ * @param annotation the annotation
+ */
public void add(AnnotationTreeNode annotation) {
annotations.add(annotation);
}
+ /**
+ * Gets the annotations.
+ *
+ * @return the annotations
+ */
public AnnotationTreeNode[] getAnnotations() {
return annotations.toArray(new AnnotationTreeNode[annotations.size()]);
}
+ /**
+ * Removes the.
+ *
+ * @param annotation the annotation
+ */
public void remove(AnnotationTreeNode annotation) {
annotations.remove(annotation);
}
- public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
+ */
+ @Override
+ public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
if (Type.class.equals(adapter)) {
return type;
@@ -62,11 +89,17 @@ class AnnotationTypeTreeNode implements
return null;
}
+ /* (non-Javadoc)
+ * @see java.lang.Object#hashCode()
+ */
@Override
public int hashCode() {
return type.hashCode();
}
+ /* (non-Javadoc)
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
@Override
public boolean equals(Object obj) {
@@ -83,11 +116,19 @@ class AnnotationTypeTreeNode implements
}
}
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
@Override
public String toString() {
return type.getShortName() + " #chhildren = " + annotations.size();
}
+ /**
+ * Gets the type.
+ *
+ * @return the type
+ */
public Object getType() {
return type;
}