svn commit: r981765 - in /felix/trunk/sigil: common/core/src/org/apache/felix/sigil/common/core/repository/ eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/ eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/ecli...

[ds...@apache.org]

Author: dsavage
Date: Tue Aug  3 07:38:41 2010
New Revision: 981765

URL: http://svn.apache.org/viewvc?rev=981765&view=rev
Log:
further tidyup - imports/unused code etc

Modified:
    felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/BundleResolver.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/ModelHelper.java

Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/BundleResolver.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/BundleResolver.java?rev=981765&r1=981764&r2=981765&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/BundleResolver.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/BundleResolver.java Tue Aug  3 07:38:41 2010
@@ -25,7 +25,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -158,7 +157,6 @@ public class BundleResolver implements I
         private final IResolutionMonitor monitor;
 
         private final Resolution resolution = new Resolution();
-        private final Set<IModelElement> parsed = new HashSet<IModelElement>();
         private final LinkedList<IModelElement> requirements = new LinkedList<IModelElement>();
 
         public ResolutionContext(IModelElement root, ResolutionConfig config, IResolutionMonitor monitor)
@@ -168,21 +166,6 @@ public class BundleResolver implements I
             this.monitor = monitor;
         }
 
-        public void enterModelElement(IModelElement element)
-        {
-            parsed.add(element);
-        }
-
-        public void exitModelElement(IModelElement element)
-        {
-            parsed.remove(element);
-        }
-
-        public boolean isNewModelElement(IModelElement element)
-        {
-            return !parsed.contains(element);
-        }
-
         public boolean isValid()
         {
             return resolution.isSuccess();

Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java?rev=981765&r1=981764&r2=981765&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java Tue Aug  3 07:38:41 2010
@@ -21,7 +21,6 @@ package org.apache.felix.sigil.eclipse.i
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;

Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java?rev=981765&r1=981764&r2=981765&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java Tue Aug  3 07:38:41 2010
@@ -38,7 +38,6 @@ import org.apache.felix.sigil.common.rep
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.install.IOSGiInstall;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
 
 public class OSGiInstallRepository extends AbstractBundleRepository
 {

Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/ModelHelper.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/ModelHelper.java?rev=981765&r1=981764&r2=981765&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/ModelHelper.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/ModelHelper.java Tue Aug  3 07:38:41 2010
@@ -28,9 +28,7 @@ import org.apache.felix.sigil.common.mod
 import org.apache.felix.sigil.common.model.IModelElement;
 import org.apache.felix.sigil.common.model.IModelWalker;
 import org.apache.felix.sigil.common.model.IRequirementModelElement;
-import org.apache.felix.sigil.common.model.ModelElementFactory;
 import org.apache.felix.sigil.common.model.osgi.IPackageExport;
-import org.apache.felix.sigil.common.model.osgi.IPackageImport;
 import org.apache.felix.sigil.common.osgi.VersionRange;
 import org.apache.felix.sigil.common.osgi.VersionRangeBoundingRule;
 import org.apache.felix.sigil.eclipse.SigilCore;