[jboss-cvs] JBossAS SVN: r89503 - in projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing: internal and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-05-28 17:36:58 -0400 (Thu, 28 May 2009)
New Revision: 89503

Modified:
   projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiBundle.java
   projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiPackageAdmin.java
   projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedPackageAdmin.java
   projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemotePackageAdmin.java
Log:
Implement toString, hashCode, equals

Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiBundle.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiBundle.java	2009-05-28 21:25:40 UTC (rev 89502)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiBundle.java	2009-05-28 21:36:58 UTC (rev 89503)
@@ -50,4 +50,28 @@
    public abstract void stop() throws BundleException;
    
    public abstract void uninstall() throws BundleException;
+   
+   @Override
+   public boolean equals(Object obj)
+   {
+      if ((obj instanceof OSGiBundle) == false)
+         return false;
+      
+      OSGiBundle other = (OSGiBundle)obj;
+      
+      boolean isEqual =  getSymbolicName().equals(other.getSymbolicName());
+      isEqual = isEqual && getVersion().equals(other.getVersion());
+      return isEqual;
+   }
+
+   @Override
+   public int hashCode()
+   {
+      return toString().hashCode();
+   }
+
+   public String toString()
+   {
+      return "[" + getSymbolicName() + "," + getVersion() + "]";
+   }
 }

Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiPackageAdmin.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiPackageAdmin.java	2009-05-28 21:25:40 UTC (rev 89502)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiPackageAdmin.java	2009-05-28 21:36:58 UTC (rev 89503)
@@ -28,7 +28,7 @@
  * @author Thomas.Diesler at jboss.org
  * @since 25-Sep-2008
  */
-public abstract class OSGiPackageAdmin
+public interface OSGiPackageAdmin
 {
-   public abstract void refreshPackages(OSGiBundle[] bundles);
+   void refreshPackages(OSGiBundle[] bundles);
 }

Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedPackageAdmin.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedPackageAdmin.java	2009-05-28 21:25:40 UTC (rev 89502)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedPackageAdmin.java	2009-05-28 21:36:58 UTC (rev 89503)
@@ -32,7 +32,7 @@
  * @author Thomas.Diesler at jboss.org
  * @since 25-Sep-2008
  */
-public class EmbeddedPackageAdmin extends OSGiPackageAdmin
+public class EmbeddedPackageAdmin implements OSGiPackageAdmin
 {
    private PackageAdmin packAdmin;
 
@@ -41,7 +41,6 @@
       this.packAdmin = packAdmin;
    }
 
-   @Override
    public void refreshPackages(OSGiBundle[] bundles)
    {
       Bundle[] bundleArr = null;

Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemotePackageAdmin.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemotePackageAdmin.java	2009-05-28 21:25:40 UTC (rev 89502)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemotePackageAdmin.java	2009-05-28 21:36:58 UTC (rev 89503)
@@ -32,7 +32,7 @@
  * @author Thomas.Diesler at jboss.org
  * @since 25-Sep-2008
  */
-public class RemotePackageAdmin extends OSGiPackageAdmin
+public class RemotePackageAdmin implements OSGiPackageAdmin
 {
    private RemoteRuntime runtime;
 
@@ -41,7 +41,6 @@
       this.runtime = runtime;
    }
 
-   @Override
    public void refreshPackages(OSGiBundle[] bundles)
    {
       String[] bundleArr = null;