svn commit: r18356 - branches/BRANCH_0_30_x: . src/argouml-app src/argouml-app/tests/org/argouml/profile src/argouml-app/tests/org/argouml/uml/ui/foundation/extension_mechanisms src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram

Author: linus
Date: 2010-04-29 12:16:21-0700
New Revision: 18356

Modified:
   branches/BRANCH_0_30_x/   (props changed)
   branches/BRANCH_0_30_x/src/argouml-app/   (props changed)
   branches/BRANCH_0_30_x/src/argouml-app/tests/org/argouml/profile/   (props changed)
   branches/BRANCH_0_30_x/src/argouml-app/tests/org/argouml/uml/ui/foundation/extension_mechanisms/TestUMLTagDefinitionComboBoxModel.java   (props changed)
   branches/BRANCH_0_30_x/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java

Log:
Merged the r18355 from trunk.

Modified: branches/BRANCH_0_30_x/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_30_x/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java?view=diff&pathrev=18356&r1=18355&r2=18356
==============================================================================
--- branches/BRANCH_0_30_x/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java	(original)
+++ branches/BRANCH_0_30_x/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java	2010-04-29 12:16:21-0700
@@ -383,20 +383,6 @@
                         collabHelper.addMessage(correctInteraction, message);
                         Model.getCoreHelper().setNamespace(
                                 action, collaboration);
-                        // If this leaves the interaction empty then
-                        // delete it.
-                        if (facade.getMessages(interaction).isEmpty()) {
-                            LOG.warn("Deleting empty interaction "
-                                    + interaction);
-                            Model.getUmlFactory().delete(interaction);
-                            // If that in turn leaves the collaboration empty
-                            // then delete that also.
-                            if (context != null && facade.getOwnedElements(context).isEmpty()) {
-                                LOG.warn("Deleting empty collaboration "
-                                        + context);
-                                Model.getUmlFactory().delete(context);
-                            }
-                        }
                     }
                 } else if (f instanceof FigClassifierRole) {
                     final Object cr = f.getOwner();

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

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