[Andromda-cvs] CVS update: cartridges/andromda-meta/src/decorators/manual/org/andromda/core/metadecorators/uml14 PseudostateDecoratorImpl.java

[Wouter Z. <dra...@us...>]

  User: draftdog
  Date: 04/02/27 00:43:48

  Modified:    andromda-meta/src/decorators/manual/org/andromda/core/metadecorators/uml14
                        Tag: V3x_MMD PseudostateDecoratorImpl.java
  Log:
  some small improvements in code readability

  fixed an issue with the decision point: it can have more than one incoming transition
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.6   +9 -10     cartridges/andromda-meta/src/decorators/manual/org/andromda/core/metadecorators/uml14/Attic/PseudostateDecoratorImpl.java
  
  Index: PseudostateDecoratorImpl.java
  ===================================================================
  RCS file: /cvsroot/andromda/cartridges/andromda-meta/src/decorators/manual/org/andromda/core/metadecorators/uml14/Attic/PseudostateDecoratorImpl.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -w -r1.1.2.5 -r1.1.2.6
  --- PseudostateDecoratorImpl.java	19 Feb 2004 03:47:20 -0000	1.1.2.5
  +++ PseudostateDecoratorImpl.java	27 Feb 2004 08:43:48 -0000	1.1.2.6
  @@ -25,37 +25,37 @@
   
       public boolean isChoice()
       {
  -        return (PseudostateKindEnum.PK_CHOICE.equals(metaObject.getKind())) ? true : false;
  +        return PseudostateKindEnum.PK_CHOICE.equals(metaObject.getKind());
       }
   
       public boolean  isInitialState()
       {
  -        return (PseudostateKindEnum.PK_INITIAL.equals(metaObject.getKind())) ? true : false;
  +        return PseudostateKindEnum.PK_INITIAL.equals(metaObject.getKind());
       }
   
       public boolean isJoin()
       {
  -        return (PseudostateKindEnum.PK_JOIN.equals(metaObject.getKind())) ? true : false;
  +        return PseudostateKindEnum.PK_JOIN.equals(metaObject.getKind());
       }
   
       public boolean isDeepHistory()
       {
  -        return (PseudostateKindEnum.PK_DEEP_HISTORY.equals(metaObject.getKind())) ? true : false;
  +        return PseudostateKindEnum.PK_DEEP_HISTORY.equals(metaObject.getKind());
       }
   
       public boolean isFork()
       {
  -        return (PseudostateKindEnum.PK_FORK.equals(metaObject.getKind())) ? true : false;
  +        return PseudostateKindEnum.PK_FORK.equals(metaObject.getKind());
       }
   
       public boolean isJunction()
       {
  -        return (PseudostateKindEnum.PK_JUNCTION.equals(metaObject.getKind())) ? true : false;
  +        return PseudostateKindEnum.PK_JUNCTION.equals(metaObject.getKind());
       }
   
       public boolean isShallowHistory()
       {
  -        return (PseudostateKindEnum.PK_SHALLOW_HISTORY.equals(metaObject.getKind())) ? true : false;
  +        return PseudostateKindEnum.PK_SHALLOW_HISTORY.equals(metaObject.getKind());
       }
   
       public boolean isDecisionPoint()
  @@ -65,11 +65,10 @@
           if (isChoice() || isJunction())
           {
               isDecisionPoint = true;
  -            isDecisionPoint = isDecisionPoint && (metaObject.getIncoming().size() == 1);
               isDecisionPoint = isDecisionPoint && (metaObject.getOutgoing().size() > 1);
           }
   
  -        return (isDecisionPoint) ? true : false;
  +        return isDecisionPoint;
       }
   
       public boolean isMergePoint()
  @@ -83,7 +82,7 @@
               isMergePoint = isMergePoint && (metaObject.getOutgoing().size() == 1);
           }
   
  -        return (isMergePoint) ? true : false;
  +        return isMergePoint;
       }
   
       // ------------- relations ------------------