[jboss-cvs] JBossAS SVN: r93465 - in projects/jboss-cl/branches/Branch_2_0: classloading/src/main/java/org/jboss/classloading/spi/dependency and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Sep 14 08:07:23 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-09-14 08:07:23 -0400 (Mon, 14 Sep 2009)
New Revision: 93465
Modified:
projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/support/TestCapability.java
projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/plugins/metadata/ModuleCapability.java
projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/plugins/metadata/PackageCapability.java
projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/Domain.java
projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/metadata/Capability.java
projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/metadata/xml/support/TestCapability.java
Log:
Restore signature on Capability.resolve()
Modified: projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/plugins/metadata/ModuleCapability.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/plugins/metadata/ModuleCapability.java 2009-09-14 11:22:36 UTC (rev 93464)
+++ projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/plugins/metadata/ModuleCapability.java 2009-09-14 12:07:23 UTC (rev 93465)
@@ -67,7 +67,7 @@
super(name, version);
}
- public boolean resolves(Module capModule, Module reqModule, Requirement requirement)
+ public boolean resolves(Module reqModule, Requirement requirement)
{
if (requirement instanceof ModuleRequirement == false)
return false;
Modified: projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/plugins/metadata/PackageCapability.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/plugins/metadata/PackageCapability.java 2009-09-14 11:22:36 UTC (rev 93464)
+++ projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/plugins/metadata/PackageCapability.java 2009-09-14 12:07:23 UTC (rev 93465)
@@ -115,7 +115,7 @@
this.splitPolicy = policy;
}
- public boolean resolves(Module capModule, Module reqModule, Requirement requirement)
+ public boolean resolves(Module reqModule, Requirement requirement)
{
if (requirement instanceof PackageRequirement == false)
return false;
Modified: projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/Domain.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/Domain.java 2009-09-14 11:22:36 UTC (rev 93464)
+++ projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/Domain.java 2009-09-14 12:07:23 UTC (rev 93465)
@@ -253,7 +253,7 @@
{
for (Capability capability : capabilities)
{
- if (capability.resolves(other, module, requirement))
+ if (capability.resolves(module, requirement))
{
if (firstMatch != null)
{
Modified: projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/metadata/Capability.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/metadata/Capability.java 2009-09-14 11:22:36 UTC (rev 93464)
+++ projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/metadata/Capability.java 2009-09-14 12:07:23 UTC (rev 93465)
@@ -36,12 +36,11 @@
{
/**
* Whether this capability resolves the requirement
- *
- * @param capModule the capability module
* @param reqModule the requirement module
* @param requirement the requirement
+ *
* @throws IllegalArgumentException for a null requirement
* @return true when it is resolves the requirement
*/
- boolean resolves(Module capModule, Module reqModule, Requirement requirement);
+ boolean resolves(Module reqModule, Requirement requirement);
}
Modified: projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/metadata/xml/support/TestCapability.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/metadata/xml/support/TestCapability.java 2009-09-14 11:22:36 UTC (rev 93464)
+++ projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/metadata/xml/support/TestCapability.java 2009-09-14 12:07:23 UTC (rev 93465)
@@ -44,7 +44,7 @@
super(name, version);
}
- public boolean resolves(Module capModule, Module reqModule, Requirement requirement)
+ public boolean resolves(Module reqModule, Requirement requirement)
{
return false;
}
Modified: projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/support/TestCapability.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/support/TestCapability.java 2009-09-14 11:22:36 UTC (rev 93464)
+++ projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/support/TestCapability.java 2009-09-14 12:07:23 UTC (rev 93465)
@@ -44,7 +44,7 @@
super(name, version);
}
- public boolean resolves(Module capModule, Module reqModule, Requirement requirement)
+ public boolean resolves(Module reqModule, Requirement requirement)
{
return false;
}
More information about the jboss-cvs-commits
mailing list