svn commit: r17037 - trunk/src/argouml-app/src/org/argouml/uml: . reveng

Author: linus
Date: 2009-04-04 22:58:28-0700
New Revision: 17037

Removed:
   trunk/src/argouml-app/src/org/argouml/uml/GenCompositeClasses.java
Modified:
   trunk/src/argouml-app/src/org/argouml/uml/GenCompositeClasses2.java
   trunk/src/argouml-app/src/org/argouml/uml/reveng/Import.java

Log:
Removed deprecated methods.

This is the simple part of the work where the methods are not used.

Removed: trunk/src/argouml-app/src/org/argouml/uml/GenCompositeClasses.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/GenCompositeClasses.java?view=markup&pathrev=17036

Modified: trunk/src/argouml-app/src/org/argouml/uml/GenCompositeClasses2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/GenCompositeClasses2.java?view=diff&pathrev=17037&r1=17036&r2=17037
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/GenCompositeClasses2.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/GenCompositeClasses2.java	2009-04-04 22:58:28-0700
@@ -24,8 +24,12 @@
 
 package org.argouml.uml;
 
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 
+import org.argouml.model.Model;
 import org.argouml.util.ChildGenerator;
 
 /**
@@ -36,7 +40,7 @@
  * @see org.argouml.uml.cognitive.critics.CrCircularComposition
  * @stereotype singleton
  */
-public class GenCompositeClasses2 extends GenCompositeClasses implements
+public class GenCompositeClasses2 implements
         ChildGenerator {
 
     /**
@@ -57,4 +61,42 @@
         return collectChildren(parent).iterator();
     }
 
+    /**
+     * Collect children.<p>
+     *
+     * @param o the parent element
+     * @return a collection of children.
+     */
+    protected Collection collectChildren(Object o) {
+        List res = new ArrayList();
+        if (!(Model.getFacade().isAClassifier(o))) {
+            return res;
+        }
+        Object cls = o;
+        List ends = new ArrayList(Model.getFacade().getAssociationEnds(cls));
+        if (ends == null) {
+            return res;
+        }
+        Iterator assocEnds = ends.iterator();
+        while (assocEnds.hasNext()) {
+            Object ae = assocEnds.next();
+            if (Model.getAggregationKind().getComposite().equals(
+                    Model.getFacade().getAggregation(ae))) {
+                Object asc = Model.getFacade().getAssociation(ae);
+                ArrayList conn =
+                    new ArrayList(Model.getFacade().getConnections(asc));
+                if (conn == null || conn.size() != 2) {
+                    continue;
+                }
+                Object otherEnd =
+                    (ae == conn.get(0)) ? conn.get(1) : conn.get(0);
+                if (Model.getFacade().getType(ae)
+                        != Model.getFacade().getType(otherEnd)) {
+                    res.add(Model.getFacade().getType(otherEnd));
+                }
+            }
+        }
+        return res;
+    }
+
 }

Modified: trunk/src/argouml-app/src/org/argouml/uml/reveng/Import.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/reveng/Import.java?view=diff&pathrev=17037&r1=17036&r2=17037
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/reveng/Import.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/reveng/Import.java	2009-04-04 22:58:28-0700
@@ -172,22 +172,6 @@
         return (String) sourceEncoding.getSelectedItem();
     }
 
-    /*
-     * @see org.argouml.uml.reveng.ImportSettings#isAttributeSelected()
-     */
-    @Deprecated
-    public boolean isAttributeSelected() {
-        return false;
-    }
-
-    /*
-     * @see org.argouml.uml.reveng.ImportSettings#isDatatypeSelected()
-     */
-    @Deprecated
-    public boolean isDatatypeSelected() {
-        return false;
-    }
-
     /**
      * Close dialog window.
      */

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

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