svn commit: r18323 - trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java

Author: bobtarling
Date: 2010-04-22 02:45:47-0700
New Revision: 18323

Modified:
   trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java

Log:
Lets not delete anything from the model even if empty as other parts of argouml may be listening for change (e.g. diagram gets deleted if its namespace is deleted)

Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java?view=diff&pathrev=18323&r1=18322&r2=18323
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java	2010-04-22 02:45:47-0700
@@ -348,7 +348,7 @@
         super.postLoad();
         
         final Facade facade = Model.getFacade();                   
-        
+        LOG.info("doing postLoad on " + getName());
         // See issue 5811. We have collaborationroles, associationroles
         // and messages and actions saved to the incorrect interaction and
         // and collaboration. If we detect this circumstance at load then
@@ -372,6 +372,7 @@
             for (final Fig f : getLayer().getContents()) {
                 if (f instanceof FigMessage) {
                     final Object message = f.getOwner();
+                    LOG.info("Checking message " + f.getOwner());
                     final Object interaction = facade.getInteraction(message);
                     final Object context = facade.getContext(interaction);
                     final Object action = facade.getAction(message);
@@ -417,12 +418,6 @@
                                         assRole, collaboration);
                             }
                         }
-                        
-                        if (facade.getOwnedElements(namespace).isEmpty()) {
-                            LOG.warn("Deleting empty collaboration "
-                                    + collaboration);
-                            Model.getUmlFactory().delete(collaboration);
-                        }
                     }
                 }
             }

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

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