svn commit: r16902 - trunk/src/argouml-app/src/org/argouml/uml/ui/TabStyle.java

Author: thn
Date: 2009-03-19 13:41:32-0700
New Revision: 16902

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/ui/TabStyle.java

Log:
fix for issue 5615: colors unusable: presentation settings not applied to diagram

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/TabStyle.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/TabStyle.java?view=diff&pathrev=16902&r1=16901&r2=16902
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/TabStyle.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/TabStyle.java	2009-03-19 13:41:32-0700
@@ -195,12 +195,18 @@
         // know what's the correct target for some tab.
         if (!(t instanceof Fig)) {
             if (Model.getFacade().isAModelElement(t)) {
-                Project p = ProjectManager.getManager().getCurrentProject();
-                Collection col = p.findFigsForMember(t);
-                if (col == null || col.isEmpty()) {
-                    return;
+                ArgoDiagram diagram = DiagramUtils.getActiveDiagram();
+                if (diagram != null) {
+                    t = diagram.presentationFor(t);
+                }
+                if (!(t instanceof Fig)) {
+                    Project p = ProjectManager.getManager().getCurrentProject();
+                    Collection col = p.findFigsForMember(t);
+                    if (col == null || col.isEmpty()) {
+                        return;
+                    }
+                    t = col.iterator().next();
                 }
-                t = col.iterator().next();
                 if (!(t instanceof Fig)) {
                     return;
                 }

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

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