[jboss-osgi-commits] JBoss-OSGI SVN: r96257 - in projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework: resolver and 2 other directories.

Author: adrian(a)jboss.org Date: 2009-11-11 09:11:52 -0500 (Wed, 11 Nov 2009) New Revision: 96257 Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/launch/OSGiFramework.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/ExportPackage.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/ImportPackage.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/NamedPackage.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolvable.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolver.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/drools/RuleBasedResolverImpl.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/vfs/BundleHandler.java Log: Source code tidyup Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/launch/OSGiFramework.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/launch/OSGiFramework.java 2009-11-11 13:45:27 UTC (rev 96256) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/launch/OSGiFramework.java 2009-11-11 14:11:52 UTC (rev 96257) @@ -123,6 +123,10 @@ /** * Install a bundle from a virtual file + * + * @param root the root file + * @return the bundle + * @throws BundleException for any error */ public Bundle installBundle(VirtualFile root) throws BundleException { Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/ExportPackage.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/ExportPackage.java 2009-11-11 13:45:27 UTC (rev 96256) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/ExportPackage.java 2009-11-11 14:11:52 UTC (rev 96257) @@ -74,11 +74,15 @@ /** * Add an importer of this export package. + * + * @param importer the importer */ void addImporter(ImportPackage importer); /** * Remove an importer of this export package. + * + * @param importer the importer */ void removeImporter(ImportPackage importer); } \ No newline at end of file Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/ImportPackage.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/ImportPackage.java 2009-11-11 13:45:27 UTC (rev 96256) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/ImportPackage.java 2009-11-11 14:11:52 UTC (rev 96257) @@ -70,6 +70,8 @@ /** * Set the exporter that this import package is wired to. + * + * @param exporter the exporter */ void setExporter(ExportPackage exporter); } \ No newline at end of file Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/NamedPackage.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/NamedPackage.java 2009-11-11 13:45:27 UTC (rev 96256) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/NamedPackage.java 2009-11-11 14:11:52 UTC (rev 96257) @@ -54,6 +54,8 @@ /** * Get the attribute value for the given key. + * + * @param key the key * @return The attribute value or null. */ Object getAttribute(String key); Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolvable.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolvable.java 2009-11-11 13:45:27 UTC (rev 96256) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolvable.java 2009-11-11 14:11:52 UTC (rev 96257) @@ -85,11 +85,15 @@ /** * Return true if this resolvable is a singleton. + * + * @return true when this is a singleton */ boolean isSingleton(); /** * Return true if this resolvable has been resolved. + * + * @return true when it is resolved */ boolean isResolved(); Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolver.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolver.java 2009-11-11 13:45:27 UTC (rev 96256) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolver.java 2009-11-11 14:11:52 UTC (rev 96257) @@ -41,13 +41,18 @@ List<Resolvable> getBundles(); /** - * Get the registered resolvable bundle. + * Get the registered resolvable bundle. + * + * @param symbolicName the symbolic name of the bundle + * @param version the version of the bundle * @return The registered resolvable bundle. */ Resolvable getBundle(String symbolicName, Version version); /** - * Get the registered resolvable bundle. + * Get the registered resolvable bundle. + * + * @param bundle the bundle * @return The registered resolvable bundle. */ Resolvable getBundle(Bundle bundle); Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/drools/RuleBasedResolverImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/drools/RuleBasedResolverImpl.java 2009-11-11 13:45:27 UTC (rev 96256) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/drools/RuleBasedResolverImpl.java 2009-11-11 14:11:52 UTC (rev 96257) @@ -35,7 +35,6 @@ import org.drools.io.ResourceFactory; import org.drools.runtime.StatefulKnowledgeSession; import org.drools.runtime.rule.FactHandle; -import org.jboss.logging.Logger; import org.jboss.osgi.framework.bundle.OSGiBundleManager; import org.jboss.osgi.framework.resolver.AbstractResolver; import org.jboss.osgi.framework.resolver.ExportPackage; @@ -51,9 +50,6 @@ */ public class RuleBasedResolverImpl extends AbstractResolver { - // Provide Logging - private static final Logger log = Logger.getLogger(RuleBasedResolverImpl.class); - private StatefulKnowledgeSession ksession; private Map<Object, FactHandle> facts = new ConcurrentHashMap<Object, FactHandle>(); Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/vfs/BundleHandler.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/vfs/BundleHandler.java 2009-11-11 13:45:27 UTC (rev 96256) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/vfs/BundleHandler.java 2009-11-11 14:11:52 UTC (rev 96257) @@ -44,6 +44,9 @@ */ class BundleHandler extends AbstractVirtualFileHandler { + /** The serialVersionUID */ + private static final long serialVersionUID = 6650185906199900589L; + private VirtualFile file; private OSGiBundleState bundleState; private VirtualFileHandler handler;