knut 2004/07/11 09:12:59
Modified: framework/src/java/org/apache/hivemind/order
ObjectOrdering.java
framework/src/test/org/apache/hivemind/order
TestOrderer.java
Log:
PR: HIVEMIND-6
Revision Changes Path
1.3 +2 -3
jakarta-hivemind/framework/src/java/org/apache/hivemind/order/ObjectOrdering.java
Index: ObjectOrdering.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/order/ObjectOrdering.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ObjectOrdering.java 5 Jun 2004 19:09:13 -0000 1.2
+++ ObjectOrdering.java 11 Jul 2004 16:12:59 -0000 1.3
@@ -16,7 +16,7 @@
/**
* Used by an [EMAIL PROTECTED] org.apache.hivemind.order.Orderer} to
organize
- * a single object and pre- and post-requisites.
+ * a single object and its pre- and post-requisites.
*
* @author Howard Lewis Ship
*/
@@ -29,7 +29,6 @@
ObjectOrdering(Object object, String name, String prereqs, String
postreqs)
{
-
_object = object;
_name = name;
_prereqs = prereqs;
@@ -39,8 +38,8 @@
public String getName()
{
return _name;
-
}
+
public Object getObject()
{
return _object;
1.6 +2 -6
jakarta-hivemind/framework/src/test/org/apache/hivemind/order/TestOrderer.java
Index: TestOrderer.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/order/TestOrderer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestOrderer.java 21 Jun 2004 14:25:44 -0000 1.5
+++ TestOrderer.java 11 Jul 2004 16:12:59 -0000 1.6
@@ -25,10 +25,6 @@
import org.easymock.AbstractMatcher;
import org.easymock.MockControl;
-import com.werken.werkz.CyclicGoalChainException;
-import com.werken.werkz.Goal;
-import com.werken.werkz.WerkzException;
-
/**
* Tests for the [EMAIL PROTECTED] org.apache.hivemind.order.Orderer}.
*
@@ -181,7 +177,7 @@
"Unable to order cartoon character 'wilma' due to dependency
cycle:"
+ " A cycle has been detected from the initial goal [wilma]",
null,
- new CyclicGoalChainException(new Goal("")));
+ new RuntimeException());
c.setMatcher(new ExceptionAwareArgumentsMatcher());
@@ -210,7 +206,7 @@
LOG,
"Unable to order cartoon character 'betty' due to dependency
cycle: A cycle has been detected from the initial goal [fred]",
null,
- new CyclicGoalChainException(new Goal("")));
+ new RuntimeException());
c.setMatcher(new ExceptionAwareArgumentsMatcher());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
