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 [3/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/DocumentUimaImpl.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/DocumentUimaImpl.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/DocumentUimaImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/DocumentUimaImpl.java Sun Nov 13 16:13:16 2016
@@ -71,26 +71,31 @@ import org.eclipse.jdt.internal.core.Jav
import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.jface.preference.IPreferenceStore;
+// TODO: Auto-generated Javadoc
/**
* This document implementation is based on an uima cas object.
*/
public class DocumentUimaImpl extends AbstractDocument {
+ /** The Constant JAVA_NATURE. */
public static final String JAVA_NATURE = "org.eclipse.jdt.core.javanature";
+ /** The m CAS. */
private CAS mCAS;
+ /** The format. */
private SerialFormat format = SerialFormat.XMI;
+ /** The type system text. */
private final String typeSystemText;
/**
* Initializes a new instance.
- *
- * @param cas
- * @param casFile
- * @param typeSystemText
- * type system string
+ *
+ * @param cas the cas
+ * @param casFile the cas file
+ * @param typeSystemText type system string
+ * @throws CoreException the core exception
*/
public DocumentUimaImpl(CAS cas, IFile casFile, String typeSystemText) throws CoreException {
mCAS = cas;
@@ -102,11 +107,17 @@ public class DocumentUimaImpl extends Ab
/**
* Retrieves the {@link CAS}.
+ *
+ * @return the cas
*/
+ @Override
public CAS getCAS() {
return mCAS;
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.caseditor.editor.AbstractDocument#getTypeSystemText()
+ */
@Override
public String getTypeSystemText() {
return typeSystemText;
@@ -114,8 +125,8 @@ public class DocumentUimaImpl extends Ab
/**
* Internally removes an annotation from the {@link CAS}.
- *
- * @param featureStructure
+ *
+ * @param featureStructure the feature structure
*/
private void addFeatureStructureInternal(FeatureStructure featureStructure) {
getCAS().getIndexRepository().addFS(featureStructure);
@@ -123,13 +134,20 @@ public class DocumentUimaImpl extends Ab
/**
* Adds the given annotation to the {@link CAS}.
+ *
+ * @param annotation the annotation
*/
+ @Override
public void addFeatureStructure(FeatureStructure annotation) {
addFeatureStructureInternal(annotation);
fireAddedFeatureStructure(annotation);
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.caseditor.editor.ICasDocument#addFeatureStructures(java.util.Collection)
+ */
+ @Override
public void addFeatureStructures(Collection<? extends FeatureStructure> annotations) {
for (FeatureStructure annotation : annotations) {
addFeatureStructureInternal(annotation);
@@ -142,8 +160,8 @@ public class DocumentUimaImpl extends Ab
/**
* Internally removes an annotation from the {@link CAS}.
- *
- * @param featureStructure
+ *
+ * @param featureStructure the feature structure
*/
private void removeAnnotationInternal(FeatureStructure featureStructure) {
getCAS().getIndexRepository().removeFS(featureStructure);
@@ -151,7 +169,10 @@ public class DocumentUimaImpl extends Ab
/**
* Removes the annotations from the {@link CAS}.
+ *
+ * @param annotation the annotation
*/
+ @Override
public void removeFeatureStructure(FeatureStructure annotation) {
removeAnnotationInternal(annotation);
@@ -160,7 +181,10 @@ public class DocumentUimaImpl extends Ab
/**
* Removes the given annotations from the {@link CAS}.
+ *
+ * @param annotationsToRemove the annotations to remove
*/
+ @Override
public void removeFeatureStructures(Collection<? extends FeatureStructure> annotationsToRemove) {
for (FeatureStructure annotationToRemove : annotationsToRemove) {
@@ -174,25 +198,39 @@ public class DocumentUimaImpl extends Ab
/**
* Notifies clients about the changed annotation.
+ *
+ * @param annotation the annotation
*/
+ @Override
public void update(FeatureStructure annotation) {
fireUpdatedFeatureStructure(annotation);
}
/**
* Notifies clients about the changed annotation.
+ *
+ * @param annotations the annotations
*/
+ @Override
public void updateFeatureStructure(Collection<? extends FeatureStructure> annotations) {
fireUpdatedFeatureStructure(annotations);
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.caseditor.editor.ICasDocument#changed()
+ */
+ @Override
public void changed() {
fireChanged();
}
/**
* Retrieves annotations of the given type from the {@link CAS}.
+ *
+ * @param type the type
+ * @return the annotations
*/
+ @Override
public Collection<AnnotationFS> getAnnotations(Type type) {
FSIndex<AnnotationFS> annotationIndex = mCAS.getAnnotationIndex(type);
@@ -204,10 +242,16 @@ public class DocumentUimaImpl extends Ab
return fsIteratorToCollection(strictTypeIterator);
}
+ /**
+ * Fs iterator to collection.
+ *
+ * @param iterator the iterator
+ * @return the collection
+ */
static Collection<AnnotationFS> fsIteratorToCollection(FSIterator<AnnotationFS> iterator) {
LinkedList<AnnotationFS> annotations = new LinkedList<AnnotationFS>();
while (iterator.hasNext()) {
- AnnotationFS annotation = (AnnotationFS) iterator.next();
+ AnnotationFS annotation = iterator.next();
annotations.addFirst(annotation);
}
@@ -217,11 +261,19 @@ public class DocumentUimaImpl extends Ab
/**
* Retrieves the given type from the {@link TypeSystem}.
+ *
+ * @param type the type
+ * @return the type
*/
+ @Override
public Type getType(String type) {
return getCAS().getTypeSystem().getType(type);
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.caseditor.editor.ICasDocument#switchView(java.lang.String)
+ */
+ @Override
public void switchView(String viewName) {
String oldViewName = mCAS.getViewName();
@@ -232,6 +284,9 @@ public class DocumentUimaImpl extends Ab
/**
* Sets the content. The XCAS {@link InputStream} gets parsed.
+ *
+ * @param casFile the new content
+ * @throws CoreException the core exception
*/
private void setContent(IFile casFile) throws CoreException {
@@ -252,6 +307,12 @@ public class DocumentUimaImpl extends Ab
}
+ /**
+ * Throw core exception.
+ *
+ * @param e the e
+ * @throws CoreException the core exception
+ */
private void throwCoreException(Exception e) throws CoreException {
String message = e.getMessage() != null ? e.getMessage() : "";
IStatus s = new Status(IStatus.ERROR, CasEditorPlugin.ID, IStatus.OK, message, e);
@@ -260,6 +321,9 @@ public class DocumentUimaImpl extends Ab
/**
* Serializes the {@link CAS} to the given {@link OutputStream} in the XCAS format.
+ *
+ * @param out the out
+ * @throws CoreException the core exception
*/
public void serialize(OutputStream out) throws CoreException {
try {
@@ -269,6 +333,13 @@ public class DocumentUimaImpl extends Ab
}
}
+ /**
+ * Gets the virgin CAS.
+ *
+ * @param typeSystemFile the type system file
+ * @return the virgin CAS
+ * @throws CoreException the core exception
+ */
public static CAS getVirginCAS(IFile typeSystemFile) throws CoreException {
ResourceSpecifierFactory resourceSpecifierFactory = UIMAFramework.getResourceSpecifierFactory();
@@ -338,6 +409,13 @@ public class DocumentUimaImpl extends Ab
return cas;
}
+ /**
+ * Gets the project class loader.
+ *
+ * @param project the project
+ * @return the project class loader
+ * @throws CoreException the core exception
+ */
public static ClassLoader getProjectClassLoader(IProject project) throws CoreException {
IProjectNature javaNature = project.getNature(JAVA_NATURE);
if (javaNature != null) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelection.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/FeatureStructureSelection.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/FeatureStructureSelection.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelection.java Sun Nov 13 16:13:16 2016
@@ -30,14 +30,20 @@ import org.eclipse.jface.viewers.IStruct
import org.eclipse.jface.viewers.StructuredSelection;
+// TODO: Auto-generated Javadoc
+/**
+ * The Class FeatureStructureSelection.
+ */
public class FeatureStructureSelection {
+
+ /** The m feature structures. */
private List<FeatureStructure> mFeatureStructures;
/**
* Initializes a the current instance with all FeatureStructure object that are contained in the
* {@link StructuredSelection}.
*
- * @param selection
+ * @param selection the selection
*/
public FeatureStructureSelection(IStructuredSelection selection) {
mFeatureStructures = new ArrayList<FeatureStructure>(selection.size());
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelectionIterator.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/FeatureStructureSelectionIterator.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/FeatureStructureSelectionIterator.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelectionIterator.java Sun Nov 13 16:13:16 2016
@@ -27,19 +27,22 @@ import org.apache.uima.cas.text.Annotati
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.viewers.IStructuredSelection;
+// TODO: Auto-generated Javadoc
/**
* Iterates over all selected {@link FeatureStructure}s.
*/
public class FeatureStructureSelectionIterator implements Iterator<FeatureStructure> {
+ /** The m selection iterator. */
private Iterator<?> mSelectionIterator;
+ /** The m next. */
private FeatureStructure mNext;
/**
* Initializes the current instance.
*
- * @param selection
+ * @param selection the selection
*/
public FeatureStructureSelectionIterator(IStructuredSelection selection) {
mSelectionIterator = selection.iterator();
@@ -50,6 +53,7 @@ public class FeatureStructureSelectionIt
*
* @return true if there is one more element.
*/
+ @Override
public boolean hasNext() {
while (mSelectionIterator.hasNext() && mNext == null) {
Object item = mSelectionIterator.next();
@@ -67,6 +71,7 @@ public class FeatureStructureSelectionIt
*
* @return the next element.
*/
+ @Override
public FeatureStructure next() {
if (!hasNext()) {
throw new NoSuchElementException();
@@ -83,6 +88,7 @@ public class FeatureStructureSelectionIt
*
* @throws UnsupportedOperationException -
*/
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelectionProvider.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/FeatureStructureSelectionProvider.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/FeatureStructureSelectionProvider.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelectionProvider.java Sun Nov 13 16:13:16 2016
@@ -33,21 +33,25 @@ import org.eclipse.jface.viewers.IStruct
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
+// TODO: Auto-generated Javadoc
/**
* This class is a {@link ISelectionProvider} and informs its listeners about the currently selected
* {@link FeatureStructure}s.
*/
class FeatureStructureSelectionProvider implements ISelectionProvider {
+ /** The m current selection. */
private IStructuredSelection mCurrentSelection = new StructuredSelection();
+ /** The m listeners. */
private Set<ISelectionChangedListener> mListeners = new HashSet<ISelectionChangedListener>();
/**
* Adds an {@link ISelectionChangedListener} to this provider.
*
- * @param listener
+ * @param listener the listener
*/
+ @Override
public void addSelectionChangedListener(ISelectionChangedListener listener) {
Assert.isNotNull(listener);
@@ -59,6 +63,7 @@ class FeatureStructureSelectionProvider
*
* @return selection
*/
+ @Override
public ISelection getSelection() {
return mCurrentSelection;
}
@@ -69,6 +74,7 @@ class FeatureStructureSelectionProvider
* @param listener
* the listener to remove
*/
+ @Override
public void removeSelectionChangedListener(ISelectionChangedListener listener) {
mListeners.remove(listener);
}
@@ -76,8 +82,9 @@ class FeatureStructureSelectionProvider
/**
* Sets the current selection.
*
- * @param selection
+ * @param selection the new selection
*/
+ @Override
public void setSelection(ISelection selection) {
Assert.isNotNull(selection);
@@ -95,7 +102,8 @@ class FeatureStructureSelectionProvider
/**
* Sets the current selection to the given {@link AnnotationFS} object.
*
- * @param annotation
+ * @param document the document
+ * @param annotation the annotation
*/
public void setSelection(ICasDocument document, AnnotationFS annotation) {
if (annotation == null) {
@@ -105,6 +113,12 @@ class FeatureStructureSelectionProvider
setSelection(new StructuredSelection(new ModelFeatureStructure(document, annotation)));
}
+ /**
+ * Sets the selection.
+ *
+ * @param document the document
+ * @param selection the selection
+ */
public void setSelection(ICasDocument document, List<AnnotationFS> selection) {
setSelection(new StructuredSelection(ModelFeatureStructure.create(document, selection)));
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.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/FeatureValue.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/FeatureValue.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java Sun Nov 13 16:13:16 2016
@@ -27,17 +27,24 @@ import org.apache.uima.caseditor.editor.
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IAdaptable;
+// TODO: Auto-generated Javadoc
+/**
+ * The Class FeatureValue.
+ */
public final class FeatureValue implements IAdaptable {
+
+ /** The m structure. */
private FeatureStructure mStructure;
+ /** The m feature. */
private Feature mFeature;
/**
* Initializes a new instance.
*
- * @param document
- * @param structure
- * @param feature
+ * @param document the document
+ * @param structure the structure
+ * @param feature the feature
*/
public FeatureValue(ICasDocument document, FeatureStructure structure, Feature feature) {
Assert.isNotNull(document);
@@ -50,10 +57,20 @@ public final class FeatureValue implemen
mStructure = structure;
}
+ /**
+ * Gets the feature structure.
+ *
+ * @return the feature structure
+ */
public FeatureStructure getFeatureStructure() {
return mStructure;
}
+ /**
+ * Gets the value.
+ *
+ * @return the value
+ */
public Object getValue() {
if (mFeature.getRange().isPrimitive()) {
return Primitives.getPrimitive(mStructure, mFeature);
@@ -62,6 +79,10 @@ public final class FeatureValue implemen
return mStructure.getFeatureValue(mFeature);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
+ */
+ @Override
public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
if (AnnotationFS.class.equals(adapter)) {
if (getValue() instanceof AnnotationFS) {
@@ -78,6 +99,9 @@ public final class FeatureValue implemen
return null;
}
+ /* (non-Javadoc)
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
@Override
public boolean equals(Object object) {
boolean result = false;
@@ -94,6 +118,9 @@ public final class FeatureValue implemen
return result;
}
+ /* (non-Javadoc)
+ * @see java.lang.Object#hashCode()
+ */
@Override
public int hashCode() {
return mStructure.hashCode() | mFeature.hashCode();
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateAction.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/FindAnnotateAction.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/FindAnnotateAction.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateAction.java Sun Nov 13 16:13:16 2016
@@ -23,6 +23,7 @@ import org.eclipse.jface.action.Action;
import org.eclipse.jface.text.IFindReplaceTarget;
import org.eclipse.swt.widgets.Display;
+// TODO: Auto-generated Javadoc
/**
* An Action to open the Find/Annotate Dialog.
*
@@ -30,14 +31,26 @@ import org.eclipse.swt.widgets.Display;
*/
public class FindAnnotateAction extends Action {
+ /** The editor. */
private AnnotationEditor editor;
+
+ /** The target. */
private IFindReplaceTarget target;
+ /**
+ * Instantiates a new find annotate action.
+ *
+ * @param editor the editor
+ * @param target the target
+ */
FindAnnotateAction(AnnotationEditor editor, IFindReplaceTarget target) {
this.editor = editor;
this.target = target;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.action.Action#run()
+ */
@Override
public void run() {
FindAnnotateDialog dialog = new FindAnnotateDialog(
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.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/FindAnnotateDialog.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/FindAnnotateDialog.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java Sun Nov 13 16:13:16 2016
@@ -46,6 +46,7 @@ import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
+// TODO: Auto-generated Javadoc
/**
* A dialog to find and annotate a piece of text in the document.
*
@@ -58,24 +59,49 @@ import org.eclipse.swt.widgets.Shell;
*/
class FindAnnotateDialog extends Dialog {
+ /** The Constant FIND_BUTTON. */
private static final int FIND_BUTTON = 100;
+
+ /** The Constant ANNOTATE_FIND_BUTTON. */
private static final int ANNOTATE_FIND_BUTTON = 101;
+
+ /** The Constant ANNOTATE_BUTTON. */
private static final int ANNOTATE_BUTTON = 102;
+
+ /** The Constant ANNOTATE_ALL_BUTTON. */
private static final int ANNOTATE_ALL_BUTTON = 103;
+
+ /** The close button. */
private static int CLOSE_BUTTON = 104;
+ /** The find replace target. */
private final IFindReplaceTarget findReplaceTarget;
+
+ /** The document. */
private final ICasDocument document;
+
+ /** The mode type. */
private final Type modeType;
+ /** The find field. */
private Combo findField;
+
+ /** The type field. */
private TypeCombo typeField;
+ /** The wide left side button. */
private Button wideLeftSideButton;
+
+ /** The lower left side button. */
private Button lowerLeftSideButton;
+
+ /** The lower right side button. */
private Button lowerRightSideButton;
+
+ /** The wide right side button. */
private Button wideRightSideButton;
+ /** The forward radio button. */
private Button forwardRadioButton;
/**
@@ -85,6 +111,14 @@ class FindAnnotateDialog extends Dialog
*/
private AnnotationFS currentAnnotation;
+ /**
+ * Instantiates a new find annotate dialog.
+ *
+ * @param parentShell the parent shell
+ * @param document the document
+ * @param findReplaceTarget the find replace target
+ * @param modeType the mode type
+ */
FindAnnotateDialog(Shell parentShell, ICasDocument document, IFindReplaceTarget findReplaceTarget, Type modeType) {
super(parentShell);
this.document = document;
@@ -92,6 +126,9 @@ class FindAnnotateDialog extends Dialog
this.modeType = modeType;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.dialogs.Dialog#create()
+ */
@Override
public void create() {
// calls createContents first
@@ -106,10 +143,9 @@ class FindAnnotateDialog extends Dialog
/**
* Creates the search string input field.
- *
- * @param parent
- *
- * @return
+ *
+ * @param parent the parent
+ * @return the composite
*/
private Composite createInputPanel(Composite parent) {
Composite panel= new Composite(parent, SWT.NULL);
@@ -155,10 +191,9 @@ class FindAnnotateDialog extends Dialog
/**
* Creates the group to specify the direction of the search.
- *
- * @param parent
- *
- * @return
+ *
+ * @param parent the parent
+ * @return the composite
*/
private Composite createDirectionGroup(Composite parent) {
Composite panel = new Composite(parent, SWT.NONE);
@@ -184,6 +219,11 @@ class FindAnnotateDialog extends Dialog
return panel;
}
+ /**
+ * Creates the annotation buttons.
+ *
+ * @param parent the parent
+ */
private void createAnnotationButtons(Composite parent) {
Composite panel = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout();
@@ -204,10 +244,12 @@ class FindAnnotateDialog extends Dialog
wideLeftSideButton.setEnabled(false);
wideLeftSideButton.addSelectionListener(new SelectionListener(){
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
// never called, do not implement
}
+ @Override
public void widgetSelected(SelectionEvent e) {
WideLeftAnnotationSideAction.wideLeftAnnotationSide(document, currentAnnotation);
}
@@ -218,10 +260,12 @@ class FindAnnotateDialog extends Dialog
Images.LOWER_LEFT_SIDE).createImage());
lowerLeftSideButton.setEnabled(false);
lowerLeftSideButton.addSelectionListener(new SelectionListener(){
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
// never called, do not implement
}
+ @Override
public void widgetSelected(SelectionEvent e) {
LowerLeftAnnotationSideAction.lowerLeftAnnotationSide(document, currentAnnotation);
}
@@ -232,10 +276,12 @@ class FindAnnotateDialog extends Dialog
Images.LOWER_RIGHT_SIDE).createImage());
lowerRightSideButton.setEnabled(false);
lowerRightSideButton.addSelectionListener(new SelectionListener(){
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
// never called, do not implement
}
+ @Override
public void widgetSelected(SelectionEvent e) {
LowerRightAnnotationSideAction.lowerRightAnnotationSide(document, currentAnnotation);
}
@@ -246,16 +292,21 @@ class FindAnnotateDialog extends Dialog
Images.WIDE_RIGHT_SIDE).createImage());
wideRightSideButton.setEnabled(false);
wideRightSideButton.addSelectionListener(new SelectionListener(){
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
// never called, do not implement
}
+ @Override
public void widgetSelected(SelectionEvent e) {
WideRightAnnotationSideAction.wideRightAnnotationSide(document, currentAnnotation);
}
});
}
+ /**
+ * Update annotation buttons.
+ */
private void updateAnnotationButtons() {
boolean areButtonsEnabled = currentAnnotation != null;
@@ -267,10 +318,9 @@ class FindAnnotateDialog extends Dialog
/**
* Creates the find and annotate buttons.
- *
- * @param parent
- *
- * @return
+ *
+ * @param parent the parent
+ * @return the composite
*/
private Composite createButtonSection(Composite parent) {
Composite panel = new Composite(parent, SWT.NONE);
@@ -295,6 +345,12 @@ class FindAnnotateDialog extends Dialog
return panel;
}
+ /**
+ * Creates the status and close button.
+ *
+ * @param parent the parent
+ * @return the composite
+ */
private Composite createStatusAndCloseButton(Composite parent) {
Composite panel= new Composite(parent, SWT.NULL);
@@ -319,6 +375,9 @@ class FindAnnotateDialog extends Dialog
return panel;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.dialogs.Dialog#createContents(org.eclipse.swt.widgets.Composite)
+ */
@Override
protected Control createContents(Composite parent) {
@@ -381,6 +440,11 @@ class FindAnnotateDialog extends Dialog
}
}
+ /**
+ * Annotate selection.
+ *
+ * @return the annotation FS
+ */
private AnnotationFS annotateSelection() {
Point selection = findReplaceTarget.getSelection();
@@ -392,6 +456,9 @@ class FindAnnotateDialog extends Dialog
return newAnnotation;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int)
+ */
@Override
protected void buttonPressed(int buttonID) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/IAnnotationEditorModifyListener.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/IAnnotationEditorModifyListener.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/IAnnotationEditorModifyListener.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/IAnnotationEditorModifyListener.java Sun Nov 13 16:13:16 2016
@@ -23,19 +23,29 @@ import java.util.Collection;
import org.apache.uima.cas.Type;
+// TODO: Auto-generated Javadoc
+/**
+ * The listener interface for receiving IAnnotationEditorModify events.
+ * The class that is interested in processing a IAnnotationEditorModify
+ * event implements this interface, and the object created
+ * with that class is registered with a component using the
+ * component's <code>addIAnnotationEditorModifyListener</code> method. When
+ * the IAnnotationEditorModify event occurs, that object's appropriate
+ * method is invoked.
+ */
public interface IAnnotationEditorModifyListener {
/**
* Called when the editor annotation mode changed.
*
- * @param newMode
+ * @param newMode the new mode
*/
public void annotationModeChanged(Type newMode);
/**
* Called when the shown annotation types in the editor are changed.
- *
- * @param shownAnnotationTypes
+ *
+ * @param shownAnnotationTypes the shown annotation types
*/
public void showAnnotationsChanged(Collection<Type> shownAnnotationTypes);
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/IAnnotationStyleListener.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/IAnnotationStyleListener.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/IAnnotationStyleListener.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/IAnnotationStyleListener.java Sun Nov 13 16:13:16 2016
@@ -21,6 +21,22 @@ package org.apache.uima.caseditor.editor
import java.util.Collection;
+// TODO: Auto-generated Javadoc
+/**
+ * The listener interface for receiving IAnnotationStyle events.
+ * The class that is interested in processing a IAnnotationStyle
+ * event implements this interface, and the object created
+ * with that class is registered with a component using the
+ * component's <code>addIAnnotationStyleListener</code> method. When
+ * the IAnnotationStyle event occurs, that object's appropriate
+ * method is invoked.
+ */
public interface IAnnotationStyleListener {
+
+ /**
+ * Annotation styles changed.
+ *
+ * @param styles the styles
+ */
void annotationStylesChanged(Collection<AnnotationStyle> styles);
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.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/ICasDocument.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/ICasDocument.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java Sun Nov 13 16:13:16 2016
@@ -26,6 +26,7 @@ import org.apache.uima.cas.FeatureStruct
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
+// TODO: Auto-generated Javadoc
/**
* The {@link ICasDocument} represents texts with meta information.
*
@@ -41,15 +42,15 @@ public interface ICasDocument {
/**
* Adds a given change listener.
- *
- * @param listener
+ *
+ * @param listener the listener
*/
void addChangeListener(ICasDocumentListener listener);
/**
* Removes the given change listener.
- *
- * @param listener
+ *
+ * @param listener the listener
*/
void removeChangeListener(ICasDocumentListener listener);
@@ -70,8 +71,8 @@ public interface ICasDocument {
/**
* Adds the {@link FeatureStructure}s.
- *
- * @param structures
+ *
+ * @param structures the structures
*/
void addFeatureStructures(Collection<? extends FeatureStructure> structures);
@@ -85,22 +86,22 @@ public interface ICasDocument {
/**
* Removes the given {@link FeatureStructure}s.
- *
- * @param structuresToRemove
+ *
+ * @param structuresToRemove the structures to remove
*/
void removeFeatureStructures(Collection<? extends FeatureStructure> structuresToRemove);
/**
* Updates the given {@link FeatureStructure}.
- *
- * @param structure
+ *
+ * @param structure the structure
*/
void update(FeatureStructure structure);
/**
* Updates the given {@link FeatureStructure}s.
- *
- * @param structures
+ *
+ * @param structures the structures
*/
void updateFeatureStructure(Collection<? extends FeatureStructure> structures);
@@ -121,22 +122,22 @@ public interface ICasDocument {
/**
* Switches the view of the underlying CAS to the provided view name.
- *
- * @param viewName
+ *
+ * @param viewName the view name
*/
void switchView(String viewName);
/**
* Retrieves the requested type.
- *
- * @param type
+ *
+ * @param type the type
* @return the type
*/
Type getType(String type);
/**
- * Retrieves the string representation of the applied type system
- *
+ * Retrieves the string representation of the applied type system.
+ *
* @return the string representation of the applied type system
*/
String getTypeSystemText();
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocumentListener.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/ICasDocumentListener.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/ICasDocumentListener.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocumentListener.java Sun Nov 13 16:13:16 2016
@@ -23,6 +23,7 @@ import java.util.Collection;
import org.apache.uima.cas.FeatureStructure;
+// TODO: Auto-generated Javadoc
/**
* This interface is used to notifies clients about {@link FeatureStructure} changes.
*/
@@ -61,15 +62,15 @@ public interface ICasDocumentListener {
/**
* This method is called if the {@link FeatureStructure} changed.
- *
- * @param featureStructure
+ *
+ * @param featureStructure the feature structure
*/
void updated(FeatureStructure featureStructure);
/**
* This method is called if the {@link FeatureStructure}s changed.
- *
- * @param featureStructure
+ *
+ * @param featureStructure the feature structure
*/
void updated(Collection<FeatureStructure> featureStructure);
@@ -84,9 +85,9 @@ public interface ICasDocumentListener {
* This method is called when the currently active view is changed in the document. A view changed
* does not indicate a structural change, but usually feature structures must be completely
* synchronized afterward.
- *
- * @param oldViewName
- * @param newViewName
+ *
+ * @param oldViewName the old view name
+ * @param newViewName the new view name
*/
void viewChanged(String oldViewName, String newViewName);
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditor.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/ICasEditor.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/ICasEditor.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditor.java Sun Nov 13 16:13:16 2016
@@ -22,6 +22,7 @@ package org.apache.uima.caseditor.editor
import org.apache.uima.cas.CAS;
import org.eclipse.ui.IEditorPart;
+// TODO: Auto-generated Javadoc
/**
* A Cas Editor is an extension to the {@link IEditorPart} interface and
* is responsible to view and edit a {@link CAS} object.
@@ -31,14 +32,37 @@ public interface ICasEditor extends IEdi
// TODO: Add a method to get the document provider, could needed
// by various views to store configuration linked to the ts!
+ /**
+ * Gets the document.
+ *
+ * @return the document
+ */
ICasDocument getDocument();
+ /**
+ * Gets the cas document provider.
+ *
+ * @return the cas document provider
+ */
CasDocumentProvider getCasDocumentProvider();
+ /**
+ * Reopen editor with new type system.
+ */
void reopenEditorWithNewTypeSystem();
+ /**
+ * Adds the cas editor input listener.
+ *
+ * @param listener the listener
+ */
void addCasEditorInputListener(ICasEditorInputListener listener);
+ /**
+ * Removes the cas editor input listener.
+ *
+ * @param listener the listener
+ */
void removeCasEditorInputListener(ICasEditorInputListener listener);
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditorInputListener.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/ICasEditorInputListener.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/ICasEditorInputListener.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasEditorInputListener.java Sun Nov 13 16:13:16 2016
@@ -21,6 +21,16 @@ package org.apache.uima.caseditor.editor
import org.eclipse.ui.IEditorInput;
+// TODO: Auto-generated Javadoc
+/**
+ * The listener interface for receiving ICasEditorInput events.
+ * The class that is interested in processing a ICasEditorInput
+ * event implements this interface, and the object created
+ * with that class is registered with a component using the
+ * component's <code>addICasEditorInputListener</code> method. When
+ * the ICasEditorInput event occurs, that object's appropriate
+ * method is invoked.
+ */
public interface ICasEditorInputListener {
/**
@@ -28,11 +38,11 @@ public interface ICasEditorInputListener
* The arguments of this methods can be null under certain circumstances.
* For example, if a document is opened where the type system cannot be found
* for, then the new document will be null.
- *
- * @param oldDocument
- * - the replaced, old document {@link ICasDocument}.
- * @param newDocument
- * - the new, current document {@link ICasDocument}.
+ *
+ * @param oldInput the old input
+ * @param oldDocument - the replaced, old document {@link ICasDocument}.
+ * @param newInput the new input
+ * @param newDocument - the new, current document {@link ICasDocument}.
*/
void casDocumentChanged(IEditorInput oldInput, ICasDocument oldDocument, IEditorInput newInput, ICasDocument newDocument);
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICustomInformationControlContentHandler.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/ICustomInformationControlContentHandler.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/ICustomInformationControlContentHandler.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICustomInformationControlContentHandler.java Sun Nov 13 16:13:16 2016
@@ -19,12 +19,17 @@
package org.apache.uima.caseditor.editor;
+// TODO: Auto-generated Javadoc
+/**
+ * The Interface ICustomInformationControlContentHandler.
+ */
public interface ICustomInformationControlContentHandler {
+
/**
* Sets the input object.
*
- * @param control
- * @param input
+ * @param control the control
+ * @param input the input
*/
void setInput(CustomInformationControl control, Object input);
}
\ 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/IEditorSelectionListener.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/IEditorSelectionListener.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/IEditorSelectionListener.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/IEditorSelectionListener.java Sun Nov 13 16:13:16 2016
@@ -19,6 +19,16 @@
package org.apache.uima.caseditor.editor;
+// TODO: Auto-generated Javadoc
+/**
+ * The listener interface for receiving IEditorSelection events.
+ * The class that is interested in processing a IEditorSelection
+ * event implements this interface, and the object created
+ * with that class is registered with a component using the
+ * component's <code>addIEditorSelectionListener</code> method. When
+ * the IEditorSelection event occurs, that object's appropriate
+ * method is invoked.
+ */
public interface IEditorSelectionListener {
/**
* Called after focus changed.
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ModelFeatureStructure.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/ModelFeatureStructure.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/ModelFeatureStructure.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ModelFeatureStructure.java Sun Nov 13 16:13:16 2016
@@ -28,53 +28,95 @@ import org.apache.uima.cas.text.Annotati
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.Platform;
+// TODO: Auto-generated Javadoc
/**
* TODO:
* set feature value to null
* delete feature value structure
- * create feature value structure
+ * create feature value structure.
*/
public class ModelFeatureStructure implements IAdaptable {
+
+ /** The m document. */
private ICasDocument mDocument;
+ /** The m feature structre. */
private FeatureStructure mFeatureStructre;
/**
* Initializes a new instance.
*
- * @param document
- * @param featureStructre
+ * @param document the document
+ * @param featureStructre the feature structre
*/
public ModelFeatureStructure(ICasDocument document, FeatureStructure featureStructre) {
mDocument = document;
mFeatureStructre = featureStructre;
}
+ /**
+ * Gets the document.
+ *
+ * @return the document
+ */
public ICasDocument getDocument() {
return mDocument;
}
+ /**
+ * Gets the structre.
+ *
+ * @return the structre
+ */
public FeatureStructure getStructre() {
return mFeatureStructre;
}
+ /**
+ * Sets the feature null.
+ *
+ * @param feature the new feature null
+ */
public void setFeatureNull(Feature feature) {
mFeatureStructre.setFeatureValue(feature, null);
}
+ /**
+ * Delete feature value.
+ *
+ * @param feature the feature
+ */
public void deleteFeatureValue(Feature feature) {
// get value and call remove
}
+ /**
+ * Creates the feature value.
+ *
+ * @param feature the feature
+ */
public void createFeatureValue(Feature feature) {
// create, add and link
}
+ /**
+ * Creates the feature value array.
+ *
+ * @param feature the feature
+ * @param size the size
+ */
public void createFeatureValueArray(Feature feature, int size) {
// create add and link
}
+ /**
+ * Creates the.
+ *
+ * @param document the document
+ * @param annotations the annotations
+ * @return the list
+ */
public static List<ModelFeatureStructure> create(ICasDocument document,
List<AnnotationFS> annotations) {
List<ModelFeatureStructure> structres = new ArrayList<ModelFeatureStructure>(annotations.size());
@@ -86,6 +128,10 @@ public class ModelFeatureStructure imple
return structres;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
+ */
+ @Override
public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
if (FeatureStructure.class.equals(adapter)) {
return getStructre();
@@ -96,10 +142,16 @@ public class ModelFeatureStructure imple
}
}
+ /**
+ * Update.
+ */
public void update() {
mDocument.update(mFeatureStructre);
}
+ /* (non-Javadoc)
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
@Override
public boolean equals(Object obj) {
@@ -115,6 +167,9 @@ public class ModelFeatureStructure imple
return false;
}
+ /* (non-Javadoc)
+ * @see java.lang.Object#hashCode()
+ */
@Override
public int hashCode() {
return mFeatureStructre.hashCode();
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/QuickTypeSelectionDialog.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/QuickTypeSelectionDialog.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/QuickTypeSelectionDialog.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/QuickTypeSelectionDialog.java Sun Nov 13 16:13:16 2016
@@ -61,24 +61,29 @@ import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
+// TODO: Auto-generated Javadoc
/**
* This is a lightweight popup dialog which creates an annotation of the chosen type.
*/
class QuickTypeSelectionDialog extends PopupDialog {
+ /** The editor. */
private final AnnotationEditor editor;
+ /** The filter text. */
private Text filterText;
+ /** The shortcut type map. */
private Map<Character, Type> shortcutTypeMap = new HashMap<Character, Type>();
+ /** The type shortcut map. */
private Map<Type, Character> typeShortcutMap = new HashMap<Type, Character>();
/**
* Initializes the current instance.
- *
- * @param parent
- * @param editor
+ *
+ * @param parent the parent
+ * @param editor the editor
*/
@SuppressWarnings("deprecation")
QuickTypeSelectionDialog(Shell parent, AnnotationEditor editor) {
@@ -100,6 +105,7 @@ class QuickTypeSelectionDialog extends P
List<Type> types = new ArrayList<Type>();
Collections.addAll(types, getTypes());
Collections.sort(types, new Comparator<Type>() {
+ @Override
public int compare(Type o1, Type o2) {
return o1.getName().compareTo(o2.getName());
}
@@ -153,11 +159,22 @@ class QuickTypeSelectionDialog extends P
}
}
+ /**
+ * Put shortcut.
+ *
+ * @param shortcut the shortcut
+ * @param type the type
+ */
private void putShortcut(Character shortcut, Type type) {
shortcutTypeMap.put(shortcut, type);
typeShortcutMap.put(type, shortcut);
}
+ /**
+ * Gets the types.
+ *
+ * @return the types
+ */
private Type[] getTypes() {
TypeSystem typeSystem = editor.getDocument().getCAS().getTypeSystem();
@@ -170,6 +187,11 @@ class QuickTypeSelectionDialog extends P
return types.toArray(new Type[types.size()]);
}
+ /**
+ * Annotate and close.
+ *
+ * @param annotationType the annotation type
+ */
private void annotateAndClose(Type annotationType) {
if (annotationType != null) {
Point textSelection = editor.getSelection();
@@ -188,6 +210,9 @@ class QuickTypeSelectionDialog extends P
QuickTypeSelectionDialog.this.close();
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.dialogs.PopupDialog#createDialogArea(org.eclipse.swt.widgets.Composite)
+ */
@Override
protected Control createDialogArea(Composite parent) {
Composite composite = (Composite) super.createDialogArea(parent);
@@ -211,6 +236,7 @@ class QuickTypeSelectionDialog extends P
filterText.addKeyListener(new KeyListener() {
+ @Override
public void keyPressed(KeyEvent e) {
if (e.keyCode == SWT.ARROW_DOWN || e.keyCode == SWT.ARROW_UP) {
typeTree.getControl().setFocus();
@@ -224,6 +250,7 @@ class QuickTypeSelectionDialog extends P
}
}
+ @Override
public void keyReleased(KeyEvent e) {
typeTree.refresh(false);
}
@@ -231,25 +258,31 @@ class QuickTypeSelectionDialog extends P
typeTree.setContentProvider(new ITreeContentProvider() {
+ @Override
public Object[] getChildren(Object parentElement) {
return null;
}
+ @Override
public Object getParent(Object element) {
return null;
}
+ @Override
public boolean hasChildren(Object element) {
return false;
}
+ @Override
public Object[] getElements(Object inputElement) {
return (Type[]) inputElement;
}
+ @Override
public void dispose() {
}
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
});
@@ -267,10 +300,12 @@ class QuickTypeSelectionDialog extends P
typeTree.setLabelProvider(new ILabelProvider() {
+ @Override
public Image getImage(Object element) {
return null;
}
+ @Override
public String getText(Object element) {
Type type = (Type) element;
@@ -284,23 +319,28 @@ class QuickTypeSelectionDialog extends P
}
}
+ @Override
public void addListener(ILabelProviderListener listener) {
}
+ @Override
public void dispose() {
}
+ @Override
public boolean isLabelProperty(Object element, String property) {
return false;
}
+ @Override
public void removeListener(ILabelProviderListener listener) {
}
});
typeTree.getControl().addKeyListener(new KeyListener() {
+ @Override
public void keyPressed(KeyEvent e) {
Type type = shortcutTypeMap.get(Character.toLowerCase(e.character));
@@ -309,12 +349,14 @@ class QuickTypeSelectionDialog extends P
}
}
+ @Override
public void keyReleased(KeyEvent e) {
}
});
typeTree.getControl().addMouseMoveListener(new MouseMoveListener() {
+ @Override
public void mouseMove(MouseEvent e) {
Tree tree = (Tree) typeTree.getControl();
@@ -331,6 +373,7 @@ class QuickTypeSelectionDialog extends P
// because there is already a selection below the mouse
typeTree.addOpenListener(new IOpenListener() {
+ @Override
public void open(OpenEvent event) {
StructuredSelection selection = (StructuredSelection) event.getSelection();
@@ -351,6 +394,9 @@ class QuickTypeSelectionDialog extends P
return composite;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.dialogs.PopupDialog#getInitialSize()
+ */
@Override
protected Point getInitialSize() {
return new Point(250, 300);
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/SubPageSite.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/SubPageSite.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/SubPageSite.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/SubPageSite.java Sun Nov 13 16:13:16 2016
@@ -28,54 +28,107 @@ import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.SubActionBars;
import org.eclipse.ui.part.IPageSite;
+// TODO: Auto-generated Javadoc
+/**
+ * The Class SubPageSite.
+ */
public class SubPageSite implements IPageSite {
+ /** The site. */
private final IPageSite site;
+ /** The sub action bars. */
private SubActionBars subActionBars;
+
+ /** The selection provider. */
private ISelectionProvider selectionProvider;
+ /**
+ * Instantiates a new sub page site.
+ *
+ * @param site the site
+ */
public SubPageSite(IPageSite site) {
this.site = site;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.services.IServiceLocator#hasService(java.lang.Class)
+ */
+ @Override
public boolean hasService(@SuppressWarnings("rawtypes") Class api) {
return site.hasService(api);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.services.IServiceLocator#getService(java.lang.Class)
+ */
+ @Override
public Object getService(@SuppressWarnings("rawtypes") Class api) {
return site.getService(api);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
+ */
+ @Override
public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
return site.getAdapter(adapter);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.IWorkbenchSite#setSelectionProvider(org.eclipse.jface.viewers.ISelectionProvider)
+ */
+ @Override
public void setSelectionProvider(ISelectionProvider provider) {
selectionProvider = provider;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.IWorkbenchSite#getWorkbenchWindow()
+ */
+ @Override
public IWorkbenchWindow getWorkbenchWindow() {
return site.getWorkbenchWindow();
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.IWorkbenchSite#getShell()
+ */
+ @Override
public Shell getShell() {
return site.getShell();
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.IWorkbenchSite#getSelectionProvider()
+ */
+ @Override
public ISelectionProvider getSelectionProvider() {
return selectionProvider;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.IWorkbenchSite#getPage()
+ */
+ @Override
public IWorkbenchPage getPage() {
return site.getPage();
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.part.IPageSite#registerContextMenu(java.lang.String, org.eclipse.jface.action.MenuManager, org.eclipse.jface.viewers.ISelectionProvider)
+ */
+ @Override
public void registerContextMenu(String menuId, MenuManager menuManager,
ISelectionProvider selectionProvider) {
site.registerContextMenu(menuId, menuManager, selectionProvider);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.part.IPageSite#getActionBars()
+ */
+ @Override
public IActionBars getActionBars() {
if (subActionBars == null) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/TextDocumentProvider.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/TextDocumentProvider.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/TextDocumentProvider.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/TextDocumentProvider.java Sun Nov 13 16:13:16 2016
@@ -28,51 +28,82 @@ import org.eclipse.jface.text.source.IAn
import org.eclipse.ui.texteditor.AbstractDocumentProvider;
import org.eclipse.ui.texteditor.IElementStateListener;
+// TODO: Auto-generated Javadoc
+/**
+ * The Class TextDocumentProvider.
+ */
class TextDocumentProvider extends AbstractDocumentProvider {
+ /**
+ * The Class CasElementInfo.
+ */
private class CasElementInfo extends AbstractDocumentProvider.ElementInfo {
+ /** The cas info. */
private CasDocumentProvider.ElementInfo casInfo;
+ /**
+ * Instantiates a new cas element info.
+ *
+ * @param document the document
+ * @param model the model
+ */
public CasElementInfo(IDocument document, IAnnotationModel model) {
super(document, model);
}
}
+ /** The document provider. */
private final CasDocumentProvider documentProvider;
+ /**
+ * Instantiates a new text document provider.
+ *
+ * @param documentProvider the document provider
+ */
public TextDocumentProvider(CasDocumentProvider documentProvider) {
this.documentProvider = documentProvider;
this.documentProvider.addElementStateListener(new IElementStateListener() {
+ @Override
public void elementMoved(Object originalElement, Object movedElement) {
fireElementMoved(originalElement, movedElement);
}
+ @Override
public void elementDirtyStateChanged(Object element, boolean isDirty) {
fireElementDirtyStateChanged(element, isDirty);
}
+ @Override
public void elementDeleted(Object element) {
fireElementDeleted(element);
}
+ @Override
public void elementContentReplaced(Object element) {
fireElementContentReplaced(element);
}
+ @Override
public void elementContentAboutToBeReplaced(Object element) {
fireElementContentAboutToBeReplaced(element);
}
});
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#createAnnotationModel(java.lang.Object)
+ */
@Override
protected IAnnotationModel createAnnotationModel(Object element) throws CoreException {
return new org.eclipse.jface.text.source.AnnotationModel();
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#createDocument(java.lang.Object)
+ */
@Override
protected IDocument createDocument(Object element) throws CoreException {
ICasDocument casDocument = documentProvider.createDocument(element);
@@ -87,6 +118,9 @@ class TextDocumentProvider extends Abstr
}
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#doSaveDocument(org.eclipse.core.runtime.IProgressMonitor, java.lang.Object, org.eclipse.jface.text.IDocument, boolean)
+ */
@Override
protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document,
boolean overwrite) throws CoreException {
@@ -99,11 +133,17 @@ class TextDocumentProvider extends Abstr
// else throw exception ->
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#getOperationRunner(org.eclipse.core.runtime.IProgressMonitor)
+ */
@Override
protected IRunnableContext getOperationRunner(IProgressMonitor monitor) {
return null;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#createElementInfo(java.lang.Object)
+ */
@Override
protected ElementInfo createElementInfo(Object element) throws CoreException {
@@ -114,6 +154,9 @@ class TextDocumentProvider extends Abstr
return casElementInfo;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#disposeElementInfo(java.lang.Object, org.eclipse.ui.texteditor.AbstractDocumentProvider.ElementInfo)
+ */
@Override
protected void disposeElementInfo(Object element, ElementInfo info) {
@@ -123,6 +166,9 @@ class TextDocumentProvider extends Abstr
documentProvider.disposeElementInfo(element, casElementInfo.casInfo);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#getStatus(java.lang.Object)
+ */
@Override
public IStatus getStatus(Object element) {
IStatus status = documentProvider.getStatus(element);
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/DeleteFeatureStructureAction.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/action/DeleteFeatureStructureAction.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/action/DeleteFeatureStructureAction.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/DeleteFeatureStructureAction.java Sun Nov 13 16:13:16 2016
@@ -25,16 +25,19 @@ import org.apache.uima.caseditor.editor.
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.actions.BaseSelectionListenerAction;
+// TODO: Auto-generated Javadoc
/**
* Deletes all selected annotations.
*/
public class DeleteFeatureStructureAction extends BaseSelectionListenerAction {
+
+ /** The editor. */
private ICasEditor editor;
/**
* Initializes the current instance.
*
- * @param editor
+ * @param editor the editor
*/
public DeleteFeatureStructureAction(ICasEditor editor) {
super("DeleteAction");
@@ -44,6 +47,9 @@ public class DeleteFeatureStructureActio
setEnabled(false);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
+ */
@Override
protected boolean updateSelection(IStructuredSelection selection) {
FeatureStructureSelection featureStructures =
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/LowerLeftAnnotationSideAction.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/action/LowerLeftAnnotationSideAction.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/action/LowerLeftAnnotationSideAction.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/LowerLeftAnnotationSideAction.java Sun Nov 13 16:13:16 2016
@@ -29,20 +29,22 @@ import org.apache.uima.caseditor.editor.
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.actions.BaseSelectionListenerAction;
+// TODO: Auto-generated Javadoc
/**
* Lowers the left side of the currently selected annotation by one.
*/
public final class LowerLeftAnnotationSideAction extends BaseSelectionListenerAction {
+ /** The Constant ID. */
public static final String ID = "LowerLeftAnnotationSide";
+ /** The editor. */
private ICasEditor editor;
/**
* Initializes a new instance.
*
- * @param editor
- *
+ * @param editor the editor
*/
public LowerLeftAnnotationSideAction(ICasEditor editor) {
super("LowerLeftAnnotationSide");
@@ -52,6 +54,9 @@ public final class LowerLeftAnnotationSi
setEnabled(false);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
+ */
@Override
protected boolean updateSelection(IStructuredSelection selection) {
AnnotationSelection annotation = new AnnotationSelection(selection);
@@ -59,6 +64,12 @@ public final class LowerLeftAnnotationSi
return annotation.size() == 1;
}
+ /**
+ * Lower left annotation side.
+ *
+ * @param document the document
+ * @param annotation the annotation
+ */
public static void lowerLeftAnnotationSide(ICasDocument document, AnnotationFS annotation) {
Type annotationType = annotation.getType();
Feature beginFeature = annotationType.getFeatureByBaseName("begin");
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/LowerRightAnnotationSideAction.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/action/LowerRightAnnotationSideAction.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/action/LowerRightAnnotationSideAction.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/LowerRightAnnotationSideAction.java Sun Nov 13 16:13:16 2016
@@ -29,19 +29,22 @@ import org.apache.uima.caseditor.editor.
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.actions.BaseSelectionListenerAction;
+// TODO: Auto-generated Javadoc
/**
* Lowers the right side of the currently selected annotation by one.
*/
public final class LowerRightAnnotationSideAction extends BaseSelectionListenerAction {
+ /** The Constant ID. */
public static final String ID = "LowerRightAnnotationSide";
+ /** The editor. */
private ICasEditor editor;
/**
* Initializes the current instance.
*
- * @param editor
+ * @param editor the editor
*/
public LowerRightAnnotationSideAction(ICasEditor editor) {
super("LowerRightAnnotationSide");
@@ -51,6 +54,9 @@ public final class LowerRightAnnotationS
setEnabled(false);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
+ */
@Override
protected boolean updateSelection(IStructuredSelection selection) {
AnnotationSelection annotation = new AnnotationSelection(selection);
@@ -58,6 +64,12 @@ public final class LowerRightAnnotationS
return annotation.size() == 1;
}
+ /**
+ * Lower right annotation side.
+ *
+ * @param document the document
+ * @param annotation the annotation
+ */
public static void lowerRightAnnotationSide(ICasDocument document, AnnotationFS annotation) {
Type annotationType = annotation.getType();
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/MergeAnnotationAction.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/action/MergeAnnotationAction.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/action/MergeAnnotationAction.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/MergeAnnotationAction.java Sun Nov 13 16:13:16 2016
@@ -28,6 +28,7 @@ import org.apache.uima.caseditor.editor.
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.actions.BaseSelectionListenerAction;
+// TODO: Auto-generated Javadoc
/**
* Merges two or more annotations.
*
@@ -35,12 +36,14 @@ import org.eclipse.ui.actions.BaseSelect
* in conflict case do nothing
*/
public class MergeAnnotationAction extends BaseSelectionListenerAction {
+
+ /** The editor. */
private ICasEditor editor;
/**
* Initializes the current instance.
*
- * @param editor
+ * @param editor the editor
*/
public MergeAnnotationAction(ICasEditor editor) {
super("MergeAnnotationAction");
@@ -50,6 +53,9 @@ public class MergeAnnotationAction exten
setEnabled(false);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
+ */
@Override
protected boolean updateSelection(IStructuredSelection selection) {
AnnotationSelection annotation = new AnnotationSelection(selection);
@@ -58,7 +64,7 @@ public class MergeAnnotationAction exten
}
/**
- * Executes the merge action
+ * Executes the merge action.
*/
@Override
public void run() {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/WideLeftAnnotationSideAction.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/action/WideLeftAnnotationSideAction.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/action/WideLeftAnnotationSideAction.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/WideLeftAnnotationSideAction.java Sun Nov 13 16:13:16 2016
@@ -29,19 +29,22 @@ import org.apache.uima.caseditor.editor.
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.actions.BaseSelectionListenerAction;
+// TODO: Auto-generated Javadoc
/**
* Widens the left side of the currently selected annotation by one.
*/
public final class WideLeftAnnotationSideAction extends BaseSelectionListenerAction {
+ /** The Constant ID. */
public static final String ID = "WideLeftAnnotationSide";
+ /** The editor. */
private ICasEditor editor;
/**
* Initializes a new instance.
*
- * @param editor
+ * @param editor the editor
*/
public WideLeftAnnotationSideAction(ICasEditor editor) {
super("WideLeftAnnotationSside");
@@ -51,6 +54,9 @@ public final class WideLeftAnnotationSid
setEnabled(false);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
+ */
@Override
protected boolean updateSelection(IStructuredSelection selection) {
AnnotationSelection annotation = new AnnotationSelection(selection);
@@ -61,9 +67,9 @@ public final class WideLeftAnnotationSid
/**
* Widens the annotation and sends and sends an update notification
* to the provided document.
- *
- * @param document
- * @param annotation
+ *
+ * @param document the document
+ * @param annotation the annotation
*/
public static void wideLeftAnnotationSide(ICasDocument document, AnnotationFS annotation) {
Type annotationType = annotation.getType();
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/WideRightAnnotationSideAction.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/action/WideRightAnnotationSideAction.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/action/WideRightAnnotationSideAction.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/WideRightAnnotationSideAction.java Sun Nov 13 16:13:16 2016
@@ -29,19 +29,22 @@ import org.apache.uima.caseditor.editor.
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.actions.BaseSelectionListenerAction;
+// TODO: Auto-generated Javadoc
/**
* Widens the right side of the currently selected annotation by one.
*/
public final class WideRightAnnotationSideAction extends BaseSelectionListenerAction {
+ /** The Constant ID. */
public static final String ID = "WideRightAnnotationSide";
+ /** The editor. */
private ICasEditor editor;
/**
* Initializes a new instance.
*
- * @param editor
+ * @param editor the editor
*/
public WideRightAnnotationSideAction(ICasEditor editor) {
super("WideRightAnnotationSide");
@@ -51,6 +54,9 @@ public final class WideRightAnnotationSi
setEnabled(false);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
+ */
@Override
protected boolean updateSelection(IStructuredSelection selection) {
AnnotationSelection annotation = new AnnotationSelection(selection);
@@ -58,6 +64,12 @@ public final class WideRightAnnotationSi
return annotation.size() == 1;
}
+ /**
+ * Wide right annotation side.
+ *
+ * @param document the document
+ * @param annotation the annotation
+ */
public static void wideRightAnnotationSide(ICasDocument document, AnnotationFS annotation) {
Type annotationType = annotation.getType();
Feature endFeature = annotationType.getFeatureByBaseName("end");
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/BackgroundDrawingStrategy.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/BackgroundDrawingStrategy.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/BackgroundDrawingStrategy.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/BackgroundDrawingStrategy.java Sun Nov 13 16:13:16 2016
@@ -33,20 +33,23 @@ import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
+// TODO: Auto-generated Javadoc
/**
* Fills the background of an annotation.
*/
final class BackgroundDrawingStrategy implements IDrawingStrategy {
+
/**
* Fill the background of the given annotation in the specified color.
*
- * @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 (length != 0) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/BoxDrawingStrategy.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/BoxDrawingStrategy.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/BoxDrawingStrategy.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/BoxDrawingStrategy.java Sun Nov 13 16:13:16 2016
@@ -26,20 +26,23 @@ import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Rectangle;
+// TODO: Auto-generated Javadoc
/**
* Draws a box around an annotation.
*/
final class BoxDrawingStrategy implements IDrawingStrategy {
+
/**
* Draws a box around the 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 (length != 0) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/BracketDrawingStrategy.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/BracketDrawingStrategy.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/BracketDrawingStrategy.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/BracketDrawingStrategy.java Sun Nov 13 16:13:16 2016
@@ -27,22 +27,26 @@ import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Rectangle;
+// TODO: Auto-generated Javadoc
/**
* Draws brackets arround an annotation.
*/
public class BracketDrawingStrategy implements IDrawingStrategy {
+
+ /** The Constant BRACKET_WIDTH. */
private static final int BRACKET_WIDTH = 3;
/**
* Draws an opening bracket to the begin and a closing bracket to the end of the 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 (length > 0) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/DrawingStyle.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/DrawingStyle.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/DrawingStyle.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/DrawingStyle.java Sun Nov 13 16:13:16 2016
@@ -26,6 +26,7 @@ import org.apache.uima.caseditor.editor.
import org.apache.uima.caseditor.editor.AnnotationStyle.Style;
import org.eclipse.jface.text.source.AnnotationPainter.IDrawingStrategy;
+// TODO: Auto-generated Javadoc
/**
* A factory for drawing styles.
*
@@ -33,6 +34,7 @@ import org.eclipse.jface.text.source.Ann
*/
public class DrawingStyle {
+ /** The stateless styles. */
private static Map<AnnotationStyle.Style, IDrawingStrategy> statelessStyles =
new HashMap<AnnotationStyle.Style, IDrawingStrategy>();
@@ -48,12 +50,16 @@ public class DrawingStyle {
statelessStyles.put(Style.BRACKET, new BracketDrawingStrategy());
}
+ /**
+ * Instantiates a new drawing style.
+ */
private DrawingStyle() {
}
/**
* Retrieves the {@link IDrawingStrategy}.
*
+ * @param style the style
* @return the {@link IDrawingStrategy} or null if does not exist.
*/
public static IDrawingStrategy createStrategy(AnnotationStyle style) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/EclipseAnnotationPeer.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/EclipseAnnotationPeer.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/EclipseAnnotationPeer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/EclipseAnnotationPeer.java Sun Nov 13 16:13:16 2016
@@ -21,18 +21,20 @@ package org.apache.uima.caseditor.editor
import org.apache.uima.cas.text.AnnotationFS;
+// TODO: Auto-generated Javadoc
/**
* This class is used to provide additional information about the {@link AnnotationFS}
* object to the custom drawing strategies.
*/
public class EclipseAnnotationPeer extends org.eclipse.jface.text.source.Annotation {
+ /** The annotation. */
private final AnnotationFS annotation;
/**
* Initializes a new instance.
*
- * @param annotation
+ * @param annotation the annotation
*/
public EclipseAnnotationPeer(AnnotationFS annotation) {
super(annotation.getType().getName(), false, "");
@@ -49,11 +51,17 @@ public class EclipseAnnotationPeer exten
return annotation;
}
+ /* (non-Javadoc)
+ * @see java.lang.Object#hashCode()
+ */
@Override
public int hashCode() {
return annotation.hashCode();
}
+ /* (non-Javadoc)
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
@Override
public boolean equals(Object obj) {
if (obj == this) {
@@ -69,6 +77,9 @@ public class EclipseAnnotationPeer exten
}
}
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
@Override
public String toString() {
return annotation.toString();
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TagDrawingStrategy.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/TagDrawingStrategy.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/TagDrawingStrategy.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TagDrawingStrategy.java Sun Nov 13 16:13:16 2016
@@ -32,15 +32,27 @@ import org.eclipse.swt.graphics.Rectangl
+// TODO: Auto-generated Javadoc
// TODO: Check if its possible to increase the space between characters,
+/**
+ * The Class TagDrawingStrategy.
+ */
// or suggest to use mono space font for long tags ...
class TagDrawingStrategy implements IDrawingStrategy {
+ /** The Constant TAG_FONT_SIZE. */
private static final int TAG_FONT_SIZE = 11;
+
+ /** The Constant MAX_LEFT_TAG_OVERLAP. */
private static final int MAX_LEFT_TAG_OVERLAP = 1;
+
+ /** The Constant MAX_RIGHT_TAG_OVERLAP. */
private static final int MAX_RIGHT_TAG_OVERLAP = 1;
+
+ /** The Constant TAG_OVERLAP. */
private static final int TAG_OVERLAP = MAX_LEFT_TAG_OVERLAP + MAX_RIGHT_TAG_OVERLAP;
+ /** The annotation drawing style. */
private IDrawingStrategy annotationDrawingStyle = new BoxDrawingStrategy();
/**
@@ -48,6 +60,11 @@ class TagDrawingStrategy implements IDra
*/
private final String featureName;
+ /**
+ * Instantiates a new tag drawing strategy.
+ *
+ * @param featureName the feature name
+ */
TagDrawingStrategy(String featureName) {
if (featureName == null)
@@ -56,6 +73,10 @@ class TagDrawingStrategy implements IDra
this.featureName = featureName;
}
+ /* (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) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TextColorDrawingStrategy.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/TextColorDrawingStrategy.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/TextColorDrawingStrategy.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TextColorDrawingStrategy.java Sun Nov 13 16:13:16 2016
@@ -26,10 +26,16 @@ import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Rectangle;
+// TODO: Auto-generated Javadoc
/**
+ * The Class TextColorDrawingStrategy.
*/
public class TextColorDrawingStrategy implements IDrawingStrategy {
+ /* (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) {
if (annotation instanceof EclipseAnnotationPeer) {