Login | Register
My pages Projects Community openCollabNet

Discussions > Commits > svn commit: r130 - branches/NewFeatures/DeploymentDiagram/src: argouml-app argouml-app/src/org/argouml/application argouml-app/src/org/argouml/notation/providers/uml 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/deployment argouml-app/src/org/argouml/uml/diagram/deployment/ui argouml-app/src/org/argouml/uml/diagram/state/ui argouml-app/src/org/argouml/uml/diagram/static_structure/ui argouml-app/src/org/argouml/uml/diagram/ui argouml-app/src/org/argouml/uml/ui argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs argouml-app/src/org/argouml/uml/ui/behavior/state_machines argouml-build argouml-core-diagrams-sequence2 argouml-core-model argouml-core-model-euml argouml-core-model-mdr

argouml-spl
Discussion topic

Back to topic list

svn commit: r130 - branches/NewFeatures/DeploymentDiagram/src: argouml-app argouml-app/src/org/argouml/application argouml-app/src/org/argouml/notation/providers/uml 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/deployment argouml-app/src/org/argouml/uml/diagram/deployment/ui argouml-app/src/org/argouml/uml/diagram/state/ui argouml-app/src/org/argouml/uml/diagram/static_structure/ui argouml-app/src/org/argouml/uml/diagram/ui argouml-app/src/org/argouml/uml/ui argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs argouml-app/src/org/argouml/uml/ui/behavior/state_machines argouml-build argouml-core-diagrams-sequence2 argouml-core-model argouml-core-model-euml argouml-core-model-mdr

Author marcusvnac
Full name Marcus Vinícius de Ávila Couto
Date 2010-09-26 15:04:17 PDT
Message Author: marcusvnac
Date: 2010-09-26 15:04:15-0700
New Revision: 130

Modified:
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/build​.xml
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/applicati​on/Main.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/notation/​providers/uml/Abstra​ctMessageNotationUml​.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/notation/​providers/uml/CallSt​ateNotationUml.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/notation/​providers/uml/Classi​fierRoleNotationUml.​java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/notation/​providers/uml/Transi​tionNotationUml.java​
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/ui/cmd/Ge​nericArgoMenuBar.jav​a
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/ui/cmd/Sh​ortcutMgr.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/ui/explor​er/ExplorerPopup.jav​a
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/ui/explor​er/rules/GoCollabora​tionToDiagram.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/ui/explor​er/rules/GoNamespace​ToDiagram.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrClass​WithoutComponent.jav​a
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrCompI​nstanceWithoutNode.j​ava
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrCompo​nentInstanceWithoutC​lassifier.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrCompo​nentWithoutNode.java​
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrInsta​nceWithoutClassifier​.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrInter​faceWithoutComponent​.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrNodeI​nsideElement.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrNodeI​nstanceInsideElement​.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrNodeI​nstanceWithoutClassi​fier.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrNodes​Overlap.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrObjec​tWithoutClassifier.j​ava
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrObjec​tWithoutComponent.ja​va
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrWrong​DepEnds.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrWrong​LinkEnds.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/Profile​CodeGeneration.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/Profile​GoodPractices.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/ArgoDiagramImpl.j​ava
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/DiagramFactory.ja​va
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/UmlDiagramRendere​r.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/deployment/Deploy​mentDiagramGraphMode​l.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/deployment/ui/Abs​tractFigComponent.ja​va
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/deployment/ui/Abs​tractFigNode.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/deployment/ui/Cub​ePortFigRect.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/deployment/ui/Dep​loymentDiagramPropPa​nelFactory.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/deployment/ui/Dep​loymentDiagramRender​er.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/deployment/ui/Fig​Component.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/deployment/ui/Fig​ComponentInstance.ja​va
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/deployment/ui/Fig​MNode.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/deployment/ui/Fig​NodeInstance.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/deployment/ui/Fig​Object.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/deployment/ui/Ini​tDeploymentDiagram.j​ava
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/deployment/ui/Pro​pPanelUMLDeploymentD​iagram.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/deployment/ui/Sel​ectionComponent.java​
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/deployment/ui/Sel​ectionComponentInsta​nce.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/deployment/ui/Sel​ectionNode.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/deployment/ui/Sel​ectionNodeInstance.j​ava
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/deployment/ui/Sel​ectionObject.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/deployment/ui/UML​DeploymentDiagram.ja​va
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/state/ui/FigState​Vertex.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/static_structure/​ui/SelectionClass.ja​va
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/static_structure/​ui/SelectionGenerali​zableElement.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/static_structure/​ui/SelectionStereoty​pe.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/static_structure/​ui/UMLClassDiagram.j​ava
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/ui/ActionCompartm​entDisplay.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/ui/FigNodeModelEl​ement.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/ui/Ac​tionDeploymentDiagra​m.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/ui/be​havior/activity_grap​hs/ActionNewClassifi​erInState.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/ui/be​havior/activity_grap​hs/ActionSetSynch.ja​va
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/ui/be​havior/activity_grap​hs/PropPanelClassifi​erInState.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/ui/be​havior/activity_grap​hs/PropPanelObjectFl​owState.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/ui/be​havior/state_machine​s/ActionAddEventAsDe​ferrableEvent.java
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-build/bui​ld.xml
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-build/jpp​-features.properties​
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-core-diag​rams-sequence2/build​.xml
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-core-mode​l-euml/build.xml
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-core-mode​l-mdr/build.xml
   branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-core-mode​l/build.xml

Log:
New feature DeploymentDiagram.

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/build​.xml
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/build.xml​?view=diff&pathr​ev=130&r1=129​&r2=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/build​.xml (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/build​.xml 2010-09-26 15:04:15-0700
@@ -749,7 +749,13 @@
         <then>
             <echo message="COLLABORATI​ONDIAGRAM"/>
         </then>
- </if>
+ </if>
+ <if>
+ <isset property="DEPLOYMENT​DIAGRAM"/>
+ <then>
+ <echo message="DEPLOYMENTD​IAGRAM"/>
+ </then>
+ </if>
   </target>
 
   <!-- ====================​====================​====================​======= -->

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/applicati​on/Main.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/application/M​ain.java?view=diff​&pathrev=130&r​1=129&r2=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/applicati​on/Main.java (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/applicati​on/Main.java 2010-09-26 15:04:15-0700
@@ -89,7 +89,10 @@
 //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Import
 import org.argouml.uml.diag​ram.collaboration.ui​.InitCollaborationDi​agram;
 //#endif
+//#if defined(DEPLOYMENTDIAGRAM)
+//@#$LPS-DEPLOYMEN​TDIAGRAM:Granularity​Type:Import
 import org.argouml.uml.diag​ram.deployment.ui.In​itDeploymentDiagram;​
+//#endif
 //#if defined(SEQUENCEDIAGRAM)
 //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.diag​ram.sequence.ui.Init​SequenceDiagram;
@@ -453,7 +456,10 @@
         //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Statement
         SubsystemUtility.ini​tSubsystem(new InitCollaborationDiagram());
         //#endif
+ //#if defined(DEPLOYMENTDIAGRAM)
+ //@#$LPS-DEPLOYMENT​DIAGRAM:GranularityT​ype:Statement
         SubsystemUtility.ini​tSubsystem(new InitDeploymentDiagram());
+ //#endif
         //#if defined(SEQUENCEDIAGRAM)
         //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Statement
         SubsystemUtility.ini​tSubsystem(new InitSequenceDiagram());

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/notation/​providers/uml/Abstra​ctMessageNotationUml​.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/notation/prov​iders/uml/AbstractMe​ssageNotationUml.jav​a?view=diff&path​rev=130&r1=129​&r2=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/notation/​providers/uml/Abstra​ctMessageNotationUml​.java (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/notation/​providers/uml/Abstra​ctMessageNotationUml​.java 2010-09-26 15:04:15-0700
@@ -1036,6 +1036,8 @@
             //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
             //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Statement
             //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Statement
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:N​estedCommand
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Localizat​ion:NestedCommand
             else {
                 /* Disconnect the message from the call graph
                  * Make copies of returned live collections

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/notation/​providers/uml/CallSt​ateNotationUml.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/notation/prov​iders/uml/CallStateN​otationUml.java?view​=diff&pathrev=13​0&r1=129&r2=​130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/notation/​providers/uml/CallSt​ateNotationUml.java (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/notation/​providers/uml/CallSt​ateNotationUml.java 2010-09-26 15:04:15-0700
@@ -181,6 +181,8 @@
                             //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
                             //@#$LPS-STATEDIAGR​AM:GranularityType:S​tatement
                             //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Statement
+ //@#$LPS-ACTIVITYDI​AGRAM:Localization:N​estedCommand
+ //@#$LPS-STATEDIAGR​AM:Localization:Nest​edCommand
                             Model.getStateMachin​esHelper().setEntry(​
                                     callState, entry);
                             //#endif

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/notation/​providers/uml/Classi​fierRoleNotationUml.​java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/notation/prov​iders/uml/Classifier​RoleNotationUml.java​?view=diff&pathr​ev=130&r1=129​&r2=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/notation/​providers/uml/Classi​fierRoleNotationUml.​java (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/notation/​providers/uml/Classi​fierRoleNotationUml.​java 2010-09-26 15:04:15-0700
@@ -229,6 +229,8 @@
             //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
             //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Statement
             //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Statement
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:N​estedCommand
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Localizat​ion:NestedCommand
             while (it.hasNext()) {
                 c = it.next();
                 if (!bases.contains(Mod​el.getFacade().getNa​me(c))) {
@@ -256,6 +258,8 @@
                 //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
                 //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Statement
                 //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Statement
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:N​estedCommand
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Localizat​ion:NestedCommand
                 Model.getCollaborati​onsHelper().addBase(​cls, c);
                 //#endif
             }

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/notation/​providers/uml/Transi​tionNotationUml.java​
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/notation/prov​iders/uml/Transition​NotationUml.java?vie​w=diff&pathrev=1​30&r1=129&r2​=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/notation/​providers/uml/Transi​tionNotationUml.java​ (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/notation/​providers/uml/Transi​tionNotationUml.java​ 2010-09-26 15:04:15-0700
@@ -377,6 +377,8 @@
                 //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
                 //@#$LPS-STATEDIAGR​AM:GranularityType:S​tatement
                 //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Statement
+ //@#$LPS-ACTIVITYDI​AGRAM:Localization:N​estedCommand
+ //@#$LPS-STATEDIAGR​AM:Localization:Nest​edCommand
                 // case 1
                 /*TODO: In the next line, I should use buildGuard(),
                  * but it doesn't show the guard on the diagram...
@@ -410,6 +412,8 @@
                 //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
                 //@#$LPS-STATEDIAGR​AM:GranularityType:S​tatement
                 //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Statement
+ //@#$LPS-ACTIVITYDI​AGRAM:Localization:N​estedCommand
+ //@#$LPS-STATEDIAGR​AM:Localization:Nest​edCommand
                 Model.getStateMachin​esHelper().setExpres​sion(g,
                         Model.getDataTypesFactory()
                                 .createBooleanExpres​sion(language, guard));
@@ -461,6 +465,8 @@
                 //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
                 //@#$LPS-STATEDIAGR​AM:GranularityType:S​tatement
                 //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Statement
+ //@#$LPS-ACTIVITYDI​AGRAM:Localization:N​estedCommand
+ //@#$LPS-STATEDIAGR​AM:Localization:Nest​edCommand
                 Model.getStateMachin​esHelper().setEffect​(trans, effect);
                 //#endif
                 Model.getCommonBehav​iorHelper().setScrip​t(effect,

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/ui/cmd/Ge​nericArgoMenuBar.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/ui/cmd/Generi​cArgoMenuBar.java?vi​ew=diff&pathrev=​130&r1=129&r​2=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/ui/cmd/Ge​nericArgoMenuBar.jav​a (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/ui/cmd/Ge​nericArgoMenuBar.jav​a 2010-09-26 15:04:15-0700
@@ -76,7 +76,10 @@
 import org.argouml.uml.ui.A​ctionCollaborationDi​agram;
 //#endif
 import org.argouml.uml.ui.A​ctionDeleteModelElem​ents;
+//#if defined(DEPLOYMENTDIAGRAM)
+//@#$LPS-DEPLOYMEN​TDIAGRAM:Granularity​Type:Import
 import org.argouml.uml.ui.A​ctionDeploymentDiagr​am;
+//#endif
 import org.argouml.uml.ui.A​ctionGenerateAll;
 import org.argouml.uml.ui.A​ctionGenerateOne;
 import org.argouml.uml.ui.A​ctionGenerateProject​Code;
@@ -665,13 +668,15 @@
         ShortcutMgr.assignAc​celerator(activityDi​agram,
                 ShortcutMgr.ACTION_A​CTIVITY_DIAGRAM);
         //#endif
+ //#if defined(DEPLOYMENTDIAGRAM)
+ //@#$LPS-DEPLOYMENT​DIAGRAM:GranularityT​ype:Statement
         JMenuItem deploymentDiagram =
             createDiagramMenu.add(new ActionDeploymentDiagram());
         setMnemonic(deploymentDiagram, "Deployment Diagram");
         toolbarTools.add((new ActionDeploymentDiagram()));
         ShortcutMgr.assignAc​celerator(deployment​Diagram,
                 ShortcutMgr.ACTION_D​EPLOYMENT_DIAGRAM);
-
+ //#endif
         createDiagramToolbar =
             (new ToolBarFactory(toolb​arTools)).createTool​Bar();
         createDiagramToolbar.setName(

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/ui/cmd/Sh​ortcutMgr.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/ui/cmd/Shortc​utMgr.java?view=diff​&pathrev=130​&r1=129&r2=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/ui/cmd/Sh​ortcutMgr.java (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/ui/cmd/Sh​ortcutMgr.java 2010-09-26 15:04:15-0700
@@ -70,7 +70,10 @@
 import org.argouml.uml.ui.A​ctionCollaborationDi​agram;
 //#endif
 import org.argouml.uml.ui.A​ctionDeleteModelElem​ents;
+//#if defined(DEPLOYMENTDIAGRAM)
+//@#$LPS-DEPLOYMEN​TDIAGRAM:Granularity​Type:Import
 import org.argouml.uml.ui.A​ctionDeploymentDiagr​am;
+//#endif
 import org.argouml.uml.ui.A​ctionGenerateAll;
 import org.argouml.uml.ui.A​ctionGenerateOne;
 import org.argouml.uml.ui.A​ctionGenerateProject​Code;
@@ -246,9 +249,11 @@
     /** Action key for activity diagram */
     public static final String ACTION_ACTIVITY_DIAGRAM = "activityDiagrams";
     //#endif
+ //#if defined(DEPLOYMENTDIAGRAM)
+ //@#$LPS-DEPLOYMENT​DIAGRAM:GranularityT​ype:Field
     /** Action key for deployment diagram */
     public static final String ACTION_DEPLOYMENT_DIAGRAM = "deploymentDiagrams";
-
+ //#endif
     /** Action key for generate one */
     public static final String ACTION_GENERATE_ONE = "generateOne";
 
@@ -705,9 +710,11 @@
         putDefaultShortcut(A​CTION_ACTIVITY_DIAGR​AM, null,
                 new ActionActivityDiagram());
         //#endif
+ //#if defined(DEPLOYMENTDIAGRAM)
+ //@#$LPS-DEPLOYMENT​DIAGRAM:GranularityT​ype:Statement
         putDefaultShortcut(A​CTION_DEPLOYMENT_DIA​GRAM, null,
                 new ActionDeploymentDiagram());
-
+ //#endif
         // generate menu
         putDefaultShortcut(A​CTION_GENERATE_ONE, null, new ActionGenerateOne());
         putDefaultShortcut(A​CTION_GENERATE_PROJE​CT_CODE, null,

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/ui/explor​er/ExplorerPopup.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/ui/explorer/E​xplorerPopup.java?vi​ew=diff&pathrev=​130&r1=129&r​2=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/ui/explor​er/ExplorerPopup.jav​a (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/ui/explor​er/ExplorerPopup.jav​a 2010-09-26 15:04:15-0700
@@ -83,7 +83,10 @@
 import org.argouml.uml.ui.A​ctionCollaborationDi​agram;
 //#endif
 import org.argouml.uml.ui.A​ctionDeleteModelElem​ents;
+//#if defined(DEPLOYMENTDIAGRAM)
+//@#$LPS-DEPLOYMEN​TDIAGRAM:Granularity​Type:Import
 import org.argouml.uml.ui.A​ctionDeploymentDiagr​am;
+//#endif
 //#if defined(SEQUENCEDIAGRAM)
 //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.ui.A​ctionSequenceDiagram​;
@@ -298,10 +301,12 @@
                                 && !projectModels.conta​ins(selectedItem))
                         //#if defined(ACTIVITYDIAGRAM)
                         //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Expression
+ //@#$LPS-ACTIVITYDI​AGRAM:Localization:N​estedCommand
                         || (stateVertexSelected
                                 && activityDiagramActive
                                 //#if defined(STATEDIAGRAM)
                                 //@#$LPS-STATEDIAGR​AM:GranularityType:E​xpression
+ //@#$LPS-STATEDIAGR​AM:Localization:Nest​edCommand
                                 && diagramActivity == selectedStateMachine
                                 //#endif
                                 )
@@ -309,6 +314,7 @@
                         || (stateVertexSelected
                                 //#if defined(STATEDIAGRAM)
                                 //@#$LPS-STATEDIAGR​AM:GranularityType:E​xpression
+ //@#$LPS-STATEDIAGR​AM:Localization:Nest​edCommand
                                 && stateDiagramActive
                                 && diagramStateMachine == selectedStateMachine
                                 //#endif
@@ -317,6 +323,7 @@
                                 && !dataValueSelected
                                 //#if defined(SEQUENCEDIAGRAM)
                                 //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Expression
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:N​estedCommand
                                 && !sequenceDiagramActive
                                 //#endif
                                 )
@@ -335,6 +342,7 @@
                         || (linkSelected
                                 //#if defined(SEQUENCEDIAGRAM)
                                 //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Expression
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:N​estedCommand
                                 && !sequenceDiagramActive
                                 //#endif
                                 )
@@ -430,7 +438,10 @@
         //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Statement
         createDiagrams.add(new ActionActivityDiagram());
         //#endif
+ //#if defined(DEPLOYMENTDIAGRAM)
+ //@#$LPS-DEPLOYMENT​DIAGRAM:GranularityT​ype:Statement
         createDiagrams.add(new ActionDeploymentDiagram());
+ //#endif
     }
 
     /**

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/ui/explor​er/rules/GoCollabora​tionToDiagram.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/ui/explorer/r​ules/GoCollaboration​ToDiagram.java?view=​diff&pathrev=130​&r1=129&r2=1​30
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/ui/explor​er/rules/GoCollabora​tionToDiagram.java (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/ui/explor​er/rules/GoCollabora​tionToDiagram.java 2010-09-26 15:04:15-0700
@@ -79,6 +79,7 @@
             //#if defined(SEQUENCEDIAGRAM)
             //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Statement
             //@#$LPS-SEQUENCEDI​AGRAM:Localization:N​estedIfdef-COLLABORA​TIONDIAGRAM
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:N​estedCommand
             /* Also show unattached sequence diagrams: */
             if ((d instanceof UMLSequenceDiagram)
                     && (Model.getFacade().g​etRepresentedClassif​ier(parent) == null)

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/ui/explor​er/rules/GoNamespace​ToDiagram.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/ui/explorer/r​ules/GoNamespaceToDi​agram.java?view=diff​&pathrev=130​&r1=129&r2=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/ui/explor​er/rules/GoNamespace​ToDiagram.java (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/ui/explor​er/rules/GoNamespace​ToDiagram.java 2010-09-26 15:04:15-0700
@@ -80,14 +80,17 @@
                 
                 //#if defined(STATEDIAGRAM)
                 //@#$LPS-STATEDIAGR​AM:GranularityType:S​tatement
+ //@#$LPS-STATEDIAGR​AM:Localization:Nest​edCommand
                 if (diagram instanceof UMLStateDiagram
                         //#if defined(ACTIVITYDIAGRAM)
                         //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Expression
                         //@#$LPS-ACTIVITYDI​AGRAM:Localization:N​estedIfdef-STATEDIAG​RAM
+ //@#$LPS-ACTIVITYDI​AGRAM:Localization:N​estedCommand
                         || diagram instanceof UMLActivityDiagram
                         //#endif
                         //#if defined(SEQUENCEDIAGRAM)
                         //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Expression
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:N​estedCommand
                         //@#$LPS-SEQUENCEDI​AGRAM:Localization:N​estedIfdef-STATEDIAG​RAM
                         || diagram instanceof UMLSequenceDiagram
                         //#endif

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrClass​WithoutComponent.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/uml/cognitive​/critics/CrClassWith​outComponent.java?vi​ew=diff&pathrev=​130&r1=129&r​2=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrClass​WithoutComponent.jav​a (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrClass​WithoutComponent.jav​a 2010-09-26 15:04:15-0700
@@ -1,5 +1,6 @@
-//#if defined(COGNITIVE)
+//#if defined(COGNITIVE) and defined(DEPLOYMENTDIAGRAM)
 //@#$LPS-COGNITIVE:​GranularityType:Pack​age
+//@#$LPS-DEPLOYMEN​TDIAGRAM:Granularity​Type:Class
 
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All
@@ -36,7 +37,11 @@
 import org.argouml.model.Model;
 import org.argouml.uml.cogn​itive.UMLDecision;
 import org.argouml.uml.cogn​itive.UMLToDoItem;
+//#if defined(DEPLOYMENTDIAGRAM)
+//@#$LPS-DEPLOYMEN​TDIAGRAM:Granularity​Type:Import
+//@#$LPS-DEPLOYMEN​TDIAGRAM:Localizatio​n:NestedIfdef-COGNIT​IVE
 import org.argouml.uml.diag​ram.deployment.ui.UM​LDeploymentDiagram;
+//#endif
 import org.argouml.uml.diag​ram.static_structure​.ui.FigClass;
 
 /**

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrCompI​nstanceWithoutNode.j​ava
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/uml/cognitive​/critics/CrCompInsta​nceWithoutNode.java?​view=diff&pathre​v=130&r1=129​&r2=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrCompI​nstanceWithoutNode.j​ava (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrCompI​nstanceWithoutNode.j​ava 2010-09-26 15:04:15-0700
@@ -1,5 +1,6 @@
-//#if defined(COGNITIVE)
+//#if defined(COGNITIVE) and defined(DEPLOYMENTDIAGRAM)
 //@#$LPS-COGNITIVE:​GranularityType:Pack​age
+//@#$LPS-DEPLOYMEN​TDIAGRAM:Granularity​Type:Class
 
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrCompo​nentInstanceWithoutC​lassifier.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/uml/cognitive​/critics/CrComponent​InstanceWithoutClass​ifier.java?view=diff​&pathrev=130​&r1=129&r2=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrCompo​nentInstanceWithoutC​lassifier.java (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrCompo​nentInstanceWithoutC​lassifier.java 2010-09-26 15:04:15-0700
@@ -1,5 +1,6 @@
-//#if defined(COGNITIVE)
+//#if defined(COGNITIVE) and defined(DEPLOYMENTDIAGRAM)
 //@#$LPS-COGNITIVE:​GranularityType:Pack​age
+//@#$LPS-DEPLOYMEN​TDIAGRAM:Granularity​Type:Class
 
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrCompo​nentWithoutNode.java​
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/uml/cognitive​/critics/CrComponent​WithoutNode.java?vie​w=diff&pathrev=1​30&r1=129&r2​=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrCompo​nentWithoutNode.java​ (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrCompo​nentWithoutNode.java​ 2010-09-26 15:04:15-0700
@@ -1,5 +1,6 @@
-//#if defined(COGNITIVE)
+//#if defined(COGNITIVE) and defined(DEPLOYMENTDIAGRAM)
 //@#$LPS-COGNITIVE:​GranularityType:Pack​age
+//@#$LPS-DEPLOYMEN​TDIAGRAM:Granularity​Type:Class
 
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrInsta​nceWithoutClassifier​.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/uml/cognitive​/critics/CrInstanceW​ithoutClassifier.jav​a?view=diff&path​rev=130&r1=129​&r2=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrInsta​nceWithoutClassifier​.java (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrInsta​nceWithoutClassifier​.java 2010-09-26 15:04:15-0700
@@ -1,5 +1,6 @@
-//#if defined(COGNITIVE)
+//#if defined(COGNITIVE) and defined(DEPLOYMENTDIAGRAM)
 //@#$LPS-COGNITIVE:​GranularityType:Pack​age
+//@#$LPS-DEPLOYMEN​TDIAGRAM:Granularity​Type:Class
 
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrInter​faceWithoutComponent​.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/uml/cognitive​/critics/CrInterface​WithoutComponent.jav​a?view=diff&path​rev=130&r1=129​&r2=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrInter​faceWithoutComponent​.java (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrInter​faceWithoutComponent​.java 2010-09-26 15:04:15-0700
@@ -1,5 +1,6 @@
-//#if defined(COGNITIVE)
+//#if defined(COGNITIVE) and defined(DEPLOYMENTDIAGRAM)
 //@#$LPS-COGNITIVE:​GranularityType:Pack​age
+//@#$LPS-DEPLOYMEN​TDIAGRAM:Granularity​Type:Class
 
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrNodeI​nsideElement.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/uml/cognitive​/critics/CrNodeInsid​eElement.java?view=d​iff&pathrev=130​&r1=129&r2=13​0
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrNodeI​nsideElement.java (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrNodeI​nsideElement.java 2010-09-26 15:04:15-0700
@@ -1,5 +1,6 @@
-//#if defined(COGNITIVE)
+//#if defined(COGNITIVE) and defined(DEPLOYMENTDIAGRAM)
 //@#$LPS-COGNITIVE:​GranularityType:Pack​age
+//@#$LPS-DEPLOYMEN​TDIAGRAM:Granularity​Type:Class
 
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrNodeI​nstanceInsideElement​.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/uml/cognitive​/critics/CrNodeInsta​nceInsideElement.jav​a?view=diff&path​rev=130&r1=129​&r2=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrNodeI​nstanceInsideElement​.java (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrNodeI​nstanceInsideElement​.java 2010-09-26 15:04:15-0700
@@ -1,5 +1,6 @@
-//#if defined(COGNITIVE)
+//#if defined(COGNITIVE) and defined(DEPLOYMENTDIAGRAM)
 //@#$LPS-COGNITIVE:​GranularityType:Pack​age
+//@#$LPS-DEPLOYMEN​TDIAGRAM:Granularity​Type:Class
 
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrNodeI​nstanceWithoutClassi​fier.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/uml/cognitive​/critics/CrNodeInsta​nceWithoutClassifier​.java?view=diff&​pathrev=130&r1=1​29&r2=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrNodeI​nstanceWithoutClassi​fier.java (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrNodeI​nstanceWithoutClassi​fier.java 2010-09-26 15:04:15-0700
@@ -1,5 +1,6 @@
-//#if defined(COGNITIVE)
+//#if defined(COGNITIVE) and defined(DEPLOYMENTDIAGRAM)
 //@#$LPS-COGNITIVE:​GranularityType:Pack​age
+//@#$LPS-DEPLOYMEN​TDIAGRAM:Granularity​Type:Class
 
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrNodes​Overlap.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/uml/cognitive​/critics/CrNodesOver​lap.java?view=diff​&pathrev=130&r​1=129&r2=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrNodes​Overlap.java (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrNodes​Overlap.java 2010-09-26 15:04:15-0700
@@ -37,8 +37,12 @@
 import org.argouml.cognitive.ListSet;
 import org.argouml.cognitive.ToDoItem;
 import org.argouml.uml.cogn​itive.UMLDecision;
+//#if defined(DEPLOYMENTDIAGRAM)
+//@#$LPS-DEPLOYMEN​TDIAGRAM:Granularity​Type:Import
+//@#$LPS-DEPLOYMEN​TDIAGRAM:Localizatio​n:NestedIfdef-COGNIT​IVE
 import org.argouml.uml.diag​ram.deployment.ui.Fi​gObject;
 import org.argouml.uml.diag​ram.deployment.ui.UM​LDeploymentDiagram;
+//#endif
 //#if defined(SEQUENCEDIAGRAM)
 //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Import
 //@#$LPS-SEQUENCEDI​AGRAM:Localization:N​estedIfdef-COGNITIVE​
@@ -150,6 +154,10 @@
                 }
                 FigNode fnj = (FigNode) oj;
                 if (fnj.intersects(boundsi)) {
+ //#if defined(DEPLOYMENTDIAGRAM)
+ //@#$LPS-DEPLOYMENT​DIAGRAM:GranularityT​ype:Expression
+ //@#$LPS-DEPLOYMENT​DIAGRAM:Localization​:NestedIfdef-COGNITI​VE
+ //@#$LPS-DEPLOYMENT​DIAGRAM:Localization​:NestedCommand
                     if (!(d instanceof UMLDeploymentDiagram)) {
                         if (fni instanceof FigNodeModelElement) {
                             if (((FigNodeModelElement) fni).getEnclosingFig()
@@ -168,14 +176,30 @@
                     // while they are not the EnclosingFig, so you
                     // have to prouve only these elements.
                     else {
+ //#endif
                         if ((!((fni instanceof FigClass)
                                 || (fni instanceof FigInterface)
- || (fni instanceof FigObject)))
+ //#if defined(DEPLOYMENTDIAGRAM)
+ //@#$LPS-DEPLOYMENT​DIAGRAM:GranularityT​ype:Expression
+ //@#$LPS-DEPLOYMENT​DIAGRAM:Localization​:NestedIfdef-COGNITI​VE
+ //@#$LPS-DEPLOYMENT​DIAGRAM:Localization​:NestedCommand
+ || (fni instanceof FigObject)
+ //#endif
+ ))
+
                                 || (!((fnj instanceof FigClass)
                                         || (fnj instanceof FigInterface)
- || (fnj instanceof FigObject))))
+ //#if defined(DEPLOYMENTDIAGRAM)
+ //@#$LPS-DEPLOYMENT​DIAGRAM:GranularityT​ype:Expression
+ //@#$LPS-DEPLOYMENT​DIAGRAM:Localization​:NestedIfdef-COGNITI​VE
+ //@#$LPS-DEPLOYMENT​DIAGRAM:Localization​:NestedCommand
+ || (fnj instanceof FigObject)
+ //#endif
+ )))
                             continue;
+ //#if defined(DEPLOYMENTDIAGRAM)
                     }
+ //#endif
                     if (offs == null) {
                         offs = new ListSet();
                         offs.add(d);

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrObjec​tWithoutClassifier.j​ava
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/uml/cognitive​/critics/CrObjectWit​houtClassifier.java?​view=diff&pathre​v=130&r1=129​&r2=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrObjec​tWithoutClassifier.j​ava (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrObjec​tWithoutClassifier.j​ava 2010-09-26 15:04:15-0700
@@ -1,5 +1,6 @@
-//#if defined(COGNITIVE)
+//#if defined(COGNITIVE) and defined(DEPLOYMENTDIAGRAM)
 //@#$LPS-COGNITIVE:​GranularityType:Pack​age
+//@#$LPS-DEPLOYMEN​TDIAGRAM:Granularity​Type:Class
 
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrObjec​tWithoutComponent.ja​va
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/uml/cognitive​/critics/CrObjectWit​houtComponent.java?v​iew=diff&pathrev​=130&r1=129&​r2=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrObjec​tWithoutComponent.ja​va (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrObjec​tWithoutComponent.ja​va 2010-09-26 15:04:15-0700
@@ -1,5 +1,6 @@
-//#if defined(COGNITIVE)
+//#if defined(COGNITIVE) and defined(DEPLOYMENTDIAGRAM)
 //@#$LPS-COGNITIVE:​GranularityType:Pack​age
+//@#$LPS-DEPLOYMEN​TDIAGRAM:Granularity​Type:Class
 
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrWrong​DepEnds.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/uml/cognitive​/critics/CrWrongDepE​nds.java?view=diff​&pathrev=130&r​1=129&r2=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrWrong​DepEnds.java (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrWrong​DepEnds.java 2010-09-26 15:04:15-0700
@@ -1,5 +1,6 @@
-//#if defined(COGNITIVE)
+//#if defined(COGNITIVE) and defined(DEPLOYMENTDIAGRAM)
 //@#$LPS-COGNITIVE:​GranularityType:Pack​age
+//@#$LPS-DEPLOYMEN​TDIAGRAM:Granularity​Type:Class
 
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrWrong​LinkEnds.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/uml/cognitive​/critics/CrWrongLink​Ends.java?view=diff​&pathrev=130&​r1=129&r2=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrWrong​LinkEnds.java (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/CrWrong​LinkEnds.java 2010-09-26 15:04:15-0700
@@ -1,5 +1,6 @@
-//#if defined(COGNITIVE)
+//#if defined(COGNITIVE) and defined(DEPLOYMENTDIAGRAM)
 //@#$LPS-COGNITIVE:​GranularityType:Pack​age
+//@#$LPS-DEPLOYMEN​TDIAGRAM:Granularity​Type:Class
 
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/Profile​CodeGeneration.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/uml/cognitive​/critics/ProfileCode​Generation.java?view​=diff&pathrev=13​0&r1=129&r2=​130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/Profile​CodeGeneration.java (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/Profile​CodeGeneration.java 2010-09-26 15:04:15-0700
@@ -110,14 +110,17 @@
         critics.add(new CrUnconventionalAttrName());
         critics.add(new CrUnconventionalClassName());
         critics.add(new CrUnconventionalPackName());
+ //#if defined(DEPLOYMENTDIAGRAM)
+ //@#$LPS-DEPLOYMENT​DIAGRAM:GranularityT​ype:Statement
         critics.add(new CrNodeInsideElement());
- critics.add(new CrNodeInstanceInsideElement());
+ critics.add(new CrNodeInstanceInsideElement());
         critics.add(new CrComponentWithoutNode());
         critics.add(new CrCompInstanceWithoutNode());
         critics.add(new CrClassWithoutComponent());
         critics.add(new CrInterfaceWithoutComponent());
         critics.add(new CrObjectWithoutComponent());
         critics.add(new CrInstanceWithoutClassifier());
+ //#endif
         critics.add(noTrans1);
         critics.add(noTrans2);
         

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/Profile​GoodPractices.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/uml/cognitive​/critics/ProfileGood​Practices.java?view=​diff&pathrev=130​&r1=129&r2=1​30
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/Profile​GoodPractices.java (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/cogni​tive/critics/Profile​GoodPractices.java 2010-09-26 15:04:15-0700
@@ -71,7 +71,11 @@
         critics.add(new CrTooManyTransitions());
         critics.add(new CrTooManyStates());
         critics.add(new CrTooManyClasses());
+ //#if defined(DEPLOYMENTDIAGRAM)
+ //@#$LPS-DEPLOYMENT​DIAGRAM:GranularityT​ype:Statement
+ //@#$LPS-DEPLOYMENT​DIAGRAM:Localization​:NestedIfdef-COGNITI​VE
         critics.add(new CrWrongLinkEnds());
+ //#endif
         critics.add(new CrUtilityViolated());
 
         this.setCritics(critics);

Modified: branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/ArgoDiagramImpl.j​ava
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Dep​loymentDiagram/src/a​rgouml-app/src/org/a​rgouml/uml/diagram/A​rgoDiagramImpl.java?​view=diff&pathre​v=130&r1=129​&r2=130
====================​====================​====================​==================
--- branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/ArgoDiagramImpl.j​ava (original)
+++ branches/NewFeatures​/DeploymentDiagram/s​rc/argouml-app/src/o​rg/argouml/uml/diagr​am/ArgoDiagramImpl.j​ava 2010-09-26 15:04:15-0700
@@ -413,6 +413,7 @@
                 && f.getOwner() == null
                 //#if defined(ACTIVITYDIAGRAM)
                 //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Expression
+ //@#$LPS-ACTIVITYDI​AGRAM:Localization:N​estedCommand
                 && !(f instanceof FigPool)
                 //#endif
                 ) {
@@ -670,6 +671,7 @@
                 }
                 //#if defined(LOGGING)
                 //@#$LPS-LOGGING:Gr​anularityType:Statem​ent
+ //@#$LPS-LOGGING:Lo​calization:NestedCom​mand
                 else {
                     LOG.warn("Diagram " + getName() + " contains non-ArgoFig "
                             + fig);
@@ -678,6 +680,7 @@
             } catch (InvalidElementException e) {
                 //#if defined(LOGGING)
                 //@#$LPS-LOGGING:Gr​anularityType:Statem​ent
+

View complete message

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

Messages

Show all messages in topic

svn commit: r130 - branches/NewFeatures/DeploymentDiagram/src: argouml-app argouml-app/src/org/argouml/application argouml-app/src/org/argouml/notation/providers/uml argouml-app/src/org/argouml/ui/cmd... marcusvnac Marcus Vinícius de Ávila Couto 2010-09-26 15:04:17 PDT
Messages per page: