Author: tfmorris Date: 2008-03-27 23:51:21-0700 New Revision: 14255 Modified: trunk/src/app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java trunk/src/app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Log: Remove uses of deprecated elementsForOffenders add @Deprecated annotations mark some redundant update calls with TODOs Modified: trunk/src/app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java?view=diff&rev=14255&p1=trunk/src/app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&p2=trunk/src/app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&r1=14254&r2=14255 ============================================================================== --- trunk/src/app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java (original) +++ trunk/src/app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java 2008-03-27 23:51:21-0700 @@ -288,8 +288,7 @@ boolean ms = TargetManager.getInstance().getTargets().size() > 1; if (!ms) { ToDoList list = Designer.theDesigner().getToDoList(); - List<ToDoItem> items = - (List<ToDoItem>) list.elementsForOffender(getOwner()).clone(); + List<ToDoItem> items = list.elementListForOffender(getOwner()); if (items != null && items.size() > 0) { ArgoJMenu critiques = new ArgoJMenu("menu.popup.critiques"); ToDoItem itemUnderMouse = hitClarifier(me.getX(), me.getY()); @@ -352,8 +351,8 @@ protected void paintClarifiers(Graphics g) { int iconPos = 25, gap = 1, xOff = -4, yOff = -4; Point p = new Point(); - ToDoList list = Designer.theDesigner().getToDoList(); - List<ToDoItem> items = list.elementsForOffender(getOwner()); + ToDoList tdList = Designer.theDesigner().getToDoList(); + List<ToDoItem> items = tdList.elementListForOffender(getOwner()); for (ToDoItem item : items) { Icon icon = item.getClarifier(); if (icon instanceof Clarifier) { @@ -366,7 +365,7 @@ iconPos += icon.getIconWidth() + gap; } } - items = list.elementsForOffender(this); + items = tdList.elementListForOffender(this); for (ToDoItem item : items) { Icon icon = item.getClarifier(); if (icon instanceof Clarifier) { @@ -409,8 +408,8 @@ public ToDoItem hitClarifier(int x, int y) { int iconPos = 25, xOff = -4, yOff = -4; Point p = new Point(); - ToDoList list = Designer.theDesigner().getToDoList(); - List<ToDoItem> items = list.elementsForOffender(getOwner()); + ToDoList tdList = Designer.theDesigner().getToDoList(); + List<ToDoItem> items = tdList.elementListForOffender(getOwner()); for (ToDoItem item : items) { Icon icon = item.getClarifier(); stuffPointAlongPerimeter(iconPos, p); @@ -432,7 +431,7 @@ return item; } } - items = list.elementsForOffender(this); + items = tdList.elementListForOffender(this); for (ToDoItem item : items) { Icon icon = item.getClarifier(); stuffPointAlongPerimeter(iconPos, p); @@ -458,9 +457,9 @@ } /** - * Return a [EMAIL PROTECTED] SelectionRerouteEdge} object that manages selection - * and rerouting of the edge. - * + * @return a [EMAIL PROTECTED] SelectionRerouteEdge} object that manages selection and + * rerouting of the edge. + * * @see org.tigris.gef.presentation.Fig#makeSelection() */ @Override @@ -621,6 +620,7 @@ * @return a i18 key that represents a help string * giving an explanation to the user of the syntax */ + @Deprecated protected String getParsingHelp() { return notationProviderName.getParsingHelp(); } @@ -863,6 +863,8 @@ } initNotationProviders(owner); updateListeners(null, owner); + // TODO: The following is redundant. It's done when setLayer is + // called after initialization complete renderingChanged(); } @@ -1235,6 +1237,7 @@ * @deprecated * @return Returns the plain font. */ + @Deprecated public Font getLabelFont() { return getProject().getProjectSettings().getFontPlain(); } @@ -1243,6 +1246,7 @@ * @deprecated * @return Returns the italic font. */ + @Deprecated public Font getItalicLabelFont() { return getProject().getProjectSettings().getFontItalic(); } 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=14255&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=14254&r2=14255 ============================================================================== --- trunk/src/app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java (original) +++ trunk/src/app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java 2008-03-27 23:51:21-0700 @@ -215,7 +215,7 @@ * <code>SmallIcon</code> mode. */ private List<Fig> floatingStereotypes = new ArrayList<Fig>(); - + /** * The current stereotype view, defaults to "textual". * @@ -224,7 +224,7 @@ * @see DiagramAppearance#STEREOTYPE_VIEW_BIG_ICON */ private int stereotypeView = DiagramAppearance.STEREOTYPE_VIEW_TEXTUAL; - + /** * The width of the profile icons when viewed at the small icon mode. * The icon width is resized to <code>ICON_WIDTH</code> and the height is @@ -241,7 +241,7 @@ * @see FigProfileIcon */ private FigText originalNameFig; - + /** * EnclosedFigs are the Figs that are enclosed by this figure. Say that * it is a Package then these are the Classes, Interfaces, Packages etc @@ -502,9 +502,8 @@ /* Check if multiple items are selected: */ if (TargetManager.getInstance().getTargets().size() == 1) { - ToDoList list = Designer.theDesigner().getToDoList(); - List<ToDoItem> items = - (List<ToDoItem>) list.elementsForOffender(getOwner()).clone(); + ToDoList tdList = Designer.theDesigner().getToDoList(); + List<ToDoItem> items = tdList.elementListForOffender(getOwner()); if (items != null && items.size() > 0) { ArgoJMenu critiques = new ArgoJMenu("menu.popup.critiques"); ToDoItem itemUnderMouse = hitClarifier(me.getX(), me.getY()); @@ -758,8 +757,8 @@ public void paintClarifiers(Graphics g) { int iconX = getX(); int iconY = getY() - 10; - ToDoList list = Designer.theDesigner().getToDoList(); - List<ToDoItem> items = list.elementsForOffender(getOwner()); + ToDoList tdList = Designer.theDesigner().getToDoList(); + List<ToDoItem> items = tdList.elementListForOffender(getOwner()); for (ToDoItem item : items) { Icon icon = item.getClarifier(); if (icon instanceof Clarifier) { @@ -771,7 +770,7 @@ iconX += icon.getIconWidth(); } } - items = list.elementsForOffender(this); + items = tdList.elementListForOffender(this); for (ToDoItem item : items) { Icon icon = item.getClarifier(); if (icon instanceof Clarifier) { @@ -792,8 +791,8 @@ */ public ToDoItem hitClarifier(int x, int y) { int iconX = getX(); - ToDoList list = Designer.theDesigner().getToDoList(); - List<ToDoItem> items = list.elementsForOffender(getOwner()); + ToDoList tdList = Designer.theDesigner().getToDoList(); + List<ToDoItem> items = tdList.elementListForOffender(getOwner()); for (ToDoItem item : items) { Icon icon = item.getClarifier(); int width = icon.getIconWidth(); @@ -815,7 +814,7 @@ } } } - items = list.elementsForOffender(this); + items = tdList.elementListForOffender(this); for (ToDoItem item : items) { Icon icon = item.getClarifier(); int width = icon.getIconWidth(); @@ -1328,7 +1327,7 @@ Project p = getProject(); if (p != null) { updateFont(); - } + } updateBounds(); } } @@ -1525,17 +1524,17 @@ this.removeFig(stereotypeFigProfileIcon); stereotypeFigProfileIcon = null; - } - + } + if (originalNameFig != null) { this.setNameFig(originalNameFig); originalNameFig = null; } for (Fig icon : floatingStereotypes) { - this.removeFig(icon); - } - floatingStereotypes.clear(); + this.removeFig(icon); + } + floatingStereotypes.clear(); int practicalView = getPracticalView(); @@ -1544,8 +1543,10 @@ Fig stereoFig = getStereotypeFig(); if (stereoFig instanceof FigStereotypesCompartment) { + boolean hiding = + practicalView == DiagramAppearance.STEREOTYPE_VIEW_SMALL_ICON; ((FigStereotypesCompartment) stereoFig) - .setHidingStereotypesWithIcon(practicalView == DiagramAppearance.STEREOTYPE_VIEW_SMALL_ICON); + .setHidingStereotypesWithIcon(hiding); } if (practicalView == DiagramAppearance.STEREOTYPE_VIEW_BIG_ICON) { @@ -1611,6 +1612,7 @@ updateSmallIcons(this.getWidth()); } + // TODO: This is a redundant invocation updateStereotypeText(); damage(); @@ -1725,6 +1727,7 @@ * @deprecated by MVW in V0.25.4. Use ProjectSettings instead. * @return the diagram font */ + @Deprecated public Font getLabelFont() { return getProject().getProjectSettings().getFontPlain(); } @@ -1733,6 +1736,7 @@ * @deprecated by MVW in V0.25.4. Use ProjectSettings instead. * @return the italic diagram font */ + @Deprecated public Font getItalicLabelFont() { return getProject().getProjectSettings().getFontItalic(); } @@ -2115,16 +2119,16 @@ // calcBounds(); // Don't do this! Causes e.g. FigActor to not center properly. updateBounds(); damage(); -} + } -/** + /** * This function should, for all FigTexts, * recalculate the font-style (plain, bold, italic, bold/italic), * and apply it by calling FigText.setFont(). <p> - * + * * If the "deepUpdateFont" function does not * work for a subclass, then override this method. - */ + */ protected void updateFont() { int style = getNameFigFontStyle(); Font f = getProject().getProjectSettings().getFont(style); @@ -2150,9 +2154,9 @@ */ if (p != null) { ProjectSettings ps = p.getProjectSettings(); - showBoldName = ps.getShowBoldNamesValue(); + showBoldName = ps.getShowBoldNamesValue(); } - + return showBoldName ? Font.BOLD : Font.PLAIN; } @@ -2181,4 +2185,3 @@ } } } - --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
