Author: bobtarling Date: 2011-05-25 06:21:57-0700 New Revision: 19508 Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNameWithAbstract.java trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java
Log: Correct fix for issue 5903 Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNameWithAbstract.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNameWithAbstract.java?view=diff&pathrev=19508&r1=19507&r2=19508 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNameWithAbstract.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNameWithAbstract.java 2011-05-25 06:21:57-0700 @@ -78,4 +78,7 @@ return super.getFigFontStyle() | style; } + public void setText(String s) { + super.setText(s); + } } 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&pathrev=19508&r1=19507&r2=19508 ============================================================================== --- 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 2011-05-25 06:21:57-0700 @@ -346,7 +346,6 @@ private void constructFigs() { // TODO: Why isn't this stuff managed by the nameFig itself? nameFig.setFilled(true); - nameFig.setText(placeString()); nameFig.setBotMargin(7); // make space for the clarifier nameFig.setRightMargin(4); // margin between text and border nameFig.setLeftMargin(4); @@ -417,8 +416,6 @@ + element.getClass().getName()); } - nameFig.setText(placeString()); - if (element != null) { NotationName nn = Notation.findNotation(notationSettings.getNotationLanguage()); notationProviderName = Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java?view=diff&pathrev=19508&r1=19507&r2=19508 ============================================================================== --- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java (original) +++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java 2011-05-25 06:21:57-0700 @@ -711,7 +711,7 @@ Actor actor = getUseCases().createActor(); // TODO: Work around for defect 5903. Remove when a better // solution is found. - actor.setName(""); +// actor.setName(""); return actor; } else if (elementType == metaTypes.getUseCase()) { return getUseCases().createUseCase(); ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2747859 To unsubscribe from this discussion, e-mail: [[email protected]].
