Author: bobtarling Date: 2010-07-18 14:59:32-0700 New Revision: 18532 Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLDefaultValueExpressionModel.java
Log: We will always have a target so don't bother checking for null Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLDefaultValueExpressionModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLDefaultValueExpressionModel.java?view=diff&pathrev=18532&r1=18531&r2=18532 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLDefaultValueExpressionModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLDefaultValueExpressionModel.java 2010-07-18 14:59:32-0700 @@ -53,18 +53,14 @@ * @param propertyName the name of the property */ public UMLDefaultValueExpressionModel(Object target) { - super(target, "default value"); + super(target, "defaultValue"); } /* * @see org.argouml.uml.ui.UMLExpressionModel2#getExpression() */ public Object getExpression() { - Object target = getTarget(); - if (target == null) { - return null; - } - return Model.getFacade().getDefaultValue(target); + return Model.getFacade().getDefaultValue(getTarget()); } /* @@ -72,15 +68,8 @@ */ public void setExpression(Object expression) { Object target = getTarget(); - - if (target != null) { - Model.getCoreHelper().setDefaultValue(target, null); - Model.getCoreHelper().setDefaultValue(target, expression); - } - else { - // TODO: Log error - } - + Model.getCoreHelper().setDefaultValue(target, null); + Model.getCoreHelper().setDefaultValue(target, expression); } /* ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2634879 To unsubscribe from this discussion, e-mail: [[email protected]].
