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/03/02 13:22:06 UTC
svn commit: r917993 - in /felix/trunk/sigil:
common/core/src/org/apache/felix/sigil/repository/
eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/
eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/
Author: dsavage
Date: Tue Mar 2 12:22:05 2010
New Revision: 917993
URL: http://svn.apache.org/viewvc?rev=917993&view=rev
Log:
Workspace repository now filters exports that project doesn't actually contain in "compile time" resolution mode (FELIX-1502)
Modified:
felix/trunk/sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionConfig.java
felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java
felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java
felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionConfig.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionConfig.java?rev=917993&r1=917992&r2=917993&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionConfig.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionConfig.java Tue Mar 2 12:22:05 2010
@@ -31,6 +31,7 @@
public static final int INDEXED_ONLY = 8;
/** Return only bundles that are stored or cached locally */
public static final int LOCAL_ONLY = 16;
+ public static final int COMPILE_TIME = 32;
public ResolutionConfig()
@@ -74,4 +75,10 @@
// TODO Auto-generated method stub
return false;
}
+
+
+ public boolean isCompileTime()
+ {
+ return ( options & COMPILE_TIME ) != 0;
+ }
}
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java?rev=917993&r1=917992&r2=917993&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java Tue Mar 2 12:22:05 2010
@@ -20,150 +20,212 @@
package org.apache.felix.sigil.eclipse.internal.repository.eclipse;
-import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
import org.apache.felix.sigil.eclipse.SigilCore;
import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.osgi.IPackageExport;
import org.apache.felix.sigil.repository.AbstractBundleRepository;
import org.apache.felix.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.repository.ResolutionConfig;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceChangeEvent;
import org.eclipse.core.resources.IResourceChangeListener;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.IResourceVisitor;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.runtime.CoreException;
-
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.core.runtime.content.IContentTypeManager;
public class WorkspaceRepository extends AbstractBundleRepository implements IResourceChangeListener
{
private static final int UPDATE_MASK = IResourceDelta.CONTENT | IResourceDelta.DESCRIPTION | IResourceDelta.OPEN;
- private ISigilBundle[] bundles;
-
public WorkspaceRepository( String id )
{
super( id );
+ }
+
+
+ @Override
+ public void accept( IRepositoryVisitor visitor, int options )
+ {
+ List<ISigilProjectModel> models = SigilCore.getRoot().getProjects();
+ for ( ISigilProjectModel project : models )
+ {
+ ISigilBundle b = project.getBundle();
+ if ( b == null )
+ {
+ SigilCore.error( "No bundle found for project " + project.getProject().getName() );
+ }
+ else
+ {
+ if ( (options & ResolutionConfig.COMPILE_TIME) != 0 ) {
+ b = compileTimeFilter(project, b);
+ }
+ visitor.visit( b );
+ }
+ }
}
- @Override
- public void accept( IRepositoryVisitor visitor, int options )
+ private ISigilBundle compileTimeFilter(ISigilProjectModel project, ISigilBundle bundle)
{
- synchronized ( this )
+ bundle = (ISigilBundle) bundle.clone();
+
+ Collection<String> packages = findPackages(project);
+
+ for ( IPackageExport pe : bundle.getBundleInfo().getExports() ) {
+ final String packagePath = pe.getPackageName().replace('.', '/');
+ if ( !packages.contains(packagePath) ) {
+ bundle.getBundleInfo().removeExport(pe);
+ }
+ }
+
+ return bundle;
+ }
+
+
+
+ private Collection<String> findPackages(ISigilProjectModel project)
+ {
+ final IContentTypeManager contentTypeManager = Platform.getContentTypeManager();
+ final IContentType javaContentType = contentTypeManager.getContentType("org.eclipse.jdt.core.javaSource");
+ final HashSet<String> packages = new HashSet<String>();
+
+ try
{
- if ( bundles == null )
+ project.getProject().accept(new IResourceVisitor()
{
- List<ISigilProjectModel> models = SigilCore.getRoot().getProjects();
- ArrayList<ISigilBundle> tmp = new ArrayList<ISigilBundle>( models.size() );
- for ( ISigilProjectModel n : models )
+ public boolean visit(IResource resource) throws CoreException
{
- ISigilBundle b = n.getBundle();
- if ( b == null )
- {
- SigilCore.error( "No bundle found for project " + n.getProject().getName() );
- }
- else
- {
- tmp.add( b );
+ if ( resource instanceof IFile ) {
+ IFile f = (IFile) resource;
+ IContentType ct = contentTypeManager.findContentTypeFor(f.getName());
+ if ( ct != null && ct.isKindOf(javaContentType) ) {
+ IPath p = f.getProjectRelativePath();
+ p = p.removeLastSegments(1);
+ p = p.removeFirstSegments(1);
+ packages.add( p.toString() );
+ }
}
+
+ return true;
}
- bundles = tmp.toArray( new ISigilBundle[tmp.size()] );
- }
+ });
}
-
- for ( ISigilBundle b : bundles )
+ catch (CoreException e)
{
- visitor.visit( b );
+ SigilCore.error( "Failed to read packages for " + project.getProject().getName() );
}
- }
+
+ return packages;
+ }
+
public void refresh()
{
- synchronized ( this )
+ // no action
+ // TODO this method is used to prompt repository to update caches -
+ // however caches are complex to maintain in this workspace as the bundle is actively being developed...
+ // potential performance improvement in future?
+ }
+
+ public void resourceChanged( IResourceChangeEvent event )
+ {
+ try
{
- bundles = null;
+ switch (event.getType()) {
+ case IResourceChangeEvent.PRE_REFRESH:
+ handleRefresh(event);
+ break;
+ case IResourceChangeEvent.POST_CHANGE:
+ handleChange(event);
+ break;
+ }
+ }
+ catch ( CoreException e )
+ {
+ SigilCore.error( "Workspace repository update failed", e );
}
}
- @Override
- protected void notifyChange()
+ private void handleRefresh(IResourceChangeEvent event)
{
- refresh();
- super.notifyChange();
+ SigilCore.log("Refreshing workspace repository");
+ notifyChange();
}
- public void resourceChanged( IResourceChangeEvent event )
+ private void handleChange(IResourceChangeEvent event) throws CoreException
{
- try
+ event.getDelta().accept( new IResourceDeltaVisitor()
{
- event.getDelta().accept( new IResourceDeltaVisitor()
+ public boolean visit( IResourceDelta delta ) throws CoreException
{
- public boolean visit( IResourceDelta delta ) throws CoreException
- {
- boolean result;
+ boolean result;
- IResource resource = delta.getResource();
- if ( resource instanceof IWorkspaceRoot )
- {
- result = true;
- }
- else if ( resource instanceof IProject )
- {
- IProject project = ( IProject ) resource;
- if ( SigilCore.isSigilProject( project ) )
- {
- switch ( delta.getKind() )
- {
- case IResourceDelta.CHANGED:
- if ( ( delta.getFlags() & UPDATE_MASK ) == 0 )
- {
- break;
- }
- // else
- // fall through on purpose
- case IResourceDelta.ADDED: // fall through on purpose
- case IResourceDelta.REMOVED: // fall through on purpose
- notifyChange();
- break;
- }
- result = true;
- }
- else
- {
- result = false;
- }
- }
- else if ( resource.getName().equals( SigilCore.SIGIL_PROJECT_FILE ) )
+ IResource resource = delta.getResource();
+ if ( resource instanceof IWorkspaceRoot )
+ {
+ result = true;
+ }
+ else if ( resource instanceof IProject )
+ {
+ IProject project = ( IProject ) resource;
+ if ( SigilCore.isSigilProject( project ) )
{
switch ( delta.getKind() )
{
case IResourceDelta.CHANGED:
- case IResourceDelta.ADDED:
- case IResourceDelta.REMOVED:
+ if ( ( delta.getFlags() & UPDATE_MASK ) == 0 )
+ {
+ break;
+ }
+ // else
+ // fall through on purpose
+ case IResourceDelta.ADDED: // fall through on purpose
+ case IResourceDelta.REMOVED: // fall through on purpose
notifyChange();
+ break;
}
- result = false;
+ result = true;
}
else
{
result = false;
}
- return result;
}
- } );
- }
- catch ( CoreException e )
- {
- SigilCore.error( "Workspace repository update failed", e );
- }
+ else if ( resource.getName().equals( SigilCore.SIGIL_PROJECT_FILE ) )
+ {
+ switch ( delta.getKind() )
+ {
+ case IResourceDelta.CHANGED:
+ case IResourceDelta.ADDED:
+ case IResourceDelta.REMOVED:
+ notifyChange();
+ }
+ result = false;
+ }
+ else
+ {
+ result = false;
+ }
+ return result;
+ }
+ } );
}
}
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java?rev=917993&r1=917992&r2=917993&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java Tue Mar 2 12:22:05 2010
@@ -44,7 +44,7 @@
if ( repository == null )
{
repository = new WorkspaceRepository( id );
- ResourcesPlugin.getWorkspace().addResourceChangeListener( repository, IResourceChangeEvent.POST_CHANGE );
+ ResourcesPlugin.getWorkspace().addResourceChangeListener( repository, IResourceChangeEvent.POST_CHANGE | IResourceChangeEvent.PRE_REFRESH );
}
return repository;
}
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java?rev=917993&r1=917992&r2=917993&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java Tue Mar 2 12:22:05 2010
@@ -363,7 +363,7 @@
ArrayList<IClasspathEntry> entries = new ArrayList<IClasspathEntry>();
ResolutionConfig config = new ResolutionConfig( ResolutionConfig.INCLUDE_OPTIONAL
- | ResolutionConfig.IGNORE_ERRORS | ResolutionConfig.INDEXED_ONLY | ResolutionConfig.LOCAL_ONLY );
+ | ResolutionConfig.IGNORE_ERRORS | ResolutionConfig.INDEXED_ONLY | ResolutionConfig.LOCAL_ONLY | ResolutionConfig.COMPILE_TIME );
IResolution resolution;
try
@@ -410,6 +410,7 @@
Set<ISigilBundle> all, List<IModelElement> requirements, IProgressMonitor monitor ) throws CoreException
{
IAccessRule[] rules = buildAccessRules( project, provider, all, requirements );
+ IClasspathAttribute[] attrs = new IClasspathAttribute[0];
ISigilProjectModel other = provider.getAncestor( ISigilProjectModel.class );
@@ -418,11 +419,11 @@
if ( other == null )
{
provider.synchronize( monitor );
- return newBundleEntry( provider, rules, null, false );
+ return newBundleEntry( provider, rules, attrs, false );
}
else
{
- return newProjectEntry( other, rules, null, false );
+ return newProjectEntry( other, rules, attrs, false );
}
}
catch ( IOException e )
@@ -432,62 +433,9 @@
}
- private static IAccessRule[] buildExportRules( ISigilBundle bundle, Set<ISigilBundle> all,
- List<IModelElement> requirements )
- {
- Set<IPackageExport> ex = mergeExports( bundle, all, requirements );
-
- IAccessRule[] rules = new IAccessRule[ex.size() + 1];
-
- Iterator<IPackageExport> iter = ex.iterator();
- for ( int i = 0; i < rules.length - 1; i++ )
- {
- IPackageExport p = iter.next();
- rules[i] = JavaCore.newAccessRule( new Path( p.getPackageName().replace( '.', '/' ) ).append( "*" ),
- IAccessRule.K_ACCESSIBLE );
- }
-
- rules[rules.length - 1] = DENY_RULE;
-
- return rules;
- }
-
-
- private static Set<IPackageExport> mergeExports( ISigilBundle bundle, Set<ISigilBundle> all,
- List<IModelElement> requirements )
- {
- IBundleModelElement headers = bundle.getBundleInfo();
- // FIXME treeset as PackageExport does not implement equals/hashCode
- TreeSet<IPackageExport> exports = new TreeSet<IPackageExport>( headers.getExports() );
- IRequiredBundle host = headers.getFragmentHost();
- if ( host != null )
- {
- for ( ISigilBundle b : all )
- {
- if ( host.accepts( b.getBundleInfo() ) )
- {
- exports.addAll( b.getBundleInfo().getExports() );
- break;
- }
- }
- }
- return exports;
- }
-
-
private static Collection<IClasspathEntry> newProjectEntry( ISigilProjectModel n, IAccessRule[] rules,
IClasspathAttribute[] attributes, boolean export ) throws CoreException
{
- // if (rules == null) {
- // rules = JavaHelper.buildExportRules(n.getBundle());
- // }
-
- if ( attributes == null )
- {
- attributes = new IClasspathAttribute[]
- {};
- }
-
ArrayList<IClasspathEntry> entries = new ArrayList<IClasspathEntry>();
entries.add( JavaCore.newProjectEntry( n.getProject().getFullPath(), rules, false, attributes, export ) );
for ( IClasspathEntry e : n.getJavaModel().getRawClasspath() )
@@ -518,16 +466,6 @@
{
String name = bundle.getBundleInfo().getSymbolicName();
- // if (rules == null) {
- // rules = JavaHelper.buildExportRules(bundle);
- // }
-
- if ( attributes == null )
- {
- attributes = new IClasspathAttribute[]
- {};
- }
-
if ( bundle.getBundleInfo().getVersion() != null )
{
name += "_version_" + bundle.getBundleInfo().getVersion();
@@ -547,7 +485,7 @@
if ( path == null )
{
- SigilCore.error( "Found null path for " + bundle.getBundleInfo().getSymbolicName() );
+ SigilCore.error( "Found null path for " + bundle.getSymbolicName() );
entries = Collections.emptyList();
}
else
@@ -820,6 +758,48 @@
return rules.toArray( new IAccessRule[rules.size()] );
}
+
+ private static IAccessRule[] buildExportRules( ISigilBundle bundle, Set<ISigilBundle> all,
+ List<IModelElement> requirements )
+ {
+ Set<IPackageExport> ex = mergeExports( bundle, all, requirements );
+
+ IAccessRule[] rules = new IAccessRule[ex.size() + 1];
+
+ Iterator<IPackageExport> iter = ex.iterator();
+ for ( int i = 0; i < rules.length - 1; i++ )
+ {
+ IPackageExport p = iter.next();
+ rules[i] = JavaCore.newAccessRule( new Path( p.getPackageName().replace( '.', '/' ) ).append( "*" ),
+ IAccessRule.K_ACCESSIBLE );
+ }
+
+ rules[rules.length - 1] = DENY_RULE;
+
+ return rules;
+ }
+
+
+ private static Set<IPackageExport> mergeExports( ISigilBundle bundle, Set<ISigilBundle> all,
+ List<IModelElement> requirements )
+ {
+ IBundleModelElement headers = bundle.getBundleInfo();
+ // FIXME treeset as PackageExport does not implement equals/hashCode
+ TreeSet<IPackageExport> exports = new TreeSet<IPackageExport>( headers.getExports() );
+ IRequiredBundle host = headers.getFragmentHost();
+ if ( host != null )
+ {
+ for ( ISigilBundle b : all )
+ {
+ if ( host.accepts( b.getBundleInfo() ) )
+ {
+ exports.addAll( b.getBundleInfo().getExports() );
+ break;
+ }
+ }
+ }
+ return exports;
+ }
/*