Author: tfmorris
Date: 2007-05-04 12:03:33-0700
New Revision: 12537
Modified:
trunk/src_new/org/argouml/uml/cognitive/critics/CrForkOutgoingTransition.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidBranch.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidFork.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidForkTriggerOrGuard.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidHistory.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidInitial.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidJoin.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidJoinTriggerOrGuard.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidPseudoStateTrigger.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrJoinIncomingTransition.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrMultipleDeepHistoryStates.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrMultipleInitialStates.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrMultipleShallowHistoryStates.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrNoGuard.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrNoIncomingTransitions.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrNoOutgoingTransitions.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrNoTransitions.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrNoTriggerOrGuard.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelPseudostate.java
Log:
Deprecate getPseudostateKind as requested in TODO
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrForkOutgoingTransition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrForkOutgoingTransition.java?view=diff&rev=12537&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrForkOutgoingTransition.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrForkOutgoingTransition.java&r1=12536&r2=12537
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrForkOutgoingTransition.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrForkOutgoingTransition.java 2007-05-04 12:03:33-0700
@@ -54,14 +54,12 @@
Object target = Model.getFacade().getTarget(tr);
Object source = Model.getFacade().getSource(tr);
if (!(Model.getFacade().isAPseudostate(source))) return NO_PROBLEM;
- if (!Model
- .getFacade()
- .equalsPseudostateKind(Model
- .getFacade().getPseudostateKind(source),
- Model.getPseudostateKind().getFork()))
+ if (!Model.getFacade().equalsPseudostateKind(
+ Model.getFacade().getKind(source),
+ Model.getPseudostateKind().getFork()))
return NO_PROBLEM;
if (Model.getFacade().isAState(target)) return NO_PROBLEM;
return PROBLEM_FOUND;
}
-} /* end class CrForkOutgoingTransition */
\ No newline at end of file
+}
\ No newline at end of file
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidBranch.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidBranch.java?view=diff&rev=12537&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidBranch.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidBranch.java&r1=12536&r2=12537
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidBranch.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidBranch.java 2007-05-04 12:03:33-0700
@@ -59,19 +59,15 @@
addTrigger("incoming");
}
- /**
- * This is the decision routine for the critic.
- *
- * @param dm is the UML entity that is being checked.
- * @param dsgr is for future development and can be ignored.
- *
- * @return boolean problem found
+
+ /*
+ * @see org.argouml.uml.cognitive.critics.CrUML#predicate2(java.lang.Object, org.argouml.cognitive.Designer)
*/
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAPseudostate(dm))) {
return NO_PROBLEM;
}
- Object k = Model.getFacade().getPseudostateKind(dm);
+ Object k = Model.getFacade().getKind(dm);
if ((!Model.getFacade().equalsPseudostateKind(k,
Model.getPseudostateKind().getChoice()))
&& (!Model.getFacade().equalsPseudostateKind(k,
@@ -91,5 +87,5 @@
return NO_PROBLEM;
}
-} /* end class CrInvalidBranch */
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidFork.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidFork.java?view=diff&rev=12537&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidFork.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidFork.java&r1=12536&r2=12537
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidFork.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidFork.java 2007-05-04 12:03:33-0700
@@ -56,7 +56,7 @@
if (!(Model.getFacade().isAPseudostate(dm))) {
return NO_PROBLEM;
}
- Object k = Model.getFacade().getPseudostateKind(dm);
+ Object k = Model.getFacade().getKind(dm);
if (!Model.getFacade().equalsPseudostateKind(
k,
Model.getPseudostateKind().getFork())) {
@@ -75,5 +75,5 @@
return NO_PROBLEM;
}
-} /* end class CrInvalidFork */
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidForkTriggerOrGuard.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidForkTriggerOrGuard.java?view=diff&rev=12537&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidForkTriggerOrGuard.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidForkTriggerOrGuard.java&r1=12536&r2=12537
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidForkTriggerOrGuard.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidForkTriggerOrGuard.java 2007-05-04 12:03:33-0700
@@ -61,7 +61,7 @@
if (!(Model.getFacade().isAPseudostate(sv))) {
return NO_PROBLEM;
}
- Object k = Model.getFacade().getPseudostateKind(sv);
+ Object k = Model.getFacade().getKind(sv);
if (!Model.getFacade().
equalsPseudostateKind(k,
Model.getPseudostateKind().getFork())) {
@@ -89,4 +89,4 @@
* The UID.
*/
private static final long serialVersionUID = -713044875133409390L;
-} /* end class CrInvalidForkTriggerOrGuard */
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidHistory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidHistory.java?view=diff&rev=12537&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidHistory.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidHistory.java&r1=12536&r2=12537
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidHistory.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidHistory.java 2007-05-04 12:03:33-0700
@@ -52,7 +52,7 @@
*/
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAPseudostate(dm))) return NO_PROBLEM;
- Object k = Model.getFacade().getPseudostateKind(dm);
+ Object k = Model.getFacade().getKind(dm);
if (!Model.getFacade().equalsPseudostateKind(k,
Model.getPseudostateKind().getDeepHistory())
&& !Model.getFacade().equalsPseudostateKind(k,
@@ -64,5 +64,5 @@
return NO_PROBLEM;
}
-} /* end class CrInvalidHistory */
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidInitial.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidInitial.java?view=diff&rev=12537&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidInitial.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidInitial.java&r1=12536&r2=12537
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidInitial.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidInitial.java 2007-05-04 12:03:33-0700
@@ -57,7 +57,7 @@
if (!(Model.getFacade().isAPseudostate(dm))) {
return NO_PROBLEM;
}
- Object k = Model.getFacade().getPseudostateKind(dm);
+ Object k = Model.getFacade().getKind(dm);
if (!Model.getFacade().equalsPseudostateKind(
k,
Model.getPseudostateKind().getInitial())) {
@@ -71,5 +71,5 @@
return NO_PROBLEM;
}
-} /* end class CrInvalidInitial */
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidJoin.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidJoin.java?view=diff&rev=12537&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidJoin.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidJoin.java&r1=12536&r2=12537
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidJoin.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidJoin.java 2007-05-04 12:03:33-0700
@@ -57,10 +57,9 @@
if (!(Model.getFacade().isAPseudostate(dm))) {
return NO_PROBLEM;
}
- Object k = Model.getFacade().getPseudostateKind(dm);
- if (!Model.getFacade().
- equalsPseudostateKind(k,
- Model.getPseudostateKind().getJoin())) {
+ Object k = Model.getFacade().getKind(dm);
+ if (!Model.getFacade().equalsPseudostateKind(k,
+ Model.getPseudostateKind().getJoin())) {
return NO_PROBLEM;
}
Collection outgoing = Model.getFacade().getOutgoings(dm);
@@ -76,5 +75,5 @@
return NO_PROBLEM;
}
-} /* end class CrInvalidJoin */
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidJoinTriggerOrGuard.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidJoinTriggerOrGuard.java?view=diff&rev=12537&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidJoinTriggerOrGuard.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidJoinTriggerOrGuard.java&r1=12536&r2=12537
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidJoinTriggerOrGuard.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidJoinTriggerOrGuard.java 2007-05-04 12:03:33-0700
@@ -61,8 +61,8 @@
return NO_PROBLEM;
}
- // WFR Transitions, OMG UML 1.3
- Object k = Model.getFacade().getPseudostateKind(dv);
+ // WFR Transitions, OMG UML 1.3
+ Object k = Model.getFacade().getKind(dv);
if (!Model.getFacade().
equalsPseudostateKind(k,
Model.getPseudostateKind().getJoin())) {
@@ -92,4 +92,4 @@
* The UID.
*/
private static final long serialVersionUID = 1052354516940735748L;
-} /* end class CrInvalidJoinTriggerOrGuard */
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidPseudoStateTrigger.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidPseudoStateTrigger.java?view=diff&rev=12537&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidPseudoStateTrigger.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidPseudoStateTrigger.java&r1=12536&r2=12537
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidPseudoStateTrigger.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidPseudoStateTrigger.java 2007-05-04 12:03:33-0700
@@ -54,7 +54,7 @@
Object t = Model.getFacade().getTrigger(tr);
Object sv = Model.getFacade().getSource(tr);
if (!(Model.getFacade().isAPseudostate(sv))) return NO_PROBLEM;
- Object k = Model.getFacade().getPseudostateKind(sv);
+ Object k = Model.getFacade().getKind(sv);
//Forks have their own outgoing transitions critic
if (Model.getFacade().
equalsPseudostateKind(k,
@@ -67,4 +67,4 @@
return NO_PROBLEM;
}
-} /* end class CrInvalidPseudoStateTrigger */
\ No newline at end of file
+}
\ No newline at end of file
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrJoinIncomingTransition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrJoinIncomingTransition.java?view=diff&rev=12537&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrJoinIncomingTransition.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrJoinIncomingTransition.java&r1=12536&r2=12537
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrJoinIncomingTransition.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrJoinIncomingTransition.java 2007-05-04 12:03:33-0700
@@ -54,14 +54,12 @@
Object target = Model.getFacade().getTarget(tr);
Object source = Model.getFacade().getSource(tr);
if (!(Model.getFacade().isAPseudostate(target))) return NO_PROBLEM;
- if (!Model
- .getFacade()
- .equalsPseudostateKind(Model.getFacade()
- .getPseudostateKind(target),
- Model.getPseudostateKind().getJoin()))
+ if (!Model.getFacade().equalsPseudostateKind(
+ Model.getFacade().getKind(target),
+ Model.getPseudostateKind().getJoin()))
return NO_PROBLEM;
if (Model.getFacade().isAState(source)) return NO_PROBLEM;
return PROBLEM_FOUND;
}
-} /* end class CrJoinIncomingTransition */
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrMultipleDeepHistoryStates.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrMultipleDeepHistoryStates.java?view=diff&rev=12537&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrMultipleDeepHistoryStates.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrMultipleDeepHistoryStates.java&r1=12536&r2=12537
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrMultipleDeepHistoryStates.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrMultipleDeepHistoryStates.java 2007-05-04 12:03:33-0700
@@ -65,10 +65,9 @@
if (!(Model.getFacade().isAPseudostate(dm))) {
return NO_PROBLEM;
}
- Object k = Model.getFacade().getPseudostateKind(dm);
- if (!Model.getFacade()
- .equalsPseudostateKind(k,
- Model.getPseudostateKind().getDeepHistory())) {
+ Object k = Model.getFacade().getKind(dm);
+ if (!Model.getFacade().equalsPseudostateKind(k,
+ Model.getPseudostateKind().getDeepHistory())) {
return NO_PROBLEM;
}
@@ -84,7 +83,7 @@
Object sv = iter.next();
if (Model.getFacade().isAPseudostate(sv)
&& Model.getFacade().equalsPseudostateKind(
- Model.getFacade().getPseudostateKind(sv),
+ Model.getFacade().getKind(sv),
Model.getPseudostateKind().getDeepHistory())) {
initialStateCount++;
}
@@ -120,7 +119,7 @@
Object sv = iter.next();
if (Model.getFacade().isAPseudostate(sv)
&& Model.getFacade().equalsPseudostateKind(
- Model.getFacade().getPseudostateKind(sv),
+ Model.getFacade().getKind(sv),
Model.getPseudostateKind().getDeepHistory())) {
offs.addElement(sv);
}
@@ -147,5 +146,5 @@
* The UID.
*/
private static final long serialVersionUID = -4893102976661022514L;
-} /* end class CrMultipleDeepHistoryStates */
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrMultipleInitialStates.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrMultipleInitialStates.java?view=diff&rev=12537&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrMultipleInitialStates.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrMultipleInitialStates.java&r1=12536&r2=12537
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrMultipleInitialStates.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrMultipleInitialStates.java 2007-05-04 12:03:33-0700
@@ -65,7 +65,7 @@
if (!(Model.getFacade().isAPseudostate(dm))) {
return NO_PROBLEM;
}
- Object k = Model.getFacade().getPseudostateKind(dm);
+ Object k = Model.getFacade().getKind(dm);
if (!Model.getFacade().equalsPseudostateKind(
k,
Model.getPseudostateKind().getInitial())) {
@@ -85,7 +85,7 @@
if (Model.getFacade().isAPseudostate(sv)
&& Model.getFacade().
equalsPseudostateKind(
- Model.getFacade().getPseudostateKind(sv),
+ Model.getFacade().getKind(sv),
Model.getPseudostateKind().getInitial())) {
initialStateCount++;
}
@@ -122,7 +122,7 @@
Object sv = iter.next();
if (Model.getFacade().isAPseudostate(sv)
&& Model.getFacade().equalsPseudostateKind(
- Model.getFacade().getPseudostateKind(sv),
+ Model.getFacade().getKind(sv),
Model.getPseudostateKind().getInitial())) {
offs.addElement(sv);
}
@@ -150,5 +150,5 @@
* The UID.
*/
private static final long serialVersionUID = 4151051235876065649L;
-} /* end class CrMultipleInitialStates */
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrMultipleShallowHistoryStates.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrMultipleShallowHistoryStates.java?view=diff&rev=12537&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrMultipleShallowHistoryStates.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrMultipleShallowHistoryStates.java&r1=12536&r2=12537
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrMultipleShallowHistoryStates.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrMultipleShallowHistoryStates.java 2007-05-04 12:03:33-0700
@@ -65,7 +65,7 @@
if (!(Model.getFacade().isAPseudostate(dm))) {
return NO_PROBLEM;
}
- Object k = Model.getFacade().getPseudostateKind(dm);
+ Object k = Model.getFacade().getKind(dm);
if (!Model.getFacade()
.equalsPseudostateKind(k,
Model.getPseudostateKind().getShallowHistory())) {
@@ -84,7 +84,7 @@
Object sv = iter.next();
if (Model.getFacade().isAPseudostate(sv)
&& Model.getFacade().equalsPseudostateKind(
- Model.getFacade().getPseudostateKind(sv),
+ Model.getFacade().getKind(sv),
Model.getPseudostateKind().getShallowHistory())) {
initialStateCount++;
}
@@ -120,7 +120,7 @@
Object sv = iter.next();
if (Model.getFacade().isAPseudostate(sv)
&& Model.getFacade().equalsPseudostateKind(
- Model.getFacade().getPseudostateKind(sv),
+ Model.getFacade().getKind(sv),
Model.getPseudostateKind().getShallowHistory())) {
offs.addElement(sv);
}
@@ -147,5 +147,5 @@
* The UID.
*/
private static final long serialVersionUID = -8324054401013865193L;
-} /* end class CrMultipleShallowHistoryStates */
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrNoGuard.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrNoGuard.java?view=diff&rev=12537&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrNoGuard.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrNoGuard.java&r1=12536&r2=12537
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrNoGuard.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrNoGuard.java 2007-05-04 12:03:33-0700
@@ -63,7 +63,7 @@
}
/* the source of the transition is a pseudostate */
if (!Model.getFacade().equalsPseudostateKind(
- Model.getFacade().getPseudostateKind(sourceVertex),
+ Model.getFacade().getKind(sourceVertex),
Model.getPseudostateKind().getChoice())) {
return NO_PROBLEM;
}
@@ -83,4 +83,4 @@
return NO_PROBLEM;
}
-} /* end class CrNoGuard */
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrNoIncomingTransitions.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrNoIncomingTransitions.java?view=diff&rev=12537&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrNoIncomingTransitions.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrNoIncomingTransitions.java&r1=12536&r2=12537
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrNoIncomingTransitions.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrNoIncomingTransitions.java 2007-05-04 12:03:33-0700
@@ -66,7 +66,7 @@
}
}
if (Model.getFacade().isAPseudostate(sv)) {
- Object k = Model.getFacade().getPseudostateKind(sv);
+ Object k = Model.getFacade().getKind(sv);
if (k.equals(Model.getPseudostateKind().getChoice())) {
return NO_PROBLEM;
}
@@ -90,4 +90,4 @@
return NO_PROBLEM;
}
-} /* end class CrNoIncomingTransitions */
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrNoOutgoingTransitions.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrNoOutgoingTransitions.java?view=diff&rev=12537&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrNoOutgoingTransitions.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrNoOutgoingTransitions.java&r1=12536&r2=12537
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrNoOutgoingTransitions.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrNoOutgoingTransitions.java 2007-05-04 12:03:33-0700
@@ -46,13 +46,8 @@
addTrigger("outgoing");
}
- /**
- * This is the decision routine for the critic.
- *
- * @param dm is the UML entity that is being checked.
- * @param dsgr is for future development and can be ignored.
- *
- * @return boolean problem found
+ /*
+ * @see org.argouml.uml.cognitive.critics.CrUML#predicate2(java.lang.Object, org.argouml.cognitive.Designer)
*/
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAStateVertex(dm))) {
@@ -66,7 +61,7 @@
}
}
if (Model.getFacade().isAPseudostate(sv)) {
- Object k = Model.getFacade().getPseudostateKind(sv);
+ Object k = Model.getFacade().getKind(sv);
if (k.equals(Model.getPseudostateKind().getChoice())) {
return NO_PROBLEM;
}
@@ -85,4 +80,4 @@
return NO_PROBLEM;
}
-} /* end class CrNoOutgoingTransitions */
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrNoTransitions.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrNoTransitions.java?view=diff&rev=12537&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrNoTransitions.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrNoTransitions.java&r1=12536&r2=12537
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrNoTransitions.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrNoTransitions.java 2007-05-04 12:03:33-0700
@@ -49,13 +49,9 @@
addTrigger("outgoing");
}
- /**
- * This is the decision routine for the critic.
- *
- * @param dm is the UML entity that is being checked.
- * @param dsgr is for future development and can be ignored.
- *
- * @return boolean problem found
+
+ /*
+ * @see org.argouml.uml.cognitive.critics.CrUML#predicate2(java.lang.Object, org.argouml.cognitive.Designer)
*/
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAStateVertex(dm))) {
@@ -73,7 +69,7 @@
boolean needsOutgoing = outgoing == null || outgoing.size() == 0;
boolean needsIncoming = incoming == null || incoming.size() == 0;
if (Model.getFacade().isAPseudostate(sv)) {
- Object k = Model.getFacade().getPseudostateKind(sv);
+ Object k = Model.getFacade().getKind(sv);
if (k.equals(Model.getPseudostateKind().getChoice())) {
return NO_PROBLEM;
}
@@ -94,4 +90,4 @@
return NO_PROBLEM;
}
-} /* end class CrNoTransitions */
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrNoTriggerOrGuard.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrNoTriggerOrGuard.java?view=diff&rev=12537&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrNoTriggerOrGuard.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrNoTriggerOrGuard.java&r1=12536&r2=12537
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrNoTriggerOrGuard.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrNoTriggerOrGuard.java 2007-05-04 12:03:33-0700
@@ -70,7 +70,7 @@
// WFR Transitions, OMG UML 1.3
- Object k = Model.getFacade().getPseudostateKind(target);
+ Object k = Model.getFacade().getKind(target);
if (Model.getFacade().
equalsPseudostateKind(k,
Model.getPseudostateKind().getJoin())) {
@@ -107,4 +107,4 @@
* The UID.
*/
private static final long serialVersionUID = -301548543890007262L;
-} /* end class CrNoTriggerOrGuard */
+}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelPseudostate.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelPseudostate.java?view=diff&rev=12537&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelPseudostate.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelPseudostate.java&r1=12536&r2=12537
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelPseudostate.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelPseudostate.java 2007-05-04 12:03:33-0700
@@ -74,7 +74,7 @@
public void refreshTarget() {
Object target = TargetManager.getInstance().getModelTarget();
if (Model.getFacade().isAPseudostate(target)) {
- Object kind = Model.getFacade().getPseudostateKind(target);
+ Object kind = Model.getFacade().getKind(target);
if (Model.getFacade().equalsPseudostateKind(kind,
Model.getPseudostateKind().getFork())) {
getTitleLabel().setText(
@@ -149,4 +149,4 @@
}
}
-} /* end class PropPanelPseudostate */
+}
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.