diff options
| author | Brian Vosburgh | 2013-02-08 19:11:57 +0000 |
|---|---|---|
| committer | Brian Vosburgh | 2013-02-11 22:16:15 +0000 |
| commit | 85b37023d0a583652b98613a6b17a0c2795c8440 (patch) | |
| tree | 48f1184c892afe8b7e1005b5300fa20e09b45468 /jpa_diagram_editor/plugins | |
| parent | c3766a4031446101b96cf94874d0bdfb8e3da7b8 (diff) | |
| download | webtools.dali-85b37023d0a583652b98613a6b17a0c2795c8440.tar.gz webtools.dali-85b37023d0a583652b98613a6b17a0c2795c8440.tar.xz webtools.dali-85b37023d0a583652b98613a6b17a0c2795c8440.zip | |
remove extra Iterator and Iterable constructors
Diffstat (limited to 'jpa_diagram_editor/plugins')
| -rw-r--r-- | jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPASolver.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPASolver.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPASolver.java index 16d88d47ec..7c15b38d3d 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPASolver.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPASolver.java @@ -1,7 +1,7 @@ /******************************************************************************* * <copyright> * - * Copyright (c) 2005, 2012 SAP AG. + * Copyright (c) 2005, 2013 SAP AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -25,7 +25,6 @@ import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.WeakHashMap; - import org.eclipse.core.internal.resources.File; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarkerDelta; @@ -66,7 +65,6 @@ import org.eclipse.jdt.internal.core.PackageFragmentRoot; import org.eclipse.jpt.common.core.JptResourceModel; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceCompilationUnit; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; import org.eclipse.jpt.common.utility.model.Model; import org.eclipse.jpt.common.utility.model.event.CollectionAddEvent; import org.eclipse.jpt.common.utility.model.event.CollectionChangeEvent; @@ -1333,7 +1331,7 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { @SuppressWarnings("unchecked") synchronized public void run() { try { - ArrayIterator<JavaPersistentAttribute> it = (ArrayIterator<JavaPersistentAttribute>) event.getItems().iterator(); + Iterator<JavaPersistentAttribute> it = (Iterator<JavaPersistentAttribute>) event.getItems().iterator(); Set<Shape> shapesToRemove = new HashSet<Shape>(); while (it.hasNext()) { JavaPersistentAttribute at = it.next(); @@ -1412,7 +1410,7 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { ContainerShape entShape = (ContainerShape)featureProvider.getPictogramElementForBusinessObject(jpt); // remove invalidated relations (if any) - ArrayIterator<JavaPersistentAttribute> it = (ArrayIterator<JavaPersistentAttribute>) event.getItems().iterator(); + Iterator<JavaPersistentAttribute> it = (Iterator<JavaPersistentAttribute>) event.getItems().iterator(); while (it.hasNext()) { JavaPersistentAttribute at = it.next(); if(at.getMapping() == null || at.getMapping().getMappingAnnotation() == null){ |