Author: bobtarling Date: 2008-05-12 13:59:47-0700 New Revision: 14714 Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClass.java trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigDataType.java trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigInterface.java
Log: Get rid of needless environment variable. Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClass.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClass.java?view=diff&rev=14714&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClass.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClass.java&r1=14713&r2=14714 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClass.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClass.java 2008-05-12 13:59:47-0700 @@ -343,24 +343,24 @@ // FigEditableCompartment? int i = new ArrayList(getAttributesFig().getFigs()).indexOf(ft); if (i != -1) { - highlightedFigText = (CompartmentFigText) ft; - highlightedFigText.setHighlighted(true); + final CompartmentFigText figText = (CompartmentFigText) ft; + figText.setHighlighted(true); - highlightedFigText.getNotationProvider() - .parse(highlightedFigText.getOwner(), ft.getText()); - ft.setText(highlightedFigText.getNotationProvider().toString( - highlightedFigText.getOwner(), null)); + figText.getNotationProvider() + .parse(figText.getOwner(), ft.getText()); + ft.setText(figText.getNotationProvider().toString( + figText.getOwner(), null)); return; } i = new ArrayList(getOperationsFig().getFigs()).indexOf(ft); if (i != -1) { - highlightedFigText = (CompartmentFigText) ft; - highlightedFigText.setHighlighted(true); + final CompartmentFigText figText = (CompartmentFigText) ft; + figText.setHighlighted(true); - highlightedFigText.getNotationProvider() - .parse(highlightedFigText.getOwner(), ft.getText()); - ft.setText(highlightedFigText.getNotationProvider().toString( - highlightedFigText.getOwner(), null)); + figText.getNotationProvider() + .parse(figText.getOwner(), ft.getText()); + ft.setText(figText.getNotationProvider().toString( + figText.getOwner(), null)); return; } } Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java?view=diff&rev=14714&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java&r1=14713&r2=14714 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java 2008-05-12 13:59:47-0700 @@ -1,5 +1,5 @@ // $Id$ -// Copyright (c) 1996-2007 The Regents of the University of California. All +// Copyright (c) 1996-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 @@ -69,13 +69,6 @@ */ private FigOperationsCompartment operationsFig; - /** - * Text highlighted by mouse actions on the diagram.<p> - * TODO: This should be private with a protected getter. However let see if - * we can get rid of it instead. See TODO's in subclasses that use this. - */ - protected CompartmentFigText highlightedFigText; - // TODO: This is already defined in the superclass, can we use that? protected Fig borderFig; Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigDataType.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigDataType.java?view=diff&rev=14714&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigDataType.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigDataType.java&r1=14713&r2=14714 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigDataType.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigDataType.java 2008-05-12 13:59:47-0700 @@ -267,12 +267,12 @@ // TODO: Duplicate code here as in FigClass. Can this all be moved to // FigEditableCompartment? if (i != -1) { - highlightedFigText = (CompartmentFigText) ft; - highlightedFigText.setHighlighted(true); - highlightedFigText.getNotationProvider() - .parse(highlightedFigText.getOwner(), ft.getText()); - ft.setText(highlightedFigText.getNotationProvider().toString( - highlightedFigText.getOwner(), null)); + final CompartmentFigText figText = (CompartmentFigText) ft; + figText.setHighlighted(true); + figText.getNotationProvider() + .parse(figText.getOwner(), ft.getText()); + ft.setText(figText.getNotationProvider().toString( + figText.getOwner(), null)); } } Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java?view=diff&rev=14714&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java&r1=14713&r2=14714 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java 2008-05-12 13:59:47-0700 @@ -208,10 +208,10 @@ // TODO: Almost duplicate code here as in FigClass. Can this all be // moved to FigEditableCompartment? if (i != -1) { - highlightedFigText = (CompartmentFigText) ft; - highlightedFigText.setHighlighted(true); - Model.getCoreHelper().setName(highlightedFigText.getOwner(), - highlightedFigText.getText().trim()); + final CompartmentFigText figText = (CompartmentFigText) ft; + figText.setHighlighted(true); + Model.getCoreHelper().setName(figText.getOwner(), + figText.getText().trim()); return; } } Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigInterface.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigInterface.java?view=diff&rev=14714&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigInterface.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigInterface.java&r1=14713&r2=14714 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigInterface.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigInterface.java 2008-05-12 13:59:47-0700 @@ -309,13 +309,13 @@ // TODO: Duplicate code here as in FigClass. Can this all be moved to // FigEditableCompartment? if (i != -1) { - highlightedFigText = (CompartmentFigText) ft; - highlightedFigText.setHighlighted(true); + final CompartmentFigText figText = (CompartmentFigText) ft; + figText.setHighlighted(true); - highlightedFigText.getNotationProvider() - .parse(highlightedFigText.getOwner(), ft.getText()); - ft.setText(highlightedFigText.getNotationProvider().toString( - highlightedFigText.getOwner(), null)); + figText.getNotationProvider() + .parse(figText.getOwner(), ft.getText()); + ft.setText(figText.getNotationProvider().toString( + figText.getOwner(), null)); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
