svn commit: r982357 - in /felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse: internal/model/project/SigilModelRoot.java model/project/ISigilModelRoot.java

[ds...@apache.org]

Author: dsavage
Date: Wed Aug  4 18:49:19 2010
New Revision: 982357

URL: http://svn.apache.org/viewvc?rev=982357&view=rev
Log:
tidy up unused codepath

Modified:
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java

Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java?rev=982357&r1=982356&r2=982357&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java Wed Aug  4 18:49:19 2010
@@ -31,17 +31,10 @@ import org.apache.felix.sigil.common.mod
 import org.apache.felix.sigil.common.model.IRequirementModelElement;
 import org.apache.felix.sigil.common.model.eclipse.ILibrary;
 import org.apache.felix.sigil.common.model.eclipse.ILibraryImport;
-import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
 import org.apache.felix.sigil.common.model.osgi.IPackageImport;
-import org.apache.felix.sigil.common.repository.IBundleResolver;
-import org.apache.felix.sigil.common.repository.IResolution;
-import org.apache.felix.sigil.common.repository.ResolutionConfig;
-import org.apache.felix.sigil.common.repository.ResolutionException;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.project.ISigilModelRoot;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
-import org.apache.felix.sigil.eclipse.progress.ProgressAdapter;
-import org.apache.felix.sigil.eclipse.repository.ResolutionMonitorAdapter;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
@@ -170,29 +163,4 @@ public class SigilModelRoot implements I
 
         return dependents;
     }
-
-    public Collection<ISigilBundle> resolveBundles(ISigilProjectModel sigil,
-        IModelElement element, boolean includeOptional, IProgressMonitor monitor)
-        throws CoreException
-    {
-        int options = ResolutionConfig.INCLUDE_DEPENDENTS;
-        if (includeOptional)
-        {
-            options |= ResolutionConfig.INCLUDE_OPTIONAL;
-        }
-
-        ResolutionConfig config = new ResolutionConfig(options);
-        try
-        {
-            IBundleResolver resolver = SigilCore.getRepositoryManager(sigil).getBundleResolver();
-            IResolution resolution = resolver.resolve(element, config,
-                new ResolutionMonitorAdapter(monitor));
-            resolution.synchronize(new ProgressAdapter(monitor));
-            return resolution.getBundles();
-        }
-        catch (ResolutionException e)
-        {
-            throw SigilCore.newCoreException(e.getMessage(), e);
-        }
-    }
 }

Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java?rev=982357&r1=982356&r2=982357&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java Wed Aug  4 18:49:19 2010
@@ -19,14 +19,12 @@
 
 package org.apache.felix.sigil.eclipse.model.project;
 
+
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
 import org.apache.felix.sigil.common.model.ICapabilityModelElement;
-import org.apache.felix.sigil.common.model.IModelElement;
-import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 
 public interface ISigilModelRoot
@@ -35,8 +33,4 @@ public interface ISigilModelRoot
 
     Set<ISigilProjectModel> resolveDependentProjects(
         Collection<ICapabilityModelElement> caps, IProgressMonitor monitor);
-
-    Collection<ISigilBundle> resolveBundles(ISigilProjectModel sigil,
-        IModelElement element, boolean includeOptional, IProgressMonitor monitor)
-        throws CoreException;
 }