Author: tfmorris Date: 2008-08-27 12:51:34-0700 New Revision: 15622 Modified: trunk/src/argouml-app/src/org/argouml/i18n/label.properties trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelCompositeState.java trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java
Log: RESOLVED - task 5342: Invalid title in Submachine State PropPanel http://argouml.tigris.org/issues/show_bug.cgi?id=5342 Modified: trunk/src/argouml-app/src/org/argouml/i18n/label.properties Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/i18n/label.properties?view=diff&rev=15622&p1=trunk/src/argouml-app/src/org/argouml/i18n/label.properties&p2=trunk/src/argouml-app/src/org/argouml/i18n/label.properties&r1=15621&r2=15622 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/i18n/label.properties (original) +++ trunk/src/argouml-app/src/org/argouml/i18n/label.properties 2008-08-27 12:51:34-0700 @@ -401,6 +401,7 @@ label.subactivity-state = SubactivityState label.submachine = Submachine: label.submachinestate = Submachine State: +label.submachine-state = Submachine State label.subsystem = Subsystem label.subvertex = Subvertices: label.supplier-dependencies = Supplier Dependencies: Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelCompositeState.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelCompositeState.java?view=diff&rev=15622&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelCompositeState.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelCompositeState.java&r1=15621&r2=15622 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelCompositeState.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelCompositeState.java 2008-08-27 12:51:34-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 @@ -146,7 +146,8 @@ } else if (Model.getFacade().isConcurrent(target)) { getTitleLabel().setText( Translator.localize("label.concurrent.composite.state")); - } else { + } else if (!Model.getFacade().isASubmachineState(target)) { + // PropPanelSubmachine is a subclass that handles its own title getTitleLabel().setText( Translator.localize("label.composite-state")); } Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java?view=diff&rev=15622&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java&r1=15621&r2=15622 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java 2008-08-27 12:51:34-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 @@ -89,7 +89,7 @@ * Construct a default property panel SubmachineState elements. */ public PropPanelSubmachineState() { - super("label.submachinestate", lookupIcon("SubmachineState")); + super("label.submachine-state", lookupIcon("SubmachineState")); addField("label.name", getNameTextField()); addField("label.container", getContainerScroll()); final JComboBox submachineBox = new UMLComboBox2( --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
