You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ds...@apache.org on 2010/09/08 12:22:03 UTC
svn commit: r994973 - in /felix/trunk/sigil:
common/core/src/org/apache/felix/sigil/common/core/repository/
common/core/src/org/apache/felix/sigil/common/repository/
eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/
ivy/resol...
Author: dsavage
Date: Wed Sep 8 10:22:02 2010
New Revision: 994973
URL: http://svn.apache.org/viewvc?rev=994973&view=rev
Log:
pull common config field up class hierarchy to avoid duplication
Modified:
felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/BundleResolver.java
felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractRepositoryManager.java
felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/AbstractEclipseRepositoryManager.java
felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.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=994973&r1=994972&r2=994973&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 Wed Sep 8 10:22:02 2010
@@ -348,7 +348,7 @@ public class BundleResolver implements I
}
};
- private AbstractRepositoryManager repositoryManager;
+ private final AbstractRepositoryManager repositoryManager;
public BundleResolver(AbstractRepositoryManager repositoryManager)
{
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractRepositoryManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractRepositoryManager.java?rev=994973&r1=994972&r2=994973&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractRepositoryManager.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractRepositoryManager.java Wed Sep 8 10:22:02 2010
@@ -30,6 +30,7 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
+import org.apache.felix.sigil.common.config.IRepositoryConfig;
import org.apache.felix.sigil.common.core.repository.BundleResolver;
import org.apache.felix.sigil.common.model.IModelWalker;
import org.apache.felix.sigil.common.model.eclipse.ILibrary;
@@ -44,14 +45,28 @@ public abstract class AbstractRepository
private boolean initialised;
- private HashMap<String, IBundleRepository> repositories = new HashMap<String, IBundleRepository>();
- private ArrayList<IBundleRepository> order = new ArrayList<IBundleRepository>();
- private TreeMap<Integer, HashSet<IBundleRepository>> levelMap = new TreeMap<Integer, HashSet<IBundleRepository>>();
- private int[] levels;
+ private final HashMap<String, IBundleRepository> repositories = new HashMap<String, IBundleRepository>();
+ private final ArrayList<IBundleRepository> order = new ArrayList<IBundleRepository>();
+ private final TreeMap<Integer, HashSet<IBundleRepository>> levelMap = new TreeMap<Integer, HashSet<IBundleRepository>>();
+ private final ArrayList<ILibrary> libraries = new ArrayList<ILibrary>();
+
+ private final BundleResolver resolver = new BundleResolver(this);
- private BundleResolver resolver = new BundleResolver(this);
+ private int[] levels;
- private ArrayList<ILibrary> libraries = new ArrayList<ILibrary>();
+ private final IRepositoryConfig config;
+
+ public AbstractRepositoryManager(IRepositoryConfig config) {
+ this.config = config;
+ }
+
+ /**
+ * @return
+ */
+ protected IRepositoryConfig getConfig()
+ {
+ return config;
+ }
public void initialise()
{
@@ -85,6 +100,7 @@ public abstract class AbstractRepository
public void notifyChange(IBundleRepository repository)
{
+
notifyListeners(new RepositoryChangeEvent(repository, Type.CHANGED));
}
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/AbstractEclipseRepositoryManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/AbstractEclipseRepositoryManager.java?rev=994973&r1=994972&r2=994973&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/AbstractEclipseRepositoryManager.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/AbstractEclipseRepositoryManager.java Wed Sep 8 10:22:02 2010
@@ -45,6 +45,7 @@ public abstract class AbstractEclipseRep
public AbstractEclipseRepositoryManager(IRepositoryConfig config, IRepositoryCache repositoryMap)
{
+ super(config);
this.config = config;
this.repositoryCache = repositoryMap;
}
Modified: felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java?rev=994973&r1=994972&r2=994973&view=diff
==============================================================================
--- felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java (original)
+++ felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java Wed Sep 8 10:22:02 2010
@@ -36,7 +36,6 @@ import org.apache.felix.sigil.common.rep
public class BldRepositoryManager extends AbstractRepositoryManager
{
private static Map<String, String> aliases = new HashMap<String, String>();
- private final IRepositoryConfig config;
static
{
@@ -53,14 +52,14 @@ public class BldRepositoryManager extend
*/
public BldRepositoryManager(IRepositoryConfig config)
{
- this.config = config;
+ super(config);
}
@Override
protected void loadRepositories()
{
List<IBundleRepository> list = new ArrayList<IBundleRepository>();
- scanRepositories(config.getRepositoryPath(), list);
+ scanRepositories(getConfig().getRepositoryPath(), list);
setRepositories(list.toArray(new IBundleRepository[list.size()]));
}
@@ -81,7 +80,7 @@ public class BldRepositoryManager extend
}
}
List<String> subpath = new LinkedList<String>();
- for (String key : config.getAllRepositories()) {
+ for (String key : getConfig().getAllRepositories()) {
if (!defined.contains(key))
{
subpath.add(key);
@@ -90,7 +89,7 @@ public class BldRepositoryManager extend
scanRepositories(subpath, list);
}
else {
- Properties props = config.getRepositoryConfig(name);
+ Properties props = getConfig().getRepositoryConfig(name);
if (props != null) {
IBundleRepository repo = buildRepository(name, props);