svn commit: r16025 - trunk/src/argouml-app/src/org/argouml/uml/diagram/ui

Author: bobtarling
Date: 2008-11-11 11:38:04-0800
New Revision: 16025

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java

Log:
Improve situation for defect 5434

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java?view=diff&rev=16025&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&r1=16024&r2=16025
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java	2008-11-11 11:38:04-0800
@@ -1468,6 +1468,12 @@
      * @see org.argouml.application.events.ArgoDiagramAppearanceEventListener#diagramFontChanged(org.argouml.application.events.ArgoDiagramAppearanceEvent)
      */
     public void diagramFontChanged(ArgoDiagramAppearanceEvent e) {
+        if (getProject() == null) {
+            /* Temporary fix related to issue 5434.
+             * TODO: However I think this can be removed. See issue 5500 - Bob
+             */
+            return;
+        }        
         updateFont();
         calcBounds(); //TODO: Does this help?
         redraw();

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java?view=diff&rev=16025&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java&r1=16024&r2=16025
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java	2008-11-11 11:38:04-0800
@@ -2313,6 +2313,12 @@
      * @see org.argouml.application.events.ArgoDiagramAppearanceEventListener#diagramFontChanged(org.argouml.application.events.ArgoDiagramAppearanceEvent)
      */
     public void diagramFontChanged(ArgoDiagramAppearanceEvent e) {
+        if (getProject() == null) {
+            /* Temporary fix related to issue 5434.
+             * TODO: However I think this can be removed. See issue 5500 - Bob
+             */
+            return;
+        }        
         updateFont();
         updateBounds();
         damage();