svn commit: r16633 - trunk/src/argouml-app/src/org/argouml/uml/diagram/DiagramSettings.java

Author: tfmorris
Date: 2009-01-16 08:48:31-0800
New Revision: 16633

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/DiagramSettings.java

Log:
RESOLVED - issue 5629: Get correct parent for notation settings inheritance
http://argouml.tigris.org/issues/show_bug.cgi?id=5629

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/DiagramSettings.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/DiagramSettings.java?view=diff&pathrev=16633&r1=16632&r2=16633
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/DiagramSettings.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/DiagramSettings.java	2009-01-16 08:48:31-0800
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 2008 The Regents of the University of California. All
+// Copyright (c) 2008, 2009 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
 // agreement is hereby granted, provided that the above copyright notice
@@ -161,7 +161,8 @@
         if (parentSettings == null) {
             notationSettings = new NotationSettings();
         } else {
-            notationSettings = new NotationSettings(getNotationSettings());
+            notationSettings = 
+                new NotationSettings(parent.getNotationSettings());
         }
         recomputeFonts();
     }

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

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