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/08/02 19:08:20 UTC
svn commit: r981604 [2/22] - in /felix/trunk/sigil:
common/core.tests/src/org/apache/felix/sigil/common/core/
common/core.tests/src/org/apache/felix/sigil/common/core/internal/model/osgi/
common/core/src/org/apache/felix/sigil/common/bnd/ common/core/s...
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/IBldProject.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/IBldProject.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/IBldProject.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/IBldProject.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.common.config;
-
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
@@ -33,54 +32,44 @@ import org.apache.felix.sigil.common.mod
import org.apache.felix.sigil.common.model.osgi.IPackageImport;
import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
-
public interface IBldProject
{
static final String PROJECT_FILE = "sigil.properties";
static final String PROJECT_DEFAULTS = "../sigil-defaults.properties";
-
void save() throws IOException;
+ void saveAs(File path) throws IOException;
- void saveAs( File path ) throws IOException;
-
-
- void saveTo( OutputStream out ) throws IOException;
-
+ void saveTo(OutputStream out) throws IOException;
/**
* gets default package version ranges.
*/
Properties getDefaultPackageVersions();
-
/**
* gets default package version range for named package.
* Also handles wildcards in defaults.
*/
- String getDefaultPackageVersion( String name );
-
+ String getDefaultPackageVersion(String name);
/**
* get project options.
*/
Properties getOptions();
-
/**
* get project version.
*/
String getVersion();
-
/**
* gets dependencies (Package-Import and Require-Bundle) needed to compile.
*/
IBundleModelElement getDependencies();
-
/**
* gets project source directories.
* This is a convenient way to specify bundle contents
@@ -88,55 +77,47 @@ public interface IBldProject
*/
List<String> getSourceDirs();
-
/**
* gets the list of packages represented by getSourceDirs().
* @throws IOException
*/
List<String> getSourcePkgs();
-
/**
* gets bundle ids.
*/
List<String> getBundleIds();
-
/**
* gets bundles.
*/
List<IBldBundle> getBundles();
-
/**
* convert specified bundle to SigilBundle.
*/
- ISigilBundle getSigilBundle( String id );
-
+ ISigilBundle getSigilBundle(String id);
/**
* convert SigilBundle to specified bundle.
*/
- void setSigilBundle( String id, ISigilBundle sb );
-
+ void setSigilBundle(String id, ISigilBundle sb);
/**
* converts default bundle to SigilBundle.
*/
ISigilBundle getDefaultBundle();
-
/**
* converts SigilBundle to default bundle.
*/
- void setDefaultBundle( ISigilBundle sb );
-
+ void setDefaultBundle(ISigilBundle sb);
/**
* resolves a relative path against the project file location.
*/
- File resolve( String path );
-
+ File resolve(String path);
+
/**
* Creates a new resource for this bundle
* @param location
@@ -144,7 +125,6 @@ public interface IBldProject
*/
Resource newResource(String location);
-
/**
* gets the last modification date of the project file.
*/
@@ -157,80 +137,68 @@ public interface IBldProject
*/
String getActivator();
-
/**
* gets bundle id within project.
*/
String getId();
-
/**
* gets bundle version.
*/
String getVersion();
-
/**
* gets the Bundle-SymbolicName.
*/
String getSymbolicName();
-
/**
* gets bundles export-packages.
*/
List<IPackageExport> getExports();
-
/**
* gets project import-packages.
*/
List<IPackageImport> getImports();
-
/**
* gets project require-bundles.
*/
List<IRequiredBundle> getRequires();
-
/**
* get bundle fragment-host.
*/
IRequiredBundle getFragmentHost();
-
/**
* gets bundle libs.
*/
Map<String, Map<String, String>> getLibs();
-
/**
* gets the bundle contents
* @return list of package patterns.
*/
List<String> getContents();
-
/**
* gets the additional resources.
* @return map with key as path in bundle, value as path in file system.
* Paths are resolved relative to location of project file and also from classpath.
*/
List<Resource> getResources();
-
+
/**
* gets additional bundle headers.
*/
Properties getHeaders();
-
/**
* resolves a relative path against the project file location.
*/
- File resolve( String path );
-
+ File resolve(String path);
/**
* @return
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/IRepositoryConfig.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/IRepositoryConfig.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/IRepositoryConfig.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/IRepositoryConfig.java Mon Aug 2 17:08:03 2010
@@ -19,17 +19,14 @@
package org.apache.felix.sigil.common.config;
-
import java.util.Map;
import java.util.Properties;
-
public interface IRepositoryConfig
{
static final String REPOSITORY_PROVIDER = "provider";
static final String REPOSITORY_LEVEL = "level";
-
/**
* get properties with which to instantiate repositories.
* The key REPOSITORY_PROVIDER will be set to the fully qualified class name of the IRepositoryProvider.
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/Resource.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/Resource.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/Resource.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/Resource.java Mon Aug 2 17:08:03 2010
@@ -26,7 +26,7 @@ import java.io.File;
*
*/
public interface Resource
-{
+{
String toBNDInstruction(File[] classpath);
/**
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/AbstractResource.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/AbstractResource.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/AbstractResource.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/AbstractResource.java Mon Aug 2 17:08:03 2010
@@ -32,18 +32,19 @@ public abstract class AbstractResource i
{
protected final String bPath;
protected final IBldProject project;
-
- protected AbstractResource(IBldProject project, String bPath) {
- if (bPath == null)
+
+ protected AbstractResource(IBldProject project, String bPath)
+ {
+ if (bPath == null)
throw new NullPointerException();
-
- if(project == null)
+
+ if (project == null)
throw new NullPointerException();
-
+
this.bPath = bPath;
this.project = project;
}
-
+
protected String findFileSystemPath(String fsPath, File[] classpath)
{
File resolved = project.resolve(fsPath);
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/InlineResource.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/InlineResource.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/InlineResource.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/InlineResource.java Mon Aug 2 17:08:03 2010
@@ -45,8 +45,9 @@ public class InlineResource extends Abst
{
return bPath;
}
-
- public String toString() {
+
+ public String toString()
+ {
return '@' + bPath;
}
@@ -57,7 +58,7 @@ public class InlineResource extends Abst
{
StringBuilder sb = new StringBuilder();
sb.append('@');
-
+
File f = project.resolve(bPath);
if (f.exists())
@@ -66,7 +67,7 @@ public class InlineResource extends Abst
}
else
sb.append(bPath);
-
+
return sb.toString();
}
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/PreprocessedResource.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/PreprocessedResource.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/PreprocessedResource.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/PreprocessedResource.java Mon Aug 2 17:08:03 2010
@@ -30,7 +30,7 @@ import org.apache.felix.sigil.common.con
public class PreprocessedResource extends AbstractResource
{
private final String fsPath;
-
+
public PreprocessedResource(IBldProject project, String bPath, String fsPath)
{
super(project, bPath);
@@ -44,13 +44,15 @@ public class PreprocessedResource extend
{
return fsPath == null ? bPath : fsPath;
}
-
+
@Override
- public String toString() {
+ public String toString()
+ {
StringBuilder sb = new StringBuilder();
sb.append('{');
sb.append(bPath);
- if (fsPath != null) {
+ if (fsPath != null)
+ {
sb.append('=');
sb.append(fsPath);
}
@@ -75,7 +77,7 @@ public class PreprocessedResource extend
sb.append('=');
sb.append(fsp);
sb.append('}');
-
+
return sb.toString();
}
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/StandardResource.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/StandardResource.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/StandardResource.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/StandardResource.java Mon Aug 2 17:08:03 2010
@@ -49,12 +49,14 @@ public class StandardResource extends Ab
{
return fsPath == null ? bPath : fsPath;
}
-
+
@Override
- public String toString() {
+ public String toString()
+ {
StringBuilder sb = new StringBuilder();
sb.append(bPath);
- if (fsPath != null) {
+ if (fsPath != null)
+ {
sb.append('=');
sb.append(fsPath);
}
@@ -76,7 +78,7 @@ public class StandardResource extends Ab
sb.append(bPath);
sb.append('=');
sb.append(fsp);
-
+
return sb.toString();
}
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/BldCore.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/BldCore.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/BldCore.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/BldCore.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.common.core;
-
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -43,61 +42,56 @@ import org.apache.felix.sigil.common.mod
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
-
public class BldCore implements BundleActivator
{
private static LicenseManager licenceManager = new LicenseManager();
- private static final Logger log = Logger.getLogger( BldCore.class.getName() );
-
+ private static final Logger log = Logger.getLogger(BldCore.class.getName());
- public static void error( String string, Throwable e )
+ public static void error(String string, Throwable e)
{
// TODO
- log.log( Level.WARNING, string, e );
+ log.log(Level.WARNING, string, e);
}
-
- public static void error( String string )
+ public static void error(String string)
{
- log.log( Level.WARNING, string );
+ log.log(Level.WARNING, string);
}
-
public static ILicenseManager getLicenseManager()
{
return licenceManager;
}
-
- public void start( BundleContext context ) throws Exception
+ public void start(BundleContext context) throws Exception
{
init();
}
-
public static void init() throws Exception
{
- ModelElementFactory.getInstance().register( ISigilBundle.class, SigilBundle.class, "bundle", "sigil", null );
- ModelElementFactory.getInstance().register( ILibrary.class, Library.class, "library", "sigil", null );
- ModelElementFactory.getInstance().register( ILibraryImport.class, LibraryImport.class, "library-import",
- "sigil", null );
+ ModelElementFactory.getInstance().register(ISigilBundle.class, SigilBundle.class,
+ "bundle", "sigil", null);
+ ModelElementFactory.getInstance().register(ILibrary.class, Library.class,
+ "library", "sigil", null);
+ ModelElementFactory.getInstance().register(ILibraryImport.class,
+ LibraryImport.class, "library-import", "sigil", null);
// osgi elements
- ModelElementFactory.getInstance().register( IBundleModelElement.class, BundleModelElement.class, "bundle",
- null, null );
- ModelElementFactory.getInstance().register( IPackageExport.class, PackageExport.class, "package.export", null,
- null );
- ModelElementFactory.getInstance().register( IPackageImport.class, PackageImport.class, "package.import", null,
- null );
- ModelElementFactory.getInstance().register( IRequiredBundle.class, RequiredBundle.class, "required.bundle",
- null, null );
+ ModelElementFactory.getInstance().register(IBundleModelElement.class,
+ BundleModelElement.class, "bundle", null, null);
+ ModelElementFactory.getInstance().register(IPackageExport.class,
+ PackageExport.class, "package.export", null, null);
+ ModelElementFactory.getInstance().register(IPackageImport.class,
+ PackageImport.class, "package.import", null, null);
+ ModelElementFactory.getInstance().register(IRequiredBundle.class,
+ RequiredBundle.class, "required.bundle", null, null);
}
-
- public void stop( BundleContext context ) throws Exception
+ public void stop(BundleContext context) throws Exception
{
// TODO Auto-generated method stub
- }
+ }
}
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/license/LicenseManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/license/LicenseManager.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/license/LicenseManager.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/license/LicenseManager.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.common.core.internal.license;
-
import java.util.Collections;
import java.util.HashMap;
import java.util.Set;
@@ -28,39 +27,33 @@ import java.util.regex.Pattern;
import org.apache.felix.sigil.common.core.licence.ILicenseManager;
import org.apache.felix.sigil.common.core.licence.ILicensePolicy;
-
public class LicenseManager implements ILicenseManager
{
private HashMap<String, Pattern> licenses = new HashMap<String, Pattern>();
private HashMap<String, LicensePolicy> policies = new HashMap<String, LicensePolicy>();
- private LicensePolicy defaultPolicy = new LicensePolicy( this );
+ private LicensePolicy defaultPolicy = new LicensePolicy(this);
-
- public void addLicense( String name, Pattern pattern )
+ public void addLicense(String name, Pattern pattern)
{
- licenses.put( name, pattern );
+ licenses.put(name, pattern);
}
-
- public void removeLicense( String name )
+ public void removeLicense(String name)
{
- licenses.remove( name );
+ licenses.remove(name);
}
-
public Set<String> getLicenseNames()
{
- return Collections.unmodifiableSet( licenses.keySet() );
+ return Collections.unmodifiableSet(licenses.keySet());
}
-
- public Pattern getLicensePattern( String name )
+ public Pattern getLicensePattern(String name)
{
- return licenses.get( name );
+ return licenses.get(name);
}
-
public ILicensePolicy getDefaultPolicy()
{
return defaultPolicy;
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/license/LicensePolicy.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/license/LicensePolicy.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/license/LicensePolicy.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/license/LicensePolicy.java Mon Aug 2 17:08:03 2010
@@ -19,45 +19,38 @@
package org.apache.felix.sigil.common.core.internal.license;
-
import org.apache.felix.sigil.common.core.licence.ILicensePolicy;
import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
import org.eclipse.core.runtime.IProgressMonitor;
-
public class LicensePolicy implements ILicensePolicy
{
private LicenseManager licenseManager;
-
- public LicensePolicy( LicenseManager licenseManager )
+ public LicensePolicy(LicenseManager licenseManager)
{
this.licenseManager = licenseManager;
}
-
- public boolean accept( ISigilBundle bundle )
+ public boolean accept(ISigilBundle bundle)
{
return true;
}
-
- public void addAllowed( String licenseName )
+ public void addAllowed(String licenseName)
{
// TODO Auto-generated method stub
}
-
- public void removeAllowed( String licenseName )
+ public void removeAllowed(String licenseName)
{
// TODO Auto-generated method stub
}
-
- public void save( IProgressMonitor monitor )
+ public void save(IProgressMonitor monitor)
{
// TODO Auto-generated method stub
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/BundleCapability.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/BundleCapability.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/BundleCapability.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/BundleCapability.java Mon Aug 2 17:08:03 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
- package org.apache.felix.sigil.common.core.internal.model.eclipse;
+package org.apache.felix.sigil.common.core.internal.model.eclipse;
import org.apache.felix.sigil.common.model.AbstractModelElement;
import org.apache.felix.sigil.common.model.eclipse.IBundleCapability;
@@ -50,15 +50,19 @@ public class BundleCapability extends Ab
@Override
public boolean equals(Object obj)
{
- if ( obj == this ) return true;
- if ( obj == null ) return false;
+ if (obj == this)
+ return true;
+ if (obj == null)
+ return false;
- if ( obj instanceof BundleCapability ) {
+ if (obj instanceof BundleCapability)
+ {
BundleCapability bc = (BundleCapability) obj;
- return (bsn == null ? bc.bsn == null : bsn.equals(bc.bsn)) &&
- (version == null ? bc.version == null : version.equals(bc.version));
+ return (bsn == null ? bc.bsn == null : bsn.equals(bc.bsn))
+ && (version == null ? bc.version == null : version.equals(bc.version));
}
- else {
+ else
+ {
return false;
}
}
@@ -67,12 +71,14 @@ public class BundleCapability extends Ab
public int hashCode()
{
int hc = 11;
-
- if ( bsn!= null ) {
+
+ if (bsn != null)
+ {
hc *= bsn.hashCode();
}
-
- if ( version != null ) {
+
+ if (version != null)
+ {
hc *= version.hashCode();
}
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/Library.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/Library.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/Library.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/Library.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.common.core.internal.model.eclipse;
-
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
@@ -30,7 +29,6 @@ import org.apache.felix.sigil.common.mod
import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
import org.osgi.framework.Version;
-
public class Library extends AbstractCompoundModelElement implements ILibrary
{
@@ -41,70 +39,59 @@ public class Library extends AbstractCom
private Set<IRequiredBundle> bundles;
private Set<IPackageImport> imports;
-
public Library()
{
- super( "Library" );
+ super("Library");
bundles = new HashSet<IRequiredBundle>();
imports = new HashSet<IPackageImport>();
}
-
- public void addBundle( IRequiredBundle bundle )
+ public void addBundle(IRequiredBundle bundle)
{
- bundles.add( bundle );
+ bundles.add(bundle);
}
-
- public void addImport( IPackageImport pi )
+ public void addImport(IPackageImport pi)
{
- imports.add( pi );
+ imports.add(pi);
}
-
public Collection<IRequiredBundle> getBundles()
{
return bundles;
}
-
public Collection<IPackageImport> getImports()
{
return imports;
}
-
public String getName()
{
return name;
}
-
public Version getVersion()
{
return version;
}
-
- public void removeBundle( IRequiredBundle bundle )
+ public void removeBundle(IRequiredBundle bundle)
{
- bundles.remove( bundle );
+ bundles.remove(bundle);
}
-
- public void removeImport( IPackageImport pi )
+ public void removeImport(IPackageImport pi)
{
- imports.remove( pi );
+ imports.remove(pi);
}
-
- public void setName( String name )
+ public void setName(String name)
{
this.name = name;
}
-
- public void setVersion( Version version )
+ public void setVersion(Version version)
{
this.version = version;
}
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/LibraryImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/LibraryImport.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/LibraryImport.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/LibraryImport.java Mon Aug 2 17:08:03 2010
@@ -19,46 +19,39 @@
package org.apache.felix.sigil.common.core.internal.model.eclipse;
-
import org.apache.felix.sigil.common.model.AbstractModelElement;
import org.apache.felix.sigil.common.model.eclipse.ILibraryImport;
import org.apache.felix.sigil.common.osgi.VersionRange;
-
public class LibraryImport extends AbstractModelElement implements ILibraryImport
{
private static final long serialVersionUID = 1L;
-
public LibraryImport()
{
- super( "Library Import" );
+ super("Library Import");
}
private String libraryName;
private VersionRange range = VersionRange.ANY_VERSION;
-
public String getLibraryName()
{
return libraryName;
}
-
public VersionRange getVersions()
{
return range;
}
-
- public void setLibraryName( String name )
+ public void setLibraryName(String name)
{
this.libraryName = name;
}
-
- public void setVersions( VersionRange range )
+ public void setVersions(VersionRange range)
{
this.range = range;
}
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/SigilBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/SigilBundle.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/SigilBundle.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/SigilBundle.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.common.core.internal.model.eclipse;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -48,7 +47,6 @@ import org.eclipse.core.runtime.IProgres
import org.eclipse.core.runtime.SubMonitor;
import org.osgi.framework.Version;
-
/**
* @author dave
*
@@ -70,106 +68,109 @@ public class SigilBundle extends Abstrac
public SigilBundle()
{
- super( "Sigil Bundle" );
+ super("Sigil Bundle");
sourcePaths = new Resource[0];
classpath = new String[0];
packages = new String[0];
}
-
- public void synchronize( IProgressMonitor monitor ) throws IOException
+ public void synchronize(IProgressMonitor monitor) throws IOException
{
- SubMonitor progress = SubMonitor.convert( monitor, 100 );
- progress.subTask( "Synchronizing " + bundle.getSymbolicName() + " binary" );
- sync( location, bundle.getUpdateLocation(), progress.newChild( 45 ) );
-
- if ( bundle.getSourceLocation() != null ) {
+ SubMonitor progress = SubMonitor.convert(monitor, 100);
+ progress.subTask("Synchronizing " + bundle.getSymbolicName() + " binary");
+ sync(location, bundle.getUpdateLocation(), progress.newChild(45));
+
+ if (bundle.getSourceLocation() != null)
+ {
try
{
- progress.subTask( "Synchronizing " + bundle.getSymbolicName() + " source" );
- sync( sourcePathLocation, bundle.getSourceLocation(), progress.newChild( 45 ) );
+ progress.subTask("Synchronizing " + bundle.getSymbolicName() + " source");
+ sync(sourcePathLocation, bundle.getSourceLocation(),
+ progress.newChild(45));
}
- catch ( IOException e )
+ catch (IOException e)
{
- BldCore.error( "Failed to download source for " + bundle.getSymbolicName() + " " + bundle.getVersion(), e
- .getCause() );
+ BldCore.error("Failed to download source for " + bundle.getSymbolicName()
+ + " " + bundle.getVersion(), e.getCause());
}
}
-
- if ( bundle.getLicenseURI() != null ) {
+
+ if (bundle.getLicenseURI() != null)
+ {
try
{
- progress.subTask( "Synchronizing " + bundle.getSymbolicName() + " licence" );
- sync( licencePathLocation, bundle.getLicenseURI(), progress.newChild( 10 ) );
+ progress.subTask("Synchronizing " + bundle.getSymbolicName() + " licence");
+ sync(licencePathLocation, bundle.getLicenseURI(), progress.newChild(10));
}
- catch ( IOException e )
+ catch (IOException e)
{
- BldCore.error( "Failed to download licence for " + bundle.getSymbolicName() + " " + bundle.getVersion(), e
- .getCause() );
+ BldCore.error("Failed to download licence for "
+ + bundle.getSymbolicName() + " " + bundle.getVersion(), e.getCause());
}
}
-
+
updateManifest(location);
}
-
private void updateManifest(File location) throws IOException
{
- if ( location != null ) {
+ if (location != null)
+ {
JarFile f = new JarFile(location);
- try {
+ try
+ {
setBundleInfo(ManifestUtil.buildBundleModelElement(f.getManifest()));
}
- finally {
+ finally
+ {
f.close();
}
}
}
-
public boolean isSynchronized()
{
return location == null || location.exists();
}
-
- private static void sync( File local, URI remote, IProgressMonitor monitor ) throws IOException
+ private static void sync(File local, URI remote, IProgressMonitor monitor)
+ throws IOException
{
try
{
- if ( remote != null )
+ if (remote != null)
{
- if ( local != null && !local.exists() )
+ if (local != null && !local.exists())
{
URL url = remote.toURL();
URLConnection connection = url.openConnection();
int contentLength = connection.getContentLength();
- monitor.beginTask( "Downloading from " + url.getHost(), contentLength );
+ monitor.beginTask("Downloading from " + url.getHost(), contentLength);
InputStream in = null;
OutputStream out = null;
try
{
URLConnection conn = url.openConnection();
- if ( conn instanceof HttpURLConnection )
+ if (conn instanceof HttpURLConnection)
{
- HttpURLConnection http = ( HttpURLConnection ) conn;
- http.setConnectTimeout( 10000 );
- http.setReadTimeout( 5000 );
+ HttpURLConnection http = (HttpURLConnection) conn;
+ http.setConnectTimeout(10000);
+ http.setReadTimeout(5000);
}
in = conn.getInputStream();
local.getParentFile().mkdirs();
- out = new FileOutputStream( local );
- stream( in, out, monitor );
+ out = new FileOutputStream(local);
+ stream(in, out, monitor);
}
finally
{
- if ( in != null )
+ if (in != null)
{
in.close();
}
- if ( out != null )
+ if (out != null)
{
out.close();
}
@@ -178,152 +179,137 @@ public class SigilBundle extends Abstrac
}
}
}
- catch ( IOException e )
+ catch (IOException e)
{
local.delete();
throw e;
}
}
-
- private static void stream( InputStream in, OutputStream out, IProgressMonitor monitor ) throws IOException
+ private static void stream(InputStream in, OutputStream out, IProgressMonitor monitor)
+ throws IOException
{
byte[] b = new byte[1024];
- for ( ;; )
+ for (;;)
{
- if ( monitor.isCanceled() )
+ if (monitor.isCanceled())
{
- throw new InterruptedIOException( "User canceled download" );
+ throw new InterruptedIOException("User canceled download");
}
- int r = in.read( b );
- if ( r == -1 )
+ int r = in.read(b);
+ if (r == -1)
break;
- out.write( b, 0, r );
- monitor.worked( r );
+ out.write(b, 0, r);
+ monitor.worked(r);
}
out.flush();
}
-
public IBundleModelElement getBundleInfo()
{
return bundle;
}
-
- public void setBundleInfo( IBundleModelElement bundle )
+ public void setBundleInfo(IBundleModelElement bundle)
{
- if ( bundle == null )
+ if (bundle == null)
{
- if ( this.bundle != null )
+ if (this.bundle != null)
{
- this.bundle.setParent( null );
+ this.bundle.setParent(null);
}
}
else
{
- bundle.setParent( this );
+ bundle.setParent(this);
}
this.bundle = bundle;
}
-
- public void addSourcePath( Resource path )
+ public void addSourcePath(Resource path)
{
ArrayList<Resource> tmp = new ArrayList<Resource>(getSourcePaths());
tmp.add(path);
- sourcePaths = tmp.toArray( new Resource[tmp.size()] );
+ sourcePaths = tmp.toArray(new Resource[tmp.size()]);
}
-
- public void removeSourcePath( Resource path )
+ public void removeSourcePath(Resource path)
{
ArrayList<Resource> tmp = new ArrayList<Resource>(getSourcePaths());
- if ( tmp.remove(path) ) {
- sourcePaths = tmp.toArray( new Resource[tmp.size()] );
+ if (tmp.remove(path))
+ {
+ sourcePaths = tmp.toArray(new Resource[tmp.size()]);
}
}
-
public Collection<Resource> getSourcePaths()
{
return Arrays.asList(sourcePaths);
}
-
public void clearSourcePaths()
{
sourcePaths = new Resource[0];
}
-
- public void addClasspathEntry( String encodedClasspath )
+ public void addClasspathEntry(String encodedClasspath)
{
ArrayList<String> tmp = new ArrayList<String>(getClasspathEntrys());
tmp.add(encodedClasspath.trim());
- classpath = tmp.toArray( new String[tmp.size()] );
+ classpath = tmp.toArray(new String[tmp.size()]);
}
-
public Collection<String> getClasspathEntrys()
{
return Arrays.asList(classpath);
}
-
- public void removeClasspathEntry( String encodedClasspath )
+ public void removeClasspathEntry(String encodedClasspath)
{
ArrayList<String> tmp = new ArrayList<String>(getClasspathEntrys());
- if ( tmp.remove( encodedClasspath.trim() ) ) {
- classpath = tmp.toArray( new String[tmp.size()] );
+ if (tmp.remove(encodedClasspath.trim()))
+ {
+ classpath = tmp.toArray(new String[tmp.size()]);
}
}
-
public File getLocation()
{
return location;
}
-
- public void setLocation( File location )
+ public void setLocation(File location)
{
this.location = location;
}
-
public File getSourcePathLocation()
{
return sourcePathLocation;
}
-
- public void setSourcePathLocation( File location )
+ public void setSourcePathLocation(File location)
{
this.sourcePathLocation = location;
}
-
public String getSourceRootPath()
{
return sourceRootPath;
}
-
- public void setSourceRootPath( String location )
+ public void setSourceRootPath(String location)
{
this.sourceRootPath = location;
}
-
public File getLicencePathLocation()
{
return licencePathLocation;
}
-
- public void setLicencePathLocation( File licencePathLocation )
+ public void setLicencePathLocation(File licencePathLocation)
{
this.licencePathLocation = licencePathLocation;
}
@@ -333,57 +319,52 @@ public class SigilBundle extends Abstrac
return bundle.getSymbolicName();
}
-
public Version getVersion()
{
return bundle.getVersion();
}
-
- public void setVersion( Version version )
+ public void setVersion(Version version)
{
- this.bundle.setVersion( version );
+ this.bundle.setVersion(version);
}
-
public String getSymbolicName()
{
return bundle.getSymbolicName();
}
-
public Collection<String> getPackages()
{
return Arrays.asList(packages);
}
-
- public void addPackage( String pkg )
+ public void addPackage(String pkg)
{
ArrayList<String> tmp = new ArrayList<String>(getClasspathEntrys());
tmp.add(pkg);
- packages = tmp.toArray( new String[tmp.size()] );
+ packages = tmp.toArray(new String[tmp.size()]);
}
-
- public boolean removePackage( String pkg )
+ public boolean removePackage(String pkg)
{
ArrayList<String> tmp = new ArrayList<String>(getClasspathEntrys());
- if ( tmp.remove(pkg) ) {
- packages = tmp.toArray( new String[tmp.size()] );
+ if (tmp.remove(pkg))
+ {
+ packages = tmp.toArray(new String[tmp.size()]);
return true;
}
- else {
+ else
+ {
return false;
}
}
-
- public IPackageExport findExport( String packageName )
+ public IPackageExport findExport(String packageName)
{
- for ( IPackageExport e : bundle.getExports() )
+ for (IPackageExport e : bundle.getExports())
{
- if ( packageName.equals( e.getPackageName() ) )
+ if (packageName.equals(e.getPackageName()))
{
return e;
}
@@ -391,45 +372,43 @@ public class SigilBundle extends Abstrac
return null;
}
-
- public IPackageImport findImport( String packageName )
+ public IPackageImport findImport(String packageName)
{
- for ( IPackageImport i : bundle.getImports() )
+ for (IPackageImport i : bundle.getImports())
{
- if ( packageName.equals( i.getPackageName() ) )
+ if (packageName.equals(i.getPackageName()))
{
return i;
}
}
return null;
}
-
+
@Override
public String toString()
{
return "SigilBundle["
- + ( getBundleInfo() == null ? null : ( getBundleInfo().getSymbolicName() + ":" + getBundleInfo()
- .getVersion() ) ) + "]";
+ + (getBundleInfo() == null ? null
+ : (getBundleInfo().getSymbolicName() + ":" + getBundleInfo().getVersion()))
+ + "]";
}
-
@Override
- public boolean equals( Object obj )
+ public boolean equals(Object obj)
{
- if ( obj == null )
+ if (obj == null)
return false;
- if ( obj == this )
+ if (obj == this)
return true;
- if ( obj instanceof SigilBundle )
+ if (obj instanceof SigilBundle)
{
- return obj.toString().equals( toString() );
+ return obj.toString().equals(toString());
}
return false;
}
-
@Override
public int hashCode()
{
@@ -441,15 +420,15 @@ public class SigilBundle extends Abstrac
{
SigilBundle b = (SigilBundle) super.clone();
b.bundle = (IBundleModelElement) b.bundle.clone();
-
+
Resource[] newPaths = new Resource[b.sourcePaths.length];
System.arraycopy(b.sourcePaths, 0, newPaths, 0, b.sourcePaths.length);
b.sourcePaths = newPaths;
-
+
String[] tmp = new String[classpath.length];
System.arraycopy(b.classpath, 0, tmp, 0, b.classpath.length);
b.classpath = tmp;
-
+
tmp = new String[packages.length];
System.arraycopy(b.packages, 0, tmp, 0, b.packages.length);
b.packages = tmp;
@@ -457,9 +436,8 @@ public class SigilBundle extends Abstrac
return b;
}
-
public IBundleCapability getBundleCapability()
{
return new BundleCapability(bundle);
- }
+ }
}
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/BundleModelElement.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/BundleModelElement.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/BundleModelElement.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/BundleModelElement.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.common.core.internal.model.osgi;
-
import java.net.URI;
import java.util.Arrays;
import java.util.Collection;
@@ -36,7 +35,6 @@ import org.apache.felix.sigil.common.mod
import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
import org.osgi.framework.Version;
-
public class BundleModelElement extends AbstractCompoundModelElement implements IBundleModelElement
{
/**
@@ -68,10 +66,9 @@ public class BundleModelElement extends
private String activator;
private Set<ILibraryImport> libraries;
-
public BundleModelElement()
{
- super( "OSGi Bundle" );
+ super("OSGi Bundle");
this.imports = new IPackageImport[0];
this.exports = new IPackageExport[0];
this.requires = new IRequiredBundle[0];
@@ -79,337 +76,301 @@ public class BundleModelElement extends
this.libraries = new HashSet<ILibraryImport>();
}
-
public String getActivator()
{
return activator;
}
-
- public void setActivator( String activator )
+ public void setActivator(String activator)
{
this.activator = activator;
}
-
- public void addLibraryImport( ILibraryImport library )
+ public void addLibraryImport(ILibraryImport library)
{
- libraries.add( library );
+ libraries.add(library);
}
-
public Set<ILibraryImport> getLibraryImports()
{
return libraries;
}
-
- public void removeLibraryImport( ILibraryImport library )
+ public void removeLibraryImport(ILibraryImport library)
{
- libraries.remove( library );
+ libraries.remove(library);
}
-
public String getCategory()
{
return category;
}
-
- public void setCategory( String category )
+ public void setCategory(String category)
{
this.category = category;
}
-
public String getContactAddress()
{
return contactAddress;
}
-
- public void setContactAddress( String contactAddress )
+ public void setContactAddress(String contactAddress)
{
this.contactAddress = contactAddress;
}
-
public String getCopyright()
{
return copyright;
}
-
- public void setCopyright( String copyright )
+ public void setCopyright(String copyright)
{
this.copyright = copyright;
}
-
public URI getDocURI()
{
return docURI;
}
-
- public void setDocURI( URI docURI )
+ public void setDocURI(URI docURI)
{
this.docURI = docURI;
}
-
public Collection<IPackageExport> getExports()
{
return Arrays.asList(exports);
}
-
- public void addExport( IPackageExport packageExport )
+ public void addExport(IPackageExport packageExport)
{
HashSet<IPackageExport> tmp = new HashSet<IPackageExport>(getExports());
- if ( tmp.add(packageExport) ) {
- exports = tmp.toArray( new IPackageExport[tmp.size()] );
- packageExport.setParent( this );
+ if (tmp.add(packageExport))
+ {
+ exports = tmp.toArray(new IPackageExport[tmp.size()]);
+ packageExport.setParent(this);
}
}
- public void removeExport( IPackageExport packageExport )
+ public void removeExport(IPackageExport packageExport)
{
HashSet<IPackageExport> tmp = new HashSet<IPackageExport>(getExports());
- if ( tmp.remove(packageExport) ) {
- exports = tmp.toArray( new IPackageExport[tmp.size()] );
- packageExport.setParent( null );
+ if (tmp.remove(packageExport))
+ {
+ exports = tmp.toArray(new IPackageExport[tmp.size()]);
+ packageExport.setParent(null);
}
}
-
public Collection<IPackageImport> getImports()
{
return Arrays.asList(imports);
}
-
- public void addImport( IPackageImport packageImport )
+ public void addImport(IPackageImport packageImport)
{
HashSet<IPackageImport> tmp = new HashSet<IPackageImport>(getImports());
- if ( tmp.add(packageImport) ) {
- imports = tmp.toArray( new IPackageImport[tmp.size()] );
- packageImport.setParent( this );
+ if (tmp.add(packageImport))
+ {
+ imports = tmp.toArray(new IPackageImport[tmp.size()]);
+ packageImport.setParent(this);
}
}
-
- public void removeImport( IPackageImport packageImport )
+ public void removeImport(IPackageImport packageImport)
{
HashSet<IPackageImport> tmp = new HashSet<IPackageImport>(getImports());
- if ( tmp.remove(packageImport) ) {
- imports = tmp.toArray( new IPackageImport[tmp.size()] );
- packageImport.setParent( null );
+ if (tmp.remove(packageImport))
+ {
+ imports = tmp.toArray(new IPackageImport[tmp.size()]);
+ packageImport.setParent(null);
}
}
-
public Collection<IRequiredBundle> getRequiredBundles()
{
return Arrays.asList(requires);
}
-
- public void addRequiredBundle( IRequiredBundle bundle )
+ public void addRequiredBundle(IRequiredBundle bundle)
{
HashSet<IRequiredBundle> tmp = new HashSet<IRequiredBundle>(getRequiredBundles());
- if ( tmp.add(bundle) ) {
- requires = tmp.toArray( new IRequiredBundle[tmp.size()] );
- bundle.setParent( this );
+ if (tmp.add(bundle))
+ {
+ requires = tmp.toArray(new IRequiredBundle[tmp.size()]);
+ bundle.setParent(this);
}
}
-
- public void removeRequiredBundle( IRequiredBundle bundle )
+ public void removeRequiredBundle(IRequiredBundle bundle)
{
HashSet<IRequiredBundle> tmp = new HashSet<IRequiredBundle>(getRequiredBundles());
- if ( tmp.remove(bundle) ) {
- requires = tmp.toArray( new IRequiredBundle[tmp.size()] );
- bundle.setParent( null );
+ if (tmp.remove(bundle))
+ {
+ requires = tmp.toArray(new IRequiredBundle[tmp.size()]);
+ bundle.setParent(null);
}
}
-
public URI getLicenseURI()
{
return licenseURI;
}
-
- public void setLicenseURI( URI licenseURI )
+ public void setLicenseURI(URI licenseURI)
{
this.licenseURI = licenseURI;
}
-
public URI getSourceLocation()
{
return sourceLocation;
}
-
- public void setSourceLocation( URI sourceLocation )
+ public void setSourceLocation(URI sourceLocation)
{
this.sourceLocation = sourceLocation;
}
-
public String getSymbolicName()
{
return symbolicName;
}
-
- public void setSymbolicName( String symbolicName )
+ public void setSymbolicName(String symbolicName)
{
this.symbolicName = symbolicName == null ? null : symbolicName.intern();
}
-
public URI getUpdateLocation()
{
return updateLocation;
}
-
- public void setUpdateLocation( URI updateLocation )
+ public void setUpdateLocation(URI updateLocation)
{
this.updateLocation = updateLocation;
}
-
public String getVendor()
{
return vendor;
}
-
- public void setVendor( String vendor )
+ public void setVendor(String vendor)
{
this.vendor = vendor;
}
-
public Version getVersion()
{
return version;
}
-
- public void setVersion( Version version )
+ public void setVersion(Version version)
{
this.version = version == null ? Version.emptyVersion : version;
}
-
public void checkValid() throws InvalidModelException
{
- if ( symbolicName == null )
- throw new InvalidModelException( this, "Bundle symbolic name not set" );
+ if (symbolicName == null)
+ throw new InvalidModelException(this, "Bundle symbolic name not set");
}
-
public BundleModelElement clone()
{
- BundleModelElement bd = ( BundleModelElement ) super.clone();
+ BundleModelElement bd = (BundleModelElement) super.clone();
bd.imports = new IPackageImport[imports.length];
bd.exports = new IPackageExport[exports.length];
bd.requires = new IRequiredBundle[requires.length];
- for ( int i = 0; i < imports.length; i++ )
+ for (int i = 0; i < imports.length; i++)
{
bd.imports[i] = (IPackageImport) imports[i].clone();
}
- for ( int i = 0; i < exports.length; i++ )
+ for (int i = 0; i < exports.length; i++)
{
- bd.exports[i] = ( IPackageExport ) exports[i].clone();
+ bd.exports[i] = (IPackageExport) exports[i].clone();
}
- for ( int i = 0; i < requires.length; i++ )
+ for (int i = 0; i < requires.length; i++)
{
- bd.requires[i] = ( IRequiredBundle ) requires[i].clone();
+ bd.requires[i] = (IRequiredBundle) requires[i].clone();
}
return bd;
}
-
public String toString()
{
StringBuffer buf = new StringBuffer();
- buf.append( "BundleModelElement[" );
- buf.append( symbolicName );
- buf.append( ", " );
- buf.append( version );
- buf.append( "]" );
+ buf.append("BundleModelElement[");
+ buf.append(symbolicName);
+ buf.append(", ");
+ buf.append(version);
+ buf.append("]");
return buf.toString();
}
-
public String getName()
{
return name;
}
-
- public void setName( String name )
+ public void setName(String name)
{
this.name = name;
}
-
public String getDescription()
{
return description;
}
-
- public void setDescription( String description )
+ public void setDescription(String description)
{
this.description = description;
}
-
- public void addClasspath( String path )
+ public void addClasspath(String path)
{
HashSet<String> tmp = new HashSet<String>(Arrays.asList(classpathElements));
- if ( tmp.add(path) ) {
- classpathElements = tmp.toArray( new String[tmp.size()] );
+ if (tmp.add(path))
+ {
+ classpathElements = tmp.toArray(new String[tmp.size()]);
}
}
-
public Collection<String> getClasspaths()
{
- return classpathElements.length == 0 ? Collections.singleton( "." ) : Arrays.asList(classpathElements);
+ return classpathElements.length == 0 ? Collections.singleton(".")
+ : Arrays.asList(classpathElements);
}
-
- public void removeClasspath( String path )
+ public void removeClasspath(String path)
{
HashSet<String> tmp = new HashSet<String>(Arrays.asList(classpathElements));
- if ( tmp.remove(path) ) {
- classpathElements = tmp.toArray( new String[tmp.size()] );
+ if (tmp.remove(path))
+ {
+ classpathElements = tmp.toArray(new String[tmp.size()]);
}
}
-
public IRequiredBundle getFragmentHost()
{
return fragmentHost;
}
-
- public void setFragmentHost( IRequiredBundle fragmentHost )
+ public void setFragmentHost(IRequiredBundle fragmentHost)
{
this.fragmentHost = fragmentHost;
}
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageExport.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageExport.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageExport.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageExport.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.common.core.internal.model.osgi;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -29,7 +28,6 @@ import org.apache.felix.sigil.common.mod
import org.apache.felix.sigil.common.model.osgi.IPackageExport;
import org.osgi.framework.Version;
-
public class PackageExport extends AbstractModelElement implements IPackageExport
{
@@ -41,33 +39,30 @@ public class PackageExport extends Abstr
public PackageExport()
{
- super( "OSGi Package Export" );
+ super("OSGi Package Export");
}
-
public String getPackageName()
{
return name;
}
-
- public void setPackageName( String packageName )
+ public void setPackageName(String packageName)
{
this.name = packageName;
}
-
public Version getVersion()
{
Version result;
- if ( version != null )
+ if (version != null)
{
result = version;
}
else
{
- ISigilBundle owningBundle = getAncestor( ISigilBundle.class );
- if ( owningBundle == null )
+ ISigilBundle owningBundle = getAncestor(ISigilBundle.class);
+ if (owningBundle == null)
{
result = Version.emptyVersion;
}
@@ -79,73 +74,64 @@ public class PackageExport extends Abstr
return result;
}
-
public Version getRawVersion()
{
return version;
}
-
- public void setVersion( Version version )
+ public void setVersion(Version version)
{
this.version = version; // == null ? Version.emptyVersion : version;
}
-
- public void addUse( String use )
+ public void addUse(String use)
{
ArrayList<String> tmp = new ArrayList<String>(getUses());
tmp.add(use);
- uses = tmp.toArray( new String[tmp.size()] );
+ uses = tmp.toArray(new String[tmp.size()]);
}
-
public Collection<String> getUses()
{
return Arrays.asList(uses);
}
-
- public void removeUse( String use )
+ public void removeUse(String use)
{
ArrayList<String> tmp = new ArrayList<String>(getUses());
tmp.remove(use);
- uses = tmp.toArray( new String[tmp.size()] );
+ uses = tmp.toArray(new String[tmp.size()]);
}
-
@Override
public String toString()
{
return "PackageExport[" + name + ":" + version + ":uses=" + uses + "]";
}
-
- public void setUses( Collection<String> uses )
+ public void setUses(Collection<String> uses)
{
ArrayList<String> tmp = new ArrayList<String>(uses);
- this.uses = tmp.toArray( new String[tmp.size()] );
+ this.uses = tmp.toArray(new String[tmp.size()]);
}
-
- public int compareTo( IPackageExport o )
+ public int compareTo(IPackageExport o)
{
- int i = name.compareTo( o.getPackageName() );
+ int i = name.compareTo(o.getPackageName());
- if ( i == 0 )
+ if (i == 0)
{
- i = compareVersion( o.getVersion() );
+ i = compareVersion(o.getVersion());
}
return i;
}
-
- private int compareVersion( Version other )
+ private int compareVersion(Version other)
{
- if ( version == null )
+ if (version == null)
{
- if ( other == null )
+ if (other == null)
{
return 0;
}
@@ -156,44 +142,45 @@ public class PackageExport extends Abstr
}
else
{
- if ( other == null )
+ if (other == null)
{
return -1;
}
else
{
- return version.compareTo( other );
+ return version.compareTo(other);
}
}
}
-
@Override
public boolean equals(Object obj)
{
- if ( obj == this ) return true;
- if ( obj == null ) return false;
-
- if ( obj instanceof PackageExport )
+ if (obj == this)
+ return true;
+ if (obj == null)
+ return false;
+
+ if (obj instanceof PackageExport)
{
PackageExport e = (PackageExport) obj;
- return (name == null ? e.name == null : name.equals( e.name )) &&
- (version == null ? e.version == null : version.equals( e.version ));
+ return (name == null ? e.name == null : name.equals(e.name))
+ && (version == null ? e.version == null : version.equals(e.version));
}
- else
+ else
{
return false;
}
}
-
@Override
public int hashCode()
{
int hc = name.hashCode();
-
- if ( version != null ) hc *= version.hashCode();
-
+
+ if (version != null)
+ hc *= version.hashCode();
+
return hc;
}
}
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageImport.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageImport.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageImport.java Mon Aug 2 17:08:03 2010
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.common.core.internal.model.osgi;
-
import org.apache.felix.sigil.common.model.AbstractModelElement;
import org.apache.felix.sigil.common.model.ICapabilityModelElement;
import org.apache.felix.sigil.common.model.InvalidModelException;
@@ -27,7 +26,6 @@ import org.apache.felix.sigil.common.mod
import org.apache.felix.sigil.common.model.osgi.IPackageImport;
import org.apache.felix.sigil.common.osgi.VersionRange;
-
public class PackageImport extends AbstractModelElement implements IPackageImport
{
@@ -41,102 +39,90 @@ public class PackageImport extends Abstr
private boolean dependency = true;
private OSGiImport osgiImport = OSGiImport.AUTO;
-
public PackageImport()
{
- super( "OSGi Package Import" );
+ super("OSGi Package Import");
}
-
@Override
public void checkValid() throws InvalidModelException
{
- if ( name == null )
+ if (name == null)
{
- throw new InvalidModelException( this, "Package name must be set" );
+ throw new InvalidModelException(this, "Package name must be set");
}
}
-
public boolean isOptional()
{
return optional;
}
-
- public void setOptional( boolean optional )
+ public void setOptional(boolean optional)
{
this.optional = optional;
}
-
public boolean isDependency()
{
return dependency;
}
-
- public void setDependency( boolean dependency )
+ public void setDependency(boolean dependency)
{
this.dependency = dependency;
}
-
public OSGiImport getOSGiImport()
{
return osgiImport;
}
-
- public void setOSGiImport( OSGiImport osgiHeader )
+ public void setOSGiImport(OSGiImport osgiHeader)
{
this.osgiImport = osgiHeader;
}
-
public String getPackageName()
{
return name;
}
-
- public void setPackageName( String name )
+ public void setPackageName(String name)
{
this.name = name;
}
-
public VersionRange getVersions()
{
return versions;
}
-
- public void setVersions( VersionRange versions )
+ public void setVersions(VersionRange versions)
{
this.versions = versions == null ? VersionRange.ANY_VERSION : versions;
}
-
@Override
public String toString()
{
- return "Package-Import[" + name + ":" + versions + ":" + ( optional ? "optional" : "mandatory" ) + "]";
+ return "Package-Import[" + name + ":" + versions + ":"
+ + (optional ? "optional" : "mandatory") + "]";
}
-
@Override
- public boolean equals( Object obj )
+ public boolean equals(Object obj)
{
- if ( this == obj )
+ if (this == obj)
return true;
- if ( obj == null )
+ if (obj == null)
return false;
- if ( obj instanceof PackageImport )
+ if (obj instanceof PackageImport)
{
- PackageImport pi = ( PackageImport ) obj;
- return name.equals( pi.name ) && versions.equals( pi.versions ) && optional == pi.optional;
+ PackageImport pi = (PackageImport) obj;
+ return name.equals(pi.name) && versions.equals(pi.versions)
+ && optional == pi.optional;
}
else
{
@@ -144,13 +130,12 @@ public class PackageImport extends Abstr
}
}
-
@Override
public int hashCode()
{
int hc = name.hashCode() * versions.hashCode();
- if ( optional )
+ if (optional)
{
hc *= -1;
}
@@ -158,13 +143,12 @@ public class PackageImport extends Abstr
return hc;
}
-
- public boolean accepts( ICapabilityModelElement provider )
+ public boolean accepts(ICapabilityModelElement provider)
{
- if ( provider instanceof IPackageExport )
+ if (provider instanceof IPackageExport)
{
- IPackageExport pe = ( IPackageExport ) provider;
- return pe.getPackageName().equals( name ) && versions.contains( pe.getVersion() );
+ IPackageExport pe = (IPackageExport) provider;
+ return pe.getPackageName().equals(name) && versions.contains(pe.getVersion());
}
else
{
@@ -172,25 +156,23 @@ public class PackageImport extends Abstr
}
}
-
- public int compareTo( IPackageImport o )
+ public int compareTo(IPackageImport o)
{
- int i = name.compareTo( o.getPackageName() );
+ int i = name.compareTo(o.getPackageName());
- if ( i == 0 )
+ if (i == 0)
{
- i = compareVersion( o.getVersions() );
+ i = compareVersion(o.getVersions());
}
return i;
}
-
- private int compareVersion( VersionRange range )
+ private int compareVersion(VersionRange range)
{
- if ( versions == null )
+ if (versions == null)
{
- if ( range == null )
+ if (range == null)
{
return 0;
}
@@ -201,13 +183,13 @@ public class PackageImport extends Abstr
}
else
{
- if ( range == null )
+ if (range == null)
{
return -1;
}
else
{
- return versions.getCeiling().compareTo( range.getCeiling() );
+ return versions.getCeiling().compareTo(range.getCeiling());
}
}
}
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/RequiredBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/RequiredBundle.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/RequiredBundle.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/RequiredBundle.java Mon Aug 2 17:08:03 2010
@@ -19,14 +19,12 @@
package org.apache.felix.sigil.common.core.internal.model.osgi;
-
import org.apache.felix.sigil.common.model.AbstractModelElement;
import org.apache.felix.sigil.common.model.ICapabilityModelElement;
import org.apache.felix.sigil.common.model.eclipse.IBundleCapability;
import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
import org.apache.felix.sigil.common.osgi.VersionRange;
-
public class RequiredBundle extends AbstractModelElement implements IRequiredBundle
{
private static final long serialVersionUID = 1L;
@@ -35,68 +33,61 @@ public class RequiredBundle extends Abst
private VersionRange versions = VersionRange.ANY_VERSION;
private boolean optional;
-
public RequiredBundle()
{
- super( "OSGi Bundle Requirement" );
+ super("OSGi Bundle Requirement");
}
-
public String getSymbolicName()
{
return symbolicName;
}
-
- public void setSymbolicName( String symbolicName )
+ public void setSymbolicName(String symbolicName)
{
this.symbolicName = symbolicName == null ? null : symbolicName.intern();
}
-
public VersionRange getVersions()
{
return versions;
}
-
- public void setVersions( VersionRange versions )
+ public void setVersions(VersionRange versions)
{
this.versions = versions == null ? VersionRange.ANY_VERSION : versions;
}
-
public boolean isOptional()
{
return optional;
}
-
- public void setOptional( boolean optional )
+ public void setOptional(boolean optional)
{
this.optional = optional;
}
-
@Override
public String toString()
{
- return "RequiredBundle[" + symbolicName + ":" + versions + ":" + ( optional ? "optional" : "mandatory" ) + "]";
+ return "RequiredBundle[" + symbolicName + ":" + versions + ":"
+ + (optional ? "optional" : "mandatory") + "]";
}
-
@Override
- public boolean equals( Object obj )
+ public boolean equals(Object obj)
{
- if ( this == obj )
+ if (this == obj)
return true;
- if ( obj == null )
+ if (obj == null)
return false;
- if ( obj instanceof RequiredBundle )
+ if (obj instanceof RequiredBundle)
{
- RequiredBundle rb = ( RequiredBundle ) obj;
- return symbolicName.equals( rb.symbolicName ) && versions.equals( rb.versions ) && optional == rb.optional;
+ RequiredBundle rb = (RequiredBundle) obj;
+ return symbolicName.equals(rb.symbolicName) && versions.equals(rb.versions)
+ && optional == rb.optional;
}
else
{
@@ -104,13 +95,12 @@ public class RequiredBundle extends Abst
}
}
-
@Override
public int hashCode()
{
int hc = symbolicName.hashCode() * versions.hashCode();
- if ( optional )
+ if (optional)
{
hc *= -1;
}
@@ -118,13 +108,13 @@ public class RequiredBundle extends Abst
return hc;
}
-
- public boolean accepts( ICapabilityModelElement provider )
+ public boolean accepts(ICapabilityModelElement provider)
{
- if ( provider instanceof IBundleCapability )
+ if (provider instanceof IBundleCapability)
{
- IBundleCapability bndl = ( IBundleCapability ) provider;
- return symbolicName.equals( bndl.getSymbolicName() ) && versions.contains( bndl.getVersion() );
+ IBundleCapability bndl = (IBundleCapability) provider;
+ return symbolicName.equals(bndl.getSymbolicName())
+ && versions.contains(bndl.getVersion());
}
else
{
@@ -132,25 +122,23 @@ public class RequiredBundle extends Abst
}
}
-
- public int compareTo( IRequiredBundle o )
+ public int compareTo(IRequiredBundle o)
{
- int i = symbolicName.compareTo( o.getSymbolicName() );
+ int i = symbolicName.compareTo(o.getSymbolicName());
- if ( i == 0 )
+ if (i == 0)
{
- i = compareVersion( o.getVersions() );
+ i = compareVersion(o.getVersions());
}
return i;
}
-
- private int compareVersion( VersionRange range )
+ private int compareVersion(VersionRange range)
{
- if ( versions == null )
+ if (versions == null)
{
- if ( range == null )
+ if (range == null)
{
return 0;
}
@@ -161,13 +149,13 @@ public class RequiredBundle extends Abst
}
else
{
- if ( range == null )
+ if (range == null)
{
return -1;
}
else
{
- return versions.getCeiling().compareTo( range.getCeiling() );
+ return versions.getCeiling().compareTo(range.getCeiling());
}
}
}
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/licence/ILicenseManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/licence/ILicenseManager.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/licence/ILicenseManager.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/licence/ILicenseManager.java Mon Aug 2 17:08:03 2010
@@ -19,24 +19,18 @@
package org.apache.felix.sigil.common.core.licence;
-
import java.util.Set;
import java.util.regex.Pattern;
-
public interface ILicenseManager
{
- void addLicense( String name, Pattern pattern );
-
-
- void removeLicense( String name );
+ void addLicense(String name, Pattern pattern);
+ void removeLicense(String name);
Set<String> getLicenseNames();
-
- Pattern getLicensePattern( String name );
-
+ Pattern getLicensePattern(String name);
ILicensePolicy getDefaultPolicy();
//ILicensePolicy getPolicy(ISigilProjectModel project);
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/licence/ILicensePolicy.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/licence/ILicensePolicy.java?rev=981604&r1=981603&r2=981604&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/licence/ILicensePolicy.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/licence/ILicensePolicy.java Mon Aug 2 17:08:03 2010
@@ -19,21 +19,16 @@
package org.apache.felix.sigil.common.core.licence;
-
import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
import org.eclipse.core.runtime.IProgressMonitor;
-
public interface ILicensePolicy
{
- void addAllowed( String licenseName );
-
-
- void removeAllowed( String licenseName );
-
+ void addAllowed(String licenseName);
- boolean accept( ISigilBundle bundle );
+ void removeAllowed(String licenseName);
+ boolean accept(ISigilBundle bundle);
- void save( IProgressMonitor monitor );
+ void save(IProgressMonitor monitor);
}