Author: mvw
Date: 2007-07-14 02:13:07-0700
New Revision: 13068
Modified:
trunk/src_new/org/argouml/i18n/critics.properties
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/CrMissingClassName.java
trunk/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java
Log:
Fix for issue 618: Critics shall have unique headlines.
Modified: trunk/src_new/org/argouml/i18n/critics.properties
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/i18n/critics.properties?view=diff&rev=13068&p1=trunk/src_new/org/argouml/i18n/critics.properties&p2=trunk/src_new/org/argouml/i18n/critics.properties&r1=13067&r2=13068
==============================================================================
--- trunk/src_new/org/argouml/i18n/critics.properties (original)
+++ trunk/src_new/org/argouml/i18n/critics.properties 2007-07-14 02:13:07-0700
@@ -224,8 +224,12 @@
highlighted element and use the Properties tab to give it a different \
name.
critics.CrIllegalName-head = Choose a Legal Name for <ocl>self</ocl>
-critics.CrInstanceWithoutClassifier-desc = Instances have a classifier
-critics.CrInstanceWithoutClassifier-head = Set Classifier
+critics.CrInstanceWithoutClassifier-desc = Instances are connected to \
+ at least one Classifier that declares their structure and behavior.\
+ \n\nTo address this, manually select the \
+ highlighted element and use the Properties tab to add \
+ at least one Classifier.
+critics.CrInstanceWithoutClassifier-head = Set Classifier for Instance
critics.CrInterfaceAllPublic-desc = Interfaces are intended to specify the set \
of operations that other classes must implement. They must be public. \
\n\nA well-designed set of interfaces is a good way to define the \
@@ -275,14 +279,14 @@
is needed to complete the behavioral specification part of your \
design. \n\nTo fix this, remove transitions by clicking on transition \
in the diagram and pressing the \"Ctrl-Delete\" key.
-critics.CrInvalidHistory-head = Remove Extra Outgoing Transitions
+critics.CrInvalidHistory-head = Remove Extra Outgoing Transitions for History State
critics.CrInvalidInitial-desc = This Initial state has an invalid number of \
transitions. Normally Initial states have at most one outgoing \
transition. \n\nDefining correct state transitions is needed to \
complete the behavioral specification part of your design. \n\nTo \
fix this, remove transitions by clicking on transition in the diagram \
and pressing the \"Ctrl-Delete\" key.
-critics.CrInvalidInitial-head = Remove Extra Outgoing Transitions
+critics.CrInvalidInitial-head = Remove Extra Outgoing Transitions for Initial State
critics.CrInvalidJoin-desc = This join state has an invalid number of \
transitions. Normally join states have two or more incoming and one \
outgoing transitions. \n\nDefining correct state transitions is needed \
@@ -348,24 +352,25 @@
and unambiguous naming is a key element in code generation and serves \
to make the design more understandable and maintainable. \n\nTo \
address this, use the \"Next>\" button, or manually select the \
- \nattribute and use the Properties tab to give it a name.
-critics.CrMissingAttrName-head = Choose a Name
+ attribute and use the Properties tab to give it a name.
+critics.CrMissingAttrName-head = Choose an Attribute Name
critics.CrMissingAttrName-ins = Set the name of this attribute.
critics.CrMissingAttrName-sug = AttributeName
-critics.CrMissingClassName-desc = Every class and interface within a package \
+critics.CrMissingClassName-desc = Every element within a package \
+ (such as class, interface, actor, usecase, etc.) \
must have a name. \n\nClear and unambiguous naming is a key element in \
code generation and serves to make the design more understandable and \
maintainable. \n\nTo address this, use the \"Next>\" button, or \
manually select the class and use the Properties tab to give it a name.
critics.CrMissingClassName-head = Choose a Name
-critics.CrMissingClassName-ins = Set the name of this class.
+critics.CrMissingClassName-ins = Set the name of this element.
critics.CrMissingClassName-sug = ClassName
critics.CrMissingOperName-desc = Every operation must have a name. \n\nClear \
and unambiguous naming is a key element in code generation and serves \
to make the design more understandable and maintainable. \n\nTo \
address this, use the \"Next>\" button, or manually select the \
- \noperation and use the Properties tab to give it a name.
-critics.CrMissingOperName-head = Choose a Name
+ operation and use the Properties tab to give it a name.
+critics.CrMissingOperName-head = Choose a Operation Name
critics.CrMissingOperName-ins = Set the name of this attribute.
critics.CrMissingOperName-sug = AttributeName
critics.CrMissingStateName-desc = Every state within a state machine should \
@@ -374,7 +379,7 @@
maintainable. \n\nTo address this, use the \"Next>\" button, or \
manually select the state and use the Properties tab to give it a \
name, or select the state and type a name.
-critics.CrMissingStateName-head = Choose a Name
+critics.CrMissingStateName-head = Choose a State Name
critics.CrMissingStateName-ins = Set the name of this state.
critics.CrMissingStateName-sug = StateName
critics.CrMultiComposite-desc = An instance may not belong by composition to \
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=13068&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidHistory.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidHistory.java&r1=13067&r2=13068
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidHistory.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidHistory.java 2007-07-14 02:13:07-0700
@@ -31,7 +31,8 @@
import org.argouml.uml.cognitive.UMLDecision;
/**
- * UML 1.5 Well-formedness rule [2] for Pseudostates.
+ * UML 1.5 Well-formedness rule [2] for Pseudostates: <p>
+ * History vertices can have at most one outgoing transition.
*
* @author [email protected]
*/
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=13068&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidInitial.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidInitial.java&r1=13067&r2=13068
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidInitial.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrInvalidInitial.java 2007-07-14 02:13:07-0700
@@ -33,8 +33,10 @@
/**
* A critic to detect when an initial state has more than one
- * outgoing transitions. Implements a constraint from the UML
- * 1.1 standard: page 10, Pseudostate [1].
+ * outgoing transitions.
+ * Implements the first part of a well-formedness rule from the UML
+ * 1.4.2 standard: Pseudostate [1]:<p>
+ * An initial vertex can have at most one outgoing transition (...).
*
* @author jrobbins
*/
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrMissingClassName.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrMissingClassName.java?view=diff&rev=13068&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrMissingClassName.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrMissingClassName.java&r1=13067&r2=13068
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrMissingClassName.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrMissingClassName.java 2007-07-14 02:13:07-0700
@@ -34,8 +34,7 @@
import org.argouml.uml.cognitive.UMLDecision;
/**
- * Well-formedness rule [1] for Namespace. See page 33 of UML 1.1
- * Semantics. OMG document ad/97-08-04.
+ * This critics tests if a ModelElement has a name.
*/
public class CrMissingClassName extends CrUML {
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java?view=diff&rev=13068&p1=trunk/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java&r1=13067&r2=13068
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java 2007-07-14 02:13:07-0700
@@ -317,6 +317,7 @@
Agency.register(crNavFromInterface, assocCls);
Agency.register(crNameConflictAC, assocClassCls);
Agency.register(clsNaming, classCls);
+ Agency.register(clsNaming, interfaceCls);
Agency.register(clsNaming, actorCls);
Agency.register(clsNaming, useCaseCls);
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.