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 2009/05/15 15:34:44 UTC
svn commit: r775131 - in
/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor:
editor/ editor/editview/ editor/fsview/ ui/corpusview/ ui/property/
ui/wizards/
Author: joern
Date: Fri May 15 13:34:44 2009
New Revision: 775131
URL: http://svn.apache.org/viewvc?rev=775131&view=rev
Log:
UIMA-546 Fixed warnings
Modified:
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureLabelProvider.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/corpusview/AnnotatorActionGroup.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/corpusview/ConsumerCorpusActionGroup.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/corpusview/WorkspaceActionGroup.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/property/AnnotationPropertyPage.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/property/NlpProjectFieldEditorPage.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/DocumentImportStructureProvider.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/ImportDocumentWizard.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/ImportDocumentWizardPage.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/WizardNewFileCreation.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/WizardNewFolderCreation.java
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java?rev=775131&r1=775130&r2=775131&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/FeatureValue.java Fri May 15 13:34:44 2009
@@ -32,8 +32,6 @@
private Feature mFeature;
- private AnnotationDocument mDocument;
-
/**
* Initializes a new instance.
*
@@ -42,8 +40,8 @@
*/
public FeatureValue(AnnotationDocument document, FeatureStructure structure, Feature feature) {
Assert.isNotNull(document);
- mDocument = document;
-
+ // TODO: Remove document parameter ? Not needed anymore!
+
Assert.isNotNull(feature);
mFeature = feature;
@@ -56,7 +54,7 @@
}
public Object getValue() {
- if (Primitives.isPrimitive(mFeature)) {
+ if (mFeature.getRange().isPrimitive()) {
return Primitives.getPrimitiv(mStructure, mFeature);
}
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java?rev=775131&r1=775130&r2=775131&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/editview/FeatureStructureContentProvider.java Fri May 15 13:34:44 2009
@@ -33,7 +33,6 @@
import org.apache.uima.caseditor.editor.ArrayValue;
import org.apache.uima.caseditor.editor.CasEditorError;
import org.apache.uima.caseditor.editor.FeatureValue;
-import org.apache.uima.caseditor.editor.util.Primitives;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.widgets.Display;
@@ -217,7 +216,7 @@
if (element instanceof FeatureValue) {
FeatureValue value = (FeatureValue) element;
- if (Primitives.isPrimitive(value.getFeature())) {
+ if (value.getFeature().getRange().isPrimitive()) {
return false;
}
else {
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java?rev=775131&r1=775130&r2=775131&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureBrowserViewPage.java Fri May 15 13:34:44 2009
@@ -37,7 +37,6 @@
import org.apache.uima.caseditor.editor.FeatureValue;
import org.apache.uima.caseditor.editor.ModelFeatureStructure;
import org.apache.uima.caseditor.editor.action.DeleteFeatureStructureAction;
-import org.apache.uima.caseditor.editor.util.Primitives;
import org.apache.uima.caseditor.editor.util.StrictTypeConstraint;
import org.apache.uima.jcas.cas.StringArray;
import org.eclipse.core.runtime.IAdaptable;
@@ -160,7 +159,7 @@
for (Feature feature : type.getFeatures()) {
- if (Primitives.isPrimitive(feature)) {
+ if (feature.getRange().isPrimitive()) {
// create a new pair
// feature and value
// add string
@@ -186,7 +185,7 @@
} else if (element instanceof FeatureValue) {
FeatureValue featureValue = (FeatureValue) element;
- if (Primitives.isPrimitive(featureValue.getFeature())) {
+ if (featureValue.getFeature().getRange().isPrimitive()) {
Object value = featureValue.getValue();
if (value == null) {
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureLabelProvider.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureLabelProvider.java?rev=775131&r1=775130&r2=775131&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureLabelProvider.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/FeatureStructureLabelProvider.java Fri May 15 13:34:44 2009
@@ -23,7 +23,6 @@
import org.apache.uima.cas.impl.FeatureStructureImpl;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.caseditor.editor.FeatureValue;
-import org.apache.uima.caseditor.editor.util.Primitives;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
@@ -42,7 +41,7 @@
return featureValue.getFeature().getShortName() + ": null";
}
- if (Primitives.isPrimitive(featureValue.getFeature())) {
+ if (featureValue.getFeature().getRange().isPrimitive()) {
return featureValue.getFeature().getShortName() + " : " + value.toString();
}
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/corpusview/AnnotatorActionGroup.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/corpusview/AnnotatorActionGroup.java?rev=775131&r1=775130&r2=775131&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/corpusview/AnnotatorActionGroup.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/corpusview/AnnotatorActionGroup.java Fri May 15 13:34:44 2009
@@ -62,6 +62,7 @@
* the context menu manager
*/
@Override
+ @SuppressWarnings("unchecked")
public void fillContextMenu(IMenuManager menu) {
IStructuredSelection selection = (IStructuredSelection) getContext().getSelection();
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/corpusview/ConsumerCorpusActionGroup.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/corpusview/ConsumerCorpusActionGroup.java?rev=775131&r1=775130&r2=775131&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/corpusview/ConsumerCorpusActionGroup.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/corpusview/ConsumerCorpusActionGroup.java Fri May 15 13:34:44 2009
@@ -50,6 +50,7 @@
* the given menu. The action appears only in the menu if a document or corpus is selected.
*/
@Override
+ @SuppressWarnings("unchecked")
public void fillContextMenu(IMenuManager menu) {
IStructuredSelection selection = (IStructuredSelection) getContext().getSelection();
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/corpusview/WorkspaceActionGroup.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/corpusview/WorkspaceActionGroup.java?rev=775131&r1=775130&r2=775131&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/corpusview/WorkspaceActionGroup.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/corpusview/WorkspaceActionGroup.java Fri May 15 13:34:44 2009
@@ -98,6 +98,7 @@
* Fills the context menu with the actions.
*/
@Override
+ @SuppressWarnings("unchecked")
public void fillContextMenu(IMenuManager menu)
{
IStructuredSelection selection = CorpusExplorerUtil
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/property/AnnotationPropertyPage.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/property/AnnotationPropertyPage.java?rev=775131&r1=775130&r2=775131&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/property/AnnotationPropertyPage.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/property/AnnotationPropertyPage.java Fri May 15 13:34:44 2009
@@ -20,6 +20,7 @@
package org.apache.uima.caseditor.ui.property;
import java.awt.Color;
+import java.util.List;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.Type;
@@ -88,8 +89,6 @@
Type selectedType = (Type) selection.getFirstElement();
- TypeSystem typesystem = mProject.getTypesystemElement().getTypeSystem();
-
AnnotationStyle style = mDotCorpusElement.getAnnotation(selectedType);
mCurrentSelectedAnnotation = style;
@@ -181,11 +180,11 @@
Type annotationType = typeSytstem.getType(CAS.TYPE_NAME_ANNOTATION);
- java.util.List types = typeSytstem.getProperlySubsumedTypes(annotationType);
+ List<Type> types = typeSytstem.getProperlySubsumedTypes(annotationType);
- for (Object typeObject : types) {
+ for (Type type : types) {
// inserts objects with type Type
- mTypeList.add(typeObject);
+ mTypeList.add(type);
}
mTypeList.addSelectionChangedListener(new ISelectionChangedListener() {
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/property/NlpProjectFieldEditorPage.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/property/NlpProjectFieldEditorPage.java?rev=775131&r1=775130&r2=775131&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/property/NlpProjectFieldEditorPage.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/property/NlpProjectFieldEditorPage.java Fri May 15 13:34:44 2009
@@ -33,30 +33,23 @@
* TODO: add javadoc here
*/
public abstract class NlpProjectFieldEditorPage extends FieldEditorPreferencePage
- implements IWorkbenchPropertyPage
-{
- private ImageDescriptor mImage;
-
+ implements IWorkbenchPropertyPage {
+
private IAdaptable mElement;
private IPreferenceStore mPreferenceStore;
- NlpProjectFieldEditorPage(int style)
- {
+ NlpProjectFieldEditorPage(int style) {
super(style);
}
- public NlpProjectFieldEditorPage(String title, int style)
- {
+ public NlpProjectFieldEditorPage(String title, int style) {
super(title, style);
}
public NlpProjectFieldEditorPage(String title, ImageDescriptor image,
- int style)
- {
+ int style) {
super(title, image, style);
-
- mImage = image;
}
/**
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/DocumentImportStructureProvider.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/DocumentImportStructureProvider.java?rev=775131&r1=775130&r2=775131&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/DocumentImportStructureProvider.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/DocumentImportStructureProvider.java Fri May 15 13:34:44 2009
@@ -60,7 +60,7 @@
public DocumentImportStructureProvider() {
}
- public List getChildren(Object element) {
+ public List<Object> getChildren(Object element) {
return null;
}
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/ImportDocumentWizard.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/ImportDocumentWizard.java?rev=775131&r1=775130&r2=775131&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/ImportDocumentWizard.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/ImportDocumentWizard.java Fri May 15 13:34:44 2009
@@ -58,11 +58,8 @@
private IStructuredSelection mCurrentResourceSelection;
- private IWorkbench mWorkbench = null;
-
public void init(IWorkbench workbench, IStructuredSelection selection)
{
- mWorkbench = workbench;
mCurrentResourceSelection = selection; // if corpus set as import corpus
setWindowTitle("Import Documents");
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/ImportDocumentWizardPage.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/ImportDocumentWizardPage.java?rev=775131&r1=775130&r2=775131&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/ImportDocumentWizardPage.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/ImportDocumentWizardPage.java Fri May 15 13:34:44 2009
@@ -134,6 +134,7 @@
/**
* Removes selected elements from the file table viewer.
*/
+ @SuppressWarnings("unchecked")
public void widgetSelected(SelectionEvent e) {
IStructuredSelection selection = (IStructuredSelection) fileTable.getSelection();
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/WizardNewFileCreation.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/WizardNewFileCreation.java?rev=775131&r1=775130&r2=775131&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/WizardNewFileCreation.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/WizardNewFileCreation.java Fri May 15 13:34:44 2009
@@ -35,14 +35,10 @@
// private WizardNewFileCreationPage mMainPage;
- private IStructuredSelection selection;
-
/**
* Initializes the <code>NLPProjectWizard</code>.
*/
- public void init(IWorkbench workbench, IStructuredSelection selection)
- {
- this.selection = selection;
+ public void init(IWorkbench workbench, IStructuredSelection selection) {
setWindowTitle("New file");
}
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/WizardNewFolderCreation.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/WizardNewFolderCreation.java?rev=775131&r1=775130&r2=775131&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/WizardNewFolderCreation.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/ui/wizards/WizardNewFolderCreation.java Fri May 15 13:34:44 2009
@@ -35,14 +35,10 @@
// private WizardNewFolderCreationPage mMainPage;
- private IStructuredSelection selection;
-
/**
* Initializes the <code>NLPProjectWizard</code>.
*/
- public void init(IWorkbench workbench, IStructuredSelection selection)
- {
- this.selection = selection;
+ public void init(IWorkbench workbench, IStructuredSelection selection) {
setWindowTitle("New folder");
}