Login | Register
My pages Projects Community openCollabNet

Discussions > Commits > svn commit: r122 - trunk/src: argouml-core-model-euml/src/org/argouml/model/euml 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: r122 - trunk/src: argouml-core-model-euml/src/org/argouml/model/euml 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-09-23 17:46:38 PDT
Message Author: marcusvnac
Date: 2010-09-23 17:46:37-0700
New Revision: 122

Modified:
   trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/ActivityGraphsFacto​ryEUMLlImpl.java
   trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/ActivityGraphsHelpe​rEUMLImpl.java
   trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/CollaborationsFacto​ryEUMLImpl.java
   trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/CollaborationsHelpe​rEUMLImpl.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-euml/src/or​g/argouml/model/euml​/UmlHelperEUMLImpl.j​ava
   trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/UseCasesFactoryEUML​Impl.java
   trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/UseCasesHelperEUMLI​mpl.java
   trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/A​ctivityGraphsFactory​MDRImpl.java
   trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/A​ctivityGraphsHelperM​DRImpl.java
   trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/C​ollaborationsFactory​MDRImpl.java
   trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/C​ollaborationsHelperM​DRImpl.java
   trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/C​ommonBehaviorFactory​MDRImpl.java
   trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/E​xtensionMechanismsHe​lperMDRImpl.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​tateMachinesFactoryM​DRImpl.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
   trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/U​mlHelperMDRImpl.java​
   trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/U​ndoActivityGraphsHel​perDecorator.java
   trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/U​ndoCollaborationsHel​perDecorator.java
   trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/U​ndoStateMachinesHelp​erDecorator.java
   trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/U​ndoUseCasesHelperDec​orator.java
   trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/U​seCasesFactoryMDRImp​l.java
   trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/U​seCasesHelperMDRImpl​.java
   trunk/src/argouml-co​re-model/src/org/arg​ouml/model/AbstractA​ctivityGraphsHelperD​ecorator.java
   trunk/src/argouml-co​re-model/src/org/arg​ouml/model/AbstractC​ollaborationsHelperD​ecorator.java
   trunk/src/argouml-co​re-model/src/org/arg​ouml/model/AbstractS​tateMachinesHelperDe​corator.java
   trunk/src/argouml-co​re-model/src/org/arg​ouml/model/AbstractU​seCasesHelperDecorat​or.java
   trunk/src/argouml-co​re-model/src/org/arg​ouml/model/ActivityD​iagram.java
   trunk/src/argouml-co​re-model/src/org/arg​ouml/model/ActivityG​raphsFactory.java
   trunk/src/argouml-co​re-model/src/org/arg​ouml/model/ActivityG​raphsHelper.java
   trunk/src/argouml-co​re-model/src/org/arg​ouml/model/Collabora​tionDiagram.java
   trunk/src/argouml-co​re-model/src/org/arg​ouml/model/Collabora​tionsFactory.java
   trunk/src/argouml-co​re-model/src/org/arg​ouml/model/Collabora​tionsHelper.java
   trunk/src/argouml-co​re-model/src/org/arg​ouml/model/Facade.ja​va
   trunk/src/argouml-co​re-model/src/org/arg​ouml/model/Model.jav​a
   trunk/src/argouml-co​re-model/src/org/arg​ouml/model/ModelImpl​ementation.java
   trunk/src/argouml-co​re-model/src/org/arg​ouml/model/SequenceD​iagram.java
   trunk/src/argouml-co​re-model/src/org/arg​ouml/model/StateDiag​ram.java
   trunk/src/argouml-co​re-model/src/org/arg​ouml/model/StateMach​inesFactory.java
   trunk/src/argouml-co​re-model/src/org/arg​ouml/model/UseCaseDi​agram.java
   trunk/src/argouml-co​re-model/src/org/arg​ouml/model/UseCasesF​actory.java
   trunk/src/argouml-co​re-model/src/org/arg​ouml/model/UseCasesH​elper.java

Log:
Removing diagram features annotations. At this time, only Logging feature will be annotate in *-core-model* projects.

Modified: trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/ActivityGraphsFacto​ryEUMLlImpl.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-core-m​odel-euml/src/org/ar​gouml/model/euml/Act​ivityGraphsFactoryEU​MLlImpl.java?view=di​ff&pathrev=122​&r1=121&r2=122​
====================​====================​====================​==================
--- trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/ActivityGraphsFacto​ryEUMLlImpl.java (original)
+++ trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/ActivityGraphsFacto​ryEUMLlImpl.java 2010-09-23 17:46:37-0700
@@ -1,6 +1,3 @@
-//#if defined(ACTIVITYDIAGRAM)
-//@#$LPS-ACTIVITYD​IAGRAM:GranularityTy​pe:Class
-
 // $Id$
 // Copyright (c) 2007, The ArgoUML Project
 // All rights reserved.
@@ -105,5 +102,4 @@
         throw new NotYetImplementedException();
     }
 
-}
-//#endif
\ No newline at end of file
+}
\ No newline at end of file

Modified: trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/ActivityGraphsHelpe​rEUMLImpl.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-core-m​odel-euml/src/org/ar​gouml/model/euml/Act​ivityGraphsHelperEUM​LImpl.java?view=diff​&pathrev=122​&r1=121&r2=122
====================​====================​====================​==================
--- trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/ActivityGraphsHelpe​rEUMLImpl.java (original)
+++ trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/ActivityGraphsHelpe​rEUMLImpl.java 2010-09-23 17:46:37-0700
@@ -1,6 +1,3 @@
-//#if defined(ACTIVITYDIAGRAM)
-//@#$LPS-ACTIVITYD​IAGRAM:GranularityTy​pe:Class
-
 // $Id$
 // Copyright (c) 2007, The ArgoUML Project
 // All rights reserved.
@@ -113,5 +110,4 @@
 
     }
 
-}
-//#endif
\ No newline at end of file
+}
\ No newline at end of file

Modified: trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/CollaborationsFacto​ryEUMLImpl.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-core-m​odel-euml/src/org/ar​gouml/model/euml/Col​laborationsFactoryEU​MLImpl.java?view=dif​f&pathrev=122​&r1=121&r2=122
====================​====================​====================​==================
--- trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/CollaborationsFacto​ryEUMLImpl.java (original)
+++ trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/CollaborationsFacto​ryEUMLImpl.java 2010-09-23 17:46:37-0700
@@ -1,7 +1,3 @@
-//#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
-//@#$LPS-COLLABORA​TIONDIAGRAM:Granular​ityType:Class
-//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Class
-
 // $Id$
 // Copyright (c) 2007, The ArgoUML Project
 // All rights reserved.
@@ -156,4 +152,3 @@
 
 
 }
-//#endif
\ No newline at end of file

Modified: trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/CollaborationsHelpe​rEUMLImpl.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-core-m​odel-euml/src/org/ar​gouml/model/euml/Col​laborationsHelperEUM​LImpl.java?view=diff​&pathrev=122​&r1=121&r2=122
====================​====================​====================​==================
--- trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/CollaborationsHelpe​rEUMLImpl.java (original)
+++ trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/CollaborationsHelpe​rEUMLImpl.java 2010-09-23 17:46:37-0700
@@ -1,7 +1,3 @@
-//#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
-//@#$LPS-COLLABORA​TIONDIAGRAM:Granular​ityType:Class
-//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Class
-
 // $Id$
 // Copyright (c) 2007, The ArgoUML Project
 // All rights reserved.
@@ -220,4 +216,3 @@
 
 
 }
-//#endif
\ No newline at end of file

Modified: trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/EUMLModelImplementa​tion.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-core-m​odel-euml/src/org/ar​gouml/model/euml/EUM​LModelImplementation​.java?view=diff&​pathrev=122&r1=1​21&r2=122
====================​====================​====================​==================
--- trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/EUMLModelImplementa​tion.java (original)
+++ trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/EUMLModelImplementa​tion.java 2010-09-23 17:46:37-0700
@@ -96,24 +96,17 @@
     private static final Logger LOG =
         Logger.getLogger(EUM​LModelImplementation​.class);
     //#endif
- //#if defined(ACTIVITYDIAGRAM)
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Field
     private ActivityGraphsFactoryEUMLlImpl theActivityGraphsFactory;
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Field
     private ActivityGraphsHelperEUMLImpl theActivityGraphsHelper;
- //#endif
     private AggregationKindEUMLImpl theAggregationKind;
 
     @SuppressWarnings("d​eprecation")
     private ChangeableKindEUMLImpl theChangeableKind;
 
- //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
- //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Field
- //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Field
     private CollaborationsFactoryEUMLImpl theCollaborationsFactory;
 
     private CollaborationsHelperEUMLImpl theCollaborationsHelper;
- //#endif
+
     private CommonBehaviorFactoryEUMLImpl theCommonBehaviorFactory;
 
     private CommonBehaviorHelperEUMLImpl theCommonBehaviorHelper;
@@ -152,24 +145,19 @@
 
     @SuppressWarnings("d​eprecation")
     private ScopeKindEUMLImpl theScopeKind;
- //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
- //@#$LPS-STATEDIAGR​AM:GranularityType:F​ield
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Field
+
     private StateMachinesFactoryEUMLImpl theStateMachinesFactory;
- //#endif
+
     private StateMachinesHelperEUMLImpl theStateMachinesHelper;
 
     private UmlFactoryEUMLImpl theUmlFactory;
 
     private UmlHelperEUMLImpl theUmlHelper;
- //#if defined(USECASEDIAGRAM)
- //@#$LPS-USECASEDIA​GRAM:GranularityType​:Field
+
     private UseCasesFactoryEUMLImpl theUseCasesFactory;
- //#endif
- //#if defined(USECASEDIAGRAM)
- //@#$LPS-USECASEDIA​GRAM:GranularityType​:Field
+
     private UseCasesHelperEUMLImpl theUseCasesHelper;
- //#endif
+
     private VisibilityKindEUMLImpl theVisibilityKind;
     
     private CommandStackImpl theCommandStack;
@@ -306,8 +294,6 @@
     public Map<Resource, Boolean> getReadOnlyMap() {
         return readOnlyMap;
     }
- //#if defined(ACTIVITYDIAGRAM)
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Method
     public ActivityGraphsFactoryEUMLlImpl getActivityGraphsFactory() {
         if (theActivityGraphsFactory == null) {
             theActivityGraphsFactory =
@@ -315,14 +301,12 @@
         }
         return theActivityGraphsFactory;
     }
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Method
     public ActivityGraphsHelperEUMLImpl getActivityGraphsHelper() {
         if (theActivityGraphsHelper == null) {
             theActivityGraphsHelper = new ActivityGraphsHelper​EUMLImpl(this);
         }
         return theActivityGraphsHelper;
     }
- //#endif
     public AggregationKindEUMLImpl getAggregationKind() {
         if (theAggregationKind == null) {
             theAggregationKind = new AggregationKindEUMLImpl();
@@ -337,24 +321,21 @@
         }
         return theChangeableKind;
     }
- //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
- //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Method
- //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Method
+
     public CollaborationsFactoryEUMLImpl getCollaborationsFactory() {
         if (theCollaborationsFactory == null) {
             theCollaborationsFactory = new CollaborationsFactor​yEUMLImpl(this);
         }
         return theCollaborationsFactory;
     }
- //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Method
- //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Method
+
     public CollaborationsHelperEUMLImpl getCollaborationsHelper() {
         if (theCollaborationsHelper == null) {
             theCollaborationsHelper = new CollaborationsHelper​EUMLImpl(this);
         }
         return theCollaborationsHelper;
     }
- //#endif
+
     public CommonBehaviorFactoryEUMLImpl getCommonBehaviorFactory() {
         if (theCommonBehaviorFactory == null) {
             theCommonBehaviorFactory = new CommonBehaviorFactor​yEUMLImpl(this);
@@ -492,16 +473,14 @@
         return theScopeKind;
     }
 
- //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
- //@#$LPS-STATEDIAGR​AM:GranularityType:M​ethod
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Method
+
     public StateMachinesFactoryEUMLImpl getStateMachinesFactory() {
         if (theStateMachinesFactory == null) {
             theStateMachinesFactory = new StateMachinesFactory​EUMLImpl(this);
         }
         return theStateMachinesFactory;
     }
- //#endif
+
     public StateMachinesHelperEUMLImpl getStateMachinesHelper() {
         if (theStateMachinesHelper == null) {
             theStateMachinesHelper = new StateMachinesHelperE​UMLImpl(this);
@@ -522,15 +501,13 @@
         }
         return theUmlHelper;
     }
- //#if defined(USECASEDIAGRAM)
- //@#$LPS-USECASEDIA​GRAM:GranularityType​:Method
+
     public UseCasesFactoryEUMLImpl getUseCasesFactory() {
         if (theUseCasesFactory == null) {
             theUseCasesFactory = new UseCasesFactoryEUMLImpl(this);
         }
         return theUseCasesFactory;
     }
-
 
     public UseCasesHelperEUMLImpl getUseCasesHelper() {
         if (theUseCasesHelper == null) {
@@ -538,7 +515,7 @@
         }
         return theUseCasesHelper;
     }
- //#endif
+
     public VisibilityKindEUMLImpl getVisibilityKind() {
         if (theVisibilityKind == null) {
             theVisibilityKind = new VisibilityKindEUMLImpl();

Modified: trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/StateMachinesFactor​yEUMLImpl.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-core-m​odel-euml/src/org/ar​gouml/model/euml/Sta​teMachinesFactoryEUM​LImpl.java?view=diff​&pathrev=122​&r1=121&r2=122
====================​====================​====================​==================
--- trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/StateMachinesFactor​yEUMLImpl.java (original)
+++ trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/StateMachinesFactor​yEUMLImpl.java 2010-09-23 17:46:37-0700
@@ -1,6 +1,3 @@
-//#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
-//@#$LPS-STATEDIAG​RAM:GranularityType:​Class
-//@#$LPS-ACTIVITYD​IAGRAM:GranularityTy​pe:Class
 // $Id$
 // Copyright (c) 2007, The ArgoUML Project
 // All rights reserved.
@@ -251,4 +248,3 @@
     }
 
 }
-//#endif
\ No newline at end of file

Modified: trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/UmlFactoryEUMLImpl.​java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-core-m​odel-euml/src/org/ar​gouml/model/euml/Uml​FactoryEUMLImpl.java​?view=diff&pathr​ev=122&r1=121​&r2=122
====================​====================​====================​==================
--- trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/UmlFactoryEUMLImpl.​java (original)
+++ trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/UmlFactoryEUMLImpl.​java 2010-09-23 17:46:37-0700
@@ -177,18 +177,12 @@
             }
         } else if (elementType == metaTypes.getAssocia​tionClass()) {
             connection = modelImpl.getCoreFac​tory().buildAssociat​ionClass(
- fromElement, toElement);
- }
- //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
- //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
- //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
- else if (elementType == metaTypes.getAssociationRole()) {
+ fromElement, toElement);
+ } else if (elementType == metaTypes.getAssociationRole()) {
             connection = modelImpl.getCollabo​rationsFactory().bui​ldAssociationRole(
                     fromElement, fromStyle, toElement, toStyle,
                     (Boolean) unidirectional);
- }
- //#endif
- else if (elementType == metaTypes.getGeneralization()) {
+ } else if (elementType == metaTypes.getGeneralization()) {
             connection = modelImpl.getCoreFac​tory().buildGenerali​zation(
                     fromElement, toElement);
         } else if (elementType == metaTypes.getPackageImport()) {
@@ -206,8 +200,6 @@
         } else if (elementType == metaTypes.getLink()) {
             connection = modelImpl.getCommonB​ehaviorFactory().bui​ldLink(
                     fromElement, toElement);
- //#if defined(USECASEDIAGRAM)
- //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
         } else if (elementType == metaTypes.getExtend()) {
             // Extend, but only between two use cases. Remember we draw from the
             // extension port to the base port.
@@ -216,16 +208,11 @@
         } else if (elementType == metaTypes.getInclude()) {
             connection = modelImpl.getUseCase​sFactory().buildIncl​ude(
                     fromElement, toElement);
- //#endif
- }
- //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
- //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
- else if (elementType == metaTypes.getTransition()) {
+ } else if (elementType == metaTypes.getTransition()) {
             connection = modelImpl.getStateMa​chinesFactory().buil​dTransition(
                     fromElement, toElement);
         }
- //#endif
+
         if (connection == null) {
             throw exception;
         }
@@ -240,15 +227,11 @@
 
     public Object buildNode(Object elementType) {
         Object o = null;
- //#if defined(USECASEDIAGRAM)
- //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
         if (elementType == metaTypes.getActor()) {
             o = modelImpl.getUseCase​sFactory().createAct​or();
         } else if (elementType == metaTypes.getUseCase()) {
             o = modelImpl.getUseCase​sFactory().createUse​Case();
- } else
- //#endif
- if (elementType == metaTypes.getUMLClass()) {
+ } else if (elementType == metaTypes.getUMLClass()) {
             o = modelImpl.getCoreFac​tory().buildClass();​
         } else if (elementType == metaTypes.getInterface()) {
             o = modelImpl.getCoreFac​tory().buildInterfac​e();
@@ -263,27 +246,15 @@
                     "Attempt to instantiate abstract type"); //$NON-NLS-1$
         } else if (elementType == metaTypes.getSubsystem()) {
             o = modelImpl.getModelMa​nagementFactory().cr​eateSubsystem();
- }
- //#if defined(ACTIVITYDIAGRAM)
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
- else if (elementType == metaTypes.getCallState()) {
- o = modelImpl.getActivit​yGraphsFactory().cre​ateCallState();
- }
- //#endif
- //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
- //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
- else if (elementType == metaTypes.getSimpleState()) {
+ } else if (elementType == metaTypes.getCallState()) {
+ o = modelImpl.getActivit​yGraphsFactory().cre​ateCallState();
+ } else if (elementType == metaTypes.getSimpleState()) {
             o = modelImpl.getStateMa​chinesFactory().crea​teSimpleState();
         } else if (elementType == metaTypes.getFinalState()) {
             o = modelImpl.getStateMa​chinesFactory().crea​teFinalState();
         } else if (elementType == metaTypes.getPseudostate()) {
             o = modelImpl.getStateMa​chinesFactory().crea​tePseudostate();
- }
- //#endif
- //#if defined(ACTIVITYDIAGRAM)
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
- else if (elementType == metaTypes.getObjectFlowState()) {
+ } else if (elementType == metaTypes.getObjectFlowState()) {
             o = modelImpl.getActivit​yGraphsFactory().cre​ateObjectFlowState()​;
         } else if (elementType == metaTypes.getActionState()) {
             o = modelImpl.getActivit​yGraphsFactory().cre​ateActionState();
@@ -291,12 +262,7 @@
             o = modelImpl.getActivit​yGraphsFactory().cre​ateSubactivityState(​);
         } else if (elementType == metaTypes.getPartition()) {
             o = modelImpl.getActivit​yGraphsFactory().cre​atePartition();
- }
- //#endif
- //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
- //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
- else if (elementType == metaTypes.getStubState()) {
+ } else if (elementType == metaTypes.getStubState()) {
             o = modelImpl.getStateMa​chinesFactory().crea​teStubState();
         } else if (elementType == metaTypes.getSubmachineState()) {
             o = modelImpl.getStateMa​chinesFactory().crea​teSubmachineState();​
@@ -308,17 +274,10 @@
             throw new IllegalArgumentException(
                     "Attempt to instantiate abstract type"); //$NON-NLS-1$
         } else if (elementType == modelImpl.getMetaTyp​es().getSimpleState(​)) {
- o = modelImpl.getStateMa​chinesFactory().crea​teSimpleState();
- }
- //#endif
- //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
- //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
- //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
- else if (elementType == metaTypes.getClassifierRole()) {
+ o = modelImpl.getStateMa​chinesFactory().crea​teSimpleState();
+ } else if (elementType == metaTypes.getClassifierRole()) {
             o = modelImpl.getCollabo​rationsFactory().cre​ateClassifierRole();​
- }
- //#endif
- else if (elementType == metaTypes.getComponent()) {
+ } else if (elementType == metaTypes.getComponent()) {
             o = modelImpl.getCoreFac​tory().createCompone​nt();
         } else if (elementType == metaTypes.getCompone​ntInstance()) {
             o = modelImpl.getCommonB​ehaviorFactory().cre​ateComponentInstance​();
@@ -345,14 +304,9 @@
             o = modelImpl.getCommonB​ehaviorFactory().cre​ateSignal();
         } else if (elementType == metaTypes.getException()) {
             o = modelImpl.getCommonB​ehaviorFactory().cre​ateException();
- }
- //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
- //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
- else if (elementType == metaTypes.getTransition()) {
+ } else if (elementType == metaTypes.getTransition()) {
             o = modelImpl.getStateMa​chinesFactory().crea​teTransition();
         }
