Login | Register
My pages Projects Community openCollabNet

Discussions > Commits > svn commit: r109 - branches/NewFeatures/CollaborationDiagram/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/collaboration argouml-app/src/org/argouml/uml/diagram/collaboration/ui argouml-app/src/org/argouml/uml/diagram/ui argouml-app/src/org/argouml/uml/ui argouml-app/src/org/argouml/uml/ui/behavior/state_machines argouml-build argouml-core-diagrams-sequence2 argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram argouml-core-model argouml-core-model-euml argouml-core-model-euml/src/org/argouml/model/euml argouml-core-model-mdr argouml-core-model-mdr/src/org/argouml/model/mdr argouml-core-model/src/org/argouml/model

argouml-spl
Discussion topic

Back to topic list

svn commit: r109 - branches/NewFeatures/CollaborationDiagram/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/collaboration argouml-app/src/org/argouml/uml/diagram/collaboration/ui argouml-app/src/org/argouml/uml/diagram/ui argouml-app/src/org/argouml/uml/ui argouml-app/src/org/argouml/uml/ui/behavior/state_machines argouml-build argouml-core-diagrams-sequence2 argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram argouml-core-model argouml-core-model-euml argouml-core-model-euml/src/org/argouml/model/euml argouml-core-model-mdr argouml-core-model-mdr/src/org/argouml/model/mdr argouml-core-model/src/org/argouml/model

Author marcusvnac
Full name Marcus Vinícius de Ávila Couto
Date 2010-08-15 18:57:31 PDT
Message Author: marcusvnac
Date: 2010-08-15 18:57:28-0700
New Revision: 109

Modified:
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/bu​ild.xml
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/applic​ation/Main.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/notati​on/providers/uml/Ext​ensionPointNotationU​ml.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/notati​on/providers/uml/Sta​teBodyNotationUml.ja​va
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/notati​on/providers/uml/Tra​nsitionNotationUml.j​ava
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/cmd​/GenericArgoMenuBar.​java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/cmd​/ShortcutMgr.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/ExplorerPopup.​java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/PerspectiveMan​ager.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoClassi​fierToCollaboration.​java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoClassi​fierToStateMachine.j​ava
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoCollab​orationToDiagram.jav​a
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoCollab​orationToInteraction​.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoModelT​oCollaboration.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoOperat​ionToCollaboration.j​ava
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoOperat​ionToCollaborationDi​agram.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoProjec​tToCollaboration.jav​a
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/co​gnitive/critics/CrSe​qInstanceWithoutClas​sifier.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/di​agram/DiagramFactory​.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/di​agram/UmlDiagramRend​erer.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/di​agram/collaboration/​CollabDiagramGraphMo​del.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/di​agram/collaboration/​ui/ActionAddClassifi​erRole.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/di​agram/collaboration/​ui/CollabDiagramRend​erer.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/di​agram/collaboration/​ui/CollaborationDiag​ramPropPanelFactory.​java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/di​agram/collaboration/​ui/FigAssociationRol​e.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/di​agram/collaboration/​ui/FigClassifierRole​.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/di​agram/collaboration/​ui/InitCollaboration​Diagram.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/di​agram/collaboration/​ui/PropPanelUMLColla​borationDiagram.java​
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/di​agram/collaboration/​ui/SelectionClassifi​erRole.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/di​agram/collaboration/​ui/UMLCollaborationD​iagram.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/di​agram/ui/ActionAddCo​ncurrentRegion.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/di​agram/ui/ActionAddEx​tensionPoint.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/di​agram/ui/ActionAddMe​ssage.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/di​agram/ui/FigMessage.​java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/ui​/ActionCollaboration​Diagram.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/ui​/ActionSequenceDiagr​am.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/ui​/UMLConditionExpress​ionModel.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/state_mach​ines/ActionNewCallEv​ent.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/state_mach​ines/ActionNewChange​Event.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/state_mach​ines/ActionNewCompos​iteState.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/state_mach​ines/ActionNewFinalS​tate.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/state_mach​ines/ActionNewGuard.​java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/state_mach​ines/ActionNewPseudo​State.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/state_mach​ines/ActionNewSignal​Event.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/state_mach​ines/ActionNewSimple​State.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/state_mach​ines/ActionNewStubSt​ate.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/state_mach​ines/ActionNewSubmac​hineState.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/state_mach​ines/ActionNewSynchS​tate.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/state_mach​ines/ActionNewTimeEv​ent.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/state_mach​ines/ActionNewTransi​tion.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/state_mach​ines/ButtonActionNew​Guard.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-build/​build.xml
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-build/​jpp-features.propert​ies
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-d​iagrams-sequence2/bu​ild.xml
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-d​iagrams-sequence2/sr​c/org/argouml/sequen​ce2/diagram/ActionAd​dClassifierRole.java​
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-d​iagrams-sequence2/sr​c/org/argouml/sequen​ce2/diagram/UMLSeque​nceDiagram.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel-euml/build.xml
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel-euml/src/org/ar​gouml/model/euml/Col​laborationsFactoryEU​MLImpl.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel-euml/src/org/ar​gouml/model/euml/Col​laborationsHelperEUM​LImpl.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel-euml/src/org/ar​gouml/model/euml/EUM​LModelImplementation​.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel-euml/src/org/ar​gouml/model/euml/Uml​FactoryEUMLImpl.java​
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel-euml/src/org/ar​gouml/model/euml/Uml​HelperEUMLImpl.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel-euml/src/org/ar​gouml/model/euml/Use​CasesFactoryEUMLImpl​.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel-euml/src/org/ar​gouml/model/euml/Use​CasesHelperEUMLImpl.​java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel-mdr/build.xml
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/Colla​borationsFactoryMDRI​mpl.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/Colla​borationsHelperMDRIm​pl.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/Commo​nBehaviorFactoryMDRI​mpl.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/MDRMo​delImplementation.ja​va
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/State​MachinesFactoryMDRIm​pl.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/UmlFa​ctoryMDRImpl.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/UmlHe​lperMDRImpl.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/UndoC​ollaborationsHelperD​ecorator.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/UndoS​tateMachinesHelperDe​corator.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/UndoU​seCasesHelperDecorat​or.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/UseCa​sesFactoryMDRImpl.ja​va
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/UseCa​sesHelperMDRImpl.jav​a
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel/build.xml
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel/src/org/argouml​/model/AbstractColla​borationsHelperDecor​ator.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel/src/org/argouml​/model/AbstractState​MachinesHelperDecora​tor.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel/src/org/argouml​/model/AbstractUseCa​sesHelperDecorator.j​ava
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel/src/org/argouml​/model/ActivityDiagr​am.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel/src/org/argouml​/model/ActivityGraph​sFactory.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel/src/org/argouml​/model/ActivityGraph​sHelper.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel/src/org/argouml​/model/Collaboration​Diagram.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel/src/org/argouml​/model/Collaboration​sFactory.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel/src/org/argouml​/model/Collaboration​sHelper.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel/src/org/argouml​/model/Facade.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel/src/org/argouml​/model/Model.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel/src/org/argouml​/model/ModelImplemen​tation.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel/src/org/argouml​/model/SequenceDiagr​am.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel/src/org/argouml​/model/StateDiagram.​java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel/src/org/argouml​/model/StateMachines​Factory.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel/src/org/argouml​/model/UseCaseDiagra​m.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel/src/org/argouml​/model/UseCasesFacto​ry.java
   branches/NewFeatures​/CollaborationDiagra​m/src/argouml-core-m​odel/src/org/argouml​/model/UseCasesHelpe​r.java

Log:
New feature (CollaborationDiagram)
Fix problems in other features.

Modified: branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/bu​ild.xml
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Col​laborationDiagram/sr​c/argouml-app/build.​xml?view=diff&pa​threv=109&r1=108​&r2=109
====================​====================​====================​==================
--- branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/bu​ild.xml (original)
+++ branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/bu​ild.xml 2010-08-15 18:57:28-0700
@@ -744,7 +744,12 @@
             <echo message="USECASEDIAGRAM"/>
         </then>
     </if>
-
+ <if>
+ <isset property="COLLABORAT​IONDIAGRAM"/>
+ <then>
+ <echo message="COLLABORATI​ONDIAGRAM"/>
+ </then>
+ </if>
   </target>
 
   <!-- ====================​====================​====================​======= -->

Modified: branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/applic​ation/Main.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Col​laborationDiagram/sr​c/argouml-app/src/or​g/argouml/applicatio​n/Main.java?view=dif​f&pathrev=109​&r1=108&r2=109
====================​====================​====================​==================
--- branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/applic​ation/Main.java (original)
+++ branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/applic​ation/Main.java 2010-08-15 18:57:28-0700
@@ -85,7 +85,10 @@
 //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.diag​ram.activity.ui.Init​ActivityDiagram;
 //#endif
+//#if defined(COLLABORATIONDIAGRAM)
+//@#$LPS-COLLABORA​TIONDIAGRAM:Granular​ityType:Import
 import org.argouml.uml.diag​ram.collaboration.ui​.InitCollaborationDi​agram;
+//#endif
 import org.argouml.uml.diag​ram.deployment.ui.In​itDeploymentDiagram;​
 //#if defined(SEQUENCEDIAGRAM)
 //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Import
@@ -446,7 +449,10 @@
         //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
         SubsystemUtility.ini​tSubsystem(new InitActivityDiagram());
         //#endif
+ //#if defined(COLLABORATIONDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
         SubsystemUtility.ini​tSubsystem(new InitCollaborationDiagram());
+ //#endif
         SubsystemUtility.ini​tSubsystem(new InitDeploymentDiagram());
         //#if defined(SEQUENCEDIAGRAM)
         //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command

Modified: branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/notati​on/providers/uml/Ext​ensionPointNotationU​ml.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Col​laborationDiagram/sr​c/argouml-app/src/or​g/argouml/notation/p​roviders/uml/Extensi​onPointNotationUml.j​ava?view=diff&pa​threv=109&r1=108​&r2=109
====================​====================​====================​==================
--- branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/notati​on/providers/uml/Ext​ensionPointNotationU​ml.java (original)
+++ branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/notati​on/providers/uml/Ext​ensionPointNotationU​ml.java 2010-08-15 18:57:28-0700
@@ -78,14 +78,17 @@
     public void parseExtensionPointFig(Object ep, String text) {
         // We can do nothing if we don't have both the use case and extension
         // point.
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
         if (ep == null) {
             return;
         }
+
         Object useCase = Model.getFacade().ge​tUseCase(ep);
         if (useCase == null) {
             return;
         }
-
+
         // Parse the string to creat a new extension point.
         Object newEp = parseExtensionPoint(text);
 
@@ -101,8 +104,11 @@
         }
         /* TODO: This needs more work!
          * We simply throw the new extension point away? */
+ //#endif
     }
 
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Method
     /**
      * Parse a string representing an extension point and return a new extension
      * point.<p>
@@ -196,7 +202,7 @@
 
         return ep;
     }
-
+ //#endif
     /*
      * @see org.argouml.notation​.providers.NotationP​rovider#getParsingHe​lp()
      */

Modified: branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/notati​on/providers/uml/Sta​teBodyNotationUml.ja​va
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Col​laborationDiagram/sr​c/argouml-app/src/or​g/argouml/notation/p​roviders/uml/StateBo​dyNotationUml.java?v​iew=diff&pathrev​=109&r1=108&​r2=109
====================​====================​====================​==================
--- branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/notati​on/providers/uml/Sta​teBodyNotationUml.ja​va (original)
+++ branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/notati​on/providers/uml/Sta​teBodyNotationUml.ja​va 2010-08-15 18:57:28-0700
@@ -190,7 +190,9 @@
                         && line.substring(2).tr​im().startsWith("/")​) {
                     parseStateDoAction(st, line);
                     foundDo = true;
- } else {
+ }
+ //#if defined(UMLSTATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+ else {
                     Object t =
                         Model.getStateMachinesFactory()
                                 .buildInternalTransition(st);
@@ -209,6 +211,7 @@
                     /* Add this new one, and mark it to be retained: */
                     internalsInfo.add(t, true);
                 }
+ //#endif
             }
         }
 

Modified: branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/notati​on/providers/uml/Tra​nsitionNotationUml.j​ava
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Col​laborationDiagram/sr​c/argouml-app/src/or​g/argouml/notation/p​roviders/uml/Transit​ionNotationUml.java?​view=diff&pathre​v=109&r1=108​&r2=109
====================​====================​====================​==================
--- branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/notati​on/providers/uml/Tra​nsitionNotationUml.j​ava (original)
+++ branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/notati​on/providers/uml/Tra​nsitionNotationUml.j​ava 2010-08-15 18:57:28-0700
@@ -225,10 +225,17 @@
         Object ns =
             Model.getStateMachinesHelper()
                 .findNamespaceForEvent(trans, null);
+ //#if defined(UMLSTATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+ //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
         StateMachinesFactory sMFactory =
                 Model.getStateMachin​esFactory();
+ //#endif
         boolean createdEvent = false;
         if (trigger.length() > 0) {
+ //#if defined(UMLSTATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+ //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
             // case 1 and 2
             if (evt == null) {
                 // case 1
@@ -253,6 +260,7 @@
                     evt = sMFactory.buildSigna​lEvent(trigger, ns);
                 }
                 createdEvent = true;
+ //#endif
             } else {
                 // case 2
                 if (timeEvent) {
@@ -361,9 +369,12 @@
      * @param guard the string that represents the guard expression
      */
     private void parseGuard(Object trans, String guard) {
- Object g = Model.getFacade().ge​tGuard(trans);
- if (guard.length() > 0) {
+ Object g = Model.getFacade().ge​tGuard(trans);
+ if (guard.length() > 0) {
             if (g == null) {
+ //#if defined(UMLSTATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+ //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
                 // case 1
                 /*TODO: In the next line, I should use buildGuard(),
                  * but it doesn't show the guard on the diagram...
@@ -380,6 +391,7 @@
                     // NSUML does this (?)
                     // Model.getFacade().se​tGuard(trans, g);
                 }
+ //#endif
             } else {
                 // case 2
                 Object expr = Model.getFacade().ge​tExpression(g);

Modified: branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/cmd​/GenericArgoMenuBar.​java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Col​laborationDiagram/sr​c/argouml-app/src/or​g/argouml/ui/cmd/Gen​ericArgoMenuBar.java​?view=diff&pathr​ev=109&r1=108​&r2=109
====================​====================​====================​==================
--- branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/cmd​/GenericArgoMenuBar.​java (original)
+++ branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/cmd​/GenericArgoMenuBar.​java 2010-08-15 18:57:28-0700
@@ -71,7 +71,10 @@
 import org.argouml.uml.ui.A​ctionActivityDiagram​;
 //#endif
 import org.argouml.uml.ui.A​ctionClassDiagram;
+//#if defined(COLLABORATIONDIAGRAM)
+//@#$LPS-COLLABORA​TIONDIAGRAM:Granular​ityType:Import
 import org.argouml.uml.ui.A​ctionCollaborationDi​agram;
+//#endif
 import org.argouml.uml.ui.A​ctionDeleteModelElem​ents;
 import org.argouml.uml.ui.A​ctionDeploymentDiagr​am;
 import org.argouml.uml.ui.A​ctionGenerateAll;
@@ -626,8 +629,8 @@
         toolbarTools.add((new ActionClassDiagram()));
         ShortcutMgr.assignAc​celerator(classDiagr​am,
                 ShortcutMgr.ACTION_C​LASS_DIAGRAM);
- //#if defined(SEQUENCEDIAGRAM)
- //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
+ //#if defined(SEQUENCEDIAGRAM)
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
         JMenuItem sequenzDiagram =
             createDiagramMenu.add(new ActionSequenceDiagram());
         setMnemonic(sequenzDiagram, "Sequenz Diagram");
@@ -635,12 +638,15 @@
         ShortcutMgr.assignAc​celerator(sequenzDia​gram,
                 ShortcutMgr.ACTION_S​EQUENCE_DIAGRAM);
         //#endif
+ //#if defined(COLLABORATIONDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
         JMenuItem collaborationDiagram =
             createDiagramMenu.add(new ActionCollaborationDiagram());
         setMnemonic(collabor​ationDiagram, "Collaboration Diagram");
         toolbarTools.add((new ActionCollaborationDiagram()));
         ShortcutMgr.assignAc​celerator(collaborat​ionDiagram,
                 ShortcutMgr.ACTION_C​OLLABORATION_DIAGRAM​);
+ //#endif
         //#if defined(UMLSTATEDIAGRAM)
         //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Command
         JMenuItem stateDiagram =

Modified: branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/cmd​/ShortcutMgr.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Col​laborationDiagram/sr​c/argouml-app/src/or​g/argouml/ui/cmd/Sho​rtcutMgr.java?view=d​iff&pathrev=109​&r1=108&r2=10​9
====================​====================​====================​==================
--- branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/cmd​/ShortcutMgr.java (original)
+++ branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/cmd​/ShortcutMgr.java 2010-08-15 18:57:28-0700
@@ -65,7 +65,10 @@
 import org.argouml.uml.ui.A​ctionActivityDiagram​;
 //#endif
 import org.argouml.uml.ui.A​ctionClassDiagram;
+//#if defined(COLLABORATIONDIAGRAM)
+//@#$LPS-COLLABORA​TIONDIAGRAM:Granular​ityType:Import
 import org.argouml.uml.ui.A​ctionCollaborationDi​agram;
+//#endif
 import org.argouml.uml.ui.A​ctionDeleteModelElem​ents;
 import org.argouml.uml.ui.A​ctionDeploymentDiagr​am;
 import org.argouml.uml.ui.A​ctionGenerateAll;
@@ -227,10 +230,12 @@
     /** Action key for sequence diagram */
     public static final String ACTION_SEQUENCE_DIAGRAM = "sequenceDiagrams";
     //#endif
-
+ //#if defined(COLLABORATIONDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Field
     /** Action key for collaboration diagram */
     public static final String ACTION_COLLABORATION_DIAGRAM =
         "collaborationDiagrams";
+ //#endif
     //#if defined(UMLSTATEDIAGRAM)
     //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Field
     /** Action key for state diagram */
@@ -685,8 +690,11 @@
         putDefaultShortcut(A​CTION_SEQUENCE_DIAGR​AM, null,
                 new ActionSequenceDiagram());
         //#endif
+ //#if defined(COLLABORATIONDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
         putDefaultShortcut(A​CTION_COLLABORATION_​DIAGRAM, null,
                 new ActionCollaborationDiagram());
+ //#endif
         //#if defined(UMLSTATEDIAGRAM)
         //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Command
         putDefaultShortcut(A​CTION_STATE_DIAGRAM,​ null,

Modified: branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/ExplorerPopup.​java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Col​laborationDiagram/sr​c/argouml-app/src/or​g/argouml/ui/explore​r/ExplorerPopup.java​?view=diff&pathr​ev=109&r1=108​&r2=109
====================​====================​====================​==================
--- branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/ExplorerPopup.​java (original)
+++ branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/ExplorerPopup.​java 2010-08-15 18:57:28-0700
@@ -78,7 +78,10 @@
 import org.argouml.uml.ui.A​ctionActivityDiagram​;
 //#endif
 import org.argouml.uml.ui.A​ctionClassDiagram;
+//#if defined(COLLABORATIONDIAGRAM)
+//@#$LPS-COLLABORA​TIONDIAGRAM:Granular​ityType:Import
 import org.argouml.uml.ui.A​ctionCollaborationDi​agram;
+//#endif
 import org.argouml.uml.ui.A​ctionDeleteModelElem​ents;
 import org.argouml.uml.ui.A​ctionDeploymentDiagr​am;
 //#if defined(SEQUENCEDIAGRAM)
@@ -414,7 +417,10 @@
         //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
         createDiagrams.add(new ActionSequenceDiagram());
         //#endif
+ //#if defined(COLLABORATIONDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
         createDiagrams.add(new ActionCollaborationDiagram());
+ //#endif
         //#if defined(UMLSTATEDIAGRAM)
         //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Command
         createDiagrams.add(new ActionStateDiagram());

Modified: branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/PerspectiveMan​ager.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Col​laborationDiagram/sr​c/argouml-app/src/or​g/argouml/ui/explore​r/PerspectiveManager​.java?view=diff&​pathrev=109&r1=1​08&r2=109
====================​====================​====================​==================
--- branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/PerspectiveMan​ager.java (original)
+++ branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/PerspectiveMan​ager.java 2010-08-15 18:57:28-0700
@@ -46,16 +46,25 @@
 import org.argouml.ui.explo​rer.rules.GoClassToN​avigableClass;
 import org.argouml.ui.explo​rer.rules.GoClassToS​ummary;
 import org.argouml.ui.explo​rer.rules.GoClassifi​erToBehavioralFeatur​e;
+//#if defined(COLLABORATIONDIAGRAM)
+//@#$LPS-COLLABORA​TIONDIAGRAMM:Granula​rityType:Import
 import org.argouml.ui.explo​rer.rules.GoClassifi​erToCollaboration;
+//#endif
 import org.argouml.ui.explo​rer.rules.GoClassifi​erToInstance;
 //#if defined(SEQUENCEDIAGRAM)
 //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.ui.explo​rer.rules.GoClassifi​erToSequenceDiagram;​
 //#endif
+//#if defined(UMLSTATEDIAGRAM)
+//@#$LPS-UMLSTATED​IAGRAM:GranularityTy​pe:Import
 import org.argouml.ui.explo​rer.rules.GoClassifi​erToStateMachine;
+//#endif
 import org.argouml.ui.explo​rer.rules.GoClassifi​erToStructuralFeatur​e;
+//#if defined(COLLABORATIONDIAGRAM)
+//@#$LPS-COLLABORA​TIONDIAGRAMM:Granula​rityType:Import
 import org.argouml.ui.explo​rer.rules.GoCollabor​ationToDiagram;
 import org.argouml.ui.explo​rer.rules.GoCollabor​ationToInteraction;
+//#endif
 import org.argouml.ui.explo​rer.rules.GoComponen​tToResidentModelElem​ent;
 //#if defined(UMLSTATEDIAGRAM)
 //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Import
@@ -79,7 +88,10 @@
 import org.argouml.ui.explo​rer.rules.GoModelEle​mentToContainedLostE​lements;
 import org.argouml.ui.explo​rer.rules.GoModelEle​mentToContents;
 import org.argouml.ui.explo​rer.rules.GoModelToB​aseElements;
+//#if defined(COLLABORATIONDIAGRAM)
+//@#$LPS-COLLABORA​TIONDIAGRAMM:Granula​rityType:Import
 import org.argouml.ui.explo​rer.rules.GoModelToC​ollaboration;
+//#endif
 import org.argouml.ui.explo​rer.rules.GoModelToD​iagrams;
 import org.argouml.ui.explo​rer.rules.GoModelToE​lements;
 import org.argouml.ui.explo​rer.rules.GoModelToN​ode;
@@ -87,8 +99,11 @@
 import org.argouml.ui.explo​rer.rules.GoNamespac​eToDiagram;
 import org.argouml.ui.explo​rer.rules.GoNamespac​eToOwnedElements;
 import org.argouml.ui.explo​rer.rules.GoNodeToRe​sidentComponent;
+//#if defined(COLLABORATIONDIAGRAM)
+//@#$LPS-COLLABORA​TIONDIAGRAMM:Granula​rityType:Import
 import org.argouml.ui.explo​rer.rules.GoOperatio​nToCollaboration;
 import org.argouml.ui.explo​rer.rules.GoOperatio​nToCollaborationDiag​ram;
+//#endif
 //#if defined(SEQUENCEDIAGRAM)
 //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.ui.explo​rer.rules.GoOperatio​nToSequenceDiagram;
@@ -101,7 +116,10 @@
 import org.argouml.ui.explo​rer.rules.GoProfileT​oCritics;
 //#endif
 import org.argouml.ui.explo​rer.rules.GoProfileT​oModel;
+//#if defined(COLLABORATIONDIAGRAM)
+//@#$LPS-COLLABORA​TIONDIAGRAMM:Granula​rityType:Import
 import org.argouml.ui.explo​rer.rules.GoProjectT​oCollaboration;
+//#endif
 import org.argouml.ui.explo​rer.rules.GoProjectT​oDiagram;
 import org.argouml.ui.explo​rer.rules.GoProjectT​oModel;
 import org.argouml.ui.explo​rer.rules.GoProjectT​oProfileConfiguratio​n;
@@ -417,16 +435,25 @@
         packagePerspective.addRule(new GoClassifierToStruct​uralFeature());
         packagePerspective.addRule(new GoClassifierToBehavi​oralFeature());
         packagePerspective.addRule(new GoEnumerationToLiterals());
+ //#if defined(COLLABORATIONDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
         packagePerspective.addRule(new GoCollaborationToInt​eraction());
+ //#endif
         packagePerspective.addRule(new GoInteractionToMessages());
         packagePerspective.addRule(new GoMessageToAction());
         packagePerspective.addRule(new GoSignalToReception());
         packagePerspective.addRule(new GoLinkToStimuli());
         packagePerspective.addRule(new GoStimulusToAction());
- packagePerspective.addRule(new GoClassifierToCollaboration());
+ //#if defined(COLLABORATIONDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
+ packagePerspective.addRule(new GoClassifierToCollaboration());
         packagePerspective.addRule(new GoOperationToCollaboration());
+ //#endif
         packagePerspective.addRule(new GoModelElementToComment());
+ //#if defined(COLLABORATIONDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
         packagePerspective.addRule(new GoCollaborationToDiagram());
+ //#endif
         /*
          * Removed the next one due to issue 2165.
          * packagePerspective.addRule(new GoOperationToCollabo​rationDiagram());
@@ -603,17 +630,27 @@
             //#endif
             new GoBehavioralFeatureT​oStateMachine(),
             new GoClassifierToBehavi​oralFeature(),
+ //#if defined(COLLABORATIONDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:StaticInitial​ization
             new GoClassifierToCollaboration(),
+ //#endif
             new GoClassifierToInstance(),
             //#if defined(SEQUENCEDIAGRAM)
- //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:StaticInitializati​on
             new GoClassifierToSequen​ceDiagram(),
             //#endif
+ //#if defined(UMLSTATEDIAGRAM)
+ //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:StaticInitializati​on
             new GoClassifierToStateMachine(),
+ //#endif
             new GoClassifierToStruct​uralFeature(),
             new GoClassToAssociatedClass(), new GoClassToNavigableClass(),
- new GoClassToSummary(), new GoCollaborationToDiagram(),
+ new GoClassToSummary(),
+ //#if defined(COLLABORATIONDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:StaticInitial​ization
+ new GoCollaborationToDiagram(),
             new GoCollaborationToInteraction(),
+ //#endif
             new GoComponentToResiden​tModelElement(),
             //#if defined(UMLSTATEDIAGRAM)
             //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:StaticInitializati​on
@@ -628,19 +665,30 @@
             new GoModelElementToContents(),
             new GoModelElementToCont​ainedDiagrams(),
             new GoModelElementToCont​ainedLostElements(),​
- new GoModelToBaseElements(), new GoModelToCollaboration(),
+ new GoModelToBaseElements(),
+ //#if defined(COLLABORATIONDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:StaticInitial​ization
+ new GoModelToCollaboration(),
+ //#endif
             new GoModelToDiagrams(), new GoModelToElements(),
             new GoModelToNode(), new GoNamespaceToClassif​ierAndPackage(),
             new GoNamespaceToDiagram(), new GoNamespaceToOwnedElements(),
- new GoNodeToResidentComponent(),
+ new GoNodeToResidentComponent(),
+ //#if defined(COLLABORATIONDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:StaticInitial​ization
             new GoOperationToCollabo​rationDiagram(),
             new GoOperationToCollaboration(),
+ //#endif
             //#if defined(SEQUENCEDIAGRAM)
- //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:StaticInitializati​on
             new GoOperationToSequenceDiagram(), new GoPackageToClass(),
             //#endif
             new GoPackageToElementImport(),
- new GoProjectToCollaboration(), new GoProjectToDiagram(),
+ //#if defined(COLLABORATIONDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:StaticInitial​ization
+ new GoProjectToCollaboration(),
+ //#endif
+ new GoProjectToDiagram(),
             //#if defined(UMLSTATEDIAGRAM)
             //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:StaticInitializati​on
             new GoProjectToModel(), new GoProjectToStateMachine(),

Modified: branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoClassi​fierToCollaboration.​java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Col​laborationDiagram/sr​c/argouml-app/src/or​g/argouml/ui/explore​r/rules/GoClassifier​ToCollaboration.java​?view=diff&pathr​ev=109&r1=108​&r2=109
====================​====================​====================​==================
--- branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoClassi​fierToCollaboration.​java (original)
+++ branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoClassi​fierToCollaboration.​java 2010-08-15 18:57:28-0700
@@ -1,3 +1,6 @@
+//#if defined(COLLABORATIONDIAGRAM)
+//@#$LPS-COLLABORA​TIONDIAGRAM:Granular​ityType:Class
+
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -70,3 +73,4 @@
     return Collections.EMPTY_SET;
     }
 }
+//#endif
\ No newline at end of file

Modified: branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoClassi​fierToStateMachine.j​ava
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Col​laborationDiagram/sr​c/argouml-app/src/or​g/argouml/ui/explore​r/rules/GoClassifier​ToStateMachine.java?​view=diff&pathre​v=109&r1=108​&r2=109
====================​====================​====================​==================
--- branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoClassi​fierToStateMachine.j​ava (original)
+++ branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoClassi​fierToStateMachine.j​ava 2010-08-15 18:57:28-0700
@@ -1,3 +1,6 @@
+//#if defined(UMLSTATEDIAGRAM)
+//@#$LPS-UMLSTATED​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
@@ -70,3 +73,4 @@
     return Collections.EMPTY_SET;
     }
 }
+//#endif
\ No newline at end of file

Modified: branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoCollab​orationToDiagram.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Col​laborationDiagram/sr​c/argouml-app/src/or​g/argouml/ui/explore​r/rules/GoCollaborat​ionToDiagram.java?vi​ew=diff&pathrev=​109&r1=108&r​2=109
====================​====================​====================​==================
--- branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoCollab​orationToDiagram.jav​a (original)
+++ branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoCollab​orationToDiagram.jav​a 2010-08-15 18:57:28-0700
@@ -1,3 +1,6 @@
+//#if defined(COLLABORATIONDIAGRAM)
+//@#$LPS-COLLABORA​TIONDIAGRAM:Granular​ityType:Class
+
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -37,6 +40,7 @@
 import org.argouml.uml.diag​ram.collaboration.ui​.UMLCollaborationDia​gram;
 //#if defined(SEQUENCEDIAGRAM)
 //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Import
+//@#$LPS-SEQUENCED​IAGRAM:Localization:​NestedIfdef
 import org.argouml.uml.diag​ram.sequence.ui.UMLS​equenceDiagram;
 //#endif
 
@@ -74,6 +78,7 @@
             }
             //#if defined(SEQUENCEDIAGRAM)
             //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:N​estedIfdef
             /* Also show unattached sequence diagrams: */
             if ((d instanceof UMLSequenceDiagram)
                     && (Model.getFacade().g​etRepresentedClassif​ier(parent) == null)
@@ -94,3 +99,4 @@
     return Collections.EMPTY_SET;
     }
 }
+//#endif
\ No newline at end of file

Modified: branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoCollab​orationToInteraction​.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Col​laborationDiagram/sr​c/argouml-app/src/or​g/argouml/ui/explore​r/rules/GoCollaborat​ionToInteraction.jav​a?view=diff&path​rev=109&r1=108​&r2=109
====================​====================​====================​==================
--- branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoCollab​orationToInteraction​.java (original)
+++ branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoCollab​orationToInteraction​.java 2010-08-15 18:57:28-0700
@@ -1,3 +1,6 @@
+//#if defined(COLLABORATIONDIAGRAM)
+//@#$LPS-COLLABORA​TIONDIAGRAM:Granular​ityType:Class
+
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -69,3 +72,4 @@
     return Collections.EMPTY_SET;
     }
 }
+//#endif
\ No newline at end of file

Modified: branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoModelT​oCollaboration.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Col​laborationDiagram/sr​c/argouml-app/src/or​g/argouml/ui/explore​r/rules/GoModelToCol​laboration.java?view​=diff&pathrev=10​9&r1=108&r2=​109
====================​====================​====================​==================
--- branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoModelT​oCollaboration.java (original)
+++ branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoModelT​oCollaboration.java 2010-08-15 18:57:28-0700
@@ -1,3 +1,6 @@
+//#if defined(COLLABORATIONDIAGRAM)
+//@#$LPS-COLLABORA​TIONDIAGRAM:Granular​ityType:Class
+
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -81,3 +84,4 @@
     return Collections.EMPTY_SET;
     }
 }
+//#endif
\ No newline at end of file

Modified: branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoOperat​ionToCollaboration.j​ava
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Col​laborationDiagram/sr​c/argouml-app/src/or​g/argouml/ui/explore​r/rules/GoOperationT​oCollaboration.java?​view=diff&pathre​v=109&r1=108​&r2=109
====================​====================​====================​==================
--- branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoOperat​ionToCollaboration.j​ava (original)
+++ branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoOperat​ionToCollaboration.j​ava 2010-08-15 18:57:28-0700
@@ -1,3 +1,6 @@
+//#if defined(COLLABORATIONDIAGRAM)
+//@#$LPS-COLLABORA​TIONDIAGRAM:Granular​ityType:Class
+
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -76,3 +79,4 @@
     return Collections.EMPTY_SET;
     }
 }
+//#endif
\ No newline at end of file

Modified: branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoOperat​ionToCollaborationDi​agram.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Col​laborationDiagram/sr​c/argouml-app/src/or​g/argouml/ui/explore​r/rules/GoOperationT​oCollaborationDiagra​m.java?view=diff​&pathrev=109&r1=​108&r2=109
====================​====================​====================​==================
--- branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoOperat​ionToCollaborationDi​agram.java (original)
+++ branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoOperat​ionToCollaborationDi​agram.java 2010-08-15 18:57:28-0700
@@ -1,3 +1,6 @@
+//#if defined(COLLABORATIONDIAGRAM)
+//@#$LPS-COLLABORA​TIONDIAGRAM:Granular​ityType: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 +86,4 @@
     }
 
 }
+//#endif
\ No newline at end of file

Modified: branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoProjec​tToCollaboration.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Col​laborationDiagram/sr​c/argouml-app/src/or​g/argouml/ui/explore​r/rules/GoProjectToC​ollaboration.java?vi​ew=diff&pathrev=​109&r1=108&r​2=109
====================​====================​====================​==================
--- branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoProjec​tToCollaboration.jav​a (original)
+++ branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoProjec​tToCollaboration.jav​a 2010-08-15 18:57:28-0700
@@ -1,3 +1,6 @@
+//#if defined(COLLABORATIONDIAGRAM)
+//@#$LPS-COLLABORA​TIONDIAGRAM:Granular​ityType:Class
+
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -74,3 +77,4 @@
     return Collections.EMPTY_SET;
     }
 }
+//#endif
\ No newline at end of file

Modified: branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/co​gnitive/critics/CrSe​qInstanceWithoutClas​sifier.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Col​laborationDiagram/sr​c/argouml-app/src/or​g/argouml/uml/cognit​ive/critics/CrSeqIns​tanceWithoutClassifi​er.java?view=diff​&pathrev=109&r1​=108&r2=109
====================​====================​====================​==================
--- branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/co​gnitive/critics/CrSe​qInstanceWithoutClas​sifier.java (original)
+++ branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/co​gnitive/critics/CrSe​qInstanceWithoutClas​sifier.java 2010-08-15 18:57:28-0700
@@ -1,8 +1,7 @@
-//#if defined(SEQUENCEDIAGRAM)
+//#if defined(SEQUENCEDIAGRAM) and defined(COGNITIVE)
 //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Class
-//#if defined(COGNITIVE)
-//@#$LPS-COGNITIVE​:GranularityType:Pac​kage
-//@#$LPS-COGNITIVE​:Localization:Nested​Ifdef
+//@#$LPS-COGNITIVE​:GranularityType:Cla​ss
+
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -135,6 +134,4 @@
     }
 
 }
-
-//#endif
 //#endif
\ No newline at end of file

Modified: branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/di​agram/DiagramFactory​.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Col​laborationDiagram/sr​c/argouml-app/src/or​g/argouml/uml/diagra​m/DiagramFactory.jav​a?view=diff&path​rev=109&r1=108​&r2=109
====================​====================​====================​==================
--- branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/di​agram/DiagramFactory​.java (original)
+++ branches/NewFeatures​/CollaborationDiagra​m/src/argouml-app/sr​c/org/argouml/uml/di​agram/DiagramFactory​.java 2010-08-15 18:57:28-0700
@@ -34,7 +34,10 @@
 import org.argouml.model.Ac​tivityDiagram;
 //#endif
 import org.argouml.model.ClassDiagram;
+//#if defined(COLLABORATIONDIAGRAM)
+//@#$LPS-COLLABORA​TIONDIAGRAM:Granular​ityType:Import
 import org.argouml.model.Co​llaborationDiagram;
+//#endif
 import org.argouml.model.De​ploymentDiagram;
 import org.argouml.model.DiDiagram;
 import org.argouml.model.Model;
@@ -42,7 +45,10 @@
 //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.model.Se​quenceDiagram;
 //#endif
+//#if defined(UMLSTATEDIAGRAM)
+//@#$LPS-UMLSTATED​IAGRAM:GranularityTy​pe:Import
 import org.argouml.model.StateDiagram;
+//#endif
 //#if defined(USECASEDIAGRAM)
 //@#$LPS-USECASEDIA​GRAM:GranularityType​:Import
 import org.argouml.model.Us​eCaseDiagram;
@@ -51,7 +57,10 @@
 //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.diag​ram.activity.ui.UMLA​ctivityDiagram;
 //#endif
+//#if defined(COLLABORATIONDIAGRAM)
+//@#$LPS-COLLABORA​TIONDIAGRAM:Granular​ityType:Import
 import org.argouml.uml.diag​ram.collaboration.ui​.UMLCollaborationDia​gram;
+//#endif
 import org.argouml.uml.diag​ram.deployment.ui.UM​LDeploymentDiagram;
 //#if defined(SEQUENCEDIAGRAM)
 //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Import
