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 2009/08/04 20:35:14 UTC
svn commit: r800915 - in /felix/trunk/sigil:
common/core/src/org/apache/felix/sigil/core/
common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/
common/core/src/org/apache/felix/sigil/model/eclipse/
eclipse/core/src/org/apache/felix/sigil/...
Author: dsavage
Date: Tue Aug 4 18:35:14 2009
New Revision: 800915
URL: http://svn.apache.org/viewvc?rev=800915&view=rev
Log:
remove non osgi concepts, create plugin functions later via extender and service patterns
Removed:
felix/trunk/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/DownloadJar.java
felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/IDownloadJar.java
felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/INewtonSystem.java
felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ISCAComposite.java
felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/DownloadSection.java
Modified:
felix/trunk/sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java
felix/trunk/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java
felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ISigilBundle.java
felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java
felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java
felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContentsForm.java
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java?rev=800915&r1=800914&r2=800915&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java Tue Aug 4 18:35:14 2009
@@ -24,7 +24,6 @@
import java.util.logging.Logger;
import org.apache.felix.sigil.core.internal.license.LicenseManager;
-import org.apache.felix.sigil.core.internal.model.eclipse.DownloadJar;
import org.apache.felix.sigil.core.internal.model.eclipse.Library;
import org.apache.felix.sigil.core.internal.model.eclipse.LibraryImport;
import org.apache.felix.sigil.core.internal.model.eclipse.SigilBundle;
@@ -34,11 +33,8 @@
import org.apache.felix.sigil.core.internal.model.osgi.RequiredBundle;
import org.apache.felix.sigil.core.licence.ILicenseManager;
import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.eclipse.IDownloadJar;
import org.apache.felix.sigil.model.eclipse.ILibrary;
import org.apache.felix.sigil.model.eclipse.ILibraryImport;
-import org.apache.felix.sigil.model.eclipse.INewtonSystem;
-import org.apache.felix.sigil.model.eclipse.ISCAComposite;
import org.apache.felix.sigil.model.eclipse.ISigilBundle;
import org.apache.felix.sigil.model.osgi.IBundleModelElement;
import org.apache.felix.sigil.model.osgi.IPackageExport;
@@ -84,7 +80,6 @@
{
String uri = "http://sigil.codecauldron.org/xml/sigil-namespace";
ModelElementFactory.getInstance().register( ISigilBundle.class, SigilBundle.class, "bundle", "sigil", uri );
- ModelElementFactory.getInstance().register( IDownloadJar.class, DownloadJar.class, "download", "sigil", uri );
ModelElementFactory.getInstance().register( ILibrary.class, Library.class, "library", "sigil", uri );
ModelElementFactory.getInstance().register( ILibraryImport.class, LibraryImport.class, "library-import",
"sigil", uri );
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java?rev=800915&r1=800914&r2=800915&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java Tue Aug 4 18:35:14 2009
@@ -35,8 +35,6 @@
import org.apache.felix.sigil.core.BldCore;
import org.apache.felix.sigil.model.AbstractCompoundModelElement;
-import org.apache.felix.sigil.model.eclipse.IDownloadJar;
-import org.apache.felix.sigil.model.eclipse.ISCAComposite;
import org.apache.felix.sigil.model.eclipse.ISigilBundle;
import org.apache.felix.sigil.model.osgi.IBundleModelElement;
import org.apache.felix.sigil.model.osgi.IPackageExport;
@@ -57,10 +55,8 @@
private static final long serialVersionUID = 1L;
private IBundleModelElement bundle;
- private IDownloadJar download;
private Set<IPath> sourcePaths;
private Set<IPath> libraryPaths;
- private Set<ISCAComposite> composites;
private Set<String> classpath;
private Set<String> packages;
private Set<String> dlPackages;
@@ -77,7 +73,6 @@
super( "Sigil Bundle" );
sourcePaths = new HashSet<IPath>();
libraryPaths = new HashSet<IPath>();
- composites = new HashSet<ISCAComposite>();
classpath = new HashSet<String>();
packages = new HashSet<String>();
dlPackages = new HashSet<String>();
@@ -217,18 +212,6 @@
}
- public IDownloadJar getDownloadJar()
- {
- return download;
- }
-
-
- public void setDownloadJar( IDownloadJar download )
- {
- this.download = download;
- }
-
-
public void addLibraryPath( IPath path )
{
libraryPaths.add( path );
@@ -271,28 +254,6 @@
}
- public void addComposite( ISCAComposite composite )
- {
- composites.add( composite );
- composite.setParent( this );
- }
-
-
- public Set<ISCAComposite> getComposites()
- {
- return composites;
- }
-
-
- public void removeComposite( ISCAComposite composite )
- {
- if ( composites.remove( composite ) )
- {
- composite.setParent( null );
- }
- }
-
-
public void addClasspathEntry( String encodedClasspath )
{
classpath.add( encodedClasspath.trim() );
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ISigilBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ISigilBundle.java?rev=800915&r1=800914&r2=800915&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ISigilBundle.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ISigilBundle.java Tue Aug 4 18:35:14 2009
@@ -53,21 +53,6 @@
void setBundleInfo( IBundleModelElement bundle );
- IDownloadJar getDownloadJar();
-
-
- void setDownloadJar( IDownloadJar download );
-
-
- void addComposite( ISCAComposite composite );
-
-
- void removeComposite( ISCAComposite composite );
-
-
- Set<ISCAComposite> getComposites();
-
-
void addLibraryPath( IPath path );
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java?rev=800915&r1=800914&r2=800915&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java Tue Aug 4 18:35:14 2009
@@ -303,11 +303,6 @@
{
convert( cp, sigil, files );
}
-
- if ( !sigil.getBundle().getComposites().isEmpty() )
- {
- throw new IllegalStateException( "XXX-FIXME-XXX" );
- }
}
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=800915&r1=800914&r2=800915&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 Aug 4 18:35:14 2009
@@ -48,7 +48,6 @@
import org.apache.felix.sigil.model.ModelElementFactory;
import org.apache.felix.sigil.model.common.VersionRange;
import org.apache.felix.sigil.model.common.VersionRangeBoundingRule;
-import org.apache.felix.sigil.model.eclipse.ISCAComposite;
import org.apache.felix.sigil.model.eclipse.ISigilBundle;
import org.apache.felix.sigil.model.osgi.IBundleModelElement;
import org.apache.felix.sigil.model.osgi.IPackageExport;
@@ -875,34 +874,12 @@
Set<String> imports = new HashSet<String>();
findJavaModelImports( project, imports, monitor );
- findSCAImports( project, imports, monitor );
findTextImports( project, imports, monitor );
return imports;
}
- private static void findSCAImports( ISigilProjectModel project, Set<String> imports, IProgressMonitor monitor )
- {
- for ( ISCAComposite sca : project.getBundle().getComposites() )
- {
- IFile f = project.getProject().getFile( sca.getLocation() );
- if ( f.exists() )
- {
- try
- {
- // TODO for now just treats sca as text files - should build in richer model that is able to detect java elements
- parseText( f, imports );
- }
- catch ( CoreException e )
- {
- SigilCore.error( "Failed to parse sca file " + f, e );
- }
- }
- }
- }
-
-
private static void findTextImports( ISigilProjectModel project, Set<String> imports, IProgressMonitor monitor )
{
IContentTypeManager contentTypeManager = Platform.getContentTypeManager();
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContentsForm.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContentsForm.java?rev=800915&r1=800914&r2=800915&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContentsForm.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContentsForm.java Tue Aug 4 18:35:14 2009
@@ -62,7 +62,7 @@
layout.topMargin = 5;
layout.leftMargin = 10;
layout.rightMargin = 10;
- layout.numColumns = 2;
+ layout.numColumns = 1;
layout.horizontalSpacing = 10;
body.setLayout( layout );
body.setLayoutData( new TableWrapData( TableWrapData.FILL ) );
@@ -72,31 +72,22 @@
layout.verticalSpacing = 20;
top.setLayout( layout );
TableWrapData data = new TableWrapData( TableWrapData.FILL_GRAB );
- data.colspan = 2;
+ //data.colspan = 2;
top.setLayoutData( data );
- Composite left = toolkit.createComposite( body );
+ Composite bottom = toolkit.createComposite( body );
layout = new TableWrapLayout();
layout.verticalSpacing = 20;
- left.setLayout( layout );
- left.setLayoutData( new TableWrapData( TableWrapData.FILL_GRAB ) );
-
- Composite right = toolkit.createComposite( body );
- layout = new TableWrapLayout();
- layout.verticalSpacing = 20;
- right.setLayout( layout );
- right.setLayoutData( new TableWrapData( TableWrapData.FILL_GRAB ) );
+ bottom.setLayout( layout );
+ bottom.setLayoutData( new TableWrapData( TableWrapData.FILL_GRAB ) );
try
{
ClasspathSection classpath = new ClasspathSection( this, top, project );
managedForm.addPart( classpath );
- ResourceBuildSection runtimeBuild = new ResourceBuildSection( this, left, project );
+ ResourceBuildSection runtimeBuild = new ResourceBuildSection( this, bottom, project );
managedForm.addPart( runtimeBuild );
-
- DownloadSection download = new DownloadSection( this, right, project );
- managedForm.addPart( download );
}
catch ( CoreException e )
{