Author: mvw Date: 2008-04-16 00:12:30-0700 New Revision: 14367 Added: trunk/src/app/src/org/argouml/uml/diagram/ui/FigNameWithAbstractAndBold.java (contents, props changed) Modified: trunk/src/app/src/org/argouml/uml/diagram/ui/FigNameWithAbstract.java trunk/src/app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Log: Better solution for issue 5013: Showing bold only for nodes. Modified: trunk/src/app/src/org/argouml/uml/diagram/ui/FigNameWithAbstract.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/ui/FigNameWithAbstract.java?view=diff&rev=14367&p1=trunk/src/app/src/org/argouml/uml/diagram/ui/FigNameWithAbstract.java&p2=trunk/src/app/src/org/argouml/uml/diagram/ui/FigNameWithAbstract.java&r1=14366&r2=14367 ============================================================================== --- trunk/src/app/src/org/argouml/uml/diagram/ui/FigNameWithAbstract.java (original) +++ trunk/src/app/src/org/argouml/uml/diagram/ui/FigNameWithAbstract.java 2008-04-16 00:12:30-0700 @@ -26,15 +26,11 @@ import java.awt.Font; -import org.argouml.kernel.Project; -import org.argouml.kernel.ProjectSettings; import org.argouml.model.Model; /** * A FigSingleLineText that represents the name of a modelelement, * which handles italic font if the element is abstract. <p> - * Also, handles cases where the projectsettings - * indicate that names should be in bold. <p> * * For the italics to work, the owner of this FigText needs to be set! * @@ -55,19 +51,11 @@ @Override protected int getFigFontStyle() { - boolean showBoldName = false; - Project p = getProject(); - if (p != null) { - ProjectSettings ps = p.getProjectSettings(); - showBoldName = ps.getShowBoldNamesValue(); - } - int boldStyle = showBoldName ? Font.BOLD : Font.PLAIN; - int style = 0; if (getOwner() != null) { style = Model.getFacade().isAbstract(getOwner()) ? Font.ITALIC : Font.PLAIN; } - return super.getFigFontStyle() | style | boldStyle; + return super.getFigFontStyle() | style; } } \ No newline at end of file Added: trunk/src/app/src/org/argouml/uml/diagram/ui/FigNameWithAbstractAndBold.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/ui/FigNameWithAbstractAndBold.java?view=auto&rev=14367 ============================================================================== --- (empty file) +++ trunk/src/app/src/org/argouml/uml/diagram/ui/FigNameWithAbstractAndBold.java 2008-04-16 00:12:30-0700 @@ -0,0 +1,70 @@ +// $Id$ +// Copyright (c) 2008 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 +// and this paragraph appear in all copies. This software program and +// documentation are copyrighted by The Regents of the University of +// California. The software program and documentation are supplied "AS +// IS", without any accompanying services from The Regents. The Regents +// does not warrant that the operation of the program will be +// uninterrupted or error-free. The end-user understands that the program +// was developed for research purposes and is advised not to rely +// exclusively on the program for any reason. IN NO EVENT SHALL THE +// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, +// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, +// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF +// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF +// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY +// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE +// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF +// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, +// UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + +package org.argouml.uml.diagram.ui; + +import java.awt.Font; + +import org.argouml.kernel.Project; +import org.argouml.kernel.ProjectSettings; + + +/** + * A FigSingleLineText that represents the name of + * a node type of modelelement, + * which handles cases where the projectsettings + * indicate that the node name should be in bold. <p> + * + * Since this Fig follows the setting "Show name of NODES in bold font", + * it would be wise to use it for nodes only. See issue 5013. + * + * @author Michiel + */ +class FigNameWithAbstractAndBold extends FigNameWithAbstract { + + /** + * @param x location x + * @param y location y + * @param w width + * @param h height + * @param expandOnly impacts behavior + */ + public FigNameWithAbstractAndBold(int x, int y, int w, int h, + boolean expandOnly) { + super(x, y, w, h, expandOnly); + } + + @Override + protected int getFigFontStyle() { + boolean showBoldName = false; + Project p = getProject(); + if (p != null) { + ProjectSettings ps = p.getProjectSettings(); + showBoldName = ps.getShowBoldNamesValue(); + } + int boldStyle = showBoldName ? Font.BOLD : Font.PLAIN; + + return super.getFigFontStyle() | boldStyle; + } +} Modified: trunk/src/app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java?view=diff&rev=14367&p1=trunk/src/app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java&p2=trunk/src/app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java&r1=14366&r2=14367 ============================================================================== --- trunk/src/app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java (original) +++ trunk/src/app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java 2008-04-16 00:12:30-0700 @@ -293,7 +293,7 @@ // is inside it: bigPort = new FigRect(10, 10, 0, 0, Color.cyan, Color.cyan); - nameFig = new FigNameWithAbstract(10, 10, 90, 21, true); + nameFig = new FigNameWithAbstractAndBold(10, 10, 90, 21, true); nameFig.setLineWidth(1); nameFig.setFilled(true); nameFig.setText(placeString()); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
