Login | Register
My pages Projects Community openCollabNet

Discussions > Commits > svn commit: r120 - trunk/src: argouml-app/src/org/argouml/notation argouml-app/src/org/argouml/notation/providers/uml argouml-app/src/org/argouml/ui/explorer argouml-app/src/org/argouml/ui/explorer/rules argouml-app/src/org/argouml/uml/diagram/collaboration/ui argouml-app/src/org/argouml/uml/diagram/sequence argouml-app/src/org/argouml/uml/diagram/state/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/collaborations argouml-app/src/org/argouml/uml/ui/behavior/common_behavior argouml-app/src/org/argouml/uml/ui/behavior/state_machines argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram argouml-core-model-euml/src/org/argouml/model/euml argouml-core-model-mdr/src/org/argouml/model/mdr

argouml-spl
Discussion topic

Back to topic list

svn commit: r120 - trunk/src: argouml-app/src/org/argouml/notation argouml-app/src/org/argouml/notation/providers/uml argouml-app/src/org/argouml/ui/explorer argouml-app/src/org/argouml/ui/explorer/rules argouml-app/src/org/argouml/uml/diagram/collaboration/ui argouml-app/src/org/argouml/uml/diagram/sequence argouml-app/src/org/argouml/uml/diagram/state/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/collaborations argouml-app/src/org/argouml/uml/ui/behavior/common_behavior argouml-app/src/org/argouml/uml/ui/behavior/state_machines argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram argouml-core-model-euml/src/org/argouml/model/euml argouml-core-model-mdr/src/org/argouml/model/mdr

Author marcusvnac
Full name Marcus Vinícius de Ávila Couto
Date 2010-09-20 18:24:15 PDT
Message Author: marcusvnac
Date: 2010-09-20 18:24:13-0700
New Revision: 120

Modified:
   trunk/src/argouml-ap​p/src/org/argouml/no​tation/NotationProvi​derFactory2.java
   trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/AbstractMessageNota​tionUml.java
   trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/AssociationRoleNota​tionUml.java
   trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/CallStateNotationUm​l.java
   trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/ClassifierRoleNotat​ionUml.java
   trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/InitNotationUml.jav​a
   trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/StateBodyNotationUm​l.java
   trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/TransitionNotationU​ml.java
   trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/ExplorerPo​pup.java
   trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoSt​ateToDownstream.java​
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/collaborat​ion/ui/UMLCollaborat​ionDiagram.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/S​equenceDiagramGraphM​odel.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/state/ui/F​igState.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/ActionA​ddConcurrentRegion.j​ava
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/ActionA​ddMessage.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/AbstractActionA​ddModelElement2.java​
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ActionDeleteMod​elElements.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ActionNewDiagra​m.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ActionSequenceD​iagram.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ElementPropPane​lFactory.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/UMLExpressionEx​pressionModel.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/UMLTimeExpressi​onModel.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/activi​ty_graphs/ActionAddE​ventAsTrigger.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/activi​ty_graphs/ActionNewE​ntryCallAction.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/ActionAddCl​assifierRoleBase.jav​a
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/ActionAddMe​ssagePredecessor.jav​a
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/ActionRemov​eClassifierRoleBase.​java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/ActionSetAs​sociationRoleBase.ja​va
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/ActionSetRe​presentedClassifierC​ollaboration.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/ActionSetRe​presentedOperationCo​llaboration.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/UMLAssociat​ionRoleBaseComboBoxM​odel.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/UMLClassifi​erRoleAvailableConte​ntsListModel.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/UMLClassifi​erRoleAvailableFeatu​resListModel.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/UMLMessageA​ctivatorComboBox.jav​a
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/UMLMessageA​ctivatorComboBoxMode​l.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/common​_behavior/ActionNewA​ction.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/common​_behavior/PropPanelS​timulus.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/state_​machines/ActionAddEv​entAsDeferrableEvent​.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/state_​machines/ActionNewCa​llEvent.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/state_​machines/ActionNewCh​angeEvent.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/state_​machines/ActionNewEv​ent.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/state_​machines/ActionNewSi​gnalEvent.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/state_​machines/ActionNewTi​meEvent.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/state_​machines/ActionNewTr​ansition.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/state_​machines/ActionSetCo​mpositeStateConcurre​nt.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/state_​machines/ActionSetCo​ntextStateMachine.ja​va
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/state_​machines/ActionSetSt​ubStateReferenceStat​e.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/state_​machines/ActionSetSu​bmachineStateSubmach​ine.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/state_​machines/PropPanelSt​ubState.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/state_​machines/PropPanelSu​bmachineState.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/state_​machines/PropPanelSy​nchState.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/state_​machines/UMLChangeEx​pressionModel.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/state_​machines/UMLStubStat​eComboBoxModel.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/state_​machines/UMLSubmachi​neStateComboBoxModel​.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/state_​machines/UMLSynchSta​teBoundDocument.java​
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/FigM​essage.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/Mode​CreateMessage.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/Sequ​enceDiagramGraphMode​l.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/UMLS​equenceDiagram.java
   trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/EUMLModelImplementa​tion.java
   trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/StateMachinesFactor​yEUMLImpl.java
   trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/UmlFactoryEUMLImpl.​java
   trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/M​DRModelImplementatio​n.java
   trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/S​tateMachinesHelperMD​RImpl.java
   trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/U​mlFactoryMDRImpl.jav​a

Log:
Fix annotation error.

Modified: trunk/src/argouml-ap​p/src/org/argouml/no​tation/NotationProvi​derFactory2.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/notati​on/NotationProviderF​actory2.java?view=di​ff&pathrev=120​&r1=119&r2=120​
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/no​tation/NotationProvi​derFactory2.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/no​tation/NotationProvi​derFactory2.java 2010-09-20 18:24:13-0700
@@ -64,12 +64,14 @@
      * TYPE_TRANSITION the main text shown above the transition.
      */
     public static final int TYPE_TRANSITION = 2;
-
+ //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+ //@#$LPS-STATEDIAGR​AM:GranularityType:F​ield
+ //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Field
     /**
      * TYPE_STATEBODY the multiline text shown inside the state body.
      */
     public static final int TYPE_STATEBODY = 3;
-
+ //#endif
     /**
      * TYPE_ACTIONSTATE the text shown in an actionstate.
      */

Modified: trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/AbstractMessageNota​tionUml.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/notati​on/providers/uml/Abs​tractMessageNotation​Uml.java?view=diff​&pathrev=120&r​1=119&r2=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/AbstractMessageNota​tionUml.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/AbstractMessageNota​tionUml.java 2010-09-20 18:24:13-0700
@@ -890,7 +890,13 @@
             if (ptr.message != null && !pre.contains(ptr.message)) {
                 pre.add(ptr.message);
             }
+ //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Localizat​ion:EndMethod
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:E​ndMethod
             Model.getCollaborati​onsHelper().setPrede​cessors(umlMessage, pre);
+ //#endif
         }
     }
 
@@ -1026,7 +1032,11 @@
                             != Model.getFacade().ge​tReceiver(umlMessage​))) {
                 String msg = "parsing.error.messa​ge.reverse-direction​-message";
                 throw new ParseException(Trans​lator.localize(msg),​ 0);
- } else {
+ }
+ //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
+ else {
                 /* Disconnect the message from the call graph
                  * Make copies of returned live collections
                  * since we're modifying
@@ -1036,13 +1046,11 @@
                 Collection c2 = new ArrayList(
                         Model.getFacade().ge​tSuccessors(umlMessa​ge));
                 Iterator it;
-
                 it = c2.iterator();
                 while (it.hasNext()) {
                     Model.getCollaborati​onsHelper().removeSu​ccessor(umlMessage,
                             it.next());
                 }
-
                 it = c.iterator();
                 while (it.hasNext()) {
                     Iterator it2 = c2.iterator();
@@ -1098,6 +1106,7 @@
                 }
                 refindOperation = true;
             }
+ //#endif
         }
         return refindOperation;
     }
@@ -1310,7 +1319,13 @@
                 .createCallAction();
             Model.getCoreHelper(​).addOwnedElement(Mo​del.getFacade().getC​ontext(
                     Model.getFacade().ge​tInteraction(umlMess​age)), a);
+ //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Localizat​ion:EndMethod
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:E​ndMethod
             Model.getCollaborati​onsHelper().setActio​n(umlMessage, a);
+ //#endif
         }
     }
 
@@ -1666,7 +1681,13 @@
         } else {
             successors.add(s);
         }
+ //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Localizat​ion:EndMethod
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:E​ndMethod
         Model.getCollaborati​onsHelper().setSucce​ssors(m, successors);
+ //#endif
     }
 
     /**

Modified: trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/AssociationRoleNota​tionUml.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/notati​on/providers/uml/Ass​ociationRoleNotation​Uml.java?view=diff​&pathrev=120&r​1=119&r2=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/AssociationRoleNota​tionUml.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/AssociationRoleNota​tionUml.java 2010-09-20 18:24:13-0700
@@ -158,6 +158,9 @@
                 return;
             }
         }
+ //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
         Collection c =
             Model.getCollaborati​onsHelper().getAllPo​ssibleBases(role);
         Iterator i = c.iterator();
@@ -178,6 +181,7 @@
                 return;
             }
         }
+ //#endif
         String msg = "parsing.error.assoc​iation-role.base-not​-found";
         throw new ParseException(Trans​lator.localize(msg),​ 0);
     }

Modified: trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/CallStateNotationUm​l.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/notati​on/providers/uml/Cal​lStateNotationUml.ja​va?view=diff&pat​hrev=120&r1=119​&r2=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/CallStateNotationUm​l.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/CallStateNotationUm​l.java 2010-09-20 18:24:13-0700
@@ -178,8 +178,12 @@
                         if (!Model.getFacade().​isACallAction(entry)​) {
                             entry = Model.getCommonBehav​iorFactory()
                                 .buildCallAction(op, "ca");
+ //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+ //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
+ //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Comand
                             Model.getStateMachin​esHelper().setEntry(​
                                     callState, entry);
+ //#endif
                         } else {
                             Model.getCommonBehav​iorHelper().setOpera​tion(
                                     entry, op);

Modified: trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/ClassifierRoleNotat​ionUml.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/notati​on/providers/uml/Cla​ssifierRoleNotationU​ml.java?view=diff​&pathrev=120&r1​=119&r2=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/ClassifierRoleNotat​ionUml.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/ClassifierRoleNotat​ionUml.java 2010-09-20 18:24:13-0700
@@ -226,14 +226,16 @@
             } else {
                 ns = Model.getFacade().ge​tModel(cls);
             }
-
+ //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
             while (it.hasNext()) {
                 c = it.next();
                 if (!bases.contains(Mod​el.getFacade().getNa​me(c))) {
                     Model.getCollaborati​onsHelper().removeBa​se(cls, c);
                 }
             }
-
+ //#endif
             it = bases.iterator();
         addBases:
             while (it.hasNext()) {
@@ -251,7 +253,11 @@
                         Model.getFacade().ge​tNamespace(c))) {
                     Model.getCoreHelper(​).setNamespace(c, ns);
                 }
+ //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
                 Model.getCollaborati​onsHelper().addBase(​cls, c);
+ //#endif
             }
         }
         

Modified: trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/InitNotationUml.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/notati​on/providers/uml/Ini​tNotationUml.java?vi​ew=diff&pathrev=​120&r1=119&r​2=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/InitNotationUml.jav​a (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/InitNotationUml.jav​a 2010-09-20 18:24:13-0700
@@ -62,9 +62,13 @@
         npf.addNotationProvider(
                 NotationProviderFact​ory2.TYPE_TRANSITION​,
                 name, TransitionNotationUml.class);
+ //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+ //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
+ //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
         npf.addNotationProvider(
                 NotationProviderFact​ory2.TYPE_STATEBODY,​
                 name, StateBodyNotationUml.class);
+ //#endif
         npf.addNotationProvider(
                 NotationProviderFact​ory2.TYPE_ACTIONSTAT​E,
                 name, ActionStateNotationUml.class);

Modified: trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/StateBodyNotationUm​l.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/notati​on/providers/uml/Sta​teBodyNotationUml.ja​va?view=diff&pat​hrev=120&r1=119​&r2=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/StateBodyNotationUm​l.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/StateBodyNotationUm​l.java 2010-09-20 18:24:13-0700
@@ -1,3 +1,7 @@
+//#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+//@#$LPS-STATEDIAG​RAM:GranularityType:​Class
+//@#$LPS-ACTIVITYD​IAGRAM:GranularityTy​pe:Class
+
 // $Id$
 // Copyright (c) 2005-2007 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -485,3 +489,4 @@
     }
 
 }
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/TransitionNotationU​ml.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/notati​on/providers/uml/Tra​nsitionNotationUml.j​ava?view=diff&pa​threv=120&r1=119​&r2=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/TransitionNotationU​ml.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/TransitionNotationU​ml.java 2010-09-20 18:24:13-0700
@@ -36,7 +36,11 @@
 import org.argouml.applicat​ion.events.ArgoHelpE​vent;
 import org.argouml.i18n.Translator;
 import org.argouml.model.Model;
+//#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+//@#$LPS-STATEDIAG​RAM:GranularityType:​Import
+//@#$LPS-ACTIVITYD​IAGRAM:GranularityTy​pe:Import
 import org.argouml.model.St​ateMachinesFactory;
+//#endif
 import org.argouml.notation​.NotationSettings;
 import org.argouml.notation​.providers.Transitio​nNotation;
 
@@ -220,22 +224,18 @@
          * 4. Unhook and erase the existing trigger.
          */
         Object evt = Model.getFacade().ge​tTrigger(trans);
+ //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+ //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
+ //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
         /* It is safe to give a null to the next function,
          * since a statemachine is always composed by a model anyhow. */
         Object ns =
             Model.getStateMachinesHelper()
- .findNamespaceForEvent(trans, null);
- //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
- //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
+ .findNamespaceForEvent(trans, null);
         StateMachinesFactory sMFactory =
                 Model.getStateMachin​esFactory();
- //#endif
         boolean createdEvent = false;
         if (trigger.length() > 0) {
- //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
- //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
             // case 1 and 2
             if (evt == null) {
                 // case 1
@@ -260,7 +260,6 @@
                     evt = sMFactory.buildSigna​lEvent(trigger, ns);
                 }
                 createdEvent = true;
- //#endif
             } else {
                 // case 2
                 if (timeEvent) {
@@ -336,6 +335,7 @@
                 Model.getStateMachin​esHelper().setEventA​sTrigger(trans, evt);
             }
         } else {
+ //#endif
             // case 3 and 4
             if (evt == null) {
                 /* case 3 */
@@ -343,7 +343,9 @@
                 // case 4
                 delete(evt); // erase it
             }
+ //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
         }
+ //#endif
     }
 
     /**
@@ -405,9 +407,13 @@
                 if (expr != null) {
                     language = Model.getDataTypesHe​lper().getLanguage(e​xpr);
                 }
+ //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+ //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
+ //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
                 Model.getStateMachin​esHelper().setExpres​sion(g,
                         Model.getDataTypesFactory()
                                 .createBooleanExpres​sion(language, guard));
+ //#endif
                 /* TODO: In this case, the properties panel
                  is not updated with the changed expression! */
             }
@@ -452,7 +458,11 @@
                         .createCallAction();
                 /* And hook it to the transition immediately,
                  * so that an exception can not cause it to remain dangling: */
+ //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+ //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
+ //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
                 Model.getStateMachin​esHelper().setEffect​(trans, effect);
+ //#endif
                 Model.getCommonBehav​iorHelper().setScrip​t(effect,
                         Model.getDataTypesFactory()
                                 .createActionExpress​ion(""/*language*/,

Modified: trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/ExplorerPo​pup.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/ExplorerPopup.​java?view=diff&p​athrev=120&r1=11​9&r2=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/ExplorerPo​pup.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/ExplorerPo​pup.java 2010-09-20 18:24:13-0700
@@ -273,13 +273,10 @@
             //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
             final boolean stateDiagramActive =
                 activeDiagram instanceof UMLStateDiagram;
- //#endif
             final Object selectedStateMachine =
                 (stateVertexSelected) ? Model
                     .getStateMachinesHel​per().getStateMachin​e(selectedItem)
                     : null;
- //#if defined(STATEDIAGRAM)
- //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
             final Object diagramStateMachine =
                 (stateDiagramActive) ? ((UMLStateDiagram) activeDiagram)
                     .getStateMachine()

Modified: trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoSt​ateToDownstream.java​
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoStateT​oDownstream.java?vie​w=diff&pathrev=1​20&r1=119&r2​=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoSt​ateToDownstream.java​ (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoSt​ateToDownstream.java​ 2010-09-20 18:24:13-0700
@@ -49,9 +49,15 @@
      * @see org.argouml.ui.explo​rer.rules.Perspectiv​eRule#getChildren(ja​va.lang.Object)
      */
     public Collection getChildren(Object parent) {
+ //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+ //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
+ //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-STATEDIAGR​AM:Localization:Star​tMethod
+ //@#$LPS-ACTIVITYDI​AGRAM:Localization:S​tartMethod
     if (Model.getFacade().i​sAStateVertex(parent​)) {
         return Model.getStateMachin​esHelper().getOutgoi​ngStates(parent);
     }
+ //#endif
     return Collections.EMPTY_SET;
     }
 

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/collaborat​ion/ui/UMLCollaborat​ionDiagram.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/collaboration/​ui/UMLCollaborationD​iagram.java?view=dif​f&pathrev=120​&r1=119&r2=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/collaborat​ion/ui/UMLCollaborat​ionDiagram.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/collaborat​ion/ui/UMLCollaborat​ionDiagram.java 2010-09-20 18:24:13-0700
@@ -490,8 +490,13 @@
                 Model.getCollaborati​onsFactory().buildCl​assifierRole(
                         collaboration);
           }
+ //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Localizat​ion:BeforeReturn
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:B​eforeReturn
         Model.getCollaborati​onsHelper().addBase(​node, base);
-
+ //#endif
         return node;
     }
     

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/S​equenceDiagramGraphM​odel.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/sequence/Seque​nceDiagramGraphModel​.java?view=diff&​pathrev=120&r1=1​19&r2=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/S​equenceDiagramGraphM​odel.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/S​equenceDiagramGraphM​odel.java 2010-09-20 18:24:13-0700
@@ -369,6 +369,9 @@
                 // not implemented yet
             }
         }
+ //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
         if (fromObject != null && toObject != null && action != null) {
             Object associationRole =
                 Model.getCollaborati​onsHelper().getAssoc​iationRole(
@@ -396,6 +399,7 @@
             addEdge(message);
             edge = message;
         }
+ //#endif
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:BeforeRet​urn

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/state/ui/F​igState.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/state/ui/FigSt​ate.java?view=diff​&pathrev=120&r​1=119&r2=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/state/ui/F​igState.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/state/ui/F​igState.java 2010-09-20 18:24:13-0700
@@ -113,10 +113,16 @@
 
         NotationName notation = Notation.findNotation(
                 getNotationSettings(​).getNotationLanguag​e());
+ //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+ //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
+ //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-STATEDIAGR​AM:Localization:EndM​ethod
+ //@#$LPS-ACTIVITYDI​AGRAM:Localization:E​ndMethod
         notationProviderBody =
             NotationProviderFact​ory2.getInstance().g​etNotationProvider(
                     NotationProviderFact​ory2.TYPE_STATEBODY,​ getOwner(), this,
                     notation);
+ //#endif
     }
 
     private void initializeState() {
@@ -168,12 +174,18 @@
         super.initNotationPr​oviders(own);
         NotationName notation = Notation.findNotation(
                 getNotationSettings(​).getNotationLanguag​e());
+ //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+ //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
+ //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-STATEDIAGR​AM:Localization:EndM​ethod
+ //@#$LPS-ACTIVITYDI​AGRAM:Localization:E​ndMethod
         if (Model.getFacade().i​sAState(own)) {
             notationProviderBody =
                 NotationProviderFact​ory2.getInstance().g​etNotationProvider(
                         NotationProviderFact​ory2.TYPE_STATEBODY,​ own, this,
                         notation);
         }
+ //#endif
     }
 
     /*

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/ActionA​ddConcurrentRegion.j​ava
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/ui/ActionAddCo​ncurrentRegion.java?​view=diff&pathre​v=120&r1=119​&r2=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/ActionA​ddConcurrentRegion.j​ava (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/ActionA​ddConcurrentRegion.j​ava 2010-09-20 18:24:13-0700
@@ -38,7 +38,11 @@
 import org.argouml.applicat​ion.helpers.Resource​LoaderWrapper;
 import org.argouml.i18n.Translator;
 import org.argouml.model.Model;
+//#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+//@#$LPS-STATEDIAG​RAM:GranularityType:​Import
+//@#$LPS-ACTIVITYD​IAGRAM:GranularityTy​pe:Import
 import org.argouml.model.St​ateMachinesFactory;
+//#endif
 import org.argouml.ui.targe​tmanager.TargetManag​er;
 import org.argouml.uml.diag​ram.DiagramSettings;​
 //#if defined(STATEDIAGRAM)
@@ -97,9 +101,13 @@
      */
     public boolean isEnabled() {
         Object target = TargetManager.getIns​tance().getModelTarg​et();
+ //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+ //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
+ //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
         if (Model.getStateMachi​nesHelper().isTopSta​te(target)) {
             return false;
         }
+ //#endif
         return TargetManager.getIns​tance().getModelTarg​ets().size() < 2;
     }
 

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/ActionA​ddMessage.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/ui/ActionAddMe​ssage.java?view=diff​&pathrev=120​&r1=119&r2=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/ActionA​ddMessage.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/ActionA​ddMessage.java 2010-09-20 18:24:13-0700
@@ -109,6 +109,11 @@
      * must be added
      */
     private void addMessage(Object associationrole) {
+ //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Method
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Method
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Localizat​ion:EntireMethod
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:E​ntireMethod
         Object collaboration = Model.getFacade().ge​tNamespace(associati​onrole);
         Object message =
             Model.getCollaborati​onsFactory()
@@ -118,10 +123,8 @@
         Layer lay = e.getLayerManager().​getActiveLayer();
         GraphNodeRenderer gr = e.getGraphNodeRenderer();
         FigNode figMsg = gr.getFigNodeFor(gm, lay, message, null);
- //#if defined(COLLABORATIONDIAGRAM)
- //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
         ((FigMessage) figMsg).addPathItemT​oFigAssociationRole(​lay);
- //#endif
+
         gm.getNodes().add(message); /*MVW This is not the correct way,
         * but it allows connecting a CommentEdge to it!
         * See e.g. ActionAddNote for the correct way.
@@ -131,6 +134,7 @@
         * */
 
         TargetManager.getIns​tance().setTarget(me​ssage);
+ //#endif
     }
     
     /*

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/AbstractActionA​ddModelElement2.java​
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/ui​/AbstractActionAddMo​delElement2.java?vie​w=diff&pathrev=1​20&r1=119&r2​=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/AbstractActionA​ddModelElement2.java​ (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/AbstractActionA​ddModelElement2.java​ 2010-09-20 18:24:13-0700
@@ -92,9 +92,15 @@
                              isMultiSelect(),
                              isExclusive());
         int result = dialog.showDialog(Ar​goFrame.getInstance(​));
+ //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+ //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
+ //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-STATEDIAGR​AM:Localization:EndM​ethod
+ //@#$LPS-ACTIVITYDI​AGRAM:Localization:E​ndMethod
         if (result == JOptionPane.OK_OPTION) {
             doIt(dialog.getSelected());
         }
+ //#endif
     }
     
     /**

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ActionDeleteMod​elElements.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/ui​/ActionDeleteModelEl​ements.java?view=dif​f&pathrev=120​&r1=119&r2=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ActionDeleteMod​elElements.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ActionDeleteMod​elElements.java 2010-09-20 18:24:13-0700
@@ -313,12 +313,17 @@
         if (Model.getFacade().i​sAAssociationEnd(tar​get)) {
             return Model.getFacade().ge​tOtherAssociationEnd​s(target).size() > 1;
         }
+ //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+ //@#$LPS-STATEDIAGR​AM:GranularityType:M​ethod
+ //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Method
+
         if (Model.getStateMachi​nesHelper().isTopSta​te(target)) {
             /* we can not delete a "top" state,
              * it comes and goes with the statemachine. Issue 2655.
              */
             return false;
         }
+ //#endif
         return target != null;
     }
 }

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ActionNewDiagra​m.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/ui​/ActionNewDiagram.ja​va?view=diff&pat​hrev=120&r1=119​&r2=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ActionNewDiagra​m.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ActionNewDiagra​m.java 2010-09-20 18:24:13-0700
@@ -134,7 +134,9 @@
     public boolean isValidNamespace(Object ns) {
         return true;
     }
-
+ //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Method
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Method
     /**
      * Utility function to create a collaboration.
      *
@@ -147,6 +149,7 @@
                 && Model.getModelManage​mentHelper().isReadO​nly(target)) {
             target = namespace;
         }
+
         Object collaboration = null;
         if (Model.getFacade().i​sAOperation(target))​ {
             Object ns = Model.getFacade().getNamespace(
@@ -177,4 +180,5 @@
         }
         return collaboration;
     }
+ //#endif
 }

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ActionSequenceD​iagram.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/ui​/ActionSequenceDiagr​am.java?view=diff​&pathrev=120&r1​=119&r2=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ActionSequenceD​iagram.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ActionSequenceD​iagram.java 2010-09-20 18:24:13-0700
@@ -48,7 +48,15 @@
     public ArgoDiagram createDiagram(Object namespace) {
         return DiagramFactory.getIn​stance().createDiagr​am(
                 DiagramFactory.Diagr​amType.Sequence,
- createCollaboration(namespace),
+ //#if defined(COLLABORATIONDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:MethodCall
+ createCollaboration(
+ //#endif
+ namespace
+ //#if defined(COLLABORATIONDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:MethodCall
+ ),
+ //#endif
                 null);
     }
 

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ElementPropPane​lFactory.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/ui​/ElementPropPanelFac​tory.java?view=diff​&pathrev=120&​r1=119&r2=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ElementPropPane​lFactory.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ElementPropPane​lFactory.java 2010-09-20 18:24:13-0700
@@ -67,9 +67,17 @@
 import org.argouml.uml.ui.b​ehavior.state_machin​es.PropPanelSimpleSt​ate;
 import org.argouml.uml.ui.b​ehavior.state_machin​es.PropPanelStateMac​hine;
 import org.argouml.uml.ui.b​ehavior.state_machin​es.PropPanelStateVer​tex;
+//#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+//@#$LPS-STATEDIAG​RAM:GranularityType:​Import
+//@#$LPS-ACTIVITYD​IAGRAM:GranularityTy​pe:Import
 import org.argouml.uml.ui.b​ehavior.state_machin​es.PropPanelStubStat​e;
+//#endif
 import org.argouml.uml.ui.b​ehavior.state_machin​es.PropPanelSubmachi​neState;
+//#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+//@#$LPS-STATEDIAG​RAM:GranularityType:​Import
+//@#$LPS-ACTIVITYD​IAGRAM:GranularityTy​pe:Import
 import org.argouml.uml.ui.b​ehavior.state_machin​es.PropPanelSynchSta​te;
+//#endif
 import org.argouml.uml.ui.b​ehavior.state_machin​es.PropPanelTimeEven​t;
 import org.argouml.uml.ui.b​ehavior.state_machin​es.PropPanelTransiti​on;
 //#if defined(USECASEDIAGRAM)
@@ -365,11 +373,17 @@
             }
         } else if (Model.getFacade().i​sAPseudostate(elemen​t)) {
             return new PropPanelPseudostate();
- } else if (Model.getFacade().i​sAStubState(element)​) {
+ }
+ //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+ //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
+ //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
+ else if (Model.getFacade().i​sAStubState(element)​) {
             return new PropPanelStubState();
- } else if (Model.getFacade().i​sASynchState(element​)) {
+ }
+ else if (Model.getFacade().i​sASynchState(element​)) {
             return new PropPanelSynchState();
         }
+ //#endif
         throw new IllegalArgumentExcep​tion("Unsupported State type");
     }
 

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/UMLExpressionEx​pressionModel.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/ui​/UMLExpressionExpres​sionModel.java?view=​diff&pathrev=120​&r1=119&r2=1​20
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/UMLExpressionEx​pressionModel.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/UMLExpressionEx​pressionModel.java 2010-09-20 18:24:13-0700
@@ -58,8 +58,14 @@
      * @see org.argouml.uml.ui.U​MLExpressionModel2#s​etExpression(java.la​ng.Object)
      */
     public void setExpression(Object expr) {
+ //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+ //@#$LPS-STATEDIAGR​AM:GranularityType:M​ethodBody
+ //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:MethodBody
+ //@#$LPS-STATEDIAGR​AM:Localization:Enti​reMethod
+ //@#$LPS-ACTIVITYDI​AGRAM:Localization:E​ntireMethod
         Model.getStateMachinesHelper()
             .setExpression(Targe​tManager.getInstance​().getTarget(), expr);
+ //#endif
     }
 
     /*

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/UMLTimeExpressi​onModel.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/ui​/UMLTimeExpressionMo​del.java?view=diff​&pathrev=120&r​1=119&r2=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/UMLTimeExpressi​onModel.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/UMLTimeExpressi​onModel.java 2010-09-20 18:24:13-0700
@@ -71,7 +71,13 @@
             throw new IllegalStateException("There is no target for "
                     + getContainer());
         }
+ //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+ //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
+ //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-STATEDIAGR​AM:Localization:Befo​reReturn
+ //@#$LPS-ACTIVITYDI​AGRAM:Localization:B​eforeReturn
         Model.getStateMachin​esHelper().setWhen(t​arget, expression);
+ //#endif
     }
 
     /*

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/activi​ty_graphs/ActionAddE​ventAsTrigger.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/activity_g​raphs/ActionAddEvent​AsTrigger.java?view=​diff&pathrev=120​&r1=119&r2=1​20
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/activi​ty_graphs/ActionAddE​ventAsTrigger.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/activi​ty_graphs/ActionAddE​ventAsTrigger.java 2010-09-20 18:24:13-0700
@@ -88,6 +88,11 @@
 
     @Override
     protected void doIt(Collection selected) {
+ //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
+ //@#$LPS-STATEDIAGR​AM:GranularityType:M​ethodBody
+ //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:MethodBody
+ //@#$LPS-STATEDIAGR​AM:Localization:Enti​reMethod
+ //@#$LPS-ACTIVITYDI​AGRAM:Localization:E​ntireMethod
         Object trans = getTarget();
         if (selected == null || selected.size() == 0) {
             Model.getStateMachin​esHelper().setEventA​sTrigger(trans, null);
@@ -95,6 +100,7 @@
             Model.getStateMachin​esHelper().setEventA​sTrigger(trans,
                     selected.iterator().next());
         }
+ //#endif
     }
 
 }

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/activi​ty_graphs/ActionNewE​ntryCallAction.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/activity_g​raphs/ActionNewEntry​CallAction.java?view​=diff&pathrev=12​0&r1=119&r2=​120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/activi​ty_graphs/ActionNewE​ntryCallAction.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/activi​ty_graphs/ActionNewE​ntryCallAction.java 2010-09-20 18:24:13-0700
@@ -52,7 +52,10 @@
         super.actionPerformed(e);
         Object t = TargetManager.getIns​tance().getModelTarg​et();
         Object ca = Model.getCommonBehav​iorFactory().createC​allAction();
+ //#if defined(COLLABORATIONDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
         Model.getStateMachin​esHelper().setEntry(​t, ca);
+ //#endif
         TargetManager.getIns​tance().setTarget(ca​);
     }
 

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/ActionAddCl​assifierRoleBase.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/collaborat​ions/ActionAddClassi​fierRoleBase.java?vi​ew=diff&pathrev=​120&r1=119&r​2=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/ActionAddCl​assifierRoleBase.jav​a (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/ActionAddCl​assifierRoleBase.jav​a 2010-09-20 18:24:13-0700
@@ -55,8 +55,14 @@
 
     protected List getChoices() {
         List vec = new ArrayList();
+ //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Localizat​ion:BeforeReturn
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:B​eforeReturn
         vec.addAll(Model.get​CollaborationsHelper​()
                 .getAllPossibleBases​(getTarget()));
+ //#endif
         return vec;
     }
 
@@ -74,8 +80,14 @@
 
 
     protected void doIt(Collection selected) {
+ //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Localizat​ion:EntireMethod
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:E​ntireMethod
         Object role = getTarget();
         Model.getCollaborati​onsHelper().setBases​(role, selected);
+ //#endif
     }
 
 

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/ActionAddMe​ssagePredecessor.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/collaborat​ions/ActionAddMessag​ePredecessor.java?vi​ew=diff&pathrev=​120&r1=119&r​2=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/ActionAddMe​ssagePredecessor.jav​a (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/ActionAddMe​ssagePredecessor.jav​a 2010-09-20 18:24:13-0700
@@ -57,8 +57,14 @@
             return Collections.EMPTY_LIST;
         }
         List vec = new ArrayList();
+ //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Localizat​ion:BeforeReturn
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:B​eforeReturn
         vec.addAll(Model.get​CollaborationsHelper​()
                 .getAllPossiblePrede​cessors(getTarget())​);
+ //#endif
         return vec;
     }
 
@@ -83,8 +89,14 @@
     if (getTarget() == null)
         throw new IllegalStateException(
                 "doIt may not be called with null target");
+ //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Localizat​ion:EndMethod
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:E​ndMethod
     Object message = getTarget();
     Model.getCollaborati​onsHelper().setPrede​cessors(message, selected);
+ //#endif
     }
 
     /**

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/ActionRemov​eClassifierRoleBase.​java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/collaborat​ions/ActionRemoveCla​ssifierRoleBase.java​?view=diff&pathr​ev=120&r1=119​&r2=120
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/ActionRemov​eClassifierRoleBase.​java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/ActionRemov​eClassifierRoleBase.​java 2010-09-20 18:24:13-0700
@@ -53,8 +53,14 @@
      */
     public void actionPerformed(ActionEvent e) {
         super.actionPerformed(e);
+ //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
+ //@#$LPS-COLLABORAT​IONDIAGRAM:Localizat​ion:EndMethod
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:E​ndMethod

View complete message

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

Messages

Show all messages in topic

svn commit: r120 - trunk/src: argouml-app/src/org/argouml/notation argouml-app/src/org/argouml/notation/providers/uml argouml-app/src/org/argouml/ui/explorer argouml-app/src/org/argouml/ui/explorer/ru... marcusvnac Marcus Vinícius de Ávila Couto 2010-09-20 18:24:15 PDT
Messages per page: