Login | Register
My pages Projects Community openCollabNet

Discussions > Commits > svn commit: r84 - branches/NewFeatures/UseCaseDiagram/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-build argouml-core-diagrams-sequence2 argouml-core-diagrams-sequence2/staging argouml-core-diagrams-sequence2/staging/org argouml-core-diagrams-sequence2/staging/org/argouml argouml-core-diagrams-sequence2/staging/org/argouml/sequence2 argouml-core-diagrams-sequence2/staging/org/argouml/sequence2/diagram argouml-core-model-euml argouml-core-model-mdr argouml-core-model/src/org/argouml/model

argouml-spl
Discussion topic

Back to topic list

svn commit: r84 - branches/NewFeatures/UseCaseDiagram/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-build argouml-core-diagrams-sequence2 argouml-core-diagrams-sequence2/staging argouml-core-diagrams-sequence2/staging/org argouml-core-diagrams-sequence2/staging/org/argouml argouml-core-diagrams-sequence2/staging/org/argouml/sequence2 argouml-core-diagrams-sequence2/staging/org/argouml/sequence2/diagram argouml-core-model-euml argouml-core-model-mdr argouml-core-model/src/org/argouml/model

Author camiloribeiro
Full name Camilo Ribeiro
Date 2010-06-21 15:02:26 PDT
Message Author: camiloribeiro
Date: 2010-06-21 15:02:25-0700
New Revision: 84

Added:
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/SequenceDiagramMod​ule.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/SequenceDiagramPro​pPanelFactory.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/diagram/
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/diagram/ActionAddC​lassifierRole.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/diagram/ActionSetA​ddMessageMode.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/diagram/ActionSetO​peration.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/diagram/FigActivat​ion.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/diagram/FigClassif​ierRole.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/diagram/FigDestroy​.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/diagram/FigHead.ja​va
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/diagram/FigLifeLin​e.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/diagram/FigMessage​.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/diagram/FigMessage​Comparator.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/diagram/FigMessage​Spline.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/diagram/ModeBroomM​essages.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/diagram/ModeCreate​Message.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/diagram/ModePlaceC​lassifierRole.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/diagram/SelectionC​lassifierRole.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/diagram/SelectionM​essage.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/diagram/SequenceDi​agramFactory.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/diagram/SequenceDi​agramGraphModel.java​
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/diagram/SequenceDi​agramRenderer.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/diagram/UMLSequenc​eDiagram.java
Modified:
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/build.xm​l
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/application/​Main.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/kernel/Proje​ctManager.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/ui/cmd/Gener​icArgoMenuBar.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/ui/cmd/Short​cutMgr.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/ui/explorer/​ExplorerPopup.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​DiagramFactory.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​UmlDiagramRenderer.j​ava
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​deployment/ui/UMLDep​loymentDiagram.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​static_structure/ui/​UMLClassDiagram.java​
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​ui/ActionCompartment​Display.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/UseCaseDiag​ramGraphModel.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/FigActor​.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/FigExten​d.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/FigInclu​de.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/FigUseCa​se.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/InitUseC​aseDiagram.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/PropPane​lUMLUseCaseDiagram.j​ava
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/Selectio​nActor.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/Selectio​nUseCase.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/StylePan​elFigUseCase.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/UMLUseCa​seDiagram.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/UseCaseD​iagramPropPanelFacto​ry.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/UseCaseD​iagramRenderer.java
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/ui/Actio​nUseCaseDiagram.java​
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-build/jpp-fe​atures.properties
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/build.xm​l
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-model-e​uml/build.xml
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-model-m​dr/build.xml
   branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-model/s​rc/org/argouml/model​/UseCaseDiagram.java​

Log:
Início da extração do diagrama de caso de uso

Modified: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/build.xm​l
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/build.xml?vi​ew=diff&pathrev=​84&r1=83&r2=​84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/build.xm​l (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/build.xm​l 2010-06-21 15:02:25-0700
@@ -727,6 +727,12 @@
         </then>
     </if>
     <if>
+ <isset property="USECASEDIAGRAM"/>
+ <then>
+ <echo message="USECASEDIAGRAM"/>
+ </then>
+ </if>
+ <if>
         <isset property="LOGGING"/>
         <then>
             <echo message="LOGGING"/>

Modified: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/application/​Main.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/application/Main​.java?view=diff&​pathrev=84&r1=83​&r2=84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/application/​Main.java (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/application/​Main.java 2010-06-21 15:02:25-0700
@@ -94,7 +94,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;
@@ -448,7 +451,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: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/kernel/Proje​ctManager.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/kernel/ProjectMa​nager.java?view=diff​&pathrev=84&​r1=83&r2=84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/kernel/Proje​ctManager.java (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/kernel/Proje​ctManager.java 2010-06-21 15:02:25-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: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/ui/cmd/Gener​icArgoMenuBar.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/ui/cmd/GenericAr​goMenuBar.java?view=​diff&pathrev=84​&r1=83&r2=84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/ui/cmd/Gener​icArgoMenuBar.java (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/ui/cmd/Gener​icArgoMenuBar.java 2010-06-21 15:02:25-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.argouml.util.osd​ep.OSXAdapter;
 import org.argouml.util.osdep.OsUtil;
 import org.tigris.gef.base.​AlignAction;
@@ -605,13 +608,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: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/ui/cmd/Short​cutMgr.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/ui/cmd/ShortcutM​gr.java?view=diff​&pathrev=84&r1=​83&r2=84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/ui/cmd/Short​cutMgr.java (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/ui/cmd/Short​cutMgr.java 2010-06-21 15:02:25-0700
@@ -83,7 +83,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;
@@ -208,9 +211,11 @@
     /** Action key for show xml dump */
     public static final String ACTION_SHOW_XML_DUMP = "showXmlDump";
 
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
     /** 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";
 
@@ -662,8 +667,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());
         putDefaultShortcut(A​CTION_SEQUENCE_DIAGR​AM, null,

Modified: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/ui/explorer/​ExplorerPopup.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/ui/explorer/Expl​orerPopup.java?view=​diff&pathrev=84​&r1=83&r2=84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/ui/explorer/​ExplorerPopup.java (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/ui/explorer/​ExplorerPopup.java 2010-06-21 15:02:25-0700
@@ -84,7 +84,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;
@@ -117,8 +120,11 @@
             "button.new-package",
             Model.getMetaTypes()​.getActor(),
             "button.new-actor",
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:command
             Model.getMetaTypes()​.getUseCase(),
             "button.new-usecase",
+ //#endif
             Model.getMetaTypes()​.getExtensionPoint()​,
             "button.new-extension-point",
             Model.getMetaTypes()​.getUMLClass(),
@@ -381,8 +387,10 @@
      *
      */
     private void initMenuCreateDiagrams() {
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Command
         createDiagrams.add(new ActionUseCaseDiagram());
-
+ //#endif
         createDiagrams.add(new ActionClassDiagram());
 
         createDiagrams.add(new ActionSequenceDiagram());

Modified: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​DiagramFactory.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/uml/diagram/Diag​ramFactory.java?view​=diff&pathrev=84​&r1=83&r2=84​
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​DiagramFactory.java (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​DiagramFactory.java 2010-06-21 15:02:25-0700
@@ -40,7 +40,10 @@
 import org.argouml.model.Model;
 import org.argouml.model.Se​quenceDiagram;
 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;
@@ -53,7 +56,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;
 
@@ -85,7 +91,11 @@
      * Enumeration containing all the different types of UML diagrams.
      */
     public enum DiagramType {
- Class, UseCase,
+ Class,
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Enum
+ UseCase,
+ //#endif
         //#if defined(UMLSTATEDIAGRAM)
         //@#$LPS-UMLSTATEDI​AGRAM:GranularityTyp​e:Enumeration
         State,
@@ -109,7 +119,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);
@@ -280,9 +293,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: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​UmlDiagramRenderer.j​ava
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/uml/diagram/UmlD​iagramRenderer.java?​view=diff&pathre​v=84&r1=83&r​2=84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​UmlDiagramRenderer.j​ava (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​UmlDiagramRenderer.j​ava 2010-06-21 15:02:25-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;
-import org.argouml.uml.diag​ram.use_case.ui.FigA​ctor;
+//#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;
+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)) {
+ } else if (Model.getFacade().i​sAInclude(edge)) {
             newEdge = new FigInclude();
+ //#endif
         }
 
         if (newEdge == null) {

Modified: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​deployment/ui/UMLDep​loymentDiagram.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/uml/diagram/depl​oyment/ui/UMLDeploym​entDiagram.java?view​=diff&pathrev=84​&r1=83&r2=84​
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​deployment/ui/UMLDep​loymentDiagram.java (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​deployment/ui/UMLDep​loymentDiagram.java 2010-06-21 15:02:25-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: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​static_structure/ui/​UMLClassDiagram.java​
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/uml/diagram/stat​ic_structure/ui/UMLC​lassDiagram.java?vie​w=diff&pathrev=8​4&r1=83&r2=8​4
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​static_structure/ui/​UMLClassDiagram.java​ (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​static_structure/ui/​UMLClassDiagram.java​ 2010-06-21 15:02:25-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;
+ 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: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​ui/ActionCompartment​Display.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/uml/diagram/ui/A​ctionCompartmentDisp​lay.java?view=diff​&pathrev=84&r1​=83&r2=84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​ui/ActionCompartment​Display.java (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​ui/ActionCompartment​Display.java 2010-06-21 15:02:25-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: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/UseCaseDiag​ramGraphModel.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/uml/diagram/use_​case/UseCaseDiagramG​raphModel.java?view=​diff&pathrev=84​&r1=83&r2=84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/UseCaseDiag​ramGraphModel.java (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/UseCaseDiag​ramGraphModel.java 2010-06-21 15:02:25-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: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/FigActor​.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/uml/diagram/use_​case/ui/FigActor.jav​a?view=diff&path​rev=84&r1=83​&r2=84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/FigActor​.java (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/FigActor​.java 2010-06-21 15:02:25-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: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/FigExten​d.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/uml/diagram/use_​case/ui/FigExtend.ja​va?view=diff&pat​hrev=84&r1=83​&r2=84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/FigExten​d.java (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/FigExten​d.java 2010-06-21 15:02:25-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: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/FigInclu​de.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/uml/diagram/use_​case/ui/FigInclude.j​ava?view=diff&pa​threv=84&r1=83​&r2=84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/FigInclu​de.java (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/FigInclu​de.java 2010-06-21 15:02:25-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: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/FigUseCa​se.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/uml/diagram/use_​case/ui/FigUseCase.j​ava?view=diff&pa​threv=84&r1=83​&r2=84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/FigUseCa​se.java (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/FigUseCa​se.java 2010-06-21 15:02:25-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: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/InitUseC​aseDiagram.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/uml/diagram/use_​case/ui/InitUseCaseD​iagram.java?view=dif​f&pathrev=84​&r1=83&r2=84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/InitUseC​aseDiagram.java (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/InitUseC​aseDiagram.java 2010-06-21 15:02:25-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: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/PropPane​lUMLUseCaseDiagram.j​ava
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/uml/diagram/use_​case/ui/PropPanelUML​UseCaseDiagram.java?​view=diff&pathre​v=84&r1=83&r​2=84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/PropPane​lUMLUseCaseDiagram.j​ava (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/PropPane​lUMLUseCaseDiagram.j​ava 2010-06-21 15:02:25-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: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/Selectio​nActor.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/uml/diagram/use_​case/ui/SelectionAct​or.java?view=diff​&pathrev=84&r1=​83&r2=84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/Selectio​nActor.java (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/Selectio​nActor.java 2010-06-21 15:02:25-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: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/Selectio​nUseCase.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/uml/diagram/use_​case/ui/SelectionUse​Case.java?view=diff​&pathrev=84&r​1=83&r2=84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/Selectio​nUseCase.java (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/Selectio​nUseCase.java 2010-06-21 15:02:25-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: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/StylePan​elFigUseCase.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/uml/diagram/use_​case/ui/StylePanelFi​gUseCase.java?view=d​iff&pathrev=84​&r1=83&r2=84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/StylePan​elFigUseCase.java (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/StylePan​elFigUseCase.java 2010-06-21 15:02:25-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: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/UMLUseCa​seDiagram.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/uml/diagram/use_​case/ui/UMLUseCaseDi​agram.java?view=diff​&pathrev=84&​r1=83&r2=84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/UMLUseCa​seDiagram.java (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/UMLUseCa​seDiagram.java 2010-06-21 15:02:25-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: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/UseCaseD​iagramPropPanelFacto​ry.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/uml/diagram/use_​case/ui/UseCaseDiagr​amPropPanelFactory.j​ava?view=diff&pa​threv=84&r1=83​&r2=84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/UseCaseD​iagramPropPanelFacto​ry.java (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/UseCaseD​iagramPropPanelFacto​ry.java 2010-06-21 15:02:25-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: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/UseCaseD​iagramRenderer.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/uml/diagram/use_​case/ui/UseCaseDiagr​amRenderer.java?view​=diff&pathrev=84​&r1=83&r2=84​
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/UseCaseD​iagramRenderer.java (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/diagram/​use_case/ui/UseCaseD​iagramRenderer.java 2010-06-21 15:02:25-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: branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/ui/Actio​nUseCaseDiagram.java​
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-app/src/org/argo​uml/uml/ui/ActionUse​CaseDiagram.java?vie​w=diff&pathrev=8​4&r1=83&r2=8​4
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/ui/Actio​nUseCaseDiagram.java​ (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-app/src/org/​argouml/uml/ui/Actio​nUseCaseDiagram.java​ 2010-06-21 15:02:25-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: branches/NewFeatures​/UseCaseDiagram/src/​argouml-build/jpp-fe​atures.properties
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-build/jpp-featur​es.properties?view=d​iff&pathrev=84​&r1=83&r2=84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-build/jpp-fe​atures.properties (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-build/jpp-fe​atures.properties 2010-06-21 15:02:25-0700
@@ -5,6 +5,7 @@
 # the constant that defines the feature in source code.
 
 COGNITIVE=on
-#ACTIVITYDIAGRAM=on
-#UMLSTATEDIAGRAM=on
-#LOGGING=on
+ACTIVITYDIAGRAM=on
+UMLSTATEDIAGRAM=on
+LOGGING=on
+#USECASEDIAGRAM=on
\ No newline at end of file

Modified: branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/build.xm​l
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-core-diagrams-se​quence2/build.xml?vi​ew=diff&pathrev=​84&r1=83&r2=​84
====================​====================​====================​==================
--- branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/build.xm​l (original)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/build.xm​l 2010-06-21 15:02:25-0700
@@ -300,6 +300,12 @@
         </then>
     </if>
     <if>
+ <isset property="USECASEDIAGRAM"/>
+ <then>
+ <echo message="USECASEDIAGRAM"/>
+ </then>
+ </if>
+ <if>
         <isset property="LOGGING"/>
         <then>
             <echo message="LOGGING"/>

Added: branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/SequenceDiagramMod​ule.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/bran​ches/NewFeatures/Use​CaseDiagram/src/argo​uml-core-diagrams-se​quence2/staging/org/​argouml/sequence2/Se​quenceDiagramModule.​java?view=markup​&pathrev=84
====================​====================​====================​==================
--- (empty file)
+++ branches/NewFeatures​/UseCaseDiagram/src/​argouml-core-diagram​s-sequence2/staging/​org/argouml/sequence​2/SequenceDiagramMod​ule.java 2010-06-21 15:02:25-0700
@@ -0,0 +1,152 @@
+// $Id: SequenceDiagramModule.java 53 2010-04-06 14:06:53Z marcusvnac $
+// Copyright (c) 2007 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
+// agreement is hereby granted, provided that the above copyright notice
+// and this paragraph appear in all copies. This software program and
+// documentation are copyrighted by The Regents of the University of
+// California. The software program and documentation are supplied "AS
+// IS", without any accompanying services from The Regents. The Regents
+// does not warrant that the operation of the program will be
+// uninterrupted or error-free. The end-user understands that the program
+// was developed for research purposes and is advised not to rely
+// exclusively on the program for any reason. IN NO EVENT SHALL THE
+// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
+// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
+// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF
+// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
+// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
+// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
+// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+package org.argouml.sequence2;
+
+
+//@#$LPS-LOGGING:G​ranularityType:Impor​t
+import org.apache.log4j.Logger;
+
+import org.argouml.modulelo​ader.ModuleInterface​;
+import org.argouml.notation.Notation;
+import org.argouml.notation​.NotationName;
+import org.argouml.notation​.NotationProviderFac​tory2;
+import org.argouml.notation​.providers.uml.SDMes​sageNotationUml;
+import org.argouml.persiste​nce.PersistenceManag​er;
+import org.argouml.sequence​2.diagram.SequenceDi​agramFactory;
+import org.argouml.uml.diag​ram.DiagramFactory;
+import org.argouml.uml.diag​ram.DiagramFactoryIn​terface2;
+import org.argouml.uml.diag​ram.DiagramFactory.D​iagramType;
+import org.argouml.uml.ui.P​ropPanelFactoryManag​er;
+
+/**
+ * The Sequence Diagram Module description.
+ *
+ * @see org.argouml.modulelo​ader.ModuleInterface​
+ * @author penyaskito
+ */
+public class SequenceDiagramModule implements ModuleInterface {
+
+ //@#$LPS-LOGGING:Gr​anularityType:Field
+ private static final Logger LOG = Logger
+ .getLogger(SequenceD​iagramModule.class);​
+
+ private SequenceDiagramPropPanelFactory propPanelFactory;
+
+ public boolean enable() {
+
+ propPanelFactory =
+ new SequenceDiagramPropP​anelFactory();
+ PropPanelFactoryMana​ger.addPropPanelFact​ory(propPanelFactory​);
+ // TO

View complete message

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

Messages

Show all messages in topic

svn commit: r84 - branches/NewFeatures/UseCaseDiagram/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... camiloribeiro Camilo Ribeiro 2010-06-21 15:02:26 PDT
Messages per page: