svn commit: r13574 - trunk/src_new/org/argouml/uml/diagram

Author: mvw
Date: 2007-09-18 01:02:40-0700
New Revision: 13574

Modified:
   trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java
   trunk/src_new/org/argouml/uml/diagram/ArgoDiagramImpl.java

Log:
Style, comments, ...

Modified: trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java?view=diff&rev=13574&p1=trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java&r1=13573&r2=13574
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java	2007-09-18 01:02:40-0700
@@ -233,6 +233,7 @@
      * @deprecated for 0.25.4 by tfmorris. Use {@link #getFigIterator()}.
      * @see Diagram#elements()
      */
+    @Deprecated
     public Enumeration elements();
     /**
      * @param listener
@@ -263,13 +264,13 @@
             PropertyChangeListener listener);
     
     /**
-     * @return
+     * @return the GEF graphmodel for this diagram
      * @see Diagram#getGraphModel()
      */
     public GraphModel getGraphModel();
     
     /**
-     * @return
+     * @return the GEF LayerPerspective of this diagram
      * @see Diagram#getLayer()
      */
     public LayerPerspective getLayer();

Modified: trunk/src_new/org/argouml/uml/diagram/ArgoDiagramImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ArgoDiagramImpl.java?view=diff&rev=13574&p1=trunk/src_new/org/argouml/uml/diagram/ArgoDiagramImpl.java&p2=trunk/src_new/org/argouml/uml/diagram/ArgoDiagramImpl.java&r1=13573&r2=13574
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ArgoDiagramImpl.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ArgoDiagramImpl.java	2007-09-18 01:02:40-0700
@@ -212,16 +212,14 @@
         boolean faultFixed;
         do {
             faultFixed = false;
-            List figs = new ArrayList(getLayer().getContentsNoEdges());
-            for (Iterator i = figs.iterator(); i.hasNext();) {
-                Fig f = (Fig) i.next();
+            List<Fig> figs = new ArrayList<Fig>(getLayer().getContentsNoEdges());
+            for (Fig f : figs) {
                 if (repairFig(f, report)) {
                     faultFixed = true;
                 }
             }
-            figs = new ArrayList(getLayer().getContentsEdgesOnly());
-            for (Iterator i = figs.iterator(); i.hasNext();) {
-                Fig f = (Fig) i.next();
+            figs = new ArrayList<Fig>(getLayer().getContentsEdgesOnly());
+            for (Fig f : figs) {
                 if (repairFig(f, report)) {
                     faultFixed = true;
                 }
@@ -417,7 +415,7 @@
 
 
     public List presentationsFor(Object obj) {
-        List presentations = new ArrayList();
+        List<Fig> presentations = new ArrayList<Fig>();
         int figCount = getLayer().getContents().size();
         for (int figIndex = 0; figIndex < figCount; ++figIndex) {
             Fig fig = (Fig) getLayer().getContents().get(figIndex);
@@ -431,10 +429,10 @@
 
     // TODO: Move to GEF
     public void remove() {
-        List contents = new ArrayList(getLayer().getContents());
+        List<Fig> contents = new ArrayList<Fig>(getLayer().getContents());
         int size = contents.size();
         for (int i = 0; i < size; ++i) {
-            Fig f = (Fig) contents.get(i);
+            Fig f = contents.get(i);
             f.removeFromDiagram();
         }
         firePropertyChange("remove", null, null);