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 [1/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...
Author: joern
Date: Tue Dec 4 15:09:45 2018
New Revision: 1848161
URL: http://svn.apache.org/viewvc?rev=1848161&view=rev
Log:
UIMA-5920: Refactor the CAS Editor to use java 8 features
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePlugin.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferencePage.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorPerspectiveFactory.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorPreferencePage.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/NlpProject.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/WorkspaceResourceDialog.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/TypeSystemSearchStrategyFactory.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/DocumentImportStructureProvider.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizard.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizardPage.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/CasEditorPlugin.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/Images.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/DefaultColors.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpus.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializer.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractAnnotationDocumentListener.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocumentListener.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferencePage.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorSelection.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorView.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationSelectionListener.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyleChangeListener.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ArrayValue.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProviderFactory.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorViewPage.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CustomInformationControl.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/DocumentUimaImpl.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelection.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureStructureSelectionProvider.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateAction.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/FindAnnotateDialog.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/IAnnotationEditorModifyListener.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ModelFeatureStructure.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/QuickTypeSelectionDialog.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/SubPageSite.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/TextDocumentProvider.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/DeleteFeatureStructureAction.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/LowerLeftAnnotationSideAction.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/LowerRightAnnotationSideAction.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/MergeAnnotationAction.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/WideLeftAnnotationSideAction.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/action/WideRightAnnotationSideAction.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/BackgroundDrawingStrategy.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/BoxDrawingStrategy.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/BracketDrawingStrategy.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/DrawingStyle.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/EclipseAnnotationPeer.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TagDrawingStrategy.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TextColorDrawingStrategy.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/annotation/TokenDrawingStrategy.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/context/AnnotationEditingControl.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/context/AnnotationEditingControlCreator.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ModeMenu.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/ShowAnnotationsMenu.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/contextmenu/TypeMenu.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/CreateFeatureStructureDialog.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditView.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureColumnLabelProvider.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/ValueColumnLabelProvider.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/ByteCellEditorValidator.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/CellEditorValidatorFacotory.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/FloatCellEditorValidator.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/IntegerCellEditorValidator.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/LongCellEditorValidator.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/editview/validator/ShortCellEditorValidator.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserView.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureLabelProvider.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/fsview/TypeCombo.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNode.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTreeNodeList.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationTypeTreeNode.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/ModeSensitiveContentProvider.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlineContentProviderBase.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlineLabelProvider.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlinePageBook.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/SwitchStyleAction.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/TypeGroupedContentProvider.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleView.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationTypeNode.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/util/AnnotationSelection.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/util/ContainingConstraint.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/util/ObjectTransfer.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/util/Span.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/util/StrictTypeConstraint.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/property/AnnotationPropertyPage.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/ui/property/EditorAnnotationPropertyPage.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/test/java/org/apache/uima/caseditor/editor/util/SpanTest.java
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePlugin.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePlugin.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePlugin.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePlugin.java Tue Dec 4 15:09:45 2018
@@ -47,12 +47,7 @@ public class CasEditorIdePlugin extends
*/
private static CasEditorIdePlugin sPlugin;
- /**
- * Resource bundle.
- */
- private ResourceBundle mResourceBundle;
-
- /**
+ /**
* The constructor.
*/
public CasEditorIdePlugin() {
@@ -154,7 +149,10 @@ public class CasEditorIdePlugin extends
super.stop(context);
sPlugin = null;
- mResourceBundle = null;
+ /**
+ * Resource bundle.
+ */
+ ResourceBundle mResourceBundle = null;
}
/**
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferencePage.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferencePage.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferencePage.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorIdePreferencePage.java Tue Dec 4 15:09:45 2018
@@ -30,27 +30,20 @@ import org.eclipse.ui.IWorkbenchPreferen
public class CasEditorIdePreferencePage extends FieldEditorPreferencePage
implements IWorkbenchPreferencePage {
- private BooleanFieldEditor mEditorRememberTypesystem;
-
public CasEditorIdePreferencePage() {
setPreferenceStore(CasEditorIdePlugin.getDefault().getPreferenceStore());
setDescription("Cas Editor Ide Preferences.");
}
-
@Override
protected void createFieldEditors() {
// should the editor use the last selected type system to open the cas?
- mEditorRememberTypesystem = new BooleanFieldEditor(CasEditorIdePreferenceConstants.CAS_EDITOR_REMEMBER_TYPESYSTEM,
- "Use the previously selected type system to open a CAS", getFieldEditorParent());
+ BooleanFieldEditor mEditorRememberTypesystem = new BooleanFieldEditor(CasEditorIdePreferenceConstants.CAS_EDITOR_REMEMBER_TYPESYSTEM,
+ "Use the previously selected type system to open a CAS", getFieldEditorParent());
addField(mEditorRememberTypesystem);
-
-
}
public void init(IWorkbench workbench) {
}
-
-
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorPerspectiveFactory.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorPerspectiveFactory.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorPerspectiveFactory.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorPerspectiveFactory.java Tue Dec 4 15:09:45 2018
@@ -93,4 +93,3 @@ public class CasEditorPerspectiveFactory
leftBottom.addView(EditView.ID_2);
}
}
-
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorPreferencePage.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorPreferencePage.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorPreferencePage.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/CasEditorPreferencePage.java Tue Dec 4 15:09:45 2018
@@ -40,6 +40,4 @@ public class CasEditorPreferencePage ext
protected void createFieldEditors() {
}
-
-
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java Tue Dec 4 15:09:45 2018
@@ -23,6 +23,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -41,7 +42,6 @@ import org.apache.uima.caseditor.editor.
import org.apache.uima.caseditor.editor.ICasEditor;
import org.apache.uima.caseditor.ide.searchstrategy.ITypeSystemSearchStrategy;
import org.apache.uima.caseditor.ide.searchstrategy.TypeSystemSearchStrategyFactory;
-import org.apache.uima.util.CasIOUtils;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceChangeEvent;
@@ -147,11 +147,9 @@ public class DefaultCasDocumentProvider
try {
tsFile.setPersistentProperty(new QualifiedName("", CAS_EDITOR_SESSION_PROPERTIES),
- new String(prefBytes.toByteArray(), "UTF-8"));
+ new String(prefBytes.toByteArray(), StandardCharsets.UTF_8));
} catch (CoreException e) {
CasEditorIdePlugin.log(e);
- } catch (IOException e) {
- CasEditorIdePlugin.log(e);
}
}
}
@@ -164,7 +162,7 @@ public class DefaultCasDocumentProvider
* The tracking is done in the provider because the document element itself does not has any link
* to the style object.
*/
- private Map<String, String> documentToTypeSystemMap = new HashMap<String, String>();
+ private Map<String, String> documentToTypeSystemMap = new HashMap<>();
/**
* This map stores temporarily the type system that should be used to open the next document.
@@ -172,15 +170,15 @@ public class DefaultCasDocumentProvider
* the previously selected type system can be deactivated. The inlined file choose, for example,
* uses this field to remember the chosen type system.
*/
- private Map<String, String> typeSystemForNextDocumentOnly = new HashMap<String, String>();
+ private Map<String, String> typeSystemForNextDocumentOnly = new HashMap<>();
- private Map<String, IPreferenceStore> sessionPreferenceStores = new HashMap<String, IPreferenceStore>();
+ private Map<String, IPreferenceStore> sessionPreferenceStores = new HashMap<>();
/**
* This map resolves a type system to a style. It is used to cache type system preference instance
* while the editor is open.
*/
- private Map<String, PreferenceStore> typeSystemPreferences = new HashMap<String, PreferenceStore>();
+ private Map<String, PreferenceStore> typeSystemPreferences = new HashMap<>();
private boolean isFileChangeTrackingEnabled = true;
@@ -205,12 +203,9 @@ public class DefaultCasDocumentProvider
private Collection<AnnotationStyle> getConfiguredAnnotationStyles(IPreferenceStore store,
TypeSystem types) {
-
- Collection<AnnotationStyle> styles = new HashSet<AnnotationStyle>();
-
// TODO: for each annotation type, try to retrieve annotation styles
- return styles;
+ return new HashSet<>();
}
@Override
@@ -315,7 +310,7 @@ public class DefaultCasDocumentProvider
if (styleFile.exists()) {
InputStream styleFileIn = null;
- DotCorpus dotCorpus = null;
+ DotCorpus dotCorpus;
try {
styleFileIn = styleFile.getContents();
dotCorpus = DotCorpusSerializer.parseDotCorpus(styleFileIn);
@@ -389,7 +384,7 @@ public class DefaultCasDocumentProvider
if (sessionPreferenceString != null) {
try {
- newStore.load(new ByteArrayInputStream(sessionPreferenceString.getBytes("UTF-8")));
+ newStore.load(new ByteArrayInputStream(sessionPreferenceString.getBytes(StandardCharsets.UTF_8)));
} catch (IOException e) {
CasEditorPlugin.log(e);
}
@@ -409,7 +404,7 @@ public class DefaultCasDocumentProvider
return doc;
} else {
- String message = null;
+ String message;
if (typeSystemFile != null) {
message = "Cannot find type system!\nPlease place a valid type system in this path:\n"
@@ -602,5 +597,4 @@ public class DefaultCasDocumentProvider
private void handleElementChanged(Object element) {
fireElementChanged(element);
}
-
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/NlpProject.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/NlpProject.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/NlpProject.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/NlpProject.java Tue Dec 4 15:09:45 2018
@@ -40,4 +40,4 @@ public final class NlpProject implements
public void setProject(IProject project) {
this.project = project;
}
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/WorkspaceResourceDialog.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/WorkspaceResourceDialog.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/WorkspaceResourceDialog.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/WorkspaceResourceDialog.java Tue Dec 4 15:09:45 2018
@@ -86,5 +86,4 @@ public class WorkspaceResourceDialog
}
return resource;
}
-
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/TypeSystemSearchStrategyFactory.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/TypeSystemSearchStrategyFactory.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/TypeSystemSearchStrategyFactory.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/searchstrategy/TypeSystemSearchStrategyFactory.java Tue Dec 4 15:09:45 2018
@@ -33,7 +33,7 @@ public class TypeSystemSearchStrategyFac
private static TypeSystemSearchStrategyFactory instance;
- private Map<Integer, ITypeSystemSearchStrategy> searchStrategies = new TreeMap<Integer, ITypeSystemSearchStrategy>();
+ private Map<Integer, ITypeSystemSearchStrategy> searchStrategies = new TreeMap<>();
private TypeSystemSearchStrategyFactory() {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/DocumentImportStructureProvider.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/DocumentImportStructureProvider.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/DocumentImportStructureProvider.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/DocumentImportStructureProvider.java Tue Dec 4 15:09:45 2018
@@ -26,6 +26,7 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.file.Files;
import java.util.List;
import javax.swing.text.BadLocationException;
@@ -141,60 +142,23 @@ final class DocumentImportStructureProvi
String fileName = fileToImport.getName();
if (fileName.endsWith(".rtf")) {
- InputStream in = null;
-
- try {
- in = new FileInputStream((File) element);
+ try (InputStream in = new FileInputStream(fileToImport)) {
String text = convert(in);
-
return getDocument(fileToImport.getAbsolutePath(), text, language, casFormat);
- } catch (FileNotFoundException e) {
- return null;
} catch (IOException e) {
return null;
- } finally {
- try {
- if (in != null) {
- in.close();
- }
- } catch (IOException e) {
- // sorry that this can happen
- }
}
-
} else if (fileName.endsWith(".txt")) {
- InputStream in = null;
try {
- in = new FileInputStream((File) element);
-
- StringBuilder textStringBuffer = new StringBuilder();
-
- byte[] readBuffer = new byte[2048];
-
- while (in.available() > 0) {
- int length = in.read(readBuffer);
-
- textStringBuffer.append(new String(readBuffer, 0, length, importEncoding));
- }
-
- return getDocument(fileToImport.getAbsolutePath(), textStringBuffer.toString(), language,
+ String text = new String(Files.readAllBytes(fileToImport.toPath()), importEncoding);
+ return getDocument(fileToImport.getAbsolutePath(), text, language,
casFormat);
- } catch (FileNotFoundException e) {
- return null;
} catch (IOException e) {
return null;
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException e) {
- // sorry that this can fail
- }
- }
}
} else {
try {
- return new FileInputStream((File) element);
+ return new FileInputStream(fileToImport);
} catch (FileNotFoundException e) {
return null;
}
@@ -242,4 +206,4 @@ final class DocumentImportStructureProvi
public boolean isFolder(Object element) {
return ((File) element).isDirectory();
}
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizard.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizard.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizard.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizard.java Tue Dec 4 15:09:45 2018
@@ -71,8 +71,8 @@ public final class ImportDocumentWizard
String lastUsedEncodingsString = store.getString(
CasEditorIdePreferenceConstants.CAS_IMPORT_WIZARD_LAST_USED_ENCODINGS);
- List<String> lastUsedEncodings = new ArrayList<String>(Arrays.asList(lastUsedEncodingsString.split(
- CasEditorIdePreferenceConstants.STRING_DELIMITER)));
+ List<String> lastUsedEncodings = new ArrayList<>(Arrays.asList(lastUsedEncodingsString.split(
+ CasEditorIdePreferenceConstants.STRING_DELIMITER)));
int usedEncodingIndex = lastUsedEncodings.indexOf(usedEncoding);
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizardPage.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizardPage.java?rev=1848161&r1=1848160&r2=1848161&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizardPage.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/wizards/ImportDocumentWizardPage.java Tue Dec 4 15:09:45 2018
@@ -78,7 +78,7 @@ final class ImportDocumentWizardPage ext
private static final Set<String> defaultEncodings;
static {
- Set<String> encodings = new HashSet<String>();
+ Set<String> encodings = new HashSet<>();
encodings.add("US-ASCII");
encodings.add("ISO-8859-1");
@@ -383,10 +383,9 @@ final class ImportDocumentWizardPage ext
// combo box ...
final Combo encodingCombo = new Combo(importOptions, SWT.NONE);
encodingCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-
- Set<String> charsets = new HashSet<String>();
- charsets.addAll(defaultEncodings);
+
+
+ Set<String> charsets = new HashSet<>(defaultEncodings);
String lastUsedEncodingsString =
store.getString(CasEditorIdePreferenceConstants.CAS_IMPORT_WIZARD_LAST_USED_ENCODINGS);
@@ -465,7 +464,7 @@ final class ImportDocumentWizardPage ext
List<File> getFilesToImport() {
- List<File> files = new ArrayList<File>(fileTable.getTable().getItemCount());
+ List<File> files = new ArrayList<>(fileTable.getTable().getItemCount());
for (int i = 0; i < fileTable.getTable().getItemCount(); i++) {
files.add((File) fileTable.getElementAt(i));
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/CasEditorPlugin.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/CasEditorPlugin.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/CasEditorPlugin.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/CasEditorPlugin.java Tue Dec 4 15:09:45 2018
@@ -116,7 +116,7 @@ public class CasEditorPlugin extends Abs
/**
* Returns the plugin's resource bundle.
*
- * @return the ResourceBbundle or null if missing
+ * @return the ResourceBundle or null if missing
*/
public ResourceBundle getResourceBundle() {
try {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/Images.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/Images.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/Images.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/Images.java Tue Dec 4 15:09:45 2018
@@ -69,7 +69,7 @@ public enum Images {
private final String mPath;
- private Images(String path) {
+ Images(String path) {
mPath = path;
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/DefaultColors.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/DefaultColors.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/core/model/DefaultColors.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/DefaultColors.java Tue Dec 4 15:09:45 2018
@@ -93,7 +93,7 @@ public class DefaultColors {
*/
public static Collection<AnnotationStyle> assignColors(TypeSystem ts, Collection<AnnotationStyle> styles) {
- Map<String, Color> typeNameToColorMap = new HashMap<String, Color>();
+ Map<String, Color> typeNameToColorMap = new HashMap<>();
for (AnnotationStyle style : styles) {
typeNameToColorMap.put(style.getAnnotation(), style.getColor());
@@ -106,7 +106,7 @@ public class DefaultColors {
}
}
- Set<AnnotationStyle> newStyles = new HashSet<AnnotationStyle>();
+ Set<AnnotationStyle> newStyles = new HashSet<>();
for (AnnotationStyle style : styles) {
typeNameToColorMap.remove(style.getAnnotation());
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpus.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpus.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/core/model/dotcorpus/DotCorpus.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpus.java Tue Dec 4 15:09:45 2018
@@ -42,10 +42,10 @@ public class DotCorpus {
private String mTypeSystemFileName;
/** names of the corpus folders. */
- private Set<String> mCorpusFolders = new HashSet<String>();
+ private Set<String> mCorpusFolders = new HashSet<>();
/** Names of the configuration source folders. */
- private Set<String> mCasProcessorFolders = new HashSet<String>();
+ private Set<String> mCasProcessorFolders = new HashSet<>();
/**
* Length hint of the lines in the editor.
@@ -55,12 +55,12 @@ public class DotCorpus {
/**
* Maps style names to style objects.
*/
- private HashMap<String, AnnotationStyle> mStyleMap = new HashMap<String, AnnotationStyle>();
+ private HashMap<String, AnnotationStyle> mStyleMap = new HashMap<>();
/**
* Contains names of types which are visible/shown.
*/
- private Set<String> shownTypes = new HashSet<String>();
+ private Set<String> shownTypes = new HashSet<>();
/**
* Retrieves type system name parameter.
@@ -301,11 +301,7 @@ public class DotCorpus {
if (a != null && b != null) {
result = a.equals(b);
} else {
- if (a == null && b == null) {
- result = true;
- } else {
- result = false;
- }
+ result = a == null && b == null;
}
return result;
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializer.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializer.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/core/model/dotcorpus/DotCorpusSerializer.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializer.java Tue Dec 4 15:09:45 2018
@@ -111,12 +111,12 @@ public class DotCorpusSerializer {
* @throws CoreException -
*/
public static DotCorpus parseDotCorpus(InputStream dotCorpusStream) throws CoreException {
- DocumentBuilderFactory documentBuilderFacoty = XMLUtils.createDocumentBuilderFactory();
+ DocumentBuilderFactory documentBuilderFactory = XMLUtils.createDocumentBuilderFactory();
DocumentBuilder documentBuilder;
try {
- documentBuilder = documentBuilderFacoty.newDocumentBuilder();
+ documentBuilder = documentBuilderFactory.newDocumentBuilder();
} catch (ParserConfigurationException e) {
String message = "This should never happen:" + (e.getMessage() != null ? e.getMessage() : "");
@@ -129,13 +129,7 @@ public class DotCorpusSerializer {
try {
dotCorpusDOM = documentBuilder.parse(dotCorpusStream);
- } catch (SAXException 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 (IOException e) {
+ } catch (SAXException | IOException e) {
String message = e.getMessage() != null ? e.getMessage() : "";
IStatus s = new Status(IStatus.ERROR, CasEditorPlugin.ID, IStatus.OK, message, e);
@@ -268,8 +262,8 @@ public class DotCorpusSerializer {
styleAttributes.addAttribute("", "", STYLE_STYLE_ATTRIBUTE, "", style.getStyle().name());
Color color = style.getColor();
- Integer colorInt = new Color(color.getRed(), color.getGreen(), color.getBlue()).getRGB();
- styleAttributes.addAttribute("", "", STYLE_COLOR_ATTRIBUTE, "", colorInt.toString());
+ int colorInt = new Color(color.getRed(), color.getGreen(), color.getBlue()).getRGB();
+ styleAttributes.addAttribute("", "", STYLE_COLOR_ATTRIBUTE, "", Integer.toString(colorInt));
styleAttributes.addAttribute("", "", STYLE_LAYER_ATTRIBUTE, "", Integer.toString(style
.getLayer()));
if (style.getConfiguration() != null) {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractAnnotationDocumentListener.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractAnnotationDocumentListener.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/AbstractAnnotationDocumentListener.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractAnnotationDocumentListener.java Tue Dec 4 15:09:45 2018
@@ -35,13 +35,13 @@ public abstract class AbstractAnnotation
/**
* Filter annotations.
*
- * @param strcutres the strcutres
+ * @param structures the structures
* @return the collection
*/
- private Collection<AnnotationFS> filterAnnotations(Collection<FeatureStructure> strcutres) {
- Collection<AnnotationFS> annotations = new ArrayList<AnnotationFS>(strcutres.size());
+ private Collection<AnnotationFS> filterAnnotations(Collection<FeatureStructure> structures) {
+ Collection<AnnotationFS> annotations = new ArrayList<>(structures.size());
- for (FeatureStructure structure : strcutres) {
+ for (FeatureStructure structure : structures) {
if (structure instanceof AnnotationFS) {
annotations.add((AnnotationFS) structure);
}
@@ -53,11 +53,11 @@ public abstract class AbstractAnnotation
/**
* Add notification.
*
- * @param structres the structres
+ * @param structures the structures
*/
@Override
- public void added(Collection<FeatureStructure> structres) {
- Collection<AnnotationFS> annotations = filterAnnotations(structres);
+ public void added(Collection<FeatureStructure> structures) {
+ Collection<AnnotationFS> annotations = filterAnnotations(structures);
if (!annotations.isEmpty()) {
addedAnnotation(annotations);
@@ -67,11 +67,11 @@ public abstract class AbstractAnnotation
/**
* Remove notification.
*
- * @param structres the structres
+ * @param structures the structures
*/
@Override
- public void removed(Collection<FeatureStructure> structres) {
- Collection<AnnotationFS> annotations = filterAnnotations(structres);
+ public void removed(Collection<FeatureStructure> structures) {
+ Collection<AnnotationFS> annotations = filterAnnotations(structures);
if (!annotations.isEmpty()) {
removedAnnotation(annotations);
@@ -81,11 +81,11 @@ public abstract class AbstractAnnotation
/**
* Update notification.
*
- * @param structres the structres
+ * @param structures the structures
*/
@Override
- public void updated(Collection<FeatureStructure> structres) {
- Collection<AnnotationFS> annotations = filterAnnotations(structres);
+ public void updated(Collection<FeatureStructure> structures) {
+ Collection<AnnotationFS> annotations = filterAnnotations(structures);
if (!annotations.isEmpty()) {
updatedAnnotation(annotations);
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.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/AbstractDocument.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java Tue Dec 4 15:09:45 2018
@@ -207,14 +207,9 @@ public abstract class AbstractDocument i
});
}
}
-
- /* (non-Javadoc)
- * @see org.apache.uima.caseditor.editor.ICasDocument#getTypeSystemText()
- */
+
@Override
public String getTypeSystemText() {
return null;
}
-
-
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocumentListener.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocumentListener.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/AbstractDocumentListener.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocumentListener.java Tue Dec 4 15:09:45 2018
@@ -19,20 +19,13 @@
package org.apache.uima.caseditor.editor;
-import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import org.apache.uima.cas.FeatureStructure;
-
-/**
- * TODO: add javadoc here.
- */
public abstract class AbstractDocumentListener implements ICasDocumentListener {
- /* (non-Javadoc)
- * @see org.apache.uima.caseditor.editor.ICasDocumentListener#added(java.util.Collection)
- */
@Override
public void added(Collection<FeatureStructure> newFeatureStructure) {
}
@@ -44,16 +37,9 @@ public abstract class AbstractDocumentLi
*/
@Override
public void added(FeatureStructure newAnnotation) {
- Collection<FeatureStructure> structures = new ArrayList<FeatureStructure>(1);
-
- structures.add(newAnnotation);
-
- added(structures);
+ added(Collections.singleton(newAnnotation));
}
- /* (non-Javadoc)
- * @see org.apache.uima.caseditor.editor.ICasDocumentListener#removed(java.util.Collection)
- */
@Override
public void removed(Collection<FeatureStructure> deletedFeatureStructure) {
}
@@ -65,16 +51,9 @@ public abstract class AbstractDocumentLi
*/
@Override
public void removed(FeatureStructure deletedAnnotation) {
- Collection<FeatureStructure> structures = new ArrayList<FeatureStructure>(1);
-
- structures.add(deletedAnnotation);
-
- removed(structures);
+ removed(Collections.singleton(deletedAnnotation));
}
- /* (non-Javadoc)
- * @see org.apache.uima.caseditor.editor.ICasDocumentListener#updated(java.util.Collection)
- */
@Override
public void updated(Collection<FeatureStructure> featureStructure) {
}
@@ -86,23 +65,13 @@ public abstract class AbstractDocumentLi
*/
@Override
public void updated(FeatureStructure annotation) {
- Collection<FeatureStructure> structures = new ArrayList<FeatureStructure>(1);
-
- structures.add(annotation);
-
- updated(structures);
+ updated(Collections.singleton(annotation));
}
- /* (non-Javadoc)
- * @see org.apache.uima.caseditor.editor.ICasDocumentListener#changed()
- */
@Override
public void changed() {
}
- /* (non-Javadoc)
- * @see org.apache.uima.caseditor.editor.ICasDocumentListener#viewChanged(java.lang.String, java.lang.String)
- */
@Override
public void viewChanged(String oldViewName, String newViewName) {
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.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/AnnotationDocument.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java Tue Dec 4 15:09:45 2018
@@ -282,9 +282,6 @@ class AnnotationDocument extends Documen
return mDocument.getType(type);
}
- /* (non-Javadoc)
- * @see org.apache.uima.caseditor.editor.ICasDocument#switchView(java.lang.String)
- */
@Override
public void switchView(String viewName) {
@@ -301,13 +298,10 @@ class AnnotationDocument extends Documen
getTracker().set(text);
// Note: Sends out view update notification
- ((DocumentUimaImpl) mDocument).switchView(viewName);
+ mDocument.switchView(viewName);
}
- /* (non-Javadoc)
- * @see org.apache.uima.caseditor.editor.ICasDocument#getTypeSystemText()
- */
@Override
public String getTypeSystemText() {
if(mDocument != null) {
@@ -315,6 +309,4 @@ class AnnotationDocument extends Documen
}
return null;
}
-
-
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.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/AnnotationEditor.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java Tue Dec 4 15:09:45 2018
@@ -154,10 +154,7 @@ public final class AnnotationEditor exte
*/
private abstract class AbstractAnnotateAction extends Action
implements ISelectionChangedListener {
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
- */
+
@Override
public void selectionChanged(SelectionChangedEvent event) {
setEnabled(AnnotationEditor.this.getSelection().y -
@@ -232,9 +229,6 @@ public final class AnnotationEditor exte
/** The Constant ID. */
private static final String ID = "Annotate";
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
@Override
public void run() {
@@ -303,8 +297,6 @@ public final class AnnotationEditor exte
/**
* This <code>IDocumentChangeListener</code> is responsible to synchronize annotation in the
* document with the annotations in eclipse.
- *
- * @see DocumentEvent
*/
private class DocumentListener extends AbstractAnnotationDocumentListener {
@@ -317,7 +309,7 @@ public final class AnnotationEditor exte
public void addedAnnotation(Collection<AnnotationFS> annotations) {
IAnnotationModelExtension annotationModel = (IAnnotationModelExtension) getDocumentProvider().getAnnotationModel(getEditorInput());
- Map<Annotation, Position> addAnnotationMap = new HashMap<Annotation, Position>();
+ Map<Annotation, Position> addAnnotationMap = new HashMap<>();
for (AnnotationFS annotation : annotations) {
addAnnotationMap.put(new EclipseAnnotationPeer(annotation), new Position(annotation.getBegin(),
@@ -372,19 +364,14 @@ public final class AnnotationEditor exte
selectionChanged(getSite().getPage().getActivePart(), mFeatureStructureSelectionProvider.getSelection());
}
- /* (non-Javadoc)
- * @see org.apache.uima.caseditor.editor.AbstractDocumentListener#changed()
- */
+
@Override
public void changed() {
mFeatureStructureSelectionProvider.clearSelection();
syncAnnotations();
}
-
- /* (non-Javadoc)
- * @see org.apache.uima.caseditor.editor.AbstractDocumentListener#viewChanged(java.lang.String, java.lang.String)
- */
+
@Override
public void viewChanged(String oldViewName, String newViewName) {
// TODO: Currently do nothing ...
@@ -393,8 +380,6 @@ public final class AnnotationEditor exte
/**
* Sometimes the wrong annotation is selected ... ????
- *
- * @see FeatureStructureDragEvent
*/
private class FeatureStructureDragListener implements DragSourceListener {
@@ -460,9 +445,6 @@ public final class AnnotationEditor exte
});
}
- /* (non-Javadoc)
- * @see org.eclipse.swt.dnd.DragSourceListener#dragStart(org.eclipse.swt.dnd.DragSourceEvent)
- */
@Override
public void dragStart(DragSourceEvent event) {
if (mIsActive) {
@@ -472,17 +454,11 @@ public final class AnnotationEditor exte
}
}
- /* (non-Javadoc)
- * @see org.eclipse.swt.dnd.DragSourceListener#dragSetData(org.eclipse.swt.dnd.DragSourceEvent)
- */
@Override
public void dragSetData(DragSourceEvent event) {
event.data = mCandidate;
}
- /* (non-Javadoc)
- * @see org.eclipse.swt.dnd.DragSourceListener#dragFinished(org.eclipse.swt.dnd.DragSourceEvent)
- */
@Override
public void dragFinished(DragSourceEvent event) {
}
@@ -493,33 +469,21 @@ public final class AnnotationEditor exte
*/
private class AnnotationAccess implements IAnnotationAccess, IAnnotationAccessExtension {
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.source.IAnnotationAccess#getType(org.eclipse.jface.text.source.Annotation)
- */
@Override
public Object getType(Annotation annotation) {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.source.IAnnotationAccess#isMultiLine(org.eclipse.jface.text.source.Annotation)
- */
@Override
public boolean isMultiLine(Annotation annotation) {
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.source.IAnnotationAccess#isTemporary(org.eclipse.jface.text.source.Annotation)
- */
@Override
public boolean isTemporary(Annotation annotation) {
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.source.IAnnotationAccessExtension#getLayer(org.eclipse.jface.text.source.Annotation)
- */
@Override
public int getLayer(Annotation annotation) {
@@ -540,25 +504,16 @@ public final class AnnotationEditor exte
}
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.source.IAnnotationAccessExtension#getSupertypes(java.lang.Object)
- */
@Override
public Object[] getSupertypes(Object annotationType) {
return new Object[0];
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.source.IAnnotationAccessExtension#getTypeLabel(org.eclipse.jface.text.source.Annotation)
- */
@Override
public String getTypeLabel(Annotation annotation) {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.source.IAnnotationAccessExtension#isPaintable(org.eclipse.jface.text.source.Annotation)
- */
@Override
public boolean isPaintable(Annotation annotation) {
assert false : "Should never be called";
@@ -583,9 +538,6 @@ public final class AnnotationEditor exte
getAnnotationMode().equals(type);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.source.IAnnotationAccessExtension#paint(org.eclipse.jface.text.source.Annotation, org.eclipse.swt.graphics.GC, org.eclipse.swt.widgets.Canvas, org.eclipse.swt.graphics.Rectangle)
- */
@Override
public void paint(Annotation annotation, GC gc, Canvas canvas, Rectangle bounds) {
assert false : "Should never be called";
@@ -609,10 +561,7 @@ public final class AnnotationEditor exte
public CasViewMenu(AnnotationEditor casEditor) {
this.casEditor = casEditor;
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.ContributionItem#fill(org.eclipse.swt.widgets.Menu, int)
- */
+
@Override
public void fill(Menu parentMenu, int index) {
@@ -664,7 +613,7 @@ public final class AnnotationEditor exte
private OutlinePageBook mOutlinePage = new OutlinePageBook();
/** The m editor listener. */
- private Set<IAnnotationEditorModifyListener> mEditorListener = new HashSet<IAnnotationEditorModifyListener>();
+ private Set<IAnnotationEditorModifyListener> mEditorListener = new HashSet<>();
/** The m editor input listener. */
private ListenerList mEditorInputListener = new ListenerList();
@@ -694,7 +643,7 @@ public final class AnnotationEditor exte
private AnnotationStyleChangeListener mAnnotationStyleListener;
/** The shown annotation types. */
- private Collection<Type> shownAnnotationTypes = new HashSet<Type>();
+ private Collection<Type> shownAnnotationTypes = new HashSet<>();
/** The preference store change listener. */
private IPropertyChangeListener preferenceStoreChangeListener;
@@ -708,9 +657,6 @@ public final class AnnotationEditor exte
public AnnotationEditor() {
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.texteditor.AbstractTextEditor#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
- */
@Override
public void init(IEditorSite site, IEditorInput input) throws PartInitException {
casDocumentProvider =
@@ -721,9 +667,6 @@ public final class AnnotationEditor exte
super.init(site, input);
}
- /* (non-Javadoc)
- * @see org.apache.uima.caseditor.editor.ICasEditor#getCasDocumentProvider()
- */
@Override
public CasDocumentProvider getCasDocumentProvider() {
return casDocumentProvider;
@@ -773,9 +716,6 @@ public final class AnnotationEditor exte
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.texteditor.AbstractTextEditor#createSourceViewer(org.eclipse.swt.widgets.Composite, org.eclipse.jface.text.source.IVerticalRuler, int)
- */
@Override
protected ISourceViewer createSourceViewer(Composite parent,
org.eclipse.jface.text.source.IVerticalRuler ruler, int styles) {
@@ -956,8 +896,6 @@ public final class AnnotationEditor exte
return false;
}
-
-
/**
* Used to inform about input changes.
*/
@@ -966,10 +904,7 @@ public final class AnnotationEditor exte
super.handleElementContentReplaced();
setInput(getEditorInput());
}
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.texteditor.StatusTextEditor#doSetInput(org.eclipse.ui.IEditorInput)
- */
+
@Override
protected void doSetInput(final IEditorInput input) throws CoreException {
final IEditorInput oldInput = getEditorInput();
@@ -1083,9 +1018,6 @@ public final class AnnotationEditor exte
// The editor status support is abused to display different control than the
// text control when displaying text is not possible, e.g. because the sofa
- /* (non-Javadoc)
- * @see org.eclipse.ui.texteditor.StatusTextEditor#isErrorStatus(org.eclipse.core.runtime.IStatus)
- */
// is not a text sofa or not set at all
@Override
protected boolean isErrorStatus(IStatus status) {
@@ -1095,7 +1027,7 @@ public final class AnnotationEditor exte
/**
* Initialized the UI from the freshly set document.
*
- * Note: Does nothing if getDoucment() return null.
+ * Note: Does nothing if getDocument() return null.
*/
private void initiallySynchronizeUI() {
if (getDocument() != null) {
@@ -1108,16 +1040,15 @@ public final class AnnotationEditor exte
public void selectionChanged(Collection<Type> selection) {
// compute change sets and apply changes:
- Collection<Type> notShownAnymore = new HashSet<Type>(shownAnnotationTypes);
+ Collection<Type> notShownAnymore = new HashSet<>(shownAnnotationTypes);
notShownAnymore.removeAll(selection);
for (Type type : notShownAnymore) {
showAnnotationType(type, false);
}
- Collection<Type> newShownTypes = new HashSet<Type>(selection);
+ Collection<Type> newShownTypes = new HashSet<>(selection);
newShownTypes.removeAll(shownAnnotationTypes);
- for (Iterator<Type> iterator = newShownTypes.iterator(); iterator.hasNext();) {
- Type type = iterator.next();
+ for (Type type : newShownTypes) {
showAnnotationType(type, true);
}
@@ -1168,10 +1099,7 @@ public final class AnnotationEditor exte
}
}
}
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.texteditor.AbstractTextEditor#editorContextMenuAboutToShow(org.eclipse.jface.action.IMenuManager)
- */
+
@Override
protected void editorContextMenuAboutToShow(IMenuManager menu) {
super.editorContextMenuAboutToShow(menu);
@@ -1182,13 +1110,13 @@ public final class AnnotationEditor exte
menu.appendToGroup(IWorkbenchActionConstants.MB_ADDITIONS, getAction(QuickAnnotateAction.ID));
menu.appendToGroup(IWorkbenchActionConstants.MB_ADDITIONS, getAction(IWorkbenchActionDefinitionIds.DELETE));
- TypeSystem typeSytem = getDocument().getCAS().getTypeSystem();
+ TypeSystem typeSystem = getDocument().getCAS().getTypeSystem();
// mode menu
MenuManager modeMenuManager = new MenuManager("Mode");
menu.appendToGroup(IWorkbenchActionConstants.MB_ADDITIONS, modeMenuManager);
- ModeMenu modeMenu = new ModeMenu(typeSytem, this);
+ ModeMenu modeMenu = new ModeMenu(typeSystem, this);
modeMenu.addListener(new IModeMenuListener(){
@Override
@@ -1217,7 +1145,7 @@ public final class AnnotationEditor exte
* Updates the status line.
*/
private void updateStatusLineModeItem() {
- // TODO: refactore this
+ // TODO: refactor this
IStatusField statusField = getStatusField(AnnotationEditorActionContributor.ID);
// can be null directly after doSetInput()
@@ -1236,9 +1164,6 @@ public final class AnnotationEditor exte
return (ICasDocument) getDocumentProvider().getDocument(getEditorInput());
}
- /* (non-Javadoc)
- * @see org.apache.uima.caseditor.editor.ICasEditor#reopenEditorWithNewTypeSystem()
- */
@Override
public void reopenEditorWithNewTypeSystem() {
setInput(getEditorInput());
@@ -1336,7 +1261,6 @@ public final class AnnotationEditor exte
return AnnotationStyle.getAnnotationStyleFromStore(prefStore, type.getName());
}
-
/**
* Sets an annotation style.
*
@@ -1482,23 +1406,16 @@ public final class AnnotationEditor exte
mEditorListener.remove(listener);
}
- /* (non-Javadoc)
- * @see org.apache.uima.caseditor.editor.ICasEditor#addCasEditorInputListener(org.apache.uima.caseditor.editor.ICasEditorInputListener)
- */
@Override
public void addCasEditorInputListener(ICasEditorInputListener listener) {
mEditorInputListener.add(listener);
}
- /* (non-Javadoc)
- * @see org.apache.uima.caseditor.editor.ICasEditor#removeCasEditorInputListener(org.apache.uima.caseditor.editor.ICasEditorInputListener)
- */
@Override
public void removeCasEditorInputListener(ICasEditorInputListener listener) {
mEditorInputListener.remove(listener);
}
-
/**
* Returns the selection.
*
@@ -1546,21 +1463,19 @@ public final class AnnotationEditor exte
* @return the selected annotations or an empty list
*/
public List<AnnotationFS> getSelectedAnnotations() {
- List<AnnotationFS> selection = new ArrayList<AnnotationFS>();
+ List<AnnotationFS> selection = new ArrayList<>();
if (isSomethingSelected()) {
Point selectedText = getSourceViewer().getTextWidget().getSelectionRange();
- Span selecectedSpan = new Span(selectedText.x, selectedText.y);
+ Span selectedSpan = new Span(selectedText.x, selectedText.y);
Collection<AnnotationFS> selectedAnnotations = getAnnotation(getDocument().getCAS(),
- getAnnotationMode(), selecectedSpan);
+ getAnnotationMode(), selectedSpan);
- for (AnnotationFS annotation : selectedAnnotations) {
- selection.add(annotation);
- }
+ selection.addAll(selectedAnnotations);
- Collections.sort(selection, new AnnotationComparator());
+ selection.sort(new AnnotationComparator());
} else {
Map<Integer, AnnotationFS> view = getView(getAnnotationMode());
@@ -1620,7 +1535,7 @@ public final class AnnotationEditor exte
// Change the view in the input document
// TODO: Add support for this to the interface
- ((AnnotationDocument) getDocument()).switchView(viewName);
+ getDocument().switchView(viewName);
// Retrieve the new (changed) text document and refresh the source viewer
getSourceViewer().setDocument((AnnotationDocument) getDocument(),
@@ -1871,9 +1786,6 @@ public final class AnnotationEditor exte
getSite().getSelectionProvider().addSelectionChangedListener(wideRightAnnotationSideAction);
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.texteditor.AbstractTextEditor#dispose()
- */
@Override
public void dispose() {
// remove selection listener
@@ -1917,7 +1829,7 @@ public final class AnnotationEditor exte
*/
public static AnnotationEditor[] getAnnotationEditors() {
- ArrayList<AnnotationEditor> dirtyParts = new ArrayList<AnnotationEditor>();
+ List<AnnotationEditor> dirtyParts = new ArrayList<>();
IWorkbenchWindow windows[] = PlatformUI.getWorkbench().getWorkbenchWindows();
for (IWorkbenchWindow element : windows) {
IWorkbenchPage pages[] = element.getPages();
@@ -1939,9 +1851,6 @@ public final class AnnotationEditor exte
return dirtyParts.toArray(new AnnotationEditor[dirtyParts.size()]);
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.texteditor.StatusTextEditor#createStatusControl(org.eclipse.swt.widgets.Composite, org.eclipse.core.runtime.IStatus)
- */
@Override
protected Control createStatusControl(Composite parent, IStatus status) {
@@ -1951,7 +1860,7 @@ public final class AnnotationEditor exte
// TODO: Is the null check on the editor input necessary ?!
// Show a form to select a type system in the document provider,
- // afterwards the form calls reopenEditorWithNewTypesytem to reopen
+ // afterwards the form calls reopenEditorWithNewTypesystem to reopen
// the editor on the input
return getCasDocumentProvider().createTypeSystemSelectorForm(this, parent, status);
}
@@ -1976,8 +1885,7 @@ public final class AnnotationEditor exte
final Combo viewSelectionCombo = new Combo(noTextComposite, SWT.READ_ONLY);
- List<String> viewNames = new ArrayList<String>();
-
+ List<String> viewNames = new ArrayList<>();
for (Iterator<CAS> it = getDocument().getCAS().getViewIterator(); it.hasNext(); ) {
viewNames.add(it.next().getViewName());
}
@@ -2044,10 +1952,10 @@ public final class AnnotationEditor exte
FSMatchConstraint strictType = new StrictTypeConstraint(type);
- FSMatchConstraint annotatioInSpanConstraint = cf.and(embeddedBegin, embeddedEnd);
+ FSMatchConstraint annotationInSpanConstraint = cf.and(embeddedBegin, embeddedEnd);
FSMatchConstraint annotationInSpanAndStrictTypeConstraint =
- cf.and(annotatioInSpanConstraint, strictType);
+ cf.and(annotationInSpanConstraint, strictType);
FSIndex<AnnotationFS> allAnnotations = cas.getAnnotationIndex(type);
@@ -2067,7 +1975,7 @@ public final class AnnotationEditor exte
private Map<Integer, AnnotationFS> getView(Type annotationType) {
Collection<AnnotationFS> annotations = getDocument().getAnnotations(annotationType);
- HashMap<Integer, AnnotationFS> viewMap = new HashMap<Integer, AnnotationFS>();
+ Map<Integer, AnnotationFS> viewMap = new HashMap<>();
for (AnnotationFS annotation : annotations) {
for (int i = annotation.getBegin(); i <= annotation.getEnd() - 1; i++) {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.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/AnnotationEditorPreferenceInitializer.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferenceInitializer.java Tue Dec 4 15:09:45 2018
@@ -23,20 +23,16 @@ import org.apache.uima.caseditor.CasEdit
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
import org.eclipse.jface.preference.IPreferenceStore;
-
/**
* The Class AnnotationEditorPreferenceInitializer.
*/
public class AnnotationEditorPreferenceInitializer extends AbstractPreferenceInitializer {
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
- */
- @Override
+ @Override
public void initializeDefaultPreferences() {
- IPreferenceStore store = CasEditorPlugin.getDefault().getPreferenceStore();
- store.setDefault(AnnotationEditorPreferenceConstants.EDITOR_LINE_LENGTH_HINT, 80);
- store.setDefault(AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_TEXT_SIZE, 13);
+ IPreferenceStore store = CasEditorPlugin.getDefault().getPreferenceStore();
+ store.setDefault(AnnotationEditorPreferenceConstants.EDITOR_LINE_LENGTH_HINT, 80);
+ store.setDefault(AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_TEXT_SIZE, 13);
store.setDefault(AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_PARTIAL_TYPESYSTEM, false);
- }
+ }
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferencePage.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferencePage.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/AnnotationEditorPreferencePage.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorPreferencePage.java Tue Dec 4 15:09:45 2018
@@ -38,10 +38,7 @@ public class AnnotationEditorPreferenceP
/** The m editor text size. */
private IntegerFieldEditor mEditorTextSize;
-
- /** The m editor partial typeystem. */
- private BooleanFieldEditor mEditorPartialTypeystem;
-
+
/**
* Instantiates a new annotation editor preference page.
*/
@@ -49,11 +46,7 @@ public class AnnotationEditorPreferenceP
setPreferenceStore(CasEditorPlugin.getDefault().getPreferenceStore());
setDescription("UIMA Annotation Editor Preferences.");
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
- */
@Override
protected void createFieldEditors() {
// editor line length hint
@@ -69,23 +62,17 @@ public class AnnotationEditorPreferenceP
addField(mEditorTextSize);
// load CAS with partial type system
- mEditorPartialTypeystem = new BooleanFieldEditor(
- AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_PARTIAL_TYPESYSTEM,
- "Load CAS leniently (WARNING: only for experienced users)", getFieldEditorParent());
- addField(mEditorPartialTypeystem);
+ BooleanFieldEditor editorPartialTypesystem = new BooleanFieldEditor(
+ AnnotationEditorPreferenceConstants.ANNOTATION_EDITOR_PARTIAL_TYPESYSTEM,
+ "Load CAS leniently (WARNING: only for experienced users)", getFieldEditorParent());
+ addField(editorPartialTypesystem);
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
- */
@Override
public void init(IWorkbench workbench) {
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.FieldEditorPreferencePage#checkState()
- */
+
@Override
protected void checkState() {
super.checkState();
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorSelection.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorSelection.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/AnnotationEditorSelection.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorSelection.java Tue Dec 4 15:09:45 2018
@@ -47,90 +47,57 @@ class AnnotationEditorSelection implemen
this.textSelection = textSelection;
this.structuredSelection = structuredSelection;
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.ITextSelection#getOffset()
- */
+
@Override
public int getOffset() {
return textSelection.getOffset();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.ITextSelection#getLength()
- */
@Override
public int getLength() {
return textSelection.getLength();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.ITextSelection#getStartLine()
- */
@Override
public int getStartLine() {
return textSelection.getStartLine();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.ITextSelection#getEndLine()
- */
@Override
public int getEndLine() {
return textSelection.getEndLine();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.ITextSelection#getText()
- */
@Override
public String getText() {
return textSelection.getText();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelection#isEmpty()
- */
@Override
public boolean isEmpty() {
return structuredSelection.isEmpty() && textSelection.isEmpty();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredSelection#getFirstElement()
- */
@Override
public Object getFirstElement() {
return structuredSelection.getFirstElement();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredSelection#iterator()
- */
@Override
public Iterator iterator() {
return structuredSelection.iterator();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredSelection#size()
- */
@Override
public int size() {
return structuredSelection.size();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredSelection#toArray()
- */
@Override
public Object[] toArray() {
return structuredSelection.toArray();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredSelection#toList()
- */
@Override
public List toList() {
return structuredSelection.toList();
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorView.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorView.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/AnnotationEditorView.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditorView.java Tue Dec 4 15:09:45 2018
@@ -46,9 +46,6 @@ public abstract class AnnotationEditorVi
this.editorNotAvailableMessage = editorNotAvailableMessage;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.part.PageBookView#createDefaultPage(org.eclipse.ui.part.PageBook)
- */
@Override
protected IPage createDefaultPage(PageBook book) {
MessagePage page = new MessagePage();
@@ -66,9 +63,6 @@ public abstract class AnnotationEditorVi
*/
protected abstract PageRec doCreatePage(ICasEditor editor);
- /* (non-Javadoc)
- * @see org.eclipse.ui.part.PageBookView#doCreatePage(org.eclipse.ui.IWorkbenchPart)
- */
@Override
protected final PageRec doCreatePage(IWorkbenchPart part) {
@@ -81,17 +75,11 @@ public abstract class AnnotationEditorVi
return null;
}
- /* (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) {
pageRecord.page.dispose();
@@ -99,9 +87,6 @@ public abstract class AnnotationEditorVi
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
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationSelectionListener.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationSelectionListener.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/AnnotationSelectionListener.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationSelectionListener.java Tue Dec 4 15:09:45 2018
@@ -33,9 +33,6 @@ import org.eclipse.ui.IWorkbenchPart;
*/
public abstract class AnnotationSelectionListener implements ISelectionListener {
- /* (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) {
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.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/AnnotationStyle.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyle.java Tue Dec 4 15:09:45 2018
@@ -279,7 +279,7 @@ public final class AnnotationStyle {
* @return the map
*/
private static Map<String, String> parseProperties(String line) {
- Map<String, String> properties = new HashMap<String, String>();
+ Map<String, String> properties = new HashMap<>();
String keyValueStrings[] = line.split(";");
@@ -306,7 +306,7 @@ public final class AnnotationStyle {
Color color = new Color(style.getColor().getRed(), style.getColor().getGreen(),
style.getColor().getBlue());
- Map<String, String> styleProperties = new HashMap<String, String>();
+ Map<String, String> styleProperties = new HashMap<>();
styleProperties.put("color", Integer.toString(color.getRGB()));
styleProperties.put("strategy", style.getStyle().toString());
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyleChangeListener.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyleChangeListener.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/AnnotationStyleChangeListener.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationStyleChangeListener.java Tue Dec 4 15:09:45 2018
@@ -35,9 +35,6 @@ import org.eclipse.jface.util.PropertyCh
public abstract class AnnotationStyleChangeListener
implements IPropertyChangeListener, IAnnotationStyleListener {
- /* (non-Javadoc)
- * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
- */
@Override
public void propertyChange(PropertyChangeEvent event) {
if (event.getProperty().endsWith(".style")) {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ArrayValue.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ArrayValue.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/ArrayValue.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ArrayValue.java Tue Dec 4 15:09:45 2018
@@ -110,7 +110,7 @@ public class ArrayValue implements IAdap
StringArrayFS array = (StringArrayFS) arrayFS;
array.set(slot, value);
} else {
- throw new CasEditorError("Unkown array type!");
+ throw new CasEditorError("Unknown array type!");
}
}
@@ -156,13 +156,10 @@ public class ArrayValue implements IAdap
ArrayFS array = (ArrayFS) arrayFS;
return array.get(slot);
} else {
- throw new CasEditorError("Unkown array type!");
+ throw new CasEditorError("Unknown array type!");
}
}
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
- */
@Override
public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
@@ -185,9 +182,6 @@ public class ArrayValue implements IAdap
return null;
}
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
@Override
public String toString() {
return Integer.toString(slot()) ;
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.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/CasDocumentProvider.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProvider.java Tue Dec 4 15:09:45 2018
@@ -69,7 +69,7 @@ public abstract class CasDocumentProvide
public static final int TYPE_SYSTEM_NOT_AVAILABLE_STATUS_CODE = 12;
/** The element state listeners. */
- private Set<IElementStateListener> elementStateListeners = new HashSet<IElementStateListener>();
+ private Set<IElementStateListener> elementStateListeners = new HashSet<>();
/**
* The method {@link #createDocument(Object)} put error status objects for the given element in
@@ -77,7 +77,7 @@ public abstract class CasDocumentProvide
*
* The method {@link #getStatus(Object)} can then retrieve and return the status.
*/
- protected Map<Object, IStatus> elementErrorStatus = new HashMap<Object, IStatus>();
+ protected Map<Object, IStatus> elementErrorStatus = new HashMap<>();
/**
* Creates the element info.
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProviderFactory.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProviderFactory.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/CasDocumentProviderFactory.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasDocumentProviderFactory.java Tue Dec 4 15:09:45 2018
@@ -45,7 +45,7 @@ class CasDocumentProviderFactory {
/** The document providers. */
// map class_name to provider
- private Map<String, CasDocumentProvider> documentProviders = new HashMap<String, CasDocumentProvider>();
+ private Map<String, CasDocumentProvider> documentProviders = new HashMap<>();
/**
* Instantiates a new cas document provider factory.
@@ -67,7 +67,7 @@ class CasDocumentProviderFactory {
try {
documentProviderObject = element.createExecutableExtension("class");
} catch (CoreException e) {
- CasEditorPlugin.log("Failed to load doucment provider with id: " + id, e);
+ CasEditorPlugin.log("Failed to load document provider with id: " + id, e);
documentProviderObject = null;
}
@@ -94,7 +94,7 @@ class CasDocumentProviderFactory {
// First try to match the input type to the editor input type
// or one of its super class
- List<Class<?>> classList = new ArrayList<Class<?>>();
+ List<Class<?>> classList = new ArrayList<>();
for (Class<?> inputClass = input.getClass(); inputClass != null;) {
classList.add(inputClass);