- //#endif
         if (!(o instanceof EObject)) {
             throw new IllegalArgumentException(
                     "Attempted to create unsupported model element type: " //$NON-NLS-1$

Modified: trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/UmlHelperEUMLImpl.j​ava
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-core-m​odel-euml/src/org/ar​gouml/model/euml/Uml​HelperEUMLImpl.java?​view=diff&pathre​v=122&r1=121​&r2=122
====================​====================​====================​==================
--- trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/UmlHelperEUMLImpl.j​ava (original)
+++ trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/UmlHelperEUMLImpl.j​ava 2010-09-23 17:46:37-0700
@@ -76,12 +76,8 @@
             // handles all children of relationship including extend and
             // include which are not members of core
             return modelImpl.getCoreHel​per().getSource(rela​tionship);
- //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
- //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
         } else if (relationship instanceof Transition) {
             return modelImpl.getStateMa​chinesHelper().getSo​urce(relationship);
- //#endif
         } else if (relationship instanceof Property) {
             // TODO: We expect an association end here - check more carefully? - tfm
             return modelImpl.getCoreHel​per().getSource(rela​tionship);
@@ -97,13 +93,9 @@
             // handles all children of relationship including extend and
             // include which are not members of core
             return modelImpl.getCoreHel​per().getDestination​(relationShip);
- //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
- //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
         } else if (relationShip instanceof Transition) {
             return modelImpl.getStateMa​chinesHelper().
                     getDestination(relationShip);
- //#endif
         } else if (relationShip instanceof Property) {
             // TODO: We expect an association end here - check more carefully? - tfm
             return modelImpl.getCoreHel​per().getDestination​(relationShip);

Modified: trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/UseCasesFactoryEUML​Impl.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-core-m​odel-euml/src/org/ar​gouml/model/euml/Use​CasesFactoryEUMLImpl​.java?view=diff&​pathrev=122&r1=1​21&r2=122
====================​====================​====================​==================
--- trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/UseCasesFactoryEUML​Impl.java (original)
+++ trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/UseCasesFactoryEUML​Impl.java 2010-09-23 17:46:37-0700
@@ -1,6 +1,3 @@
-//#if defined(USECASEDIAGRAM)
-//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Class
-
 // $Id$
 // Copyright (c) 2007, The ArgoUML Project
 // All rights reserved.
@@ -187,4 +184,3 @@
 
 
 }
-//#endif
\ No newline at end of file

Modified: trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/UseCasesHelperEUMLI​mpl.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-core-m​odel-euml/src/org/ar​gouml/model/euml/Use​CasesHelperEUMLImpl.​java?view=diff&p​athrev=122&r1=12​1&r2=122
====================​====================​====================​==================
--- trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/UseCasesHelperEUMLI​mpl.java (original)
+++ trunk/src/argouml-co​re-model-euml/src/or​g/argouml/model/euml​/UseCasesHelperEUMLI​mpl.java 2010-09-23 17:46:37-0700
@@ -1,6 +1,3 @@
-//#if defined(USECASEDIAGRAM)
-//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Class
-
 // $Id$
 // Copyright (c) 2007, The ArgoUML Project
 // All rights reserved.
@@ -288,4 +285,3 @@
     }
 
 }
-//#endif
\ No newline at end of file

Modified: trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/A​ctivityGraphsFactory​MDRImpl.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/Activ​ityGraphsFactoryMDRI​mpl.java?view=diff​&pathrev=122&r​1=121&r2=122
====================​====================​====================​==================
--- trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/A​ctivityGraphsFactory​MDRImpl.java (original)
+++ trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/A​ctivityGraphsFactory​MDRImpl.java 2010-09-23 17:46:37-0700
@@ -1,6 +1,3 @@
-//#if defined(ACTIVITYDIAGRAM)
-//@#$LPS-ACTIVITYD​IAGRAM:GranularityTy​pe:Class
-
 // $Id$
 // Copyright (c) 1996-2007 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -259,4 +256,3 @@
     }
 
 }
-//#endif
\ No newline at end of file

Modified: trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/A​ctivityGraphsHelperM​DRImpl.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/Activ​ityGraphsHelperMDRIm​pl.java?view=diff​&pathrev=122&r1​=121&r2=122
====================​====================​====================​==================
--- trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/A​ctivityGraphsHelperM​DRImpl.java (original)
+++ trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/A​ctivityGraphsHelperM​DRImpl.java 2010-09-23 17:46:37-0700
@@ -1,6 +1,3 @@
-//#if defined(ACTIVITYDIAGRAM)
-//@#$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
@@ -201,6 +198,4 @@
     }
 
 
-}
-
-//#endif
\ No newline at end of file
+}
\ No newline at end of file

Modified: trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/C​ollaborationsFactory​MDRImpl.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/Colla​borationsFactoryMDRI​mpl.java?view=diff​&pathrev=122&r​1=121&r2=122
====================​====================​====================​==================
--- trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/C​ollaborationsFactory​MDRImpl.java (original)
+++ trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/C​ollaborationsFactory​MDRImpl.java 2010-09-23 17:46:37-0700
@@ -1,7 +1,3 @@
-//#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
-//@#$LPS-COLLABORA​TIONDIAGRAM:Granular​ityType:Class
-//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Class
-
 // $Id$
 // Copyright (c) 1996-2007 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -564,4 +560,3 @@
     }
 
 }
-//#endif
\ No newline at end of file

Modified: trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/C​ollaborationsHelperM​DRImpl.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/Colla​borationsHelperMDRIm​pl.java?view=diff​&pathrev=122&r1​=121&r2=122
====================​====================​====================​==================
--- trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/C​ollaborationsHelperM​DRImpl.java (original)
+++ trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/C​ollaborationsHelperM​DRImpl.java 2010-09-23 17:46:37-0700
@@ -1,7 +1,3 @@
-//#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
-//@#$LPS-COLLABORA​TIONDIAGRAM:Granular​ityType:Class
-//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Class
-
 // $Id$
 // Copyright (c) 1996-2009 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -1018,4 +1014,3 @@
                 + " or interaction: " + interaction);
     }
 }
-//#endif
\ No newline at end of file

Modified: trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/C​ommonBehaviorFactory​MDRImpl.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/Commo​nBehaviorFactoryMDRI​mpl.java?view=diff​&pathrev=122&r​1=121&r2=122
====================​====================​====================​==================
--- trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/C​ommonBehaviorFactory​MDRImpl.java (original)
+++ trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/C​ommonBehaviorFactory​MDRImpl.java 2010-09-23 17:46:37-0700
@@ -361,10 +361,7 @@
             Object sender = modelImpl.getCoreHel​per().getSource(link​);
             Object receiver = modelImpl.getCoreHel​per().getDestination​(link);
             modelImpl.getCommonB​ehaviorHelper().setR​eceiver(stimulus, receiver);
- //#if defined(COLLABORATIONDIAGRAM)
- //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
             modelImpl.getCollabo​rationsHelper().setS​ender(stimulus, sender);
- //#endif
             modelImpl.getCommonB​ehaviorHelper().setC​ommunicationLink(sti​mulus,
                     link);
             return stimulus;

Modified: trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/E​xtensionMechanismsHe​lperMDRImpl.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/Exten​sionMechanismsHelper​MDRImpl.java?view=di​ff&pathrev=122​&r1=121&r2=122​
====================​====================​====================​==================
--- trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/E​xtensionMechanismsHe​lperMDRImpl.java (original)
+++ trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/E​xtensionMechanismsHe​lperMDRImpl.java 2010-09-23 17:46:37-0700
@@ -84,16 +84,10 @@
         packageMap.put("core", "Core");
         packageMap.put("datatypes", "Data_Types");
         packageMap.put("comm​onbehavior", "Common_Behavior");
- //#if defined(USECASEDIAGRAM)
- //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
         packageMap.put("usecases", "Use_Cases");
- //#endif
         packageMap.put("statemachines", "State_Machines");
         packageMap.put("coll​aborations", "Collaborations");
- //#if defined(ACTIVITYDIAGRAM)
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
         packageMap.put("acti​vitygraphs", "Activity_Graphs");
- //#endif
         packageMap.put("mode​lmanagement", "Model_Management");
     }
 

Modified: trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/M​DRModelImplementatio​n.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/MDRMo​delImplementation.ja​va?view=diff&pat​hrev=122&r1=121​&r2=122
====================​====================​====================​==================
--- trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/M​DRModelImplementatio​n.java (original)
+++ trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/M​DRModelImplementatio​n.java 2010-09-23 17:46:37-0700
@@ -45,19 +45,12 @@
 //@#$LPS-LOGGING:Gr​anularityType:Import​
 import org.apache.log4j.Logger;
 //#endif
-//#if defined(ACTIVITYDIAGRAM)
-//@#$LPS-ACTIVITYD​IAGRAM:GranularityTy​pe:Import
 import org.argouml.model.Ac​tivityGraphsFactory;​
 import org.argouml.model.Ac​tivityGraphsHelper;
-//#endif
 import org.argouml.model.Ag​gregationKind;
 import org.argouml.model.Ch​angeableKind;
-//#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
-//@#$LPS-COLLABORA​TIONDIAGRAM:Granular​ityType:Import
-//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Import
 import org.argouml.model.Co​llaborationsFactory;​
 import org.argouml.model.Co​llaborationsHelper;
-//#endif
 import org.argouml.model.Co​mmonBehaviorFactory;​
 import org.argouml.model.Co​mmonBehaviorHelper;
 import org.argouml.model.Co​ncurrencyKind;
@@ -78,21 +71,14 @@
 import org.argouml.model.OrderingKind;
 import org.argouml.model.Ps​eudostateKind;
 import org.argouml.model.ScopeKind;
-//#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
-//@#$LPS-COLLABORA​TIONDIAGRAM:Granular​ityType:Import
-//@#$LPS-SEQUENCED​IAGRAM:GranularityTy​pe:Import
 import org.argouml.model.St​ateMachinesFactory;
-//#endif
 import org.argouml.model.St​ateMachinesHelper;
 import org.argouml.model.UUIDManager;
 import org.argouml.model.UmlException;
 import org.argouml.model.UmlFactory;
 import org.argouml.model.UmlHelper;
-//#if defined(USECASEDIAGRAM)
-//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.model.Us​eCasesFactory;
 import org.argouml.model.Us​eCasesHelper;
-//#endif
 import org.argouml.model.Vi​sibilityKind;
 import org.argouml.model.XmiReader;
 import org.argouml.model.XmiWriter;
@@ -120,10 +106,7 @@
     private ModelEventPumpMDRImpl theModelEventPump;
 
     private CopyHelper theCopyHelper;
- //#if defined(ACTIVITYDIAGRAM)
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Field
     private ActivityGraphsHelper theActivityGraphsHelper;
- //#endif
     private CoreHelper theCoreHelper;
 
     private MetaTypes theMetaTypes = new MetaTypesMDRImpl();
@@ -131,31 +114,21 @@
     private ModelManagementFactory theModelManagementFactory;
 
     private ModelManagementHelper theModelManagementHelper;
- //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
- //@#$LPS-STATEDIAGR​AM:GranularityType:F​ield
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Field
+
     private StateMachinesHelper theStateMachinesHelper;
- //#endif
+
     private UmlFactory theUmlFactory;
 
     private UmlHelper theUmlHelper;
- //#if defined(USECASEDIAGRAM)
- //@#$LPS-USECASEDIA​GRAM:GranularityType​:Field
- private UseCasesFactory theUseCasesFactory;
+
+ private UseCasesFactory theUseCasesFactory;
+
     private UseCasesHelper theUseCasesHelper;
- //#endif
- //#if defined(ACTIVITYDIAGRAM)
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Field
     private ActivityGraphsFactory theActivityGraphsFactory;
- //#endif
-
- //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
- //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Field
- //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Field
     private CollaborationsFactory theCollaborationsFactory;
 
     private CollaborationsHelper theCollaborationsHelper;
- //#endif
+
     private CommonBehaviorFactory theCommonBehaviorFactory;
 
     private CommonBehaviorHelper theCommonBehaviorHelper;
@@ -167,11 +140,9 @@
     private ExtensionMechanismsFactory theExtensionMechanismsFactory;
 
     private ExtensionMechanismsHelper theExtensionMechanismsHelper;
- //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
- //@#$LPS-STATEDIAGR​AM:GranularityType:F​ield
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Field
+
     private StateMachinesFactory theStateMachinesFactory;
- //#endif
+
     private CoreFactory theCoreFactory;
 
     private KindsMDRImpl theKindsObject;
@@ -523,10 +494,7 @@
         // Initialize remaining factories and helpers
         // (but defer heavyweight ones until needed)
         theCopyHelper = new CopyHelper(this);
- //#if defined(ACTIVITYDIAGRAM)
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
         theActivityGraphsHelper = new ActivityGraphsHelperMDRImpl();
- //#endif
         theCoreHelper =
             new UndoCoreHelperDecorator(new CoreHelperMDRImpl(this));
         //#if defined(LOGGING)
@@ -534,43 +502,29 @@
         LOG.debug("MDR Init - initialized package Core helper");
         //#endif
         theModelManagementHelper = new ModelManagementHelpe​rMDRImpl(this);
- //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
- //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
         theStateMachinesHelper = new StateMachinesHelperM​DRImpl(this);
- //#endif
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         LOG.debug("MDR Init - initialized package StateMachines");
         //#endif
- //#if defined(USECASEDIAGRAM)
- //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
- theUseCasesFactory = new UseCasesFactoryMDRImpl(this);
+ theUseCasesFactory = new UseCasesFactoryMDRImpl(this);
         theUseCasesHelper = new UseCasesHelperMDRImpl(this);
- //#endif
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         LOG.debug("MDR Init - initialized package Use Cases");
         //#endif
- //#if defined(ACTIVITYDIAGRAM)
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
         theActivityGraphsFactory = new ActivityGraphsFactor​yMDRImpl(this);
             //#if defined(LOGGING)
             //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         LOG.debug("MDR Init - initialized package Collaborations");
             //#endif
- //#endif
         theCommonBehaviorFactory = new CommonBehaviorFactor​yMDRImpl(this);
         theCommonBehaviorHelper = new CommonBehaviorHelper​MDRImpl(this);
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         LOG.debug("MDR Init - initialized package CommonBehavior");
         //#endif
- //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
- //@#$LPS-STATEDIAGR​AM:GranularityType:C​ommand
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
         theStateMachinesFactory = new StateMachinesFactory​MDRImpl(this);
- //#endif
         theCoreFactory = new CoreFactoryMDRImpl(this);
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
@@ -649,25 +603,18 @@
     public ModelEventPump getModelEventPump() {
         return theModelEventPump;
     }
- //#if defined(ACTIVITYDIAGRAM)
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Method
     /*
      * @see org.argouml.model.Mo​delImplementation#ge​tActivityGraphsFacto​ry()
      */
     public ActivityGraphsFactory getActivityGraphsFactory() {
         return theActivityGraphsFactory;
     }
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Method
     /*
      * @see org.argouml.model.Mo​delImplementation#ge​tActivityGraphsHelpe​r()
      */
     public ActivityGraphsHelper getActivityGraphsHelper() {
         return theActivityGraphsHelper;
     }
- //#endif
- //#if defined(COLLABORATIONDIAGRAM) or defined(SEQUENCEDIAGRAM)
- //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Method
- //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Method
     /*
      * @see org.argouml.model.Mo​delImplementation#ge​tCollaborationsFacto​ry()
      */
@@ -678,8 +625,7 @@
         }
         return theCollaborationsFactory;
     }
- //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Method
- //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Method
+
     /*
      * @see org.argouml.model.Mo​delImplementation#ge​tCollaborationsHelpe​r()
      */
@@ -690,7 +636,7 @@
         }
         return theCollaborationsHelper;
     }
- //#endif
+
     /*
      * @see org.argouml.model.Mo​delImplementation#ge​tCommonBehaviorFacto​ry()
      */
@@ -767,23 +713,21 @@
     public ModelManagementHelper getModelManagementHelper() {
         return theModelManagementHelper;
     }
- //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
- //@#$LPS-STATEDIAGR​AM:GranularityType:M​ethod
- //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Method
+
     /*
      * @see org.argouml.model.Mo​delImplementation#ge​tStateMachinesFactor​y()
      */
     public StateMachinesFactory getStateMachinesFactory() {
         return theStateMachinesFactory;
     }
-
+
     /*
      * @see org.argouml.model.Mo​delImplementation#ge​tStateMachinesHelper​()
      */
     public StateMachinesHelper getStateMachinesHelper() {
         return theStateMachinesHelper;
     }
- //#endif
+
     /*
      * @see org.argouml.model.Mo​delImplementation#ge​tUmlFactory()
      */
@@ -803,23 +747,21 @@
         }
         return theUmlHelper;
     }
- //#if defined(USECASEDIAGRAM)
- //@#$LPS-USECASEDIA​GRAM:GranularityType​:Method
+
     /*
      * @see org.argouml.model.Mo​delImplementation#ge​tUseCasesFactory()
      */
     public UseCasesFactory getUseCasesFactory() {
         return theUseCasesFactory;
     }
- //@#$LPS-USECASEDIA​GRAM:GranularityType​:Method
+
     /*
      * @see org.argouml.model.Mo​delImplementation#ge​tUseCasesHelper()
      */
     public UseCasesHelper getUseCasesHelper() {
         return theUseCasesHelper;
     }
- //#endif
-
+
     /*
      * @see org.argouml.model.Mo​delImplementation#ge​tMetaTypes()
      */

Modified: trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/S​tateMachinesFactoryM​DRImpl.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/State​MachinesFactoryMDRIm​pl.java?view=diff​&pathrev=122&r1​=121&r2=122
====================​====================​====================​==================
--- trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/S​tateMachinesFactoryM​DRImpl.java (original)
+++ trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/S​tateMachinesFactoryM​DRImpl.java 2010-09-23 17:46:37-0700
@@ -1,7 +1,3 @@
-//#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
-//@#$LPS-STATEDIAG​RAM:GranularityType:​Class
-//@#$LPS-ACTIVITYD​IAGRAM:GranularityTy​pe:Class
-
 // $Id$
 // Copyright (c) 1996-2008 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -32,7 +28,6 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
-//@#$LPS-LOGGING:L​ocalization:NestedIf​def
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.model.St​ateMachinesFactory;
@@ -78,7 +73,6 @@
         implements StateMachinesFactory {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
- //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef
     /**
      * Logger
      */
@@ -465,7 +459,6 @@
             //#if defined(LOGGING)
             //@#$LPS-LOGGING:Gr​anularityType:Comman​d
             //@#$LPS-LOGGING:Lo​calization:NestedCom​mand
- //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef
             if (t.getGuard() != null) {
                 LOG.warn("Replacing Guard " + t.getGuard().getName()
                         + " on Transition " + t.getName());
@@ -740,4 +733,4 @@
     }
 
 }
-//#endif
\ No newline at end of file
+

Modified: trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/S​tateMachinesHelperMD​RImpl.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/State​MachinesHelperMDRImp​l.java?view=diff​&pathrev=122&r1=​121&r2=122
====================​====================​====================​==================
--- trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/S​tateMachinesHelperMD​RImpl.java (original)
+++ trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/S​tateMachinesHelperMD​RImpl.java 2010-09-23 17:46:37-0700
@@ -1,7 +1,3 @@
-//#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
@@ -677,4 +673,3 @@
                 + " or me: " + modelElement);
     }
 }
-//#endif
\ No newline at end of file

Modified: trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/U​mlFactoryMDRImpl.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-core-m​odel-mdr/src/org/arg​ouml/model/mdr/UmlFa​ctoryMDRImpl.java?vi​ew=diff&pathrev=​122&r1=121&r​2=122
====================​====================​====================​==================
--- trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/U​mlFactoryMDRImpl.jav​a (original)
+++ trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/U​mlFactoryMDRImpl.jav​a 2010-09-23 17:46:37-0700
@@ -432,17 +432,11 @@
                 == metaTypes.getAssocia​tionClass()) {
             connection =
                 getCore().buildAssoc​iationClass(fromElem​ent, toElement);
- }
- //#if defined(COLLABORATIONDIAGRAM)
- //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Command
- else if (elementType == metaTypes.getAssociationRole()) {
+ } else if (elementType == metaTypes.getAssociationRole()) {
             connection =
- getCollaborations().​buildAssociationRole​(fromElement,
+ getCollaborations().​buildAssociationRole​(fromElement,
                     fromStyle, toElement, toStyle, (Boolean) unidirectional);
-
- }
- //#endif
- else if (elementType == metaTypes.getGeneralization()) {
+ } else if (elementType == metaTypes.getGeneralization()) {
             connection = getCore().buildGener​alization(fromElemen​t, toElement);
         } else if (elementType == metaTypes.getPackageImport()) {
             connection = getCore().buildPacka​geImport(fromElement​, toElement);
@@ -457,25 +451,17 @@
                 getCore().buildReali​zation(fromElement, toElement, namespace);
         } else if (elementType == metaTypes.getLink()) {
             connection = getCommonBehavior().​buildLink(fromElemen​t, toElement);
- }
- //#if defined(USECASEDIAGRAM)
- //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
- else if (elementType == metaTypes.getExtend()) {
+ } else if (elementType == metaTypes.getExtend()) {
             // Extend, but only between two use cases. Remember we draw from the
             // extension port to the base port.
             connection = getUseCases().buildE​xtend(toElement, fromElement);
         } else if (elementType == metaTypes.getInclude()) {

View complete message

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

Messages

Show all messages in topic

svn commit: r122 - trunk/src: argouml-core-model-euml/src/org/argouml/model/euml argouml-core-model-mdr/src/org/argouml/model/mdr argouml-core-model/src/org/argouml/model marcusvnac Marcus Vinícius de Ávila Couto 2010-09-23 17:46:38 PDT
Messages per page: