svn commit: r16308 - trunk/src: argouml-core-model-euml/src/org/argouml/model/euml argouml-core-model-mdr/src/org/argouml/model/mdr argouml-core-model/src/org/argouml/model

Author: tfmorris
Date: 2008-12-07 20:10:30-0800
New Revision: 16308

Modified:
   trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CollaborationsFactoryEUMLImpl.java
   trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java
   trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CollaborationsFactoryMDRImpl.java
   trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java
   trunk/src/argouml-core-model/src/org/argouml/model/CollaborationsFactory.java
   trunk/src/argouml-core-model/src/org/argouml/model/CoreFactory.java

Log:
Switch Boolean to boolean in API

Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CollaborationsFactoryEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CollaborationsFactoryEUMLImpl.java?view=diff&pathrev=16308&r1=16307&r2=16308
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CollaborationsFactoryEUMLImpl.java	(original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CollaborationsFactoryEUMLImpl.java	2008-12-07 20:10:30-0800
@@ -65,8 +65,19 @@
         return null;
     }
 
+    @Deprecated
     public Object buildAssociationRole(Object from, Object agg1, Object to,
             Object agg2, Boolean unidirectional) {
+        if (unidirectional == null) {
+            return buildAssociationRole(from, agg1, to, agg2, false);
+        } else {
+            return buildAssociationRole(from, agg1, to, agg2, 
+                    unidirectional.booleanValue());
+        }
+    }
+
+    public Object buildAssociationRole(Object from, Object agg1, Object to,
+            Object agg2, boolean unidirectional) {
         // TODO: Auto-generated method stub
         return null;
     }

Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java?view=diff&pathrev=16308&r1=16307&r2=16308
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java	(original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java	2008-12-07 20:10:30-0800
@@ -201,6 +201,7 @@
         return (Association) run.getParams().get(0);
     }
 
+    @Deprecated
     public Association buildAssociation(Object fromClassifier,
             Object aggregationKind1, Object toClassifier,
             Object aggregationKind2, Boolean unidirectional) {
@@ -214,6 +215,16 @@
                     aggregationKind2, null);
         }
     }
+    
+
+    public Object buildAssociation(Object fromClassifier,
+            Object aggregationKind1, Object toClassifier,
+            Object aggregationKind2, boolean unidirectional) {
+        return buildAssociation(
+                fromClassifier, true, aggregationKind1, toClassifier,
+                !unidirectional, aggregationKind2, null); 
+    }
+
 
     public Association buildAssociation(Object classifier1, 
             Object classifier2) {

Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CollaborationsFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CollaborationsFactoryMDRImpl.java?view=diff&pathrev=16308&r1=16307&r2=16308
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CollaborationsFactoryMDRImpl.java	(original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CollaborationsFactoryMDRImpl.java	2008-12-07 20:10:30-0800
@@ -239,8 +239,20 @@
     }
 
 
+    @Deprecated
     public AssociationRole buildAssociationRole(Object from, Object agg1, Object to,
             Object agg2, Boolean unidirectional) {
+        if (unidirectional == null) {
+            return buildAssociationRole(from, agg1, to, agg2, false);
+        } else {
+            return buildAssociationRole(from, agg1, to, agg2, 
+                    unidirectional.booleanValue());
+        }
+    }
+
+    
+    public AssociationRole buildAssociationRole(Object from, Object agg1,
+            Object to, Object agg2, boolean unidirectional) {
 
         AggregationKind ak1 = checkAggregationKind(agg1);
         AggregationKind ak2 = checkAggregationKind(agg2);
@@ -251,7 +263,7 @@
         AssociationEndRole end =
                 (AssociationEndRole) role.getConnection().get(0);
         end.setAggregation(ak1);
-        end.setNavigable(Boolean.FALSE.equals(unidirectional));
+        end.setNavigable(!unidirectional);
 
         end = (AssociationEndRole) role.getConnection().get(1);
         end.setAggregation(ak2);
@@ -259,8 +271,7 @@
 
         return role;
     }
-
-
+    
     /**
      * Checks that aggregationKind is valid and promotes null
      * to AK_NONE.

Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java?view=diff&pathrev=16308&r1=16307&r2=16308
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java	(original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java	2008-12-07 20:10:30-0800
@@ -466,10 +466,25 @@
         return assoc;
     }
 
-
+    @SuppressWarnings("deprecation")
+    @Deprecated
     public UmlAssociation buildAssociation(Object fromClassifier,
             Object aggregationKind1, Object toClassifier,
             Object aggregationKind2, Boolean unidirectional) {
+        
+        if (unidirectional == null) {
+            return buildAssociation(fromClassifier, aggregationKind1,
+                    toClassifier, aggregationKind2, false);
+        } else {
+            return buildAssociation(fromClassifier, aggregationKind1,
+                    toClassifier, aggregationKind2, unidirectional
+                            .booleanValue());
+        }
+    }
+
+    public UmlAssociation buildAssociation(Object fromClassifier,
+            Object aggregationKind1, Object toClassifier,
+            Object aggregationKind2, boolean unidirectional) {
         if (fromClassifier == null || toClassifier == null) {
             throw new IllegalArgumentException("one of "
                     + "the classifiers to be " + "connected is null");
@@ -478,12 +493,7 @@
         Classifier to = (Classifier) toClassifier;
         AggregationKind agg1 = (AggregationKind) aggregationKind1;
         AggregationKind agg2 = (AggregationKind) aggregationKind2;
-        
-        // Watch out for nulls which are possible due to dumb API design!
-        if (unidirectional == null) {
-            unidirectional = Boolean.FALSE;
-        }
-        
+
         Namespace ns = from.getNamespace();
         if (ns == null || modelImpl.getModelManagementHelper().isReadOnly(ns)) {
             ns = to.getNamespace();

Modified: trunk/src/argouml-core-model/src/org/argouml/model/CollaborationsFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/CollaborationsFactory.java?view=diff&pathrev=16308&r1=16307&r2=16308
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/CollaborationsFactory.java	(original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/CollaborationsFactory.java	2008-12-07 20:10:30-0800
@@ -149,11 +149,30 @@
      * @param agg2   the second aggregationkind
      * @param unidirectional true if unidirectional
      * @return the newly build assoc. role
+     * @deprecated for 0.27.3 by tfmorris.  Use 
+     * {@link #buildAssociationRole(Object, Object, Object, Object, boolean)}.
      */
+    @Deprecated
     Object buildAssociationRole(Object from,
             Object agg1, Object to, Object agg2,
             Boolean unidirectional);
 
+
+    /**
+     * Builds a binary associationrole on basis of two classifierroles,
+     * navigation and aggregation.
+     *
+     * @param from   the first classifierrole
+     * @param agg1   the first aggregationkind
+     * @param to     the second classifierrole
+     * @param agg2   the second aggregationkind
+     * @param unidirectional true if unidirectional
+     * @return the newly build assoc. role
+     */
+    Object buildAssociationRole(Object from,
+            Object agg1, Object to, Object agg2,
+            boolean unidirectional);
+    
     /**
      * Builds an associationrole based on a given link. The link must
      * have a source and a destination instance that both have a

Modified: trunk/src/argouml-core-model/src/org/argouml/model/CoreFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/CoreFactory.java?view=diff&pathrev=16308&r1=16307&r2=16308
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/CoreFactory.java	(original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/CoreFactory.java	2008-12-07 20:10:30-0800
@@ -331,11 +331,30 @@
      * @param aggregationKind2 the second aggregationkind
      * @param unidirectional true if unidirectional
      * @return the newly build binary associationrole
+     * @deprecated for 0.27.3 by tfmorris.  Use 
+     * {@link #buildAssociation(Object, Object, Object, Object, boolean)}.
      */
+    @Deprecated
     Object buildAssociation(Object fromClassifier, Object aggregationKind1,
             Object toClassifier, Object aggregationKind2,
             Boolean unidirectional);
 
+
+    /**
+     * Builds a binary associationrole on basis of two classifierroles,
+     * navigation and aggregation.
+     *
+     * @param fromClassifier   the first given classifier
+     * @param aggregationKind1 the first aggregationkind
+     * @param toClassifier     the second given classifier
+     * @param aggregationKind2 the second aggregationkind
+     * @param unidirectional true if unidirectional
+     * @return the newly build binary associationrole
+     */
+    Object buildAssociation(Object fromClassifier, Object aggregationKind1,
+            Object toClassifier, Object aggregationKind2,
+            boolean unidirectional);
+
     /**
      * Builds a binary associations between two classifiers with
      * default values for the association ends and the association

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=981022

To unsubscribe from this discussion, e-mail: [[email protected]].