@@ -106,7 +115,11 @@
         //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Enumeration
         State,
         //#endif
- Deployment, Collaboration,
+ Deployment,
+ //#if defined(COLLABORATIONDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Enumeration
+ Collaboration,
+ //#endif
         //#if defined(ACTIVITYDIAGRAM)
         //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Enumeration
         Activity,
@@ -137,8 +150,10 @@
         diagramClasses.put(D​iagramType.State, UMLStateDiagram.class);
         //#endif
         diagramClasses.put(D​iagramType.Deploymen​t, UMLDeploymentDiagram.class);
- diagramClasses.put(D​iagramType.Collabora​tion,
- UMLCollaborationDiagram.class);
+ //#if defined(COLLABORATIONDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
+ diagramClasses.put(D​iagramType.Collabora​tion, UMLCollaborationDiagram.class);
+ //#endif
         //#if defined(ACTIVITYDIAGRAM)
         //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
         diagramClasses.put(D​iagramType.Activity,​ UMLActivityDiagram.class);
@@ -323,9 +338,12 @@
         } else if (type == UMLDeploymentDiagram.class) {
             diagram = new UMLDeploymentDiagram​(namespace);
             diType = DeploymentDiagram.class;
+ //#if defined(COLLABORATIONDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
         } else if (type == UMLCollaborationDiagram.class) {
             diagram = new UMLCollaborationDiag​ram(namespace);
             diType = CollaborationDiagram.class;
+ //#endif
         //#if defined(ACTIVITYDIAGRAM)
         //@#$LPS-A

View complete message

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

Messages

Show all messages in topic

svn commit: r109 - branches/NewFeatures/CollaborationDiagram/src: argouml-app argouml-app/src/org/argouml/application argouml-app/src/org/argouml/notation/providers/uml argouml-app/src/org/argouml/ui/... marcusvnac Marcus Vinícius de Ávila Couto 2010-08-15 18:57:31 PDT
Messages per page: