You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by jo...@apache.org on 2018/12/04 15:09:47 UTC
svn commit: r1848161 [2/3] - in /uima/uv3/uimaj-v3/trunk:
uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/
uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/
uimaj-ep-cas-editor-ide/src/main/java/org...
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java Tue Dec 4 15:09:45 2018
@@ -53,11 +53,11 @@ public abstract class CasEditorView exte
/** The editor listener map. */
private Map<ICasEditor, ICasEditorInputListener> editorListenerMap =
- new HashMap<ICasEditor, ICasEditorInputListener>();
+ new HashMap<>();
/** The document listener map. */
private Map<ICasEditor, ICasDocumentListener> documentListenerMap =
- new HashMap<ICasEditor, ICasDocumentListener>();
+ new HashMap<>();
/**
* Instantiates a new cas editor view.
@@ -84,10 +84,7 @@ public abstract class CasEditorView exte
protected boolean isRecreatePageOnCASViewSwitch() {
return false;
}
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.part.PageBookView#createDefaultPage(org.eclipse.ui.part.PageBook)
- */
+
@Override
protected IPage createDefaultPage(PageBook book) {
MessagePage page = new MessagePage();
@@ -129,10 +126,7 @@ public abstract class CasEditorView exte
casViewPageBookedPage.setCASViewPage(null);
}
}
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.part.PageBookView#doCreatePage(org.eclipse.ui.IWorkbenchPart)
- */
+
@Override
protected final PageRec doCreatePage(final IWorkbenchPart part) {
@@ -197,17 +191,11 @@ public abstract class CasEditorView exte
return result;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.part.PageBookView#getBootstrapPart()
- */
@Override
protected IWorkbenchPart getBootstrapPart() {
return getSite().getPage().getActiveEditor();
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.part.PageBookView#doDestroyPage(org.eclipse.ui.IWorkbenchPart, org.eclipse.ui.part.PageBookView.PageRec)
- */
@Override
protected void doDestroyPage(IWorkbenchPart part, PageRec pageRecord) {
@@ -231,9 +219,6 @@ public abstract class CasEditorView exte
pageRecord.dispose();
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.part.PageBookView#isImportant(org.eclipse.ui.IWorkbenchPart)
- */
@Override
protected boolean isImportant(IWorkbenchPart part) {
// only interested in annotation editors
@@ -249,10 +234,7 @@ public abstract class CasEditorView exte
public void partBroughtToTop(IWorkbenchPart part) {
partActivated(part);
}
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.part.PageBookView#dispose()
- */
+
@Override
public void dispose() {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java Tue Dec 4 15:09:45 2018
@@ -19,7 +19,6 @@
package org.apache.uima.caseditor.editor;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
@@ -84,13 +83,10 @@ public class CasEditorViewPage extends P
IActionBars actionBars = getSite().getActionBars();
actionBars.clearGlobalActionHandlers();
- Map newActionHandlers = subActionBar
- .getGlobalActionHandlers();
+ Map newActionHandlers = subActionBar.getGlobalActionHandlers();
if (newActionHandlers != null) {
- Set keys = newActionHandlers.entrySet();
- Iterator iter = keys.iterator();
- while (iter.hasNext()) {
- Map.Entry entry = (Map.Entry) iter.next();
+ Set<Map.Entry> keys = newActionHandlers.entrySet();
+ for (Map.Entry entry : keys) {
actionBars.setGlobalActionHandler((String) entry.getKey(),
(IAction) entry.getValue());
}
@@ -98,18 +94,12 @@ public class CasEditorViewPage extends P
}
// These are called from the outside, even if the page is not active ...
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
// this leads to the processing of events which should not be processed!
@Override
public void addSelectionChangedListener(ISelectionChangedListener listener) {
selectionChangedListeners.add(listener);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
@Override
public void removeSelectionChangedListener(ISelectionChangedListener listener) {
selectionChangedListeners.remove(listener);
@@ -136,9 +126,6 @@ public class CasEditorViewPage extends P
}
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
@Override
public ISelection getSelection() {
if (casViewPage != null && casViewPage.getSite().getSelectionProvider() != null) {
@@ -149,9 +136,6 @@ public class CasEditorViewPage extends P
}
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
@Override
public void setSelection(ISelection selection) {
if (casViewPage != null && casViewPage.getSite().getSelectionProvider() != null) {
@@ -159,9 +143,6 @@ public class CasEditorViewPage extends P
}
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.part.Page#createControl(org.eclipse.swt.widgets.Composite)
- */
@Override
public void createControl(Composite parent) {
book = new PageBook(parent, SWT.NONE);
@@ -190,13 +171,7 @@ public class CasEditorViewPage extends P
// Note: If page is in background event listening must be disabled!
ISelectionProvider selectionProvider = page.getSite().getSelectionProvider();
- selectionProvider.addSelectionChangedListener(new ISelectionChangedListener() {
-
- @Override
- public void selectionChanged(SelectionChangedEvent event) {
- CasEditorViewPage.this.selectionChanged(event);
- }
- });
+ selectionProvider.addSelectionChangedListener(CasEditorViewPage.this::selectionChanged);
subActionBar = (SubActionBars) casViewPage.getSite().getActionBars();
@@ -233,25 +208,16 @@ public class CasEditorViewPage extends P
initializeAndShowPage(page);
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.part.Page#getControl()
- */
@Override
public Control getControl() {
return book;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.part.Page#setFocus()
- */
@Override
public void setFocus() {
book.setFocus();
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.part.Page#dispose()
- */
@Override
public void dispose() {
super.dispose();
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CustomInformationControl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CustomInformationControl.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CustomInformationControl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CustomInformationControl.java Tue Dec 4 15:09:45 2018
@@ -84,50 +84,32 @@ public class CustomInformationControl im
return mShell;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.IInformationControl#setInformation(java.lang.String)
- */
@Override
public void setInformation(String information) {
// this method is replaced by the extension interface
// method setInput(...)
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.IInformationControl#setSizeConstraints(int, int)
- */
@Override
public void setSizeConstraints(int maxWidth, int maxHeight) {
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.IInformationControl#computeSizeHint()
- */
@Override
public Point computeSizeHint() {
return mShell.computeSize(SWT.DEFAULT, SWT.DEFAULT);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.IInformationControl#setVisible(boolean)
- */
@Override
public void setVisible(boolean visible) {
mControl.setVisible(visible);
mShell.setVisible(visible);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.IInformationControl#setSize(int, int)
- */
@Override
public void setSize(int width, int height) {
// mShell.setSize(width, height);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.IInformationControl#setLocation(org.eclipse.swt.graphics.Point)
- */
@Override
public void setLocation(Point location) {
Rectangle trim = mShell.computeTrim(0, 0, 0, 0);
@@ -139,9 +121,6 @@ public class CustomInformationControl im
mShell.setLocation(location);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.IInformationControl#dispose()
- */
@Override
public void dispose() {
if (mShell != null && !mShell.isDisposed()) {
@@ -149,77 +128,49 @@ public class CustomInformationControl im
}
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.IInformationControl#addDisposeListener(org.eclipse.swt.events.DisposeListener)
- */
@Override
public void addDisposeListener(DisposeListener listener) {
mShell.addDisposeListener(listener);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.IInformationControl#removeDisposeListener(org.eclipse.swt.events.DisposeListener)
- */
@Override
public void removeDisposeListener(DisposeListener listener) {
mShell.removeDisposeListener(listener);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.IInformationControl#setForegroundColor(org.eclipse.swt.graphics.Color)
- */
@Override
public void setForegroundColor(Color foreground) {
mShell.setForeground(foreground);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.IInformationControl#setBackgroundColor(org.eclipse.swt.graphics.Color)
- */
@Override
public void setBackgroundColor(Color background) {
mShell.setBackground(background);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.IInformationControl#isFocusControl()
- */
@Override
public boolean isFocusControl() {
return mShell.isFocusControl();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.IInformationControl#setFocus()
- */
@Override
public void setFocus() {
mShell.setFocus();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.IInformationControl#addFocusListener(org.eclipse.swt.events.FocusListener)
- */
@Override
public void addFocusListener(FocusListener listener) {
mShell.addFocusListener(listener);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.IInformationControl#removeFocusListener(org.eclipse.swt.events.FocusListener)
- */
@Override
public void removeFocusListener(FocusListener listener) {
mShell.removeFocusListener(listener);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.IInformationControlExtension2#setInput(java.lang.Object)
- */
@Override
public void setInput(Object input) {
mContentHandler.setInput(this, input);
-
}
/**
@@ -230,4 +181,4 @@ public class CustomInformationControl im
public Control getControl() {
return mControl;
}
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/DocumentUimaImpl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/DocumentUimaImpl.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/DocumentUimaImpl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/DocumentUimaImpl.java Tue Dec 4 15:09:45 2018
@@ -115,9 +115,6 @@ public class DocumentUimaImpl extends Ab
return mCAS;
}
- /* (non-Javadoc)
- * @see org.apache.uima.caseditor.editor.AbstractDocument#getTypeSystemText()
- */
@Override
public String getTypeSystemText() {
return typeSystemText;
@@ -144,9 +141,6 @@ public class DocumentUimaImpl extends Ab
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) {
@@ -216,9 +210,6 @@ public class DocumentUimaImpl extends Ab
fireUpdatedFeatureStructure(annotations);
}
- /* (non-Javadoc)
- * @see org.apache.uima.caseditor.editor.ICasDocument#changed()
- */
@Override
public void changed() {
fireChanged();
@@ -249,7 +240,7 @@ public class DocumentUimaImpl extends Ab
* @return the collection
*/
static Collection<AnnotationFS> fsIteratorToCollection(FSIterator<AnnotationFS> iterator) {
- LinkedList<AnnotationFS> annotations = new LinkedList<AnnotationFS>();
+ LinkedList<AnnotationFS> annotations = new LinkedList<>();
while (iterator.hasNext()) {
AnnotationFS annotation = iterator.next();
@@ -270,9 +261,6 @@ public class DocumentUimaImpl extends Ab
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();
@@ -336,15 +324,13 @@ public class DocumentUimaImpl extends Ab
/**
* Gets the virgin CAS.
*
- * @param typeSystemFile the type system file
+ * @param extensionTypeSystemFile the type system file
* @return the virgin CAS
* @throws CoreException the core exception
*/
- public static CAS getVirginCAS(IFile typeSystemFile) throws CoreException {
+ public static CAS getVirginCAS(IFile extensionTypeSystemFile) throws CoreException {
ResourceSpecifierFactory resourceSpecifierFactory = UIMAFramework.getResourceSpecifierFactory();
- IFile extensionTypeSystemFile = typeSystemFile;
-
InputStream inTypeSystem;
if (extensionTypeSystemFile != null && extensionTypeSystemFile.exists()) {
@@ -363,10 +349,10 @@ public class DocumentUimaImpl extends Ab
try {
typeSystemDesciptor = (TypeSystemDescription) xmlParser.parse(xmlTypeSystemSource);
- IProject project = typeSystemFile.getProject();
+ IProject project = extensionTypeSystemFile.getProject();
ClassLoader classLoader = getProjectClassLoader(project);
- ResourceManager resourceManager = null;
+ ResourceManager resourceManager;
if(classLoader != null) {
resourceManager = new ResourceManager_impl(classLoader);
} else {
@@ -379,11 +365,7 @@ public class DocumentUimaImpl extends Ab
resourceManager.setDataPath(dataPath);
}
typeSystemDesciptor.resolveImports(resourceManager);
- } catch (InvalidXMLException e) {
- String message = e.getMessage() != null ? e.getMessage() : "";
- IStatus s = new Status(IStatus.ERROR, CasEditorPlugin.ID, IStatus.OK, message, e);
- throw new CoreException(s);
- } catch (MalformedURLException e) {
+ } catch (InvalidXMLException | MalformedURLException e) {
String message = e.getMessage() != null ? e.getMessage() : "";
IStatus s = new Status(IStatus.ERROR, CasEditorPlugin.ID, IStatus.OK, message, e);
throw new CoreException(s);
@@ -423,8 +405,7 @@ public class DocumentUimaImpl extends Ab
String[] runtimeClassPath = JavaRuntime.computeDefaultRuntimeClassPath(javaProject);
List<URL> urls = new ArrayList<>();
- for (int i = 0; i < runtimeClassPath.length; i++) {
- String cp = runtimeClassPath[i];
+ for (String cp : runtimeClassPath) {
try {
urls.add(Paths.get(cp).toUri().toURL());
} catch (MalformedURLException e) {
@@ -435,5 +416,4 @@ public class DocumentUimaImpl extends Ab
}
return null;
}
-
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelection.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelection.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelection.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelection.java Tue Dec 4 15:09:45 2018
@@ -46,7 +46,7 @@ public class FeatureStructureSelection {
* @param selection the selection
*/
public FeatureStructureSelection(IStructuredSelection selection) {
- mFeatureStructures = new ArrayList<FeatureStructure>(selection.size());
+ mFeatureStructures = new ArrayList<>(selection.size());
for (Object item : selection.toList()) {
FeatureStructure annotation = (FeatureStructure) Platform.getAdapterManager().getAdapter(
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelectionProvider.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelectionProvider.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelectionProvider.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelectionProvider.java Tue Dec 4 15:09:45 2018
@@ -44,7 +44,7 @@ class FeatureStructureSelectionProvider
private IStructuredSelection mCurrentSelection = new StructuredSelection();
/** The m listeners. */
- private Set<ISelectionChangedListener> mListeners = new HashSet<ISelectionChangedListener>();
+ private Set<ISelectionChangedListener> mListeners = new HashSet<>();
/**
* Adds an {@link ISelectionChangedListener} to this provider.
@@ -88,9 +88,7 @@ class FeatureStructureSelectionProvider
public void setSelection(ISelection selection) {
Assert.isNotNull(selection);
- IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-
- mCurrentSelection = structuredSelection;
+ mCurrentSelection = (IStructuredSelection) selection;
for (ISelectionChangedListener listener : mListeners) {
SelectionChangedEvent event = new SelectionChangedEvent(this, mCurrentSelection);
@@ -139,4 +137,4 @@ class FeatureStructureSelectionProvider
public void clearSelectionSilently() {
mCurrentSelection = new StructuredSelection();
}
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java Tue Dec 4 15:09:45 2018
@@ -79,9 +79,6 @@ 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)) {
@@ -99,16 +96,13 @@ 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;
if (this == object) {
result = true;
- } else if (object != null && object instanceof FeatureValue) {
+ } else if (object instanceof FeatureValue) {
FeatureValue valueToCompare = (FeatureValue) object;
result = valueToCompare.mStructure.equals(mStructure)
@@ -118,9 +112,6 @@ 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/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateAction.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateAction.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateAction.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateAction.java Tue Dec 4 15:09:45 2018
@@ -48,9 +48,6 @@ public class FindAnnotateAction extends
this.target = target;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
@Override
public void run() {
FindAnnotateDialog dialog = new FindAnnotateDialog(
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java Tue Dec 4 15:09:45 2018
@@ -126,9 +126,6 @@ class FindAnnotateDialog extends Dialog
this.modeType = modeType;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.Dialog#create()
- */
@Override
public void create() {
// calls createContents first
@@ -375,9 +372,6 @@ 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) {
@@ -424,7 +418,7 @@ class FindAnnotateDialog extends Dialog
boolean isForwardSearch = forwardRadioButton.getSelection();
- int textOffset = -1;
+ int textOffset;
if (isForwardSearch) {
textOffset = findReplaceTarget.getSelection().x + findReplaceTarget.getSelection().y;
@@ -456,9 +450,6 @@ class FindAnnotateDialog extends Dialog
return newAnnotation;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int)
- */
@Override
protected void buttonPressed(int buttonID) {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/IAnnotationEditorModifyListener.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/IAnnotationEditorModifyListener.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/IAnnotationEditorModifyListener.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/IAnnotationEditorModifyListener.java Tue Dec 4 15:09:45 2018
@@ -40,12 +40,12 @@ public interface IAnnotationEditorModify
*
* @param newMode the new mode
*/
- public void annotationModeChanged(Type newMode);
+ void annotationModeChanged(Type newMode);
/**
* Called when the shown annotation types in the editor are changed.
*
* @param shownAnnotationTypes the shown annotation types
*/
- public void showAnnotationsChanged(Collection<Type> shownAnnotationTypes);
+ void showAnnotationsChanged(Collection<Type> shownAnnotationTypes);
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ModelFeatureStructure.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ModelFeatureStructure.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ModelFeatureStructure.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ModelFeatureStructure.java Tue Dec 4 15:09:45 2018
@@ -119,18 +119,15 @@ public class ModelFeatureStructure imple
*/
public static List<ModelFeatureStructure> create(ICasDocument document,
List<AnnotationFS> annotations) {
- List<ModelFeatureStructure> structres = new ArrayList<ModelFeatureStructure>(annotations.size());
+ List<ModelFeatureStructure> structures = new ArrayList<>(annotations.size());
for (AnnotationFS annotation : annotations) {
- structres.add(new ModelFeatureStructure(document, annotation));
+ structures.add(new ModelFeatureStructure(document, annotation));
}
- return structres;
+ return structures;
}
- /* (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)) {
@@ -149,9 +146,6 @@ public class ModelFeatureStructure imple
mDocument.update(mFeatureStructre);
}
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
@Override
public boolean equals(Object obj) {
@@ -167,9 +161,6 @@ public class ModelFeatureStructure imple
return false;
}
- /* (non-Javadoc)
- * @see java.lang.Object#hashCode()
- */
@Override
public int hashCode() {
return mFeatureStructre.hashCode();
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/QuickTypeSelectionDialog.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/QuickTypeSelectionDialog.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/QuickTypeSelectionDialog.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/QuickTypeSelectionDialog.java Tue Dec 4 15:09:45 2018
@@ -74,10 +74,10 @@ class QuickTypeSelectionDialog extends P
private Text filterText;
/** The shortcut type map. */
- private Map<Character, Type> shortcutTypeMap = new HashMap<Character, Type>();
+ private Map<Character, Type> shortcutTypeMap = new HashMap<>();
/** The type shortcut map. */
- private Map<Type, Character> typeShortcutMap = new HashMap<Type, Character>();
+ private Map<Type, Character> typeShortcutMap = new HashMap<>();
/**
* Initializes the current instance.
@@ -96,15 +96,15 @@ class QuickTypeSelectionDialog extends P
String shortcutsString = "qwertzuiopasdfghjklyxcvbnm1234567890";
- Set<Character> shortcuts = new HashSet<Character>();
+ Set<Character> shortcuts = new HashSet<>();
for (int i = 0; i < shortcutsString.length(); i++) {
shortcuts.add(shortcutsString.charAt(i));
}
- List<Type> types = new ArrayList<Type>();
+ List<Type> types = new ArrayList<>();
Collections.addAll(types, getTypes());
- Collections.sort(types, new Comparator<Type>() {
+ types.sort(new Comparator<Type>() {
@Override
public int compare(Type o1, Type o2) {
return o1.getName().compareTo(o2.getName());
@@ -210,9 +210,6 @@ 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);
@@ -394,9 +391,6 @@ 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/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/SubPageSite.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/SubPageSite.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/SubPageSite.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/SubPageSite.java Tue Dec 4 15:09:45 2018
@@ -52,82 +52,52 @@ public class SubPageSite implements IPag
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() {
@@ -137,4 +107,4 @@ public class SubPageSite implements IPag
return subActionBars;
}
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/TextDocumentProvider.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/TextDocumentProvider.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/TextDocumentProvider.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/TextDocumentProvider.java Tue Dec 4 15:09:45 2018
@@ -92,18 +92,12 @@ class TextDocumentProvider extends Abstr
}
});
}
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#createAnnotationModel(java.lang.Object)
- */
+
@Override
- protected IAnnotationModel createAnnotationModel(Object element) throws CoreException {
+ protected IAnnotationModel createAnnotationModel(Object element) {
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);
@@ -118,9 +112,6 @@ 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 {
@@ -133,17 +124,11 @@ 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 {
@@ -153,10 +138,7 @@ 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) {
@@ -165,10 +147,7 @@ class TextDocumentProvider extends Abstr
CasElementInfo casElementInfo = (CasElementInfo) info;
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/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/DeleteFeatureStructureAction.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/DeleteFeatureStructureAction.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/DeleteFeatureStructureAction.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/DeleteFeatureStructureAction.java Tue Dec 4 15:09:45 2018
@@ -47,9 +47,6 @@ 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 =
@@ -69,4 +66,4 @@ public class DeleteFeatureStructureActio
editor.getDocument().removeFeatureStructures(featureStructures.toList());
}
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/LowerLeftAnnotationSideAction.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/LowerLeftAnnotationSideAction.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/LowerLeftAnnotationSideAction.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/LowerLeftAnnotationSideAction.java Tue Dec 4 15:09:45 2018
@@ -47,16 +47,13 @@ public final class LowerLeftAnnotationSi
* @param editor the editor
*/
public LowerLeftAnnotationSideAction(ICasEditor editor) {
- super("LowerLeftAnnotationSide");
+ super(ID);
this.editor = editor;
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);
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/LowerRightAnnotationSideAction.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/LowerRightAnnotationSideAction.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/LowerRightAnnotationSideAction.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/LowerRightAnnotationSideAction.java Tue Dec 4 15:09:45 2018
@@ -47,16 +47,13 @@ public final class LowerRightAnnotationS
* @param editor the editor
*/
public LowerRightAnnotationSideAction(ICasEditor editor) {
- super("LowerRightAnnotationSide");
+ super(ID);
this.editor = editor;
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);
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/MergeAnnotationAction.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/MergeAnnotationAction.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/MergeAnnotationAction.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/MergeAnnotationAction.java Tue Dec 4 15:09:45 2018
@@ -53,9 +53,6 @@ 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);
@@ -80,4 +77,4 @@ public class MergeAnnotationAction exten
document.removeFeatureStructures(annotations.toList());
document.addFeatureStructure(mergedAnnotation);
}
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/WideLeftAnnotationSideAction.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/WideLeftAnnotationSideAction.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/WideLeftAnnotationSideAction.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/WideLeftAnnotationSideAction.java Tue Dec 4 15:09:45 2018
@@ -54,9 +54,6 @@ 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);
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/WideRightAnnotationSideAction.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/WideRightAnnotationSideAction.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/WideRightAnnotationSideAction.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/WideRightAnnotationSideAction.java Tue Dec 4 15:09:45 2018
@@ -47,16 +47,13 @@ public final class WideRightAnnotationSi
* @param editor the editor
*/
public WideRightAnnotationSideAction(ICasEditor editor) {
- super("WideRightAnnotationSide");
+ super(ID);
this.editor = editor;
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);
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/BackgroundDrawingStrategy.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/BackgroundDrawingStrategy.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/BackgroundDrawingStrategy.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/BackgroundDrawingStrategy.java Tue Dec 4 15:09:45 2018
@@ -50,12 +50,11 @@ final class BackgroundDrawingStrategy im
* @param color the color
*/
@Override
- public void draw(Annotation annotation, GC gc, StyledText textWidget, int offset, int length,
+ public void draw(Annotation annotation, GC gc, StyledText textWidget, int annotationBegin, int length,
Color color) {
if (length != 0) {
if (gc != null) {
- int annotationBegin = offset;
- int annotationEnd = offset + length;
+ int annotationEnd = annotationBegin + length;
Rectangle bounds = textWidget.getTextBounds(annotationBegin, annotationEnd - 1);
@@ -73,12 +72,12 @@ final class BackgroundDrawingStrategy im
// The z offsets should be drawn, the X offsets should not be overdrawn. That is solved
// by drawing for every z offset area one background rectangle.
- List<Span> dontOverDrawSpans = new ArrayList<Span>();
+ List<Span> dontOverDrawSpans = new ArrayList<>();
- Span annotationSpan = new Span(offset, length);
+ Span annotationSpan = new Span(annotationBegin, length);
// add all style ranges to the list in the range of the annotation
- for (StyleRange styleRange : textWidget.getStyleRanges(offset, length)) {
+ for (StyleRange styleRange : textWidget.getStyleRanges(annotationBegin, length)) {
Span styleRangeSpan = new Span(styleRange.start, styleRange.length);
if (styleRangeSpan.getLength() > 0)
dontOverDrawSpans.add(styleRangeSpan);
@@ -99,7 +98,7 @@ final class BackgroundDrawingStrategy im
gc.setBackground(color);
if (dontOverDrawSpans.size() > 0) {
- int zBegin = offset;
+ int zBegin = annotationBegin;
for (Span xSpan : dontOverDrawSpans) {
if (xSpan.getLength() > 0 && zBegin < xSpan.getStart()) {
Rectangle selectionBounds = textWidget.getTextBounds(zBegin, xSpan.getStart() -1);
@@ -121,13 +120,12 @@ final class BackgroundDrawingStrategy im
gc.fillRectangle(selectionBounds);
}
- int start = offset;
- int end = offset + length - 1;
+ int end = annotationBegin + length - 1;
gc.setForeground(new Color(gc.getDevice(), 0, 0, 0));
// Instead of a tab draw textWidget.getTabs() spaces
- String annotationText = textWidget.getText(start, end);
+ String annotationText = textWidget.getText(annotationBegin, end);
if (annotationText.contains("\t")) {
char replacementSpaces[] = new char[textWidget.getTabs()];
@@ -139,7 +137,7 @@ final class BackgroundDrawingStrategy im
gc.drawText(annotationText, bounds.x, bounds.y, true);
}
else {
- textWidget.redrawRange(offset, length, true);
+ textWidget.redrawRange(annotationBegin, length, true);
}
}
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/BoxDrawingStrategy.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/BoxDrawingStrategy.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/BoxDrawingStrategy.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/BoxDrawingStrategy.java Tue Dec 4 15:09:45 2018
@@ -73,4 +73,4 @@ final class BoxDrawingStrategy implement
}
}
}
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/BracketDrawingStrategy.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/BracketDrawingStrategy.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/BracketDrawingStrategy.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/BracketDrawingStrategy.java Tue Dec 4 15:09:45 2018
@@ -29,7 +29,7 @@ import org.eclipse.swt.graphics.Rectangl
/**
- * Draws brackets arround an annotation.
+ * Draws brackets around an annotation.
*/
public class BracketDrawingStrategy implements IDrawingStrategy {
@@ -85,4 +85,4 @@ public class BracketDrawingStrategy impl
}
}
}
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/DrawingStyle.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/DrawingStyle.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/DrawingStyle.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/DrawingStyle.java Tue Dec 4 15:09:45 2018
@@ -36,7 +36,7 @@ public class DrawingStyle {
/** The stateless styles. */
private static Map<AnnotationStyle.Style, IDrawingStrategy> statelessStyles =
- new HashMap<AnnotationStyle.Style, IDrawingStrategy>();
+ new HashMap<>();
static {
statelessStyles.put(Style.BACKGROUND, new BackgroundDrawingStrategy());
@@ -72,4 +72,4 @@ public class DrawingStyle {
return strategy;
}
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/EclipseAnnotationPeer.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/EclipseAnnotationPeer.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/EclipseAnnotationPeer.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/EclipseAnnotationPeer.java Tue Dec 4 15:09:45 2018
@@ -51,17 +51,12 @@ public class EclipseAnnotationPeer exten
return annotation;
}
- /* (non-Javadoc)
- * @see java.lang.Object#hashCode()
- */
+
@Override
public int hashCode() {
return annotation._id();
}
-
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
+
@Override
public boolean equals(Object obj) {
if (obj == this) {
@@ -76,10 +71,7 @@ public class EclipseAnnotationPeer exten
return false;
}
}
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
+
@Override
public String toString() {
return annotation.toString();
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TagDrawingStrategy.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TagDrawingStrategy.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TagDrawingStrategy.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TagDrawingStrategy.java Tue Dec 4 15:09:45 2018
@@ -73,9 +73,6 @@ 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/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TextColorDrawingStrategy.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TextColorDrawingStrategy.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TextColorDrawingStrategy.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TextColorDrawingStrategy.java Tue Dec 4 15:09:45 2018
@@ -32,17 +32,13 @@ import org.eclipse.swt.graphics.Rectangl
*/
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) {
+ public void draw(Annotation annotation, GC gc, StyledText textWidget, int start, int length, Color color) {
if (length > 0) {
if (annotation instanceof EclipseAnnotationPeer) {
if (gc != null) {
- int start = offset;
- int end = offset + length - 1;
+ int end = start + length - 1;
Rectangle bounds = textWidget.getTextBounds(start, end);
@@ -51,9 +47,9 @@ public class TextColorDrawingStrategy im
gc.drawText(textWidget.getText(start, end), bounds.x, bounds.y, true);
} else {
- textWidget.redrawRange(offset, length, true);
+ textWidget.redrawRange(start, length, true);
}
}
}
}
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TokenDrawingStrategy.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TokenDrawingStrategy.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TokenDrawingStrategy.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TokenDrawingStrategy.java Tue Dec 4 15:09:45 2018
@@ -44,15 +44,9 @@ public class TokenDrawingStrategy implem
* @return true, if is whitespace
*/
private static boolean isWhitespace(String text, int offset) {
-
- char character = text.charAt(offset);
-
- return Character.isWhitespace(character);
+ return Character.isWhitespace(text.charAt(offset));
}
- /* (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) {
@@ -94,4 +88,4 @@ public class TokenDrawingStrategy implem
}
}
}
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/context/AnnotationEditingControl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/context/AnnotationEditingControl.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/context/AnnotationEditingControl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/context/AnnotationEditingControl.java Tue Dec 4 15:09:45 2018
@@ -26,9 +26,6 @@ import org.eclipse.swt.widgets.Composite
import org.eclipse.swt.widgets.Label;
-/**
- * TODO: add javadoch here.
- */
public class AnnotationEditingControl extends Composite {
/**
@@ -53,8 +50,5 @@ public class AnnotationEditingControl ex
* @param structure the structure
*/
public void displayFeatureStructure(FeatureStructure structure) {
-
-
-
}
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/context/AnnotationEditingControlCreator.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/context/AnnotationEditingControlCreator.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/context/AnnotationEditingControlCreator.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/context/AnnotationEditingControlCreator.java Tue Dec 4 15:09:45 2018
@@ -64,4 +64,4 @@ public class AnnotationEditingControlCre
return control;
}
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ModeMenu.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ModeMenu.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ModeMenu.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ModeMenu.java Tue Dec 4 15:09:45 2018
@@ -42,7 +42,7 @@ public class ModeMenu extends TypeMenu {
private AnnotationEditor editor;
/** The listeners. */
- private Set<IModeMenuListener> listeners = new HashSet<IModeMenuListener>();
+ private Set<IModeMenuListener> listeners = new HashSet<>();
/**
* Initializes a new instance.
@@ -72,10 +72,7 @@ public class ModeMenu extends TypeMenu {
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);
@@ -94,4 +91,4 @@ public class ModeMenu extends TypeMenu {
}
});
}
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ShowAnnotationsMenu.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ShowAnnotationsMenu.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ShowAnnotationsMenu.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ShowAnnotationsMenu.java Tue Dec 4 15:09:45 2018
@@ -41,13 +41,13 @@ import org.eclipse.swt.widgets.MenuItem;
public class ShowAnnotationsMenu extends TypeMenu {
/** The listeners. */
- private Set<IShowAnnotationsListener> listeners = new HashSet<IShowAnnotationsListener>();
+ private Set<IShowAnnotationsListener> listeners = new HashSet<>();
/**
* This collection contains all type names which are displayed in the
* editor.
*/
- private Collection<Type> typesToDisplay = new HashSet<Type>();
+ private Collection<Type> typesToDisplay = new HashSet<>();
/**
* Editor annotation mode type. This variable is only set if the editor
@@ -65,9 +65,7 @@ public class ShowAnnotationsMenu extends
public ShowAnnotationsMenu(TypeSystem typeSystem, Collection<Type> shownTypes) {
super(typeSystem.getType(CAS.TYPE_NAME_ANNOTATION), typeSystem);
- for (Type type : shownTypes) {
- typesToDisplay.add(type);
- }
+ typesToDisplay.addAll(shownTypes);
}
/**
@@ -88,9 +86,6 @@ public class ShowAnnotationsMenu extends
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);
@@ -128,15 +123,13 @@ public class ShowAnnotationsMenu extends
* @return the selected types
*/
public Collection<Type> getSelectedTypes() {
- Collection<Type> selectedTypes = new LinkedList<Type>();
+ Collection<Type> selectedTypes = new LinkedList<>();
if (editorAnnotationMode != null) {
selectedTypes.add(editorAnnotationMode);
}
-
- for (Type type : typesToDisplay) {
- selectedTypes.add(type);
- }
+
+ selectedTypes.addAll(typesToDisplay);
return Collections.unmodifiableCollection(selectedTypes);
}
@@ -178,11 +171,8 @@ public class ShowAnnotationsMenu extends
* @param types the new selected types
*/
public void setSelectedTypes(Collection<Type> types) {
- typesToDisplay = new HashSet<Type>();
-
- for (Type type : types) {
- typesToDisplay.add(type);
- }
+ typesToDisplay = new HashSet<>();
+ typesToDisplay.addAll(types);
for (IShowAnnotationsListener listener : listeners) {
listener.selectionChanged(getSelectedTypes());
@@ -207,4 +197,4 @@ public class ShowAnnotationsMenu extends
fireChanged();
}
}
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/TypeMenu.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/TypeMenu.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/TypeMenu.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/TypeMenu.java Tue Dec 4 15:09:45 2018
@@ -19,7 +19,6 @@
package org.apache.uima.caseditor.editor.contextmenu;
-import java.util.Iterator;
import java.util.List;
import org.apache.uima.cas.Type;
@@ -94,11 +93,7 @@ abstract class TypeMenu extends Contribu
insertAction(parentType, newSubMenu);
- Iterator<Type> childsIterator = childs.iterator();
-
- while (childsIterator.hasNext()) {
- Type child = childsIterator.next();
-
+ for (Type child : childs) {
fillTypeMenu(child, newSubMenu, true);
}
}
@@ -116,5 +111,4 @@ abstract class TypeMenu extends Contribu
* @param parentMenu the parent menu
*/
protected abstract void insertAction(final Type type, Menu parentMenu);
-
- }
\ No newline at end of file
+ }
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/CreateFeatureStructureDialog.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/CreateFeatureStructureDialog.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/CreateFeatureStructureDialog.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/CreateFeatureStructureDialog.java Tue Dec 4 15:09:45 2018
@@ -66,9 +66,6 @@ public class CreateFeatureStructureDialo
/** The is array size displayed. */
private boolean isArraySizeDisplayed;
- /** The type selection. */
- private TypeCombo typeSelection;
-
/** The selected type. */
private Type selectedType;
@@ -98,7 +95,7 @@ public class CreateFeatureStructureDialo
message = "Please enter the size of the array.";
}
- filterTypes = new HashSet<Type>();
+ filterTypes = new HashSet<>();
filterTypes.add(typeSystem.getType(CAS.TYPE_NAME_ARRAY_BASE));
filterTypes.add(typeSystem.getType(CAS.TYPE_NAME_BYTE));
filterTypes.add(typeSystem.getType(CAS.TYPE_NAME_ANNOTATION_BASE));
@@ -113,10 +110,6 @@ public class CreateFeatureStructureDialo
filterTypes.add(typeSystem.getType(CAS.TYPE_NAME_STRING));
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
@Override
protected void configureShell(Shell newShell) {
newShell.setText(title);
@@ -172,9 +165,6 @@ public class CreateFeatureStructureDialo
}
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
@Override
protected Control createDialogArea(final Composite parent) {
@@ -197,8 +187,8 @@ public class CreateFeatureStructureDialo
Label typeLabel = new Label(typePanel, SWT.NONE);
typeLabel.setText("Type: ");
-
- typeSelection = new TypeCombo(typePanel);
+
+ TypeCombo typeSelection = new TypeCombo(typePanel);
typeSelection.setInput(superType, typeSystem, filterTypes);
selectedType = typeSelection.getType();
@@ -234,18 +224,13 @@ public class CreateFeatureStructureDialo
return labelAndText;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
- */
- @Override
+
+ @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);
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java Tue Dec 4 15:09:45 2018
@@ -25,42 +25,32 @@ import org.apache.uima.caseditor.editor.
import org.eclipse.ui.part.IPageBookViewPage;
-/**
- * TODO: add javadoc here.
- */
public final class EditView extends CasEditorView {
- /**
- * 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) {
-
- IPageBookViewPage result = null;
-
- ICasDocument document = editor.getDocument();
-
- if (document != null) {
- EditViewPage page = new EditViewPage(this, editor, document);
-
- result = page;
- }
-
- return result;
- }
-}
\ No newline at end of file
+ /**
+ * 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.");
+ }
+
+ @Override
+ protected IPageBookViewPage doCreatePage(ICasEditor editor) {
+ IPageBookViewPage result = null;
+
+ ICasDocument document = editor.getDocument();
+ if (document != null) {
+ result = new EditViewPage(this, editor, document);
+ }
+
+ return result;
+ }
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java Tue Dec 4 15:09:45 2018
@@ -113,9 +113,6 @@ final class EditViewPage extends Page im
super(viewer);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)
- */
@Override
protected boolean canEdit(Object element) {
@@ -146,9 +143,6 @@ final class EditViewPage extends Page im
}
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)
- */
@Override
protected CellEditor getCellEditor(Object element) {
@@ -209,7 +203,7 @@ final class EditViewPage extends Page im
// no validator needed
}
else {
- throw new CasEditorError("Unkown array type: " + arrayFS.getClass().getName());
+ throw new CasEditorError("Unknown array type: " + arrayFS.getClass().getName());
}
}
@@ -220,9 +214,6 @@ final class EditViewPage extends Page im
}
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)
- */
@Override
protected Object getValue(Object element) {
@@ -257,9 +248,6 @@ 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) {
@@ -322,9 +310,6 @@ final class EditViewPage extends Page im
setEnabled(false);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
@Override
public void run() {
IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
@@ -350,9 +335,6 @@ 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) {
@@ -414,27 +396,37 @@ final class EditViewPage extends Page im
TypeSystem ts = document.getCAS().getTypeSystem();
if (type.isArray()) {
- if (type.getName().equals(CAS.TYPE_NAME_BOOLEAN_ARRAY)) {
- fs = document.getCAS().createBooleanArrayFS(arraySize);
- } else if (type.getName().equals(CAS.TYPE_NAME_BYTE_ARRAY)) {
- fs = document.getCAS().createByteArrayFS(arraySize);
- } else if (type.getName().equals(CAS.TYPE_NAME_SHORT_ARRAY)) {
- fs = document.getCAS().createShortArrayFS(arraySize);
- } else if (type.getName().equals(CAS.TYPE_NAME_INTEGER_ARRAY)) {
- fs = document.getCAS().createIntArrayFS(arraySize);
- } else if (type.getName().equals(CAS.TYPE_NAME_LONG_ARRAY)) {
- fs = document.getCAS().createLongArrayFS(arraySize);
- } else if (type.getName().equals(CAS.TYPE_NAME_FLOAT_ARRAY)) {
- fs = document.getCAS().createFloatArrayFS(arraySize);
- } else if (type.getName().equals(CAS.TYPE_NAME_DOUBLE_ARRAY)) {
- fs = document.getCAS().createDoubleArrayFS(arraySize);
- } else if (type.getName().equals(CAS.TYPE_NAME_STRING_ARRAY)) {
- fs = document.getCAS().createStringArrayFS(arraySize);
- } else if (type.getName().equals(CAS.TYPE_NAME_FS_ARRAY)) {
- fs = document.getCAS().createArrayFS(arraySize);
- } else {
- throw new CasEditorError("Unkown array type: " + type.getName() + "!");
- }
+ switch (type.getName()) {
+ case CAS.TYPE_NAME_BOOLEAN_ARRAY:
+ fs = document.getCAS().createBooleanArrayFS(arraySize);
+ break;
+ case CAS.TYPE_NAME_BYTE_ARRAY:
+ fs = document.getCAS().createByteArrayFS(arraySize);
+ break;
+ case CAS.TYPE_NAME_SHORT_ARRAY:
+ fs = document.getCAS().createShortArrayFS(arraySize);
+ break;
+ case CAS.TYPE_NAME_INTEGER_ARRAY:
+ fs = document.getCAS().createIntArrayFS(arraySize);
+ break;
+ case CAS.TYPE_NAME_LONG_ARRAY:
+ fs = document.getCAS().createLongArrayFS(arraySize);
+ break;
+ case CAS.TYPE_NAME_FLOAT_ARRAY:
+ fs = document.getCAS().createFloatArrayFS(arraySize);
+ break;
+ case CAS.TYPE_NAME_DOUBLE_ARRAY:
+ fs = document.getCAS().createDoubleArrayFS(arraySize);
+ break;
+ case CAS.TYPE_NAME_STRING_ARRAY:
+ fs = document.getCAS().createStringArrayFS(arraySize);
+ break;
+ case CAS.TYPE_NAME_FS_ARRAY:
+ fs = document.getCAS().createArrayFS(arraySize);
+ break;
+ default:
+ throw new CasEditorError("Unkown array type: " + type.getName() + "!");
+ }
}
else if (ts.subsumes(ts.getType(CAS.TYPE_NAME_ANNOTATION), type)) {
@@ -463,9 +455,6 @@ 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();
@@ -550,9 +539,6 @@ 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) {
@@ -629,9 +615,6 @@ 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) {
@@ -812,17 +795,11 @@ final class EditViewPage extends Page im
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
@@ -850,9 +827,6 @@ 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) {
@@ -873,12 +847,9 @@ final class EditViewPage extends Page im
}
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.part.Page#dispose()
- */
@Override
public void dispose() {
getSite().getPage().removeSelectionListener(this);
super.dispose();
}
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureColumnLabelProvider.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureColumnLabelProvider.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureColumnLabelProvider.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureColumnLabelProvider.java Tue Dec 4 15:09:45 2018
@@ -30,10 +30,7 @@ import org.eclipse.jface.viewers.ViewerC
* 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) {
@@ -54,4 +51,4 @@ final class FeatureColumnLabelProvider e
throw new CasEditorError("Unkown element!");
}
}
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java Tue Dec 4 15:09:45 2018
@@ -97,9 +97,6 @@ final class FeatureStructureContentProvi
return size;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
@Override
public Object[] getElements(Object inputElement) {
@@ -111,7 +108,7 @@ final class FeatureStructureContentProvi
if (!type.isArray()) {
- Collection<FeatureValue> featureValues = new LinkedList<FeatureValue>();
+ Collection<FeatureValue> featureValues = new LinkedList<>();
for (Feature feature : type.getFeatures()) {
featureValues.add(new FeatureValue(mDocument, featureStructure, feature));
@@ -136,50 +133,30 @@ 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();
- }
- });
+ Display.getDefault().syncExec(viewer::refresh);
}
}
- /* (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() {
@@ -191,9 +168,6 @@ final class FeatureStructureContentProvi
});
}
- /* (non-Javadoc)
- * @see org.apache.uima.caseditor.editor.AbstractDocumentListener#removed(java.util.Collection)
- */
@Override
public void removed(Collection<FeatureStructure> deletedFeatureStructure) {
for(FeatureStructure fs : deletedFeatureStructure) {
@@ -205,9 +179,6 @@ 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() {
@@ -219,9 +190,6 @@ final class FeatureStructureContentProvi
});
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
- */
@Override
public Object[] getChildren(Object parentElement) {
@@ -248,9 +216,6 @@ final class FeatureStructureContentProvi
}
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
- */
@Override
public Object getParent(Object element) {
return null;
@@ -282,9 +247,6 @@ final class FeatureStructureContentProvi
return result;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
- */
@Override
public boolean hasChildren(Object element) {
@@ -316,4 +278,4 @@ final class FeatureStructureContentProvi
throw new CasEditorError("Unkown element type");
}
}
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/ValueColumnLabelProvider.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/ValueColumnLabelProvider.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/ValueColumnLabelProvider.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/ValueColumnLabelProvider.java Tue Dec 4 15:09:45 2018
@@ -33,10 +33,7 @@ import org.eclipse.jface.viewers.ViewerC
* 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) {
@@ -79,7 +76,7 @@ final class ValueColumnLabelProvider ext
}
}
else {
- throw new CasEditorError("Unkown element!");
+ throw new CasEditorError("Unknown element!");
}
}
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/ByteCellEditorValidator.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/ByteCellEditorValidator.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/ByteCellEditorValidator.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/ByteCellEditorValidator.java Tue Dec 4 15:09:45 2018
@@ -47,4 +47,4 @@ public class ByteCellEditorValidator imp
return null;
}
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/CellEditorValidatorFacotory.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/CellEditorValidatorFacotory.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/CellEditorValidatorFacotory.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/CellEditorValidatorFacotory.java Tue Dec 4 15:09:45 2018
@@ -31,8 +31,7 @@ import org.eclipse.jface.viewers.ICellEd
public class CellEditorValidatorFacotory {
/** The s validator map. */
- private static Map<Class<?>, ICellEditorValidator> sValidatorMap =
- new HashMap<Class<?>, ICellEditorValidator>();
+ private static Map<Class<?>, ICellEditorValidator> sValidatorMap = new HashMap<>();
static {
sValidatorMap.put(Byte.class, new ByteCellEditorValidator());
@@ -63,4 +62,4 @@ public class CellEditorValidatorFacotory
return sValidatorMap.get(type);
}
-}
\ No newline at end of file
+}