Login | Register
My pages Projects Community openCollabNet

Discussions > Commits > svn commit: r156 - trunk/src/argouml-app/src/org/argouml/uml: diagram/ui ui ui/behavior/collaborations

argouml-spl
Discussion topic

Back to topic list

svn commit: r156 - trunk/src/argouml-app/src/org/argouml/uml: diagram/ui ui ui/behavior/collaborations

Author benjamin_klatt
Full name Benjamin Klatt
Date 2014-06-28 00:50:15 PDT
Message Author: benjamin_klatt
Date: 2014-06-28 00:50:14-0700
New Revision: 156

Modified:
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/ActionA​ddExtensionPoint.jav​a
   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/collab​orations/ActionAddMe​ssagePredecessor.jav​a

Log:
aligned indentation of feature specific code and markers

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/ActionA​ddExtensionPoint.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/ui/ActionAddEx​tensionPoint.java?vi​ew=diff&pathrev=​156&r1=155&r​2=156
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/ActionA​ddExtensionPoint.jav​a (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/ActionA​ddExtensionPoint.jav​a 2014-06-28 00:50:14-0700
@@ -67,7 +67,7 @@
         super(Translator.loc​alize("button.new-ex​tension-point"),
                 ResourceLoaderWrappe​r.lookupIcon("button​.new-extension-point​"));
         // Set the tooltip string:
- putValue(Action.SHOR​T_DESCRIPTION,
+ putValue(Action.SHOR​T_DESCRIPTION,
                 Translator.localize(​"button.new-extensio​n-point"));
     }
 
@@ -115,13 +115,13 @@
     if (!(Model.getFacade()​.isAUseCase(target))​) {
             return;
         }
- //#if defined(USECASEDIAGRAM)
- //@#$LPS-USECASEDIA​GRAM:GranularityType​:Statement
- //@#$LPS-USECASEDIA​GRAM:Localization:En​dMethod
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Statement
+ //@#$LPS-USECASEDIA​GRAM:Localization:En​dMethod
         // Create a new extension point and make it the browser target. Then
         // invoke the superclass action method.
-
- Object ep =
+
+ Object ep =
             Model.getUseCasesFactory()
                 .buildExtensionPoint(target);
 

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=156&​r1=155&r2=156
====================​====================​====================​==================
--- 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 2014-06-28 00:50:14-0700
@@ -120,9 +120,9 @@
 import org.argouml.uml.ui.m​odel_management.Prop​PanelSubsystem;
 
 /**
- * This factory creates the right PropPanelModelElement
+ * This factory creates the right PropPanelModelElement
  * for a given UML Element. <p>
- *
+ *
  * Constraint: Every UML element shall have a proppanel.
  * We throw an exception if one is not found.
  *
@@ -143,7 +143,7 @@
             } else if (Model.getFacade().i​sAStateVertex(elemen​t)) {
                 return getStateVertexPropPa​nel(element);
             } else if (Model.getFacade().i​sAActionSequence(ele​ment)) {
- // This is not a subtype of PropPanelAction,
+ // This is not a subtype of PropPanelAction,
                 // so it must come first
                 return new PropPanelActionSequence();
             } else if (Model.getFacade().i​sAAction(element)) {
@@ -175,12 +175,14 @@
                 return new PropPanelConstraint();
             } else if (Model.getFacade().i​sAEnumerationLiteral​(element)) {
                 return new PropPanelEnumerationLiteral();
- //#if defined(USECASEDIAGRAM)
- //@#$LPS-USECASEDIA​GRAM:GranularityType​:Statement
- } else if (Model.getFacade().i​sAExtensionPoint(ele​ment)) {
+ } else
+ //#if defined(USECASEDIAGRAM)
+ //@#$LPS-USECASEDIA​GRAM:GranularityType​:Statement
+ if (Model.getFacade().i​sAExtensionPoint(ele​ment)) {
                 return new PropPanelExtensionPoint();
+ } else
             //#endif
- } else if (Model.getFacade().i​sAGuard(element)) {
+ if (Model.getFacade().i​sAGuard(element)) {
                 return new PropPanelGuard();
             } else if (Model.getFacade().i​sAInteraction(elemen​t)) {
                 return new PropPanelInteraction();
@@ -238,14 +240,13 @@
 
 
     private PropPanelClassifier getClassifierPropPanel(Object element) {
- if
         //#if defined(USECASEDIAGRAM)
         //@#$LPS-USECASEDIA​GRAM:GranularityType​:Statement
- (Model.getFacade().i​sAActor(element)) {
+ if (Model.getFacade().i​sAActor(element)) {
             return new PropPanelActor();
- } else if
+ } else
         //#endif
- (Model.getFacade().i​sAAssociationClass(e​lement)) {
+ if (Model.getFacade().i​sAAssociationClass(e​lement)) {
             return new PropPanelAssociationClass();
         } else if (Model.getFacade().i​sAClass(element)) {
             return new PropPanelClass();
@@ -277,18 +278,18 @@
             return new PropPanelUseCase();
         //#endif
         }
-
+
         // TODO: A Subsystem is a Classifier, but its PropPanel is derived from
         // PropPanelPackage
 // else if (Model.getFacade().i​sASubsystem(element)​) {
 // return new PropPanelSubsystem();
 // }
 
-
+
         // TODO: In UML 2.x Associations will fall through here because they
         // are Classifiers as well as Relationships, but we test for Classifier
         // first.
-
+
         throw new IllegalArgumentExcep​tion("Unsupported Element type");
     }
 
@@ -347,7 +348,7 @@
         }
         throw new IllegalArgumentExcep​tion("Unsupported Action type");
     }
-
+
     private PropPanelStateVertex getStateVertexPropPanel(Object element) {
         if (Model.getFacade().i​sAState(element)) {
             if (Model.getFacade().i​sACallState(element)​) {
@@ -373,13 +374,13 @@
             }
         } else if (Model.getFacade().i​sAPseudostate(elemen​t)) {
             return new PropPanelPseudostate();
- }
+ }
         //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
         //@#$LPS-STATEDIAGR​AM:GranularityType:S​tatement
         //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Statement
         else if (Model.getFacade().i​sAStubState(element)​) {
             return new PropPanelStubState();
- }
+ }
         else if (Model.getFacade().i​sASynchState(element​)) {
             return new PropPanelSynchState();
         }

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/ActionAddMe​ssagePredecessor.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/uml/ui​/behavior/collaborat​ions/ActionAddMessag​ePredecessor.java?vi​ew=diff&pathrev=​156&r1=155&r​2=156
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/ActionAddMe​ssagePredecessor.jav​a (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/ActionAddMe​ssagePredecessor.jav​a 2014-06-28 00:50:14-0700
@@ -61,7 +61,7 @@
         //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Statement
         //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Statement
         //@#$LPS-COLLABORAT​IONDIAGRAM:Localizat​ion:BeforeReturn
- //@#$LPS-SEQUENCEDI​AGRAM:Localization:B​eforeReturn
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:B​eforeReturn
         vec.addAll(Model.get​CollaborationsHelper​()
                 .getAllPossiblePrede​cessors(getTarget())​);
         //#endif
@@ -93,10 +93,10 @@
         //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Statement
         //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Statement
         //@#$LPS-COLLABORAT​IONDIAGRAM:Localizat​ion:EndMethod
- //@#$LPS-SEQUENCEDI​AGRAM:Localization:E​ndMethod
- Object message = getTarget();
- Model.getCollaborati​onsHelper().setPrede​cessors(message, selected);
- //#endif
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:E​ndMethod
+ Object message = getTarget();
+ Model.getCollaborati​onsHelper().setPrede​cessors(message, selected);
+ //#endif
     }
 
     /**

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

Messages

Show all messages in topic

svn commit: r156 - trunk/src/argouml-app/src/org/argouml/uml: diagram/ui ui ui/behavior/collaborations benjamin_klatt Benjamin Klatt 2014-06-28 00:50:15 PDT
Messages per page: