Author: mvw Date: 2010-06-21 05:11:02-0700 New Revision: 18452 Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java
Log: Fix for issue 4282: Statemachine should not be owned by a class. Creating a statechart diagram or a activity diagram now correctly puts the statemachine or activitygraph in the namespace that owns the context. This implements WFR 2 of a class for when ArgoUML has to decide on a location for a statemachine. Added more tests to test the implemented code. This fix includes changes to the MDR subsystem - the equivalent EUML operations are not yet implemented at all. TODO: Not all cases are covered - such as operations on imported classes. Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java?view=diff&pathrev=18452&r1=18451&r2=18452 ============================================================================== --- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java (original) +++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java 2010-06-21 05:11:02-0700 @@ -1,6 +1,6 @@ /* $Id$ ***************************************************************************** - * Copyright (c) 2009 Contributors - see below + * Copyright (c) 2009-2010 Contributors - see below * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,6 +8,7 @@ * * Contributors: * Thomas Neustupny + * mvw ***************************************************************************** * * Some portions of this file was previously release using the BSD License: @@ -1426,9 +1427,9 @@ || modelElement instanceof Constraint || modelElement instanceof Dependency || modelElement instanceof Collaboration - // TODO: Having StateMachine here is non-standard - // see issue 4284 - || modelElement instanceof StateMachine + // Having StateMachine here would be non-standard. + // See issue 4284. Hence removed: + /* || modelElement instanceof StateMachine */ || modelElement instanceof DataType || modelElement instanceof Interface)) { return false; ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2624207 To unsubscribe from this discussion, e-mail: [[email protected]].
