Login | Register
My pages Projects Community openCollabNet

Discussions > Commits > svn commit: r83 - branches/NewFeatures/SequenceDiagram/src: argouml-app argouml-app/src/org/argouml/application argouml-app/src/org/argouml/moduleloader argouml-app/src/org/argouml/ui/cmd argouml-app/src/org/argouml/ui/explorer argouml-app/src/org/argouml/ui/explorer/rules argouml-app/src/org/argouml/uml/cognitive/critics argouml-app/src/org/argouml/uml/diagram argouml-app/src/org/argouml/uml/diagram/sequence argouml-app/src/org/argouml/uml/diagram/sequence/ui argouml-app/src/org/argouml/uml/diagram/ui argouml-app/src/org/argouml/uml/ui argouml-core-diagrams-sequence2 argouml-core-diagrams-sequence2/src/org/argouml/sequence2 argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram argouml-core-diagrams-sequence2/tests/org/argouml/sequence2/diagram argouml-core-model argouml-core-model-euml argouml-core-model-mdr argouml-core-model/src/org/argouml/model

argouml-spl
Discussion topic

Back to topic list

svn commit: r83 - branches/NewFeatures/SequenceDiagram/src: argouml-app argouml-app/src/org/argouml/application argouml-app/src/org/argouml/moduleloader argouml-app/src/org/argouml/ui/cmd argouml-app/src/org/argouml/ui/explorer argouml-app/src/org/argouml/ui/explorer/rules argouml-app/src/org/argouml/uml/cognitive/critics argouml-app/src/org/argouml/uml/diagram argouml-app/src/org/argouml/uml/diagram/sequence argouml-app/src/org/argouml/uml/diagram/sequence/ui argouml-app/src/org/argouml/uml/diagram/ui argouml-app/src/org/argouml/uml/ui argouml-core-diagrams-sequence2 argouml-core-diagrams-sequence2/src/org/argouml/sequence2 argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram argouml-core-diagrams-sequence2/tests/org/argouml/sequence2/diagram argouml-core-model argouml-core-model-euml argouml-core-model-mdr argouml-core-model/src/org/argouml/model

Author marcusvnac
Full name Marcus Vinícius de Ávila Couto
Date 2010-06-20 16:24:01 PDT
Message Author: marcusvnac
Date: 2010-06-20 16:23:57-0700
New Revision: 83

Modified:
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/build.x​ml
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/application​/Main.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/moduleloade​r/ModuleLoader2.java​
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/cmd/Gene​ricArgoMenuBar.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/cmd/Shor​tcutMgr.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/ExplorerPopup.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/PerspectiveManager.​java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/rules/GoClassifierT​oSequenceDiagram.jav​a
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/rules/GoCollaborati​onToDiagram.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/rules/GoNamespaceTo​Diagram.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/rules/GoOperationTo​SequenceDiagram.java​
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/cogniti​ve/critics/CrNodesOv​erlap.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/cogniti​ve/critics/CrSeqInst​anceWithoutClassifie​r.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/cogniti​ve/critics/ProfileGo​odPractices.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/DiagramFactory.java​
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/MessageNod​e.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/SequenceDi​agramGraphModel.java​
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/ActionA​ddClassifierRole.jav​a
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigActi​vation.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigBirt​hActivation.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigCall​ActionMessage.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigClas​sifierRole.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigCrea​teActionMessage.java​
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigDest​royActionMessage.jav​a
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigHead​.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigLife​Line.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigMess​age.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigMess​agePort.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigRetu​rnActionMessage.java​
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/InitSeq​uenceDiagram.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/ModeCha​ngeHeight.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/ModeCon​tract.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/ModeCre​ateMessage.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/ModeExp​and.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/PropPan​elUMLSequenceDiagram​.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/Selecti​onClassifierRole.jav​a
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/Selecti​onMessage.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/Sequenc​eDiagramLayer.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/Sequenc​eDiagramPropPanelFac​tory.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/Sequenc​eDiagramRenderer.jav​a
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/UMLSequ​enceDiagram.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/ui/ActionSetAddMess​ageMode.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/ui/Acti​onSequenceDiagram.ja​va
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/build.x​ml
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/S​equenceDiagramModule​.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/S​equenceDiagramPropPa​nelFactory.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/d​iagram/ActionAddClas​sifierRole.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/d​iagram/ActionSetAddM​essageMode.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/d​iagram/ActionSetOper​ation.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/d​iagram/FigActivation​.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/d​iagram/FigClassifier​Role.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/d​iagram/FigDestroy.ja​va
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/d​iagram/FigHead.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/d​iagram/FigLifeLine.j​ava
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/d​iagram/FigMessage.ja​va
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/d​iagram/FigMessageCom​parator.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/d​iagram/FigMessageSpl​ine.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/d​iagram/ModeBroomMess​ages.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/d​iagram/ModeCreateMes​sage.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/d​iagram/ModePlaceClas​sifierRole.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/d​iagram/SelectionClas​sifierRole.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/d​iagram/SelectionMess​age.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/d​iagram/SequenceDiagr​amFactory.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/d​iagram/SequenceDiagr​amGraphModel.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/d​iagram/SequenceDiagr​amRenderer.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/src/org​/argouml/sequence2/d​iagram/UMLSequenceDi​agram.java
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-diagra​ms-sequence2/tests/o​rg/argouml/sequence2​/diagram/TestSequenc​eDiagramFactory.java​
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-model-​euml/build.xml
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-model-​mdr/.project
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-model-​mdr/build.xml
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-model/​build.xml
   branches/NewFeatures​/SequenceDiagram/src​/argouml-core-model/​src/org/argouml/mode​l/SequenceDiagram.ja​va

Log:
SequenceDiagram (by camiloribeiro)

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/build.x​ml
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/build.xml?v​iew=diff&pathrev​=83&r1=82&r2​=83
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/build.x​ml (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/build.x​ml 2010-06-20 16:23:57-0700
@@ -727,6 +727,12 @@
         </then>
     </if>
     <if>
+ <isset property="SEQUENCEDIAGRAM"/>
+ <then>
+ <echo message="SEQUENCEDIAGRAM"/>
+ </then>
+ </if>
+ <if>
         <isset property="LOGGING"/>
         <then>
             <echo message="LOGGING"/>

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/application​/Main.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/application/Mai​n.java?view=diff​&pathrev=83&r1=8​2&r2=83
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/application​/Main.java (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/application​/Main.java 2010-06-20 16:23:57-0700
@@ -87,7 +87,10 @@
 //#endif
 import org.argouml.uml.diag​ram.collaboration.ui​.InitCollaborationDi​agram;
 import org.argouml.uml.diag​ram.deployment.ui.In​itDeploymentDiagram;​
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Import
 import org.argouml.uml.diag​ram.sequence.ui.Init​SequenceDiagram;
+//#endif
 //#if defined(UMLSTATEDIAGRAM)
 //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.diag​ram.state.ui.InitSta​teDiagram;
@@ -442,7 +445,10 @@
         //#endif
         SubsystemUtility.ini​tSubsystem(new InitCollaborationDiagram());
         SubsystemUtility.ini​tSubsystem(new InitDeploymentDiagram());
+ //#if defined(SEQUENCEDIAGRAM)
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
         SubsystemUtility.ini​tSubsystem(new InitSequenceDiagram());
+ //#endif
         //#if defined(UMLSTATEDIAGRAM)
         //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Command
         SubsystemUtility.ini​tSubsystem(new InitStateDiagram());

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/moduleloade​r/ModuleLoader2.java​
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/moduleloader/Mo​duleLoader2.java?vie​w=diff&pathrev=8​3&r1=82&r2=8​3
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/moduleloade​r/ModuleLoader2.java​ (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/moduleloade​r/ModuleLoader2.java​ 2010-06-20 16:23:57-0700
@@ -446,9 +446,10 @@
      * As the modules are found they are appended to {@link #moduleStatus}.<p>
      */
     private void huntForModules() {
+ //#if defined(SEQUENCEDIAGRAM)
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:MethodBody
         huntForModulesFromEx​tensionDir();
- // TODO: huntForModulesFromJa​vaWebStart();
-
+ // TODO: huntForModulesFromJa​vaWebStart();
         // Load modules specified by a System property.
         // Modules specified by a system property is for
         // running modules from within Eclipse and running
@@ -469,6 +470,7 @@
                 }
             }
         }
+ //#endif
     }
     
     /**

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/cmd/Gene​ricArgoMenuBar.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/ui/cmd/GenericA​rgoMenuBar.java?view​=diff&pathrev=83​&r1=82&r2=83​
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/cmd/Gene​ricArgoMenuBar.java (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/cmd/Gene​ricArgoMenuBar.java 2010-06-20 16:23:57-0700
@@ -85,7 +85,10 @@
 import org.argouml.uml.ui.A​ctionSaveAllGraphics​;
 import org.argouml.uml.ui.A​ctionSaveGraphics;
 import org.argouml.uml.ui.A​ctionSaveProjectAs;
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:import
 import org.argouml.uml.ui.A​ctionSequenceDiagram​;
+//#endif
 //#if defined(UMLSTATEDIAGRAM)
 //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.ui.A​ctionStateDiagram;
@@ -618,14 +621,15 @@
         toolbarTools.add((new ActionClassDiagram()));
         ShortcutMgr.assignAc​celerator(classDiagr​am,
                 ShortcutMgr.ACTION_C​LASS_DIAGRAM);
-
+ //#if defined(SEQUENCEDIAGRAM)
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:command
         JMenuItem sequenzDiagram =
             createDiagramMenu.add(new ActionSequenceDiagram());
         setMnemonic(sequenzDiagram, "Sequenz Diagram");
         toolbarTools.add((new ActionSequenceDiagram()));
         ShortcutMgr.assignAc​celerator(sequenzDia​gram,
                 ShortcutMgr.ACTION_S​EQUENCE_DIAGRAM);
-
+ //#endif
         JMenuItem collaborationDiagram =
             createDiagramMenu.add(new ActionCollaborationDiagram());
         setMnemonic(collabor​ationDiagram, "Collaboration Diagram");

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/cmd/Shor​tcutMgr.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/ui/cmd/Shortcut​Mgr.java?view=diff​&pathrev=83&r1​=82&r2=83
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/cmd/Shor​tcutMgr.java (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/cmd/Shor​tcutMgr.java 2010-06-20 16:23:57-0700
@@ -78,7 +78,10 @@
 import org.argouml.uml.ui.A​ctionSaveAllGraphics​;
 import org.argouml.uml.ui.A​ctionSaveGraphics;
 import org.argouml.uml.ui.A​ctionSaveProjectAs;
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Import
 import org.argouml.uml.ui.A​ctionSequenceDiagram​;
+//#endif
 //#if defined(UMLSTATEDIAGRAM)
 //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.ui.A​ctionStateDiagram;
@@ -214,9 +217,12 @@
     /** Action key for class diagram */
     public static final String ACTION_CLASS_DIAGRAM = "classDiagrams";
 
+ //#if defined(SEQUENCEDIAGRAM)
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Field
     /** Action key for sequence diagram */
     public static final String ACTION_SEQUENCE_DIAGRAM = "sequenceDiagrams";
-
+ //#endif
+
     /** Action key for collaboration diagram */
     public static final String ACTION_COLLABORATION_DIAGRAM =
         "collaborationDiagrams";
@@ -666,8 +672,11 @@
                 new ActionUseCaseDiagram());
         putDefaultShortcut(A​CTION_CLASS_DIAGRAM,​ null,
                 new ActionClassDiagram());
+ //#if defined(SEQUENCEDIAGRAM)
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
         putDefaultShortcut(A​CTION_SEQUENCE_DIAGR​AM, null,
                 new ActionSequenceDiagram());
+ //#endif
         putDefaultShortcut(A​CTION_COLLABORATION_​DIAGRAM, null,
                 new ActionCollaborationDiagram());
         //#if defined(UMLSTATEDIAGRAM)

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/ExplorerPopup.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/ui/explorer/Exp​lorerPopup.java?view​=diff&pathrev=83​&r1=82&r2=83​
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/ExplorerPopup.java (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/ExplorerPopup.java 2010-06-20 16:23:57-0700
@@ -58,7 +58,10 @@
 //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.diag​ram.activity.ui.UMLA​ctivityDiagram;
 //#endif
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-ACTIVITYD​IAGRAM:GranularityTy​pe:Import
 import org.argouml.uml.diag​ram.sequence.ui.UMLS​equenceDiagram;
+//#endif
 //#if defined(UMLSTATEDIAGRAM)
 //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.diag​ram.state.ui.UMLStat​eDiagram;
@@ -78,7 +81,10 @@
 import org.argouml.uml.ui.A​ctionCollaborationDi​agram;
 import org.argouml.uml.ui.A​ctionDeleteModelElem​ents;
 import org.argouml.uml.ui.A​ctionDeploymentDiagr​am;
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-ACTIVITYD​IAGRAM:GranularityTy​pe:Import
 import org.argouml.uml.ui.A​ctionSequenceDiagram​;
+//#endif
 import org.argouml.uml.ui.A​ctionSetSourcePath;
 //#if defined(UMLSTATEDIAGRAM)
 //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Import
@@ -249,8 +255,11 @@
             final boolean activityDiagramActive =
                 activeDiagram instanceof UMLActivityDiagram;
             //#endif
+ //#if defined(SEQUENCEDIAGRAM)
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Field
             final boolean sequenceDiagramActive =
                 activeDiagram instanceof UMLSequenceDiagram;
+ //#endif
             //#if defined(UMLSTATEDIAGRAM)
             //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Command
             final boolean stateDiagramActive =
@@ -296,7 +305,11 @@
                             )
                         || (instanceSelected
                                 && !dataValueSelected
- && !sequenceDiagramActive)
+ //#if defined(SEQUENCEDIAGRAM)
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Expression
+ && !sequenceDiagramActive
+ //#endif
+ )
                         || nAryAssociationSelected || commentSelected) {
                     // TODO: Why can't we use ActionAddExistingNodes here? Bob.
                     Action action =
@@ -309,7 +322,12 @@
                 if ((relationshipSelected
                         && !flowSelected
                         && !nAryAssociationSelected)
- || (linkSelected && !sequenceDiagramActive)
+ || (linkSelected
+ //#if defined(SEQUENCEDIAGRAM)
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Expression
+ && !sequenceDiagramActive
+ //#endif
+ )
                         || transitionSelected) {
 
                     Action action =
@@ -384,9 +402,10 @@
         createDiagrams.add(new ActionUseCaseDiagram());
 
         createDiagrams.add(new ActionClassDiagram());
-
+ //#if defined(SEQUENCEDIAGRAM)
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
         createDiagrams.add(new ActionSequenceDiagram());
-
+ //#endif
         createDiagrams.add(new ActionCollaborationDiagram());
         //#if defined(UMLSTATEDIAGRAM)
         //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Command

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/PerspectiveManager.​java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/ui/explorer/Per​spectiveManager.java​?view=diff&pathr​ev=83&r1=82&​r2=83
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/PerspectiveManager.​java (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/PerspectiveManager.​java 2010-06-20 16:23:57-0700
@@ -48,7 +48,10 @@
 import org.argouml.ui.explo​rer.rules.GoClassifi​erToBehavioralFeatur​e;
 import org.argouml.ui.explo​rer.rules.GoClassifi​erToCollaboration;
 import org.argouml.ui.explo​rer.rules.GoClassifi​erToInstance;
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:import
 import org.argouml.ui.explo​rer.rules.GoClassifi​erToSequenceDiagram;​
+//#endif
 import org.argouml.ui.explo​rer.rules.GoClassifi​erToStateMachine;
 import org.argouml.ui.explo​rer.rules.GoClassifi​erToStructuralFeatur​e;
 import org.argouml.ui.explo​rer.rules.GoCollabor​ationToDiagram;
@@ -86,7 +89,10 @@
 import org.argouml.ui.explo​rer.rules.GoNodeToRe​sidentComponent;
 import org.argouml.ui.explo​rer.rules.GoOperatio​nToCollaboration;
 import org.argouml.ui.explo​rer.rules.GoOperatio​nToCollaborationDiag​ram;
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Import
 import org.argouml.ui.explo​rer.rules.GoOperatio​nToSequenceDiagram;
+//#endif
 import org.argouml.ui.explo​rer.rules.GoPackageT​oClass;
 import org.argouml.ui.explo​rer.rules.GoPackageT​oElementImport;
 import org.argouml.ui.explo​rer.rules.GoProfileC​onfigurationToProfil​e;
@@ -437,8 +443,11 @@
         packagePerspective.addRule(new GoStateToDoActivity());
         packagePerspective.addRule(new GoStateToEntry());
         packagePerspective.addRule(new GoStateToExit());
+ //#if defined(SEQUENCEDIAGRAM)
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
         packagePerspective.addRule(new GoClassifierToSequen​ceDiagram());
         packagePerspective.addRule(new GoOperationToSequenc​eDiagram());
+ //#endif
         packagePerspective.addRule(new GoClassifierToInstance());
         //#if defined(UMLSTATEDIAGRAM)
         //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Command
@@ -596,7 +605,10 @@
             new GoClassifierToBehavi​oralFeature(),
             new GoClassifierToCollaboration(),
             new GoClassifierToInstance(),
+ //#if defined(SEQUENCEDIAGRAM)
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
             new GoClassifierToSequen​ceDiagram(),
+ //#endif
             new GoClassifierToStateMachine(),
             new GoClassifierToStruct​uralFeature(),
             new GoClassToAssociatedClass(), new GoClassToNavigableClass(),
@@ -623,7 +635,10 @@
             new GoNodeToResidentComponent(),
             new GoOperationToCollabo​rationDiagram(),
             new GoOperationToCollaboration(),
+ //#if defined(SEQUENCEDIAGRAM)
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
             new GoOperationToSequenceDiagram(), new GoPackageToClass(),
+ //#endif
             new GoPackageToElementImport(),
             new GoProjectToCollaboration(), new GoProjectToDiagram(),
             //#if defined(UMLSTATEDIAGRAM)

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/rules/GoClassifierT​oSequenceDiagram.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/ui/explorer/rul​es/GoClassifierToSeq​uenceDiagram.java?vi​ew=diff&pathrev=​83&r1=82&r2=​83
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/rules/GoClassifierT​oSequenceDiagram.jav​a (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/rules/GoClassifierT​oSequenceDiagram.jav​a 2010-06-20 16:23:57-0700
@@ -1,3 +1,5 @@
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Class
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -83,3 +85,4 @@
     return Collections.EMPTY_SET;
     }
 }
+//#endif
\ No newline at end of file

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/rules/GoCollaborati​onToDiagram.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/ui/explorer/rul​es/GoCollaborationTo​Diagram.java?view=di​ff&pathrev=83​&r1=82&r2=83
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/rules/GoCollaborati​onToDiagram.java (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/rules/GoCollaborati​onToDiagram.java 2010-06-20 16:23:57-0700
@@ -35,7 +35,10 @@
 import org.argouml.model.Model;
 import org.argouml.uml.diag​ram.ArgoDiagram;
 import org.argouml.uml.diag​ram.collaboration.ui​.UMLCollaborationDia​gram;
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Import
 import org.argouml.uml.diag​ram.sequence.ui.UMLS​equenceDiagram;
+//#endif
 
 /**
  * Rule for Collaboration->Diagram.
@@ -69,6 +72,8 @@
                     && ((UMLCollaborationDiagram) d).getNamespace() == parent) {
                 res.add(d);
             }
+ //#if defined(SEQUENCEDIAGRAM)
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
             /* Also show unattached sequence diagrams: */
             if ((d instanceof UMLSequenceDiagram)
                     && (Model.getFacade().g​etRepresentedClassif​ier(parent) == null)
@@ -76,6 +81,7 @@
                     && (parent == ((UMLSequenceDiagram) d).getNamespace())) {
                 res.add(d);
             }
+ //#endif
         }
         return res;
     }

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/rules/GoNamespaceTo​Diagram.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/ui/explorer/rul​es/GoNamespaceToDiag​ram.java?view=diff​&pathrev=83&r1​=82&r2=83
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/rules/GoNamespaceTo​Diagram.java (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/rules/GoNamespaceTo​Diagram.java 2010-06-20 16:23:57-0700
@@ -39,7 +39,10 @@
 //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.diag​ram.activity.ui.UMLA​ctivityDiagram;
 //#endif
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Import
 import org.argouml.uml.diag​ram.sequence.ui.UMLS​equenceDiagram;
+//#endif
 //#if defined(UMLSTATEDIAGRAM)
 //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.diag​ram.state.ui.UMLStat​eDiagram;
@@ -82,7 +85,12 @@
                         //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Expression
                         || diagram instanceof UMLActivityDiagram
                         //#endif
- || diagram instanceof UMLSequenceDiagram) {
+ //#if defined(SEQUENCEDIAGRAM)
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Expression
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:N​estedIfdef
+ || diagram instanceof UMLSequenceDiagram
+ //#endif
+ ) {
                     continue;
                 }
                 //#endif

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/rules/GoOperationTo​SequenceDiagram.java​
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/ui/explorer/rul​es/GoOperationToSequ​enceDiagram.java?vie​w=diff&pathrev=8​3&r1=82&r2=8​3
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/rules/GoOperationTo​SequenceDiagram.java​ (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/ui/explorer​/rules/GoOperationTo​SequenceDiagram.java​ 2010-06-20 16:23:57-0700
@@ -1,3 +1,5 @@
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Class
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -84,3 +86,4 @@
     return Collections.EMPTY_SET;
     }
 }
+//#endif
\ No newline at end of file

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/cogniti​ve/critics/CrNodesOv​erlap.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/uml/cognitive/c​ritics/CrNodesOverla​p.java?view=diff​&pathrev=83&r1=8​2&r2=83
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/cogniti​ve/critics/CrNodesOv​erlap.java (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/cogniti​ve/critics/CrNodesOv​erlap.java 2010-06-20 16:23:57-0700
@@ -40,7 +40,11 @@
 import org.argouml.uml.cogn​itive.UMLDecision;
 import org.argouml.uml.diag​ram.deployment.ui.Fi​gObject;
 import org.argouml.uml.diag​ram.deployment.ui.UM​LDeploymentDiagram;
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Import
+//@#$LPS-SEQUENCED​IAGRAM:Localization:​NestedIfdef
 import org.argouml.uml.diag​ram.sequence.ui.UMLS​equenceDiagram;
+//#endif
 import org.argouml.uml.diag​ram.static_structure​.ui.FigClass;
 import org.argouml.uml.diag​ram.static_structure​.ui.FigInterface;
 import org.argouml.uml.diag​ram.ui.FigNodeModelE​lement;
@@ -79,12 +83,15 @@
             return NO_PROBLEM;
         }
     Diagram d = (Diagram) dm;
-
+ //#if defined(SEQUENCEDIAGRAM)
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:N​estedIfdef
     // fixes bug #669. Sequencediagrams always overlap, so they shall
     // never report a problem
     if (dm instanceof UMLSequenceDiagram) {
             return NO_PROBLEM;
         }
+ //endif
 
     ListSet offs = computeOffenders(d);
     if (offs == null) return NO_PROBLEM;

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/cogniti​ve/critics/CrSeqInst​anceWithoutClassifie​r.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/uml/cognitive/c​ritics/CrSeqInstance​WithoutClassifier.ja​va?view=diff&pat​hrev=83&r1=82​&r2=83
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/cogniti​ve/critics/CrSeqInst​anceWithoutClassifie​r.java (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/cogniti​ve/critics/CrSeqInst​anceWithoutClassifie​r.java 2010-06-20 16:23:57-0700
@@ -1,6 +1,8 @@
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Class
 //#if defined(COGNITIVE)
 //@#$LPS-COGNITIVE:​GranularityType:Pack​age
-
+//@#$LPS-COGNITIVE​:Localization:Nested​Ifdef
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -134,4 +136,5 @@
 
 }
 
+//#endif
 //#endif
\ No newline at end of file

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/cogniti​ve/critics/ProfileGo​odPractices.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/uml/cognitive/c​ritics/ProfileGoodPr​actices.java?view=di​ff&pathrev=83​&r1=82&r2=83
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/cogniti​ve/critics/ProfileGo​odPractices.java (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/cogniti​ve/critics/ProfileGo​odPractices.java 2010-06-20 16:23:57-0700
@@ -52,7 +52,11 @@
         
         // general
         critics.add(new CrEmptyPackage());
+ //#if defined(SEQUENCEDIAGRAM)
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:N​estedIfdef
         critics.add(new CrNodesOverlap());
+ //#endif
         critics.add(new CrZeroLengthEdge());
         critics.add(new CrCircularComposition());
         critics.add(new CrMissingAttrName());

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/DiagramFactory.java​
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/uml/diagram/Dia​gramFactory.java?vie​w=diff&pathrev=8​3&r1=82&r2=8​3
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/DiagramFactory.java​ (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/DiagramFactory.java​ 2010-06-20 16:23:57-0700
@@ -38,7 +38,10 @@
 import org.argouml.model.De​ploymentDiagram;
 import org.argouml.model.DiDiagram;
 import org.argouml.model.Model;
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Import
 import org.argouml.model.Se​quenceDiagram;
+//#endif
 import org.argouml.model.StateDiagram;
 import org.argouml.model.Us​eCaseDiagram;
 //#if defined(ACTIVITYDIAGRAM)
@@ -47,7 +50,10 @@
 //#endif
 import org.argouml.uml.diag​ram.collaboration.ui​.UMLCollaborationDia​gram;
 import org.argouml.uml.diag​ram.deployment.ui.UM​LDeploymentDiagram;
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Import
 import org.argouml.uml.diag​ram.sequence.ui.UMLS​equenceDiagram;
+//#endif
 //#if defined(UMLSTATEDIAGRAM)
 //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.diag​ram.state.ui.UMLStat​eDiagram;
@@ -95,7 +101,10 @@
         //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Enumeration
         Activity,
         //#endif
+ //#if defined(SEQUENCEDIAGRAM)
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Enumeration
         Sequence
+ //#endif
     }
 
     private Map<DiagramType, Object> factories =
@@ -121,7 +130,10 @@
         //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
         diagramClasses.put(D​iagramType.Activity,​ UMLActivityDiagram.class);
         //#endif
+ //#if defined(SEQUENCEDIAGRAM)
+ //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
         diagramClasses.put(D​iagramType.Sequence,​ UMLSequenceDiagram.class);
+ //#endif
     }
 
     /**
@@ -228,13 +240,16 @@
             if ((
                  //#if defined(UMLSTATEDIAGRAM)
                  //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Expression
+ //@#$LPS-UMLSTATEDI​ADRAM:Localization:N​estedIfdef
                  type == DiagramType.State
                  //#endif
                     //#if defined(UMLSTATEDIAGRAM) and defined(ACTIVITYDIAGRAM)
+ //@#$LPS-UMLSTATEDI​ADRAM:Localization:N​estedIfdef
                     ||
                     //#endif
                     //#if defined(ACTIVITYDIAGRAM)
                     //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Expression
+ //@#$LPS-ACTIVITYDI​AGRAM:Localization:N​estedIfdef
                     type == DiagramType.Activity
                     //#endif
                     )
@@ -301,11 +316,14 @@
             diagram = new UMLActivityDiagram(namespace, machine);
             diType = ActivityDiagram.class;
         //#endif
- } else if (type == UMLSequenceDiagram.class) {
+ }
+ //#if defined(SEQUENCEDIAGRAM)
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
+ else if (type == UMLSequenceDiagram.class) {
             diagram = new UMLSequenceDiagram(namespace);
             diType = SequenceDiagram.class;
         }
-
+ //#endif
         if (diagram == null) {
             throw new IllegalArgumentException ("Unknown diagram type");
         }

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/MessageNod​e.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/uml/diagram/seq​uence/MessageNode.ja​va?view=diff&pat​hrev=83&r1=82​&r2=83
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/MessageNod​e.java (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/MessageNod​e.java 2010-06-20 16:23:57-0700
@@ -1,3 +1,5 @@
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Package
 // $Id$
 // Copyright (c) 2003-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -234,3 +236,4 @@
         return destroyableNode;
     }
 }
+//#endif
\ No newline at end of file

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/SequenceDi​agramGraphModel.java​
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/uml/diagram/seq​uence/SequenceDiagra​mGraphModel.java?vie​w=diff&pathrev=8​3&r1=82&r2=8​3
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/SequenceDi​agramGraphModel.java​ (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/SequenceDi​agramGraphModel.java​ 2010-06-20 16:23:57-0700
@@ -1,3 +1,5 @@
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Package
 // $Id$
 // Copyright (c) 1996-2008 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -34,6 +36,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.model.De​leteInstanceEvent;
@@ -58,6 +61,7 @@
     implements VetoableChangeListener, PropertyChangeListener {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef
     /**
      * Logger.
      */
@@ -198,6 +202,7 @@
             //#if defined(LOGGING)
             //@#$LPS-LOGGING:Gr​anularityType:Comman​d
             //@#$LPS-LOGGING:Lo​calization:BeforeRet​urn
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef
             LOG.error("Edge rejected. Its destination end is attached to "
                     + end1
                     + " but this is not in the graph model");
@@ -394,6 +399,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:BeforeRet​urn
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef
         if (edge == null) {
             LOG.debug("Incorrect edge");
         }
@@ -511,3 +517,4 @@
         
     }
 }
+//#endif
\ No newline at end of file

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/ActionA​ddClassifierRole.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/uml/diagram/seq​uence/ui/ActionAddCl​assifierRole.java?vi​ew=diff&pathrev=​83&r1=82&r2=​83
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/ActionA​ddClassifierRole.jav​a (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/ActionA​ddClassifierRole.jav​a 2010-06-20 16:23:57-0700
@@ -1,3 +1,5 @@
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Package
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -75,3 +77,4 @@
     }
 
 }
+//#endif
\ No newline at end of file

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigActi​vation.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/uml/diagram/seq​uence/ui/FigActivati​on.java?view=diff​&pathrev=83&r1=​82&r2=83
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigActi​vation.java (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigActi​vation.java 2010-06-20 16:23:57-0700
@@ -1,3 +1,5 @@
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Package
 // $Id$
 // Copyright (c) 2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -37,3 +39,4 @@
         setFilled(true);
     }
 }
+//#endif
\ No newline at end of file

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigBirt​hActivation.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/uml/diagram/seq​uence/ui/FigBirthAct​ivation.java?view=di​ff&pathrev=83​&r1=82&r2=83
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigBirt​hActivation.java (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigBirt​hActivation.java 2010-06-20 16:23:57-0700
@@ -1,3 +1,5 @@
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Package
 // $Id$
 // Copyright (c) 2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -37,3 +39,4 @@
         setFillColor(Color.black);
     }
 }
+//#endif
\ No newline at end of file

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigCall​ActionMessage.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/uml/diagram/seq​uence/ui/FigCallActi​onMessage.java?view=​diff&pathrev=83​&r1=82&r2=83
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigCall​ActionMessage.java (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigCall​ActionMessage.java 2010-06-20 16:23:57-0700
@@ -1,3 +1,5 @@
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Package
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -51,3 +53,4 @@
         this(null);
     }
 }
+//#endif
\ No newline at end of file

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigClas​sifierRole.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/uml/diagram/seq​uence/ui/FigClassifi​erRole.java?view=dif​f&pathrev=83​&r1=82&r2=83
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigClas​sifierRole.java (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigClas​sifierRole.java 2010-06-20 16:23:57-0700
@@ -1,3 +1,5 @@
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Package
 // $Id$
 // Copyright (c) 1996-2008 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -38,6 +40,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.model.Model;
@@ -71,6 +74,7 @@
     implements MouseListener, HandlerFactory {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef
     /**
      * Logger.
      */
@@ -673,6 +677,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef
         LOG.debug("Updating activations");
         //#endif
         lifeLineFig.removeAc​tivations();
@@ -1085,6 +1090,7 @@
             //@#$LPS-LOGGING:Gr​anularityType:Comman​d
             //@#$LPS-LOGGING:Lo​calization:NestedCom​mand
             //@#$LPS-LOGGING:Lo​calization:BeforeRet​urn
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef
             LOG.debug("Got a ClassifierRole - only legal on load");
             //#endif
             return null;
@@ -1338,3 +1344,4 @@
      */
     private static final long serialVersionUID = 7763573563940441408L;
 }
+//#endif
\ No newline at end of file

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigCrea​teActionMessage.java​
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/uml/diagram/seq​uence/ui/FigCreateAc​tionMessage.java?vie​w=diff&pathrev=8​3&r1=82&r2=8​3
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigCrea​teActionMessage.java​ (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigCrea​teActionMessage.java​ 2010-06-20 16:23:57-0700
@@ -1,3 +1,5 @@
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Package
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -51,3 +53,4 @@
     }
 
 }
+//#endif
\ No newline at end of file

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigDest​royActionMessage.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/uml/diagram/seq​uence/ui/FigDestroyA​ctionMessage.java?vi​ew=diff&pathrev=​83&r1=82&r2=​83
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigDest​royActionMessage.jav​a (original)
+++ branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigDest​royActionMessage.jav​a 2010-06-20 16:23:57-0700
@@ -1,3 +1,5 @@
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Package
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -55,3 +57,4 @@
         this(null);
     }
 }
+//#endif
\ No newline at end of file

Modified: branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigHead​.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Seq​uenceDiagram/src/arg​ouml-app/src/org/arg​ouml/uml/diagram/seq​uence/ui/FigHead.jav​a?view=diff&path​rev=83&r1=82​&r2=83
====================​====================​====================​==================
--- branches/NewFeatures​/SequenceDiagram/src​/argouml-app/src/org​/argouml/uml/diagram​/sequence/ui/FigHead​.java (original)
+++ branches/New

View complete message

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r83 - branches/NewFeatures/SequenceDiagram/src: argouml-app argouml-app/src/org/argouml/application argouml-app/src/org/argouml/moduleloader argouml-app/src/org/argouml/ui/cmd argouml-app/... marcusvnac Marcus Vinícius de Ávila Couto 2010-06-20 16:24:01 PDT
Messages per page: