svn commit: r16650 - trunk/src/argouml-app/src/org/argouml/notation/providers/uml

Author: mvw
Date: 2009-01-18 06:09:08-0800
New Revision: 16650

Modified:
   trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AbstractMessageNotationUml.java
   trunk/src/argouml-app/src/org/argouml/notation/providers/uml/MessageNotationUml.java
   trunk/src/argouml-app/src/org/argouml/notation/providers/uml/SDMessageNotationUml.java

Log:
Do not give the same comment trice.

Modified: trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AbstractMessageNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AbstractMessageNotationUml.java?view=diff&pathrev=16650&r1=16649&r2=16650
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AbstractMessageNotationUml.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AbstractMessageNotationUml.java	2009-01-18 06:09:08-0800
@@ -51,7 +51,8 @@
  * and {@link SDMessageNotationUml}, with the notation of 
  * messages as seen in sequence diagrams.<p>
  * 
- * Parses a message line of the form:
+ * The Message notation syntax is a line of the following form,
+ * which we can generate and parse: <p>
  *
  * <pre>
  * intno := integer|name

Modified: trunk/src/argouml-app/src/org/argouml/notation/providers/uml/MessageNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/notation/providers/uml/MessageNotationUml.java?view=diff&pathrev=16650&r1=16649&r2=16650
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/notation/providers/uml/MessageNotationUml.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/notation/providers/uml/MessageNotationUml.java	2009-01-18 06:09:08-0800
@@ -30,43 +30,8 @@
 import org.argouml.notation.NotationSettings;
 
 /**
- * The UML notation for a message, as shown on a collaboration diagram. <p>
- *
- * The Message notation syntax is a line of the following form,
- * which we can generate and parse: <p>
- *
- * <pre>
- * intno := integer|name
- * seq := intno ['.' intno]*
- * recurrence := '*'['//'] 
- *      | '*'['//']'[' <code>iteration </code>']' 
- *      | '['<code>condition </code>']'
- * seqelem := {[intno] ['['recurrence']']}
- * seq_expr := seqelem ['.' seqelem]*
- * ret_list := lvalue [',' lvalue]*
- * arg_list := rvalue [',' rvalue]*
- * predecessor := seq [',' seq]* '/'
- * message := [predecessor] seq_expr ':' [ret_list :=] name ([arg_list])
- * </pre> <p>
- *
- * Which is rather complex, so a few examples:<p><ul>
- * <li> 2: display(x, y)
- * <li> 1.3.1: p := find(specs)
- * <li> [x &lt; 0] 4: invert(color)
- * <li> A3, B4/ C3.1*: update()
- * </ul><p>
- *
- * This syntax is compatible with the UML 1.4.2 specification.<p>
+ * The UML notation for a message, as shown on a collaboration diagram. 
  * 
- * TODO: The '//' in the recurrence should be '||' according the standard.
-See issue 5606. <p>
- *
- * Actually, only a subset of this syntax is currently supported, and some
- * is not even planned to be supported. The exceptions are intno, which
- * allows a number possibly followed by a sequence of letters in the range
- * 'a' - 'z', seqelem, which does not allow a recurrence, and message, which
- * does allow one recurrence near seq_expr. (formerly: name: action )
- *
  * @author michiel
  */
 public class MessageNotationUml extends AbstractMessageNotationUml {

Modified: trunk/src/argouml-app/src/org/argouml/notation/providers/uml/SDMessageNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/notation/providers/uml/SDMessageNotationUml.java?view=diff&pathrev=16650&r1=16649&r2=16650
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/notation/providers/uml/SDMessageNotationUml.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/notation/providers/uml/SDMessageNotationUml.java	2009-01-18 06:09:08-0800
@@ -31,38 +31,7 @@
 import org.argouml.notation.SDNotationSettings;
 
 /**
- * The UML notation for a message, as shown on a sequence diagram. <p>
- *
- * The Message notation syntax is a line of the following form,
- * which we can generate and parse: <p>
- * 
- * <pre>
- * intno := integer|name
- * seq := intno ['.' intno]*
- * recurrence := '*'['//'] | '*'['//']'[' <code>iteration </code>']' | '['
- * <code>condition </code>']'
- * seqelem := {[intno] ['['recurrence']']}
- * seq_expr := seqelem ['.' seqelem]*
- * ret_list := lvalue [',' lvalue]*
- * arg_list := rvalue [',' rvalue]*
- * predecessor := seq [',' seq]* '/'
- * message := [predecessor] seq_expr ':' [ret_list :=] name ([arg_list])
- * </pre> <p>
- *
- * Which is rather complex, so a few examples:<p><ul>
- * <li> 2: display(x, y)
- * <li> 1.3.1: p := find(specs)
- * <li> [x &lt; 0] 4: invert(color)
- * <li> A3, B4/ C3.1*: update()
- * </ul><p>
- *
- * This syntax is compatible with the UML 1.4.2 specification.<p>
- *
- * Actually, only a subset of this syntax is currently supported, and some
- * is not even planned to be supported. The exceptions are intno, which
- * allows a number possibly followed by a sequence of letters in the range
- * 'a' - 'z', seqelem, which does not allow a recurrence, and message, which
- * does allow one recurrence near seq_expr. (formerly: name: action )
+ * The UML notation for a message, as shown on a sequence diagram.
  *
  * @author michiel
  */

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=1032671

To unsubscribe from this discussion, e-mail: [[email protected]].