You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by fr...@apache.org on 2007/03/05 18:18:25 UTC

svn commit: r514739 - /incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/util/SDOGenUtil.java

Author: frankb
Date: Mon Mar  5 09:18:24 2007
New Revision: 514739

URL: http://svn.apache.org/viewvc?view=rev&rev=514739
Log:
Second fix for TUSCANY-1120

Modified:
    incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/util/SDOGenUtil.java

Modified: incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/util/SDOGenUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/util/SDOGenUtil.java?view=diff&rev=514739&r1=514738&r2=514739
==============================================================================
--- incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/util/SDOGenUtil.java (original)
+++ incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/util/SDOGenUtil.java Mon Mar  5 09:18:24 2007
@@ -69,7 +69,7 @@
     {
         boolean unsettable = genFeature.isUnsettable();
         
-        if(suppressNotification)
+        if (suppressNotification)
         {
             return "ListKind.BASIC";
         }
@@ -94,22 +94,19 @@
             }
             else
             {
-                if (genFeature.isBidirectional())
+                if (genFeature.isResolveProxies())
                 {
-                    if (genFeature.isResolveProxies())
-                    {
-                        if( unsettable )
-                            return "ListKind.CONTAINMENT_RESOLVING_UNSETTABLE";
-                        else
-                            return "ListKind.CONTAINMENT_RESOLVING";
-                    }
+                    if( unsettable )
+                        return "ListKind.CONTAINMENT_RESOLVING_UNSETTABLE";
                     else
-                    {
-                        if( unsettable )
-                            return "ListKind.CONTAINMENT_UNSETTABLE";
-                        else
-                            return "ListKind.CONTAINMENT";
-                    }
+                        return "ListKind.CONTAINMENT_RESOLVING";
+                }
+                else
+                {
+                    if( unsettable )
+                        return "ListKind.CONTAINMENT_UNSETTABLE";
+                    else
+                        return "ListKind.CONTAINMENT";
                 }
             }
         }
@@ -188,7 +185,6 @@
                     return "ListKind.DATATYPE";
             }
         }
-        return "ListKind.CONTAINMENT";
     }
 
     public static boolean hasChangeSummaryProperty(GenClass genClass)



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org