svn commit: r14794 - trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: mvw
Date: 2008-05-23 13:05:27-0700
New Revision: 14794
Modified:
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java
Log:
Trying to fix the failing test.
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java?view=diff&rev=14794&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java&r1=14793&r2=14794
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java 2008-05-23 13:05:27-0700
@@ -27,9 +27,9 @@
import java.awt.Color;
import java.awt.Graphics;
import java.beans.PropertyChangeEvent;
-import java.util.HashMap;
import org.apache.log4j.Logger;
+import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.AssociationChangeEvent;
import org.argouml.model.AttributeChangeEvent;
@@ -140,9 +140,13 @@
multiplicityNotationProvider =
NotationProviderFactory2.getInstance().getNotationProvider(
NotationProviderFactory2.TYPE_MULTIPLICITY, own, this);
- boolean value = getProject().getProjectSettings()
- .getShowSingularMultiplicitiesValue();
- getNotationArguments().put("singularMultiplicityVisible", value);
+ Project p = getProject();
+ if (p != null) {
+ boolean value = p.getProjectSettings()
+ .getShowSingularMultiplicitiesValue();
+ getNotationArguments().put("singularMultiplicityVisible",
+ value);
+ }
}
}