tidy up npe caused by adding system bundle repository to repository set (FELIX-2133)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@916032 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/repository/SystemRepository.java b/sigil/common/core/src/org/apache/felix/sigil/core/repository/SystemRepository.java
index 1f1cb0b..b39a7b2 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/repository/SystemRepository.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/core/repository/SystemRepository.java
@@ -85,6 +85,9 @@
info = ModelElementFactory.getInstance().newModelElement( IBundleModelElement.class );
}
+ info.setSymbolicName("system bundle");
+ info.setName("Sigil system bundle");
+
applyProfile( info );
systemBundle.addChild( info );
}
diff --git a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java
index 081d751..86ca1e9 100644
--- a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java
+++ b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java
@@ -351,13 +351,13 @@
}
- public static Collection<IClasspathEntry> resolveClasspathEntrys( ISigilProjectModel newton,
+ public static Collection<IClasspathEntry> resolveClasspathEntrys( ISigilProjectModel sigil,
IProgressMonitor monitor ) throws CoreException
{
if ( monitor == null )
{
monitor = Job.getJobManager().createProgressGroup();
- monitor.beginTask( "Resolving classpath for " + newton.getSymbolicName(), 2 );
+ monitor.beginTask( "Resolving classpath for " + sigil.getSymbolicName(), 2 );
}
ArrayList<IClasspathEntry> entries = new ArrayList<IClasspathEntry>();
@@ -368,7 +368,7 @@
IResolution resolution;
try
{
- resolution = SigilCore.getRepositoryManager( newton ).getBundleResolver().resolve( newton, config,
+ resolution = SigilCore.getRepositoryManager( sigil ).getBundleResolver().resolve( sigil, config,
new ResolutionMonitorAdapter( monitor ) );
}
catch ( ResolutionException e )
@@ -381,10 +381,10 @@
Set<ISigilBundle> bundles = resolution.getBundles();
for ( ISigilBundle bundle : bundles )
{
- if ( !bundle.getBundleInfo().getSymbolicName().equals( newton.getSymbolicName() ) )
+ if ( !sigil.getSymbolicName().equals(bundle.getBundleInfo().getSymbolicName()) )
{ // discard self reference...
List<IModelElement> matched = resolution.getMatchedRequirements( bundle );
- for ( IClasspathEntry cpe : buildClassPathEntry( newton, bundle, bundles, matched, monitor ) )
+ for ( IClasspathEntry cpe : buildClassPathEntry( sigil, bundle, bundles, matched, monitor ) )
{
entries.add( cpe );
}