Login | Register
My pages Projects Community openCollabNet

Discussions > Commits > svn commit: r89 - trunk/src: argouml-app argouml-app/src/org/argouml/application argouml-app/src/org/argouml/kernel argouml-app/src/org/argouml/ui/cmd argouml-app/src/org/argouml/ui/explorer argouml-app/src/org/argouml/uml/diagram argouml-app/src/org/argouml/uml/diagram/deployment/ui argouml-app/src/org/argouml/uml/diagram/static_structure/ui argouml-app/src/org/argouml/uml/diagram/ui argouml-app/src/org/argouml/uml/diagram/use_case argouml-app/src/org/argouml/uml/diagram/use_case/ui argouml-app/src/org/argouml/uml/ui argouml-app/src/org/argouml/uml/ui/behavior/use_cases argouml-build argouml-core-diagrams-sequence2 argouml-core-infra argouml-core-model argouml-core-model-euml argouml-core-model-mdr argouml-core-model-mdr/src/org/argouml/model/mdr argouml-core-model/src/org/argouml/model

argouml-spl
Discussion topic

Back to topic list

svn commit: r89 - trunk/src: argouml-app argouml-app/src/org/argouml/application argouml-app/src/org/argouml/kernel argouml-app/src/org/argouml/ui/cmd argouml-app/src/org/argouml/ui/explorer argouml-app/src/org/argouml/uml/diagram argouml-app/src/org/argouml/uml/diagram/deployment/ui argouml-app/src/org/argouml/uml/diagram/static_structure/ui argouml-app/src/org/argouml/uml/diagram/ui argouml-app/src/org/argouml/uml/diagram/use_case argouml-app/src/org/argouml/uml/diagram/use_case/ui argouml-app/src/org/argouml/uml/ui argouml-app/src/org/argouml/uml/ui/behavior/use_cases argouml-build argouml-core-diagrams-sequence2 argouml-core-infra argouml-core-model argouml-core-model-euml argouml-core-model-mdr argouml-core-model-mdr/src/org/argouml/model/mdr argouml-core-model/src/org/argouml/model

Author marcusvnac
Full name Marcus Vinícius de Ávila Couto
Date 2010-07-31 16:06:13 PDT
Message Author: marcusvnac
Date: 2010-07-31 16:06:12-0700
New Revision: 89

Modified:
   trunk/src/argouml-app/ (props changed)
   trunk/src/argouml-app/build.xml
   trunk/src/argouml-ap​p/src/org/argouml/ap​plication/Main.java
   trunk/src/argouml-ap​p/src/org/argouml/ke​rnel/ProjectManager.​java
   trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/GenericArgoMenu​Bar.java
   trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/ShortcutMgr.jav​a
   trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/ExplorerPo​pup.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/DiagramFac​tory.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/UmlDiagram​Renderer.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/deployment​/ui/UMLDeploymentDia​gram.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/static_str​ucture/ui/UMLClassDi​agram.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/ActionC​ompartmentDisplay.ja​va
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/U​seCaseDiagramGraphMo​del.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/FigActor.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/FigExtend.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/FigInclude.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/FigUseCase.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/InitUseCaseDiagram​.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/PropPanelUMLUseCas​eDiagram.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/SelectionActor.jav​a
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/SelectionUseCase.j​ava
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/StylePanelFigUseCa​se.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/UMLUseCaseDiagram.​java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/UseCaseDiagramProp​PanelFactory.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/UseCaseDiagramRend​erer.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ActionUseCaseDi​agram.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/behavior/use_ca​ses/ActionAddExtendE​xtensionPoint.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionNewActor.j​ava
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionNewExtendE​xtensionPoint.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionNewExtensi​onPoint.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionNewUseCase​.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionNewUseCase​ExtensionPoint.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/PropPanelActor.j​ava
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/PropPanelExtend.​java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/PropPanelExtensi​onPoint.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/PropPanelInclude​.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/PropPanelUseCase​.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/UMLExtendBaseLis​tModel.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/UMLExtendExtensi​onListModel.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/UMLExtendExtensi​onPointListModel.jav​a
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/UMLExtensionPoin​tExtendListModel.jav​a
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/UMLExtensionPoin​tLocationDocument.ja​va
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/UMLExtensionPoin​tUseCaseListModel.ja​va
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/UMLIncludeAdditi​onListModel.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/UMLIncludeBaseLi​stModel.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/UMLIncludeListMo​del.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/UMLUseCaseExtend​ListModel.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/UMLUseCaseExtens​ionPointListModel.ja​va
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/UMLUseCaseInclud​eListModel.java
   trunk/src/argouml-build/ (props changed)
   trunk/src/argouml-bu​ild/jpp-features.pro​perties
   trunk/src/argouml-co​re-diagrams-sequence​2/build.xml
   trunk/src/argouml-core-infra/ (props changed)
   trunk/src/argouml-core-model/ (props changed)
   trunk/src/argouml-co​re-model-euml/ (props changed)
   trunk/src/argouml-co​re-model-euml/build.​xml
   trunk/src/argouml-co​re-model-mdr/ (props changed)
   trunk/src/argouml-co​re-model-mdr/build.x​ml
   trunk/src/argouml-co​re-model-mdr/src/org​/argouml/model/mdr/E​xtensionMechanismsHe​lperMDRImpl.java
   trunk/src/argouml-co​re-model/src/org/arg​ouml/model/UseCaseDi​agram.java

Log:
Merging branch /branches/NewFeature​s/UseCaseDiagram

Modified: trunk/src/argouml-app/build.xml
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/bu​ild.xml?view=diff​&pathrev=89&r1=​88&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-app/build.xml (original)
+++ trunk/src/argouml-app/build.xml 2010-07-31 16:06:12-0700
@@ -733,6 +733,12 @@
         </then>
     </if>
     <if>
+ <isset property="USECASEDIAGRAM"/>
+ <then>
+ <echo message="USECASEDIAGRAM"/>
+ </then>
+ </if>
+ <if>
         <isset property="LOGGING"/>
         <then>
             <echo message="LOGGING"/>

Modified: trunk/src/argouml-ap​p/src/org/argouml/ap​plication/Main.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/applic​ation/Main.java?view​=diff&pathrev=89​&r1=88&r2=89​
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ap​plication/Main.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ap​plication/Main.java 2010-07-31 16:06:12-0700
@@ -97,7 +97,10 @@
 //#endif
 import org.argouml.uml.diag​ram.static_structure​.ui.InitClassDiagram​;
 import org.argouml.uml.diag​ram.ui.InitDiagramAp​pearanceUI;
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.diag​ram.use_case.ui.Init​UseCaseDiagram;
+//#endif
 import org.argouml.uml.ui.InitUmlUI;
 import org.argouml.util.ArgoFrame;
 import org.argouml.util.Jav​aRuntimeUtility;
@@ -454,7 +457,10 @@
         SubsystemUtility.ini​tSubsystem(new InitStateDiagram());
         //#endif
         SubsystemUtility.ini​tSubsystem(new InitClassDiagram());
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
         SubsystemUtility.ini​tSubsystem(new InitUseCaseDiagram());
+ //#endif
         SubsystemUtility.ini​tSubsystem(new InitUmlUI());
         //#if defined(COGNITIVE)
         //@#$LPS-COGNITIVE:​GranularityType:Comm​and

Modified: trunk/src/argouml-ap​p/src/org/argouml/ke​rnel/ProjectManager.​java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/kernel​/ProjectManager.java​?view=diff&pathr​ev=89&r1=88&​r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ke​rnel/ProjectManager.​java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ke​rnel/ProjectManager.​java 2010-07-31 16:06:12-0700
@@ -339,9 +339,12 @@
                 model,
                 project.getProjectSe​ttings().getDefaultD​iagramSettings());
         project.addMember(d);
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
         project.addMember(df.create(
                 DiagramFactory.Diagr​amType.UseCase, model,
                 project.getProjectSe​ttings().getDefaultD​iagramSettings()));
+ //#endif
         //#if defined(COGNITIVE)
         //@#$LPS-COGNITIVE:​GranularityType:Comm​and
         project.addMember(new ProjectMemberTodoList("",

Modified: trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/GenericArgoMenu​Bar.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/ui/cmd​/GenericArgoMenuBar.​java?view=diff&p​athrev=89&r1=88​&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/GenericArgoMenu​Bar.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/GenericArgoMenu​Bar.java 2010-07-31 16:06:12-0700
@@ -93,7 +93,10 @@
 //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.ui.A​ctionStateDiagram;
 //#endif
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.ui.A​ctionUseCaseDiagram;​
+//#endif
 import org.argouml.util.osd​ep.OSXAdapter;
 import org.argouml.util.osdep.OsUtil;
 import org.tigris.gef.base.​AlignAction;
@@ -608,13 +611,15 @@
         Collection<Action> toolbarTools = new ArrayList<Action>();
         createDiagramMenu = add(new JMenu(menuLocalize("Create Diagram")));
         setMnemonic(createDiagramMenu, "Create Diagram");
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:command
         JMenuItem usecaseDiagram = createDiagramMenu
                 .add(new ActionUseCaseDiagram());
         setMnemonic(usecaseDiagram, "Usecase Diagram");
         toolbarTools.add((new ActionUseCaseDiagram()));
         ShortcutMgr.assignAc​celerator(usecaseDia​gram,
                 ShortcutMgr.ACTION_U​SE_CASE_DIAGRAM);
-
+ //#endif
         JMenuItem classDiagram =
             createDiagramMenu.add(new ActionClassDiagram());
         setMnemonic(classDiagram, "Class Diagram");

Modified: trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/ShortcutMgr.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/ui/cmd​/ShortcutMgr.java?vi​ew=diff&pathrev=​89&r1=88&r2=​89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/ShortcutMgr.jav​a (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/ShortcutMgr.jav​a 2010-07-31 16:06:12-0700
@@ -86,7 +86,10 @@
 //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.ui.A​ctionStateDiagram;
 //#endif
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.ui.A​ctionUseCaseDiagram;​
+//#endif
 import org.argouml.util.KeyEventUtils;
 import org.tigris.gef.base.​AlignAction;
 import org.tigris.gef.base.​DistributeAction;
@@ -211,9 +214,11 @@
     /** Action key for show xml dump */
     public static final String ACTION_SHOW_XML_DUMP = "showXmlDump";
 
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Field
     /** Action key for use case diagram */
     public static final String ACTION_USE_CASE_DIAGRAM = "useCaseDiagrams";
-
+ //#endif
     /** Action key for class diagram */
     public static final String ACTION_CLASS_DIAGRAM = "classDiagrams";
 
@@ -668,8 +673,11 @@
                 0), new ActionFind());
 
         // create menu
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
         putDefaultShortcut(A​CTION_USE_CASE_DIAGR​AM, null,
                 new ActionUseCaseDiagram());
+ //#endif
         putDefaultShortcut(A​CTION_CLASS_DIAGRAM,​ null,
                 new ActionClassDiagram());
         //#if defined(SEQUENCEDIAGRAM)

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=89&r1=88​&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/ExplorerPo​pup.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/ExplorerPo​pup.java 2010-07-31 16:06:12-0700
@@ -90,7 +90,10 @@
 //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.ui.A​ctionStateDiagram;
 //#endif
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.ui.A​ctionUseCaseDiagram;​
+//#endif
 import org.tigris.gef.base.Diagram;
 import org.tigris.gef.base.Editor;
 import org.tigris.gef.base.Globals;
@@ -123,8 +126,11 @@
             "button.new-package",
             Model.getMetaTypes()​.getActor(),
             "button.new-actor",
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:StaticInitializatio​n
             Model.getMetaTypes()​.getUseCase(),
             "button.new-usecase",
+ //#endif
             Model.getMetaTypes()​.getExtensionPoint()​,
             "button.new-extension-point",
             Model.getMetaTypes()​.getUMLClass(),
@@ -399,8 +405,10 @@
      *
      */
     private void initMenuCreateDiagrams() {
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
         createDiagrams.add(new ActionUseCaseDiagram());
-
+ //#endif
         createDiagrams.add(new ActionClassDiagram());
         //#if defined(SEQUENCEDIAGRAM)
         //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/DiagramFac​tory.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/DiagramFactory​.java?view=diff&​pathrev=89&r1=88​&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/DiagramFac​tory.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/DiagramFac​tory.java 2010-07-31 16:06:12-0700
@@ -43,7 +43,10 @@
 import org.argouml.model.Se​quenceDiagram;
 //#endif
 import org.argouml.model.StateDiagram;
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.model.Us​eCaseDiagram;
+//#endif
 //#if defined(ACTIVITYDIAGRAM)
 //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.diag​ram.activity.ui.UMLA​ctivityDiagram;
@@ -59,7 +62,10 @@
 import org.argouml.uml.diag​ram.state.ui.UMLStat​eDiagram;
 //#endif
 import org.argouml.uml.diag​ram.static_structure​.ui.UMLClassDiagram;​
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.diag​ram.use_case.ui.UMLU​seCaseDiagram;
+//#endif
 import org.tigris.gef.base.Diagram;
 import org.tigris.gef.graph​.GraphNodeRenderer;
 
@@ -91,7 +97,11 @@
      * Enumeration containing all the different types of UML diagrams.
      */
     public enum DiagramType {
- Class, UseCase,
+ Class,
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Enumeration
+ UseCase,
+ //#endif
         //#if defined(UMLSTATEDIAGRAM)
         //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Enumeration
         State,
@@ -118,7 +128,10 @@
         // TODO: Use our extension registration mechanism for our internal
         // classes as well, so everything is treated the same
         diagramClasses.put(D​iagramType.Class, UMLClassDiagram.class);
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
         diagramClasses.put(D​iagramType.UseCase, UMLUseCaseDiagram.class);
+ //#endif
         //#if defined(UMLSTATEDIAGRAM)
         //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Command
         diagramClasses.put(D​iagramType.State, UMLStateDiagram.class);
@@ -295,9 +308,12 @@
         if (type == UMLClassDiagram.class) {
             diagram = new UMLClassDiagram(namespace);
             diType = ClassDiagram.class;
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
         } else if (type == UMLUseCaseDiagram.class) {
             diagram = new UMLUseCaseDiagram(namespace);
             diType = UseCaseDiagram.class;
+ //#endif
         //#if defined(UMLSTATEDIAGRAM)
         //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Command
         } else if (type == UMLStateDiagram.class) {

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/UmlDiagram​Renderer.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/UmlDiagramRend​erer.java?view=diff​&pathrev=89&r​1=88&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/UmlDiagram​Renderer.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/UmlDiagram​Renderer.java 2010-07-31 16:06:12-0700
@@ -85,10 +85,13 @@
 import org.argouml.uml.diag​ram.ui.FigNodeAssoci​ation;
 import org.argouml.uml.diag​ram.ui.FigPermission​;
 import org.argouml.uml.diag​ram.ui.FigUsage;
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.diag​ram.use_case.ui.FigA​ctor;
 import org.argouml.uml.diag​ram.use_case.ui.FigE​xtend;
 import org.argouml.uml.diag​ram.use_case.ui.FigI​nclude;
 import org.argouml.uml.diag​ram.use_case.ui.FigU​seCase;
+//#endif
 import org.tigris.gef.base.Layer;
 import org.tigris.gef.graph​.GraphEdgeRenderer;
 import org.tigris.gef.graph​.GraphNodeRenderer;
@@ -151,10 +154,13 @@
             figNode = new FigPackage(node, x, y);
         } else if (Model.getFacade().i​sAAssociation(node))​ {
             figNode = new FigNodeAssociation();
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
         } else if (Model.getFacade().i​sAActor(node)) {
             figNode = new FigActor();
         } else if (Model.getFacade().i​sAUseCase(node)) {
             figNode = new FigUseCase();
+ //#endif
         //#if defined(ACTIVITYDIAGRAM)
         //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
         } else if (Model.getFacade().i​sAPartition(node)) {
@@ -302,10 +308,13 @@
         } else if (Model.getFacade().i​sATransition(edge)) {
             newEdge = new FigTransition();
         //#endif
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
         } else if (Model.getFacade().i​sAExtend(edge)) {
             newEdge = new FigExtend();
         } else if (Model.getFacade().i​sAInclude(edge)) {
             newEdge = new FigInclude();
+ //#endif
         }
 
         if (newEdge == null) {

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/deployment​/ui/UMLDeploymentDia​gram.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/deployment/ui/​UMLDeploymentDiagram​.java?view=diff&​pathrev=89&r1=88​&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/deployment​/ui/UMLDeploymentDia​gram.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/deployment​/ui/UMLDeploymentDia​gram.java 2010-07-31 16:06:12-0700
@@ -50,7 +50,10 @@
 import org.argouml.uml.diag​ram.ui.FigNodeAssoci​ation;
 import org.argouml.uml.diag​ram.ui.RadioAction;
 import org.argouml.uml.diag​ram.ui.UMLDiagram;
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.diag​ram.use_case.ui.FigA​ctor;
+//#endif
 import org.argouml.util.Too​lBarUtility;
 import org.tigris.gef.base.​LayerPerspective;
 import org.tigris.gef.base.​LayerPerspectiveMuta​ble;
@@ -567,8 +570,11 @@
             return true;
         } else if (Model.getFacade().i​sAComment(objectToAc​cept)) {
             return true;
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
         } else if (Model.getFacade().i​sAActor(objectToAcce​pt)) {
             return true;
+ //#endif
         }
         return false;
     }
@@ -601,8 +607,11 @@
             figNode = new FigInterface(droppedObject, bounds, settings);
         } else if (Model.getFacade().i​sAObject(droppedObje​ct)) {
             figNode = new FigObject(droppedObject, bounds, settings);
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
         } else if (Model.getFacade().i​sAActor(droppedObjec​t)) {
             figNode = new FigActor(droppedObject, bounds, settings);
+ //#endif
         } else if (Model.getFacade().i​sAComment(droppedObj​ect)) {
             figNode = new FigComment(droppedObject, bounds, settings);
         }

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/static_str​ucture/ui/UMLClassDi​agram.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/static_structu​re/ui/UMLClassDiagra​m.java?view=diff​&pathrev=89&r1=8​8&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/static_str​ucture/ui/UMLClassDi​agram.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/static_str​ucture/ui/UMLClassDi​agram.java 2010-07-31 16:06:12-0700
@@ -51,8 +51,11 @@
 import org.argouml.uml.diag​ram.ui.ModeCreatePer​mission;
 import org.argouml.uml.diag​ram.ui.ModeCreateUsa​ge;
 import org.argouml.uml.diag​ram.ui.UMLDiagram;
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.diag​ram.use_case.ui.FigA​ctor;
 import org.argouml.uml.diag​ram.use_case.ui.FigU​seCase;
+//#endif
 import org.argouml.uml.ui.f​oundation.core.Actio​nAddAttribute;
 import org.argouml.uml.ui.f​oundation.core.Actio​nAddOperation;
 import org.argouml.util.Too​lBarUtility;
@@ -644,10 +647,13 @@
             return true;
         } else if (Model.getFacade().i​sASignal(objectToAcc​ept)) {
             return true;
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
         } else if (Model.getFacade().i​sAActor(objectToAcce​pt)) {
             return true;
         } else if (Model.getFacade().i​sAUseCase(objectToAc​cept)) {
             return true;
+ //#endif
         } else if (Model.getFacade().i​sAObject(objectToAcc​ept)) {
             return true;
         } else if (Model.getFacade().i​sANodeInstance(objec​tToAccept)) {
@@ -701,10 +707,13 @@
             figNode = new FigException(droppedObject, bounds, settings);
         } else if (Model.getFacade().i​sASignal(droppedObje​ct)) {
             figNode = new FigSignal(droppedObject, bounds, settings);
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
         } else if (Model.getFacade().i​sAActor(droppedObjec​t)) {
             figNode = new FigActor(droppedObject, bounds, settings);
         } else if (Model.getFacade().i​sAUseCase(droppedObj​ect)) {
             figNode = new FigUseCase(droppedObject, bounds, settings);
+ //#endif
         } else if (Model.getFacade().i​sAObject(droppedObje​ct)) {
             figNode = new FigObject(droppedObject, bounds, settings);
         } else if (Model.getFacade().i​sANodeInstance(dropp​edObject)) {

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/ActionC​ompartmentDisplay.ja​va
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/ActionCompa​rtmentDisplay.java?v​iew=diff&pathrev​=89&r1=88&r2​=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/ActionC​ompartmentDisplay.ja​va (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/ActionC​ompartmentDisplay.ja​va 2010-07-31 16:06:12-0700
@@ -36,7 +36,10 @@
 import org.argouml.uml.diag​ram.AttributesCompar​tmentContainer;
 import org.argouml.uml.diag​ram.ExtensionsCompar​tmentContainer;
 import org.argouml.uml.diag​ram.OperationsCompar​tmentContainer;
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.diag​ram.use_case.ui.FigU​seCase;
+//#endif
 import org.tigris.gef.base.Editor;
 import org.tigris.gef.base.Globals;
 import org.tigris.gef.base.Selection;
@@ -323,9 +326,12 @@
             }
 
             if ((cType & COMPARTMENT_EXTENSIONPOINT) != 0) {
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
                 if (f instanceof FigUseCase) {
                     ((FigUseCase) f).setExtensionPoint​Visible(display);
                 }
+ //#endif
             }
             if ((cType & COMPARTMENT_ENUMLITERAL) != 0) {
                 if (f instanceof EnumLiteralsCompartm​entContainer) {

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/U​seCaseDiagramGraphMo​del.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/use_case/UseCa​seDiagramGraphModel.​java?view=diff&p​athrev=89&r1=88​&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/U​seCaseDiagramGraphMo​del.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/U​seCaseDiagramGraphMo​del.java 2010-07-31 16:06:12-0700
@@ -1,3 +1,5 @@
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Package
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -53,6 +55,7 @@
         implements VetoableChangeListener {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedCom​mand
     /**
      * Logger.
      */
@@ -596,3 +599,4 @@
     static final long serialVersionUID = -8516841965639203796L;
 
 }
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/FigActor.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/use_case/ui/Fi​gActor.java?view=dif​f&pathrev=89​&r1=88&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/FigActor.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/FigActor.java 2010-07-31 16:06:12-0700
@@ -1,3 +1,5 @@
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Package
 // $Id$
 // Copyright (c) 1996-2008 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -404,3 +406,4 @@
     }
 
 }
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/FigExtend.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/use_case/ui/Fi​gExtend.java?view=di​ff&pathrev=89​&r1=88&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/FigExtend.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/FigExtend.java 2010-07-31 16:06:12-0700
@@ -1,3 +1,5 @@
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Package
 // $Id$
 // Copyright (c) 1996-2009 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -284,3 +286,4 @@
     }
 
 }
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/FigInclude.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/use_case/ui/Fi​gInclude.java?view=d​iff&pathrev=89​&r1=88&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/FigInclude.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/FigInclude.java 2010-07-31 16:06:12-0700
@@ -1,3 +1,5 @@
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Package
 // $Id$
 // Copyright (c) 1996-2009 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -163,4 +165,4 @@
         super.paint(g);
     }
 }
-
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/FigUseCase.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/use_case/ui/Fi​gUseCase.java?view=d​iff&pathrev=89​&r1=88&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/FigUseCase.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/FigUseCase.java 2010-07-31 16:06:12-0700
@@ -1,3 +1,5 @@
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Package
 // $Id$
 // Copyright (c) 1996-2008 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -1289,3 +1291,4 @@
         return l;
     }
 }
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/InitUseCaseDiagram​.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/use_case/ui/In​itUseCaseDiagram.jav​a?view=diff&path​rev=89&r1=88​&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/InitUseCaseDiagram​.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/InitUseCaseDiagram​.java 2010-07-31 16:06:12-0700
@@ -1,3 +1,5 @@
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Package
 // $Id$
 // Copyright (c) 2008 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -59,3 +61,4 @@
     }
 
 }
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/PropPanelUMLUseCas​eDiagram.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/use_case/ui/Pr​opPanelUMLUseCaseDia​gram.java?view=diff​&pathrev=89&r​1=88&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/PropPanelUMLUseCas​eDiagram.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/PropPanelUMLUseCas​eDiagram.java 2010-07-31 16:06:12-0700
@@ -1,3 +1,5 @@
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Package
 // $Id$
 // Copyright (c) 1996-2008 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -42,3 +44,4 @@
     }
 
 }
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/SelectionActor.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/di​agram/use_case/ui/Se​lectionActor.java?vi​ew=diff&pathrev=​89&r1=88&r2=​89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/SelectionActor.jav​a (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/SelectionActor.jav​a 2010-07-31 16:06:12-0700
@@ -1,3 +1,5 @@
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Package
 // $Id$
 // Copyright (c) 1996-2008 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -129,4 +131,4 @@
     }
 
 }
-
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/SelectionUseCase.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/use_case/ui/Se​lectionUseCase.java?​view=diff&pathre​v=89&r1=88&r​2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/SelectionUseCase.j​ava (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/SelectionUseCase.j​ava 2010-07-31 16:06:12-0700
@@ -1,3 +1,5 @@
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Package
 // $Id$
 // Copyright (c) 1996-2008 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -124,3 +126,4 @@
     }
 
 }
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/StylePanelFigUseCa​se.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/use_case/ui/St​ylePanelFigUseCase.j​ava?view=diff&pa​threv=89&r1=88​&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/StylePanelFigUseCa​se.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/StylePanelFigUseCa​se.java 2010-07-31 16:06:12-0700
@@ -1,3 +1,5 @@
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Package
 // $Id$
 // Copyright (c) 1996-2007 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -106,3 +108,4 @@
     }
 
 } /* end class StylePanelFigUseCase */
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/UMLUseCaseDiagram.​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/use_case/ui/UM​LUseCaseDiagram.java​?view=diff&pathr​ev=89&r1=88&​r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/UMLUseCaseDiagram.​java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/UMLUseCaseDiagram.​java 2010-07-31 16:06:12-0700
@@ -1,3 +1,5 @@
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Package
 // $Id$
 // Copyright (c) 1996-2008 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -34,6 +36,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.i18n.Translator;
@@ -66,6 +69,7 @@
 public class UMLUseCaseDiagram extends UMLDiagram {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef
     private static final Logger LOG = Logger.getLogger(UML​UseCaseDiagram.class​);
     //#endif
     // Actions specific to the use case diagram toolbar
@@ -501,6 +505,7 @@
         }
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef
         if (figNode != null) {
             LOG.debug("Dropped object " + droppedObject + " converted to "
                     + figNode);
@@ -511,3 +516,4 @@
         return figNode;
     }
 }
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/UseCaseDiagramProp​PanelFactory.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/use_case/ui/Us​eCaseDiagramPropPane​lFactory.java?view=d​iff&pathrev=89​&r1=88&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/UseCaseDiagramProp​PanelFactory.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/UseCaseDiagramProp​PanelFactory.java 2010-07-31 16:06:12-0700
@@ -1,3 +1,5 @@
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Package
 // $Id$
 // Copyright (c) 2008 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -42,3 +44,4 @@
     }
 
 }
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/UseCaseDiagramRend​erer.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/use_case/ui/Us​eCaseDiagramRenderer​.java?view=diff&​pathrev=89&r1=88​&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/UseCaseDiagramRend​erer.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/UseCaseDiagramRend​erer.java 2010-07-31 16:06:12-0700
@@ -1,3 +1,5 @@
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Package
 // $Id$
 // Copyright (c) 1996-2008 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -258,3 +260,4 @@
     }
 
 }
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ActionUseCaseDi​agram.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/ui​/ActionUseCaseDiagra​m.java?view=diff​&pathrev=89&r1=8​8&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ActionUseCaseDi​agram.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ActionUseCaseDi​agram.java 2010-07-31 16:06:12-0700
@@ -1,3 +1,5 @@
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Class
 // $Id$
 // Copyright (c) 1996-2007 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -26,6 +28,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.model.Model;
@@ -39,6 +42,7 @@
 public class ActionUseCaseDiagram extends ActionAddDiagram {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef
     private static final Logger LOG =
         Logger.getLogger(Act​ionUseCaseDiagram.cl​ass);
     //#endif
@@ -105,3 +109,4 @@
     }
 
 }
+//#endif
\ No newline at end of file

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=89&r​1=88&r2=89
====================​====================​====================​==================
--- 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-07-31 16:06:12-0700
@@ -72,11 +72,14 @@
 import org.argouml.uml.ui.b​ehavior.state_machin​es.PropPanelSynchSta​te;
 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)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Import
 import org.argouml.uml.ui.b​ehavior.use_cases.Pr​opPanelActor;
 import org.argouml.uml.ui.b​ehavior.use_cases.Pr​opPanelExtend;
 import org.argouml.uml.ui.b​ehavior.use_cases.Pr​opPanelExtensionPoin​t;
 import org.argouml.uml.ui.b​ehavior.use_cases.Pr​opPanelInclude;
 import org.argouml.uml.ui.b​ehavior.use_cases.Pr​opPanelUseCase;
+//#endif
 import org.argouml.uml.ui.f​oundation.core.PropP​anelAbstraction;
 import org.argouml.uml.ui.f​oundation.core.PropP​anelAssociation;
 import org.argouml.uml.ui.f​oundation.core.PropP​anelAssociationClass​;
@@ -164,8 +167,11 @@
                 return new PropPanelConstraint();
             } else if (Model.getFacade().i​sAEnumerationLiteral​(element)) {
                 return new PropPanelEnumerationLiteral();
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
             } else if (Model.getFacade().i​sAExtensionPoint(ele​ment)) {
                 return new PropPanelExtensionPoint();
+ //#endif
             } else if (Model.getFacade().i​sAGuard(element)) {
                 return new PropPanelGuard();
             } else if (Model.getFacade().i​sAInteraction(elemen​t)) {
@@ -224,9 +230,14 @@
 
 
     private PropPanelClassifier getClassifierPropPanel(Object element) {
- if (Model.getFacade().i​sAActor(element)) {
+ if
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
+ (Model.getFacade().i​sAActor(element)) {
             return new PropPanelActor();
- } else if (Model.getFacade().i​sAAssociationClass(e​lement)) {
+ } else if
+ //#endif
+ (Model.getFacade().i​sAAssociationClass(e​lement)) {
             return new PropPanelAssociationClass();
         } else if (Model.getFacade().i​sAClass(element)) {
             return new PropPanelClass();
@@ -252,9 +263,12 @@
             } else {
                 return new PropPanelSignal();
             }
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Package
         } else if (Model.getFacade().i​sAUseCase(element)) {
             return new PropPanelUseCase();
- }
+ //#endif
+ }
         
         // TODO: A Subsystem is a Classifier, but its PropPanel is derived from
         // PropPanelPackage
@@ -289,14 +303,20 @@
             } else {
                 return new PropPanelDependency();
             }
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
         } else if (Model.getFacade().i​sAExtend(element)) {
             return new PropPanelExtend();
+ //#endif
         } else if (Model.getFacade().i​sAFlow(element)) {
             return new PropPanelFlow();
         } else if (Model.getFacade().i​sAGeneralization(ele​ment)) {
             return new PropPanelGeneralization();
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
         } else if (Model.getFacade().i​sAInclude(element)) {
             return new PropPanelInclude();
+ //#endif
         }
         throw new IllegalArgumentExcep​tion("Unsupported Relationship type");
     }

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionAddExtendE​xtensionPoint.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/use_cases/​ActionAddExtendExten​sionPoint.java?view=​diff&pathrev=89​&r1=88&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionAddExtendE​xtensionPoint.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionAddExtendE​xtensionPoint.java 2010-07-31 16:06:12-0700
@@ -1,3 +1,5 @@
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Package
 // $Id$
 // Copyright (c) 1996-2007 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -88,3 +90,4 @@
     }
 
 }
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionNewActor.j​ava
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/use_cases/​ActionNewActor.java?​view=diff&pathre​v=89&r1=88&r​2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionNewActor.j​ava (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionNewActor.j​ava 2010-07-31 16:06:12-0700
@@ -1,3 +1,5 @@
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Package
 // $Id$
 // Copyright (c) 2004-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -64,3 +66,4 @@
         }
     }
 }
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionNewExtendE​xtensionPoint.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/use_cases/​ActionNewExtendExten​sionPoint.java?view=​diff&pathrev=89​&r1=88&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionNewExtendE​xtensionPoint.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionNewExtendE​xtensionPoint.java 2010-07-31 16:06:12-0700
@@ -1,3 +1,5 @@
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Package
 // $Id$
 // Copyright (c) 2002-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -64,3 +66,4 @@
     }
 
 }
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionNewExtensi​onPoint.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/use_cases/​ActionNewExtensionPo​int.java?view=diff​&pathrev=89&r1​=88&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionNewExtensi​onPoint.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionNewExtensi​onPoint.java 2010-07-31 16:06:12-0700
@@ -1,3 +1,5 @@
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Package
 // $Id$
 // Copyright (c) 2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -69,4 +71,5 @@
      * The UID.
      */
     private static final long serialVersionUID = 1556105736769814764L;
-}
\ No newline at end of file
+}
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionNewUseCase​.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/use_cases/​ActionNewUseCase.jav​a?view=diff&path​rev=89&r1=88​&r2=89
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionNewUseCase​.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionNewUseCase​.java 2010-07-31 16:06:12-0700
@@ -1,3 +1,5 @@
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Package
 // $Id$
 // Copyright (c) 2005-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -66,4 +68,5 @@
             }
         }
     }
-}
\ No newline at end of file
+}
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionNewUseCase​ExtensionPoint.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/use_cases/​ActionNewUseCaseExte​nsionPoint.java?view​=diff&pathrev=89​&r1=88&r2=89​
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionNewUseCase​ExtensionPoint.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/ActionNewUseCase​ExtensionPoint.java 2010-07-31 16:06:12-0700
@@ -1,3 +1,5 @@
+//#if defined(USECASEDIAGRAM)
+//@#$LPS-USECASEDI​AGRAM:GranularityTyp​e:Package
 // $Id$
 // Copyright (c) 2002-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -60,3 +62,4 @@
         }
     }
 }
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/use_ca​ses/PropPanelActor.j​ava
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/use_cases/​PropPanelAc

View complete message

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

Messages

Show all messages in topic

svn commit: r89 - trunk/src: argouml-app argouml-app/src/org/argouml/application argouml-app/src/org/argouml/kernel argouml-app/src/org/argouml/ui/cmd argouml-app/src/org/argouml/ui/explorer argouml-a... marcusvnac Marcus Vinícius de Ávila Couto 2010-07-31 16:06:13 PDT
Messages per page: