Login | Register
My pages Projects Community openCollabNet

Discussions > Commits > svn commit: r88 - trunk/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-build argouml-core-diagrams-sequence2 argouml-core-diagrams-sequence2/src/org/argouml/sequence2 argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram argouml-core-infra 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: r88 - trunk/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-build argouml-core-diagrams-sequence2 argouml-core-diagrams-sequence2/src/org/argouml/sequence2 argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram argouml-core-infra 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-07-31 15:39:03 PDT
Message Author: marcusvnac
Date: 2010-07-31 15:39:02-0700
New Revision: 88

Modified:
   trunk/src/argouml-app/ (props changed)
   trunk/src/argouml-app/build.xml
   trunk/src/argouml-ap​p/src/org/argouml/ap​plication/Main.java
   trunk/src/argouml-ap​p/src/org/argouml/mo​duleloader/ModuleLoa​der2.java
   trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/GenericArgoMenu​Bar.java
   trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/ShortcutMgr.jav​a
   trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/ExplorerPo​pup.java
   trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/Perspectiv​eManager.java
   trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoCl​assifierToSequenceDi​agram.java
   trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoCo​llaborationToDiagram​.java
   trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoNa​mespaceToDiagram.jav​a
   trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoOp​erationToSequenceDia​gram.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​CrNodesOverlap.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​CrSeqInstanceWithout​Classifier.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​ProfileGoodPractices​.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/DiagramFac​tory.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/M​essageNode.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/S​equenceDiagramGraphM​odel.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/ActionAddClassifie​rRole.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigActivation.java​
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigBirthActivation​.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigCallActionMessa​ge.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigClassifierRole.​java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigCreateActionMes​sage.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigDestroyActionMe​ssage.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigHead.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigLifeLine.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigMessage.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigMessagePort.jav​a
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigReturnActionMes​sage.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/InitSequenceDiagra​m.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/ModeChangeHeight.j​ava
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/ModeContract.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/ModeCreateMessage.​java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/ModeExpand.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/PropPanelUMLSequen​ceDiagram.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/SelectionClassifie​rRole.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/SelectionMessage.j​ava
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/SequenceDiagramLay​er.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/SequenceDiagramPro​pPanelFactory.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/SequenceDiagramRen​derer.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/UMLSequenceDiagram​.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/ActionS​etAddMessageMode.jav​a
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ActionSequenceD​iagram.java
   trunk/src/argouml-build/ (props changed)
   trunk/src/argouml-bu​ild/jpp-features.pro​perties
   trunk/src/argouml-co​re-diagrams-sequence​2/ (props changed)
   trunk/src/argouml-co​re-diagrams-sequence​2/build.xml
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/SequenceDiag​ramModule.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/SequenceDiag​ramPropPanelFactory.​java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/Acti​onAddClassifierRole.​java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/Acti​onSetAddMessageMode.​java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/Acti​onSetOperation.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/FigA​ctivation.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/FigC​lassifierRole.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/FigD​estroy.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/FigH​ead.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/FigL​ifeLine.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/FigM​essage.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/FigM​essageComparator.jav​a
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/FigM​essageSpline.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/Mode​BroomMessages.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/Mode​CreateMessage.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/Mode​PlaceClassifierRole.​java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/Sele​ctionClassifierRole.​java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/Sele​ctionMessage.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/Sequ​enceDiagramFactory.j​ava
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/Sequ​enceDiagramGraphMode​l.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/Sequ​enceDiagramRenderer.​java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/UMLS​equenceDiagram.java
   trunk/src/argouml-core-infra/ (props changed)
   trunk/src/argouml-core-model/ (props changed)
   trunk/src/argouml-co​re-model-euml/ (props changed)
   trunk/src/argouml-co​re-model-euml/build.​xml
   trunk/src/argouml-co​re-model-mdr/ (props changed)
   trunk/src/argouml-co​re-model-mdr/build.x​ml
   trunk/src/argouml-co​re-model/build.xml
   trunk/src/argouml-co​re-model/src/org/arg​ouml/model/SequenceD​iagram.java

Log:
Merging branch /NewFeatures/SequenceDiagram

Modified: trunk/src/argouml-app/build.xml
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/bu​ild.xml?view=diff​&pathrev=88&r1=​87&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-app/build.xml (original)
+++ trunk/src/argouml-app/build.xml 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/ap​plication/Main.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/applic​ation/Main.java?view​=diff&pathrev=88​&r1=87&r2=88​
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ap​plication/Main.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ap​plication/Main.java 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/mo​duleloader/ModuleLoa​der2.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/module​loader/ModuleLoader2​.java?view=diff&​pathrev=88&r1=87​&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/mo​duleloader/ModuleLoa​der2.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/mo​duleloader/ModuleLoa​der2.java 2010-07-31 15:39:02-0700
@@ -446,6 +446,8 @@
      * 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();
 
@@ -469,6 +471,7 @@
                 }
             }
         }
+ //#endif
     }
     
     /**

Modified: trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/GenericArgoMenu​Bar.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/ui/cmd​/GenericArgoMenuBar.​java?view=diff&p​athrev=88&r1=87​&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/GenericArgoMenu​Bar.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/GenericArgoMenu​Bar.java 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/ShortcutMgr.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/ui/cmd​/ShortcutMgr.java?vi​ew=diff&pathrev=​88&r1=87&r2=​88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/ShortcutMgr.jav​a (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/ShortcutMgr.jav​a 2010-07-31 15:39:02-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,8 +217,11 @@
     /** 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 =
@@ -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: trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/ExplorerPo​pup.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/ExplorerPopup.​java?view=diff&p​athrev=88&r1=87​&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/ExplorerPo​pup.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/ExplorerPo​pup.java 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/Perspectiv​eManager.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/PerspectiveMan​ager.java?view=diff​&pathrev=88&r​1=87&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/Perspectiv​eManager.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/Perspectiv​eManager.java 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoCl​assifierToSequenceDi​agram.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoClassi​fierToSequenceDiagra​m.java?view=diff​&pathrev=88&r1=8​7&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoCl​assifierToSequenceDi​agram.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoCl​assifierToSequenceDi​agram.java 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoCo​llaborationToDiagram​.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoCollab​orationToDiagram.jav​a?view=diff&path​rev=88&r1=87​&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoCo​llaborationToDiagram​.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoCo​llaborationToDiagram​.java 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoNa​mespaceToDiagram.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoNamesp​aceToDiagram.java?vi​ew=diff&pathrev=​88&r1=87&r2=​88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoNa​mespaceToDiagram.jav​a (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoNa​mespaceToDiagram.jav​a 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoOp​erationToSequenceDia​gram.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoOperat​ionToSequenceDiagram​.java?view=diff&​pathrev=88&r1=87​&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoOp​erationToSequenceDia​gram.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoOp​erationToSequenceDia​gram.java 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​CrNodesOverlap.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/co​gnitive/critics/CrNo​desOverlap.java?view​=diff&pathrev=88​&r1=87&r2=88​
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​CrNodesOverlap.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​CrNodesOverlap.java 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​CrSeqInstanceWithout​Classifier.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/co​gnitive/critics/CrSe​qInstanceWithoutClas​sifier.java?view=dif​f&pathrev=88​&r1=87&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​CrSeqInstanceWithout​Classifier.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​CrSeqInstanceWithout​Classifier.java 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​ProfileGoodPractices​.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/co​gnitive/critics/Prof​ileGoodPractices.jav​a?view=diff&path​rev=88&r1=87​&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​ProfileGoodPractices​.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​ProfileGoodPractices​.java 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/DiagramFac​tory.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/DiagramFactory​.java?view=diff&​pathrev=88&r1=87​&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/DiagramFac​tory.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/DiagramFac​tory.java 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/M​essageNode.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/sequence/Messa​geNode.java?view=dif​f&pathrev=88​&r1=87&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/M​essageNode.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/M​essageNode.java 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/S​equenceDiagramGraphM​odel.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/sequence/Seque​nceDiagramGraphModel​.java?view=diff&​pathrev=88&r1=87​&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/S​equenceDiagramGraphM​odel.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/S​equenceDiagramGraphM​odel.java 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/ActionAddClassifie​rRole.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/sequence/ui/Ac​tionAddClassifierRol​e.java?view=diff​&pathrev=88&r1=8​7&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/ActionAddClassifie​rRole.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/ActionAddClassifie​rRole.java 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigActivation.java​
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/sequence/ui/Fi​gActivation.java?vie​w=diff&pathrev=8​8&r1=87&r2=8​8
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigActivation.java​ (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigActivation.java​ 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigBirthActivation​.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/sequence/ui/Fi​gBirthActivation.jav​a?view=diff&path​rev=88&r1=87​&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigBirthActivation​.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigBirthActivation​.java 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigCallActionMessa​ge.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/sequence/ui/Fi​gCallActionMessage.j​ava?view=diff&pa​threv=88&r1=87​&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigCallActionMessa​ge.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigCallActionMessa​ge.java 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigClassifierRole.​java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/sequence/ui/Fi​gClassifierRole.java​?view=diff&pathr​ev=88&r1=87&​r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigClassifierRole.​java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigClassifierRole.​java 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigCreateActionMes​sage.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/sequence/ui/Fi​gCreateActionMessage​.java?view=diff&​pathrev=88&r1=87​&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigCreateActionMes​sage.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigCreateActionMes​sage.java 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigDestroyActionMe​ssage.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/sequence/ui/Fi​gDestroyActionMessag​e.java?view=diff​&pathrev=88&r1=8​7&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigDestroyActionMe​ssage.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigDestroyActionMe​ssage.java 2010-07-31 15:39:02-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: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigHead.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/sequence/ui/Fi​gHead.java?view=diff​&pathrev=88&​r1=87&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigHead.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigHead.java 2010-07-31 15:39:02-0700
@@ -1,3 +1,5 @@
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Package
 // $Id$
 // Copyright (c) 1996-2009 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -152,3 +154,4 @@
      */
     private static final long serialVersionUID = 2970745558193935791L;
 }
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigLifeLine.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/sequence/ui/Fi​gLifeLine.java?view=​diff&pathrev=88​&r1=87&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigLifeLine.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigLifeLine.java 2010-07-31 15:39:02-0700
@@ -1,3 +1,5 @@
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Package
 // $Id$
 // Copyright (c) 2006-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.uml.diag​ram.sequence.Message​Node;
@@ -57,6 +60,7 @@
     private static final long serialVersionUID = -1242239243040698287L;
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef
     private static final Logger LOG = Logger.getLogger(Fig​LifeLine.class);
     //#endif
     static final int WIDTH = 20;
@@ -151,6 +155,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef
         LOG.info("Removing " + f.getClass().getName());
         //#endif
         super.removeFig(f);
@@ -275,3 +280,4 @@
         }
     }
 }
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigMessage.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/sequence/ui/Fi​gMessage.java?view=d​iff&pathrev=88​&r1=87&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigMessage.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigMessage.java 2010-07-31 15:39:02-0700
@@ -1,3 +1,5 @@
+//#if defined(SEQUENCEDIAGRAM)
+//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Package
 // $Id$
 // Copyright (c) 1996-2009 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -291,3 +293,4 @@
         return new SelectionMessage(this);
     }
 }
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigMessagePort.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/sequence/ui/Fi​gMessagePort.java?vi​ew=diff&pathrev=​88&r1=87&r2=​88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigMessagePort.jav​a (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigMessagePort.jav​a 2010-07-31 15:39:02-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
@@ -30,6 +32,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.uml.diag​ram.sequence.Message​Node;
@@ -47,6 +50,7 @@
     private static final long serialVersionUID = -7805833566723101923L;
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef
     private static final Logger LOG = Logger.getLogger(Fig​MessagePort.class);
     //#endif
     private MessageNode node;
@@ -152,3 +156,4 @@
         return (FigLine) getFigs().get(0);
     }
 }
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigReturnActionMes​sage.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/sequence/ui/Fi​gReturnActionMessage​.java?view=diff&​pathrev=88&r1=87​&r2=88
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigReturnActionMes​sage.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigReturnActionMes​sage.java

View complete message

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

Messages

Show all messages in topic

svn commit: r88 - trunk/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 arg... marcusvnac Marcus Vinícius de Ávila Couto 2010-07-31 15:39:03 PDT
Messages per page: