Login | Register
My pages Projects Community openCollabNet

Discussions > Commit Messages > svn commit: r19951 - trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/TabDiagram.java

argouml
Discussion topic

Back to topic list

svn commit: r19951 - trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/TabDiagram.java

Author mvw
Full name Michiel van der Wulp
Date 2014-09-14 08:35:45 PDT
Message Author: mvw
Date: 2014-09-14 08:35:44-0700
New Revision: 19951

Modified:
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/TabDiag​ram.java

Log:
Fix some association class related exceptions

Modified: trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/TabDiag​ram.java
Url: http://argouml.tigri​s.org/source/browse/​argouml/trunk/src/ar​gouml-app/src/org/ar​gouml/uml/diagram/ui​/TabDiagram.java?vie​w=diff&pathrev=1​9951&r1=19950​&r2=19951
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/TabDiag​ram.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/TabDiag​ram.java 2014-09-14 08:35:44-0700
@@ -1,6 +1,6 @@
 /* $Id$
  ********************​********************​********************​*****************
- * Copyright (c) 2009-2012 Contributors - see below
+ * Copyright (c) 2009-2014 Contributors - see below
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,9 +8,10 @@
  *
  * Contributors:
  * tfmorris
+ * Michiel van der Wulp
  ********************​********************​********************​*****************
  *
- * Some portions of this file was previously release using the BSD License:
+ * Some portions of this file were previously released using the BSD License:
  */
 
 // Copyright (c) 1996-2008 The Regents of the University of California. All
@@ -432,8 +433,11 @@
                         || Model.getFacade().is​AOperation(targets[i​])) {
                     // Assuming the target is some model element.
                     Object container = Model.getFacade().ge​tModelElementContain​er(targets[i]);
- FigCompartmentBox theContainer =
- (FigCompartmentBox) manager.presentation​For(container);
+ Fig tc = manager.presentation​For(container);
+ if (tc instanceof FigAssociationClass) {
+ tc = ((FigAssociationClass) tc).getAssociationClass();
+ }
+ FigCompartmentBox theContainer = (FigCompartmentBox) tc;
                     if (theContainer != null) {
                         for (FigCompartment fc : theContainer.getCompartments()) {
                             for (Object o : fc.getFigs()) {

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r19951 - trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/TabDiagram.java mvw Michiel van der Wulp 2014-09-14 08:35:45 PDT
Messages per page: