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 11:41:35 UTC
svn commit: r775073 - in
/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor:
core/model/ editor/ editor/editview/ editor/fsview/
Author: joern
Date: Fri May 15 09:41:35 2009
New Revision: 775073
URL: http://svn.apache.org/viewvc?rev=775073&view=rev
Log:
UIMA-546 Fixed warnings
Modified:
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/NlpProject.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/QuickTypeSelectionDialog.java
incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.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/TypeSelectionPane.java
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/NlpProject.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/NlpProject.java?rev=775073&r1=775072&r2=775073&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/NlpProject.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/core/model/NlpProject.java Fri May 15 09:41:35 2009
@@ -85,7 +85,6 @@
*
* @throws CoreException
*/
- @SuppressWarnings("unchecked")
void initialize() throws CoreException {
loadDotCorpus();
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/QuickTypeSelectionDialog.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/QuickTypeSelectionDialog.java?rev=775073&r1=775072&r2=775073&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/QuickTypeSelectionDialog.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/QuickTypeSelectionDialog.java Fri May 15 09:41:35 2009
@@ -161,7 +161,6 @@
typeShortcutMap.put(type, shortcut);
}
- @SuppressWarnings("unchecked")
private Type[] getTypes() {
TypeSystem typeSystem = editor.getDocument().getCAS().getTypeSystem();
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java?rev=775073&r1=775072&r2=775073&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/editview/EditViewPage.java Fri May 15 09:41:35 2009
@@ -419,7 +419,7 @@
Type fsSuperType = featureValue.getFeature().getRange();
if (!fsSuperType.isArray()) {
- List subTypes =
+ List<Type> subTypes =
document.getCAS().getTypeSystem().getProperlySubsumedTypes(fsSuperType);
Type typeToCreate;
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=775073&r1=775072&r2=775073&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 09:41:35 2009
@@ -20,9 +20,7 @@
package org.apache.uima.caseditor.editor.editview;
import java.util.Collection;
-import java.util.Iterator;
import java.util.LinkedList;
-import java.util.List;
import org.apache.uima.cas.ArrayFS;
import org.apache.uima.cas.CommonArrayFS;
@@ -92,15 +90,10 @@
Type type = featureStructure.getType();
if (!type.isArray()) {
- List featureTypes = type.getFeatures();
Collection<FeatureValue> featureValues = new LinkedList<FeatureValue>();
- Iterator featuresItertor = featureTypes.iterator();
-
- while (featuresItertor.hasNext()) {
- Feature feature = (Feature) featuresItertor.next();
-
+ for (Feature feature : type.getFeatures()) {
featureValues.add(new FeatureValue(mDocument, featureStructure, feature));
}
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=775073&r1=775072&r2=775073&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 09:41:35 2009
@@ -21,9 +21,7 @@
import java.util.Collection;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.LinkedList;
-import java.util.Vector;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.FSIterator;
@@ -160,12 +158,7 @@
Type type = featureStructure.getType();
- Vector featureTypes = type.getAppropriateFeatures();
-
- Iterator featuresItertor = featureTypes.iterator();
-
- while (featuresItertor.hasNext()) {
- Feature feature = (Feature) featuresItertor.next();
+ for (Feature feature : type.getFeatures()) {
if (Primitives.isPrimitive(feature)) {
// create a new pair
Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/TypeSelectionPane.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/TypeSelectionPane.java?rev=775073&r1=775072&r2=775073&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/TypeSelectionPane.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/fsview/TypeSelectionPane.java Fri May 15 09:41:35 2009
@@ -20,7 +20,6 @@
package org.apache.uima.caseditor.editor.fsview;
import java.util.Collection;
-import java.util.Iterator;
import java.util.LinkedList;
import org.apache.uima.cas.Type;
@@ -92,11 +91,7 @@
typeNameList.add(superType.getName());
- // get a collection of all types
- Iterator typeIterator = mTypeSystem.getProperlySubsumedTypes(superType).iterator();
-
- while (typeIterator.hasNext()) {
- Type type = (Type) typeIterator.next();
+ for (Type type : mTypeSystem.getProperlySubsumedTypes(superType)) {
if (!filterTypes.contains(type)) {
typeNameList.add(type.getName());