Author: tfmorris Date: 2011-05-15 11:49:49-0700 New Revision: 19433 Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewCompositeState.java trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewFinalState.java trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewGuard.java trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewPseudoState.java trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewSimpleState.java trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewStubState.java trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewSubmachineState.java trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewSynchState.java trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewTransition.java trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLStateMachineContextComboBoxModel.java trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLStubStateComboBoxModel.java trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLSubmachineStateComboBoxModel.java trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLSynchStateBoundDocument.java
Log: Clean up Javadoc and add links to replacement methods Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewCompositeState.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewCompositeState.java?view=diff&pathrev=19433&r1=19432&r2=19433 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewCompositeState.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewCompositeState.java 2011-05-15 11:49:49-0700 @@ -49,8 +49,8 @@ /** * @since Dec 14, 2002 * @author [email protected] - * @deprecated by Bob Tarling in 0.33.4. This is no longer used - * ActionCreateContainedModelElement can be used instead. + * @deprecated by Bob Tarling in 0.33.4. This is no longer used. + * Use {@link org.argouml.ui.ActionCreateContainedModelElement} instead. */ @Deprecated public class ActionNewCompositeState extends AbstractActionNewModelElement { @@ -67,9 +67,7 @@ Translator.localize("button.new-compositestate")); } - /* - * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ + @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); Model.getStateMachinesFactory().buildCompositeState(getTarget()); Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewFinalState.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewFinalState.java?view=diff&pathrev=19433&r1=19432&r2=19433 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewFinalState.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewFinalState.java 2011-05-15 11:49:49-0700 @@ -49,8 +49,8 @@ /** * @since Dec 14, 2002 * @author [email protected] - * @deprecated by Bob Tarling in 0.33.4. This is no longer used - * ActionCreateContainedModelElement can be used instead. + * @deprecated by Bob Tarling in 0.33.4. This is no longer used. + * Use {@link org.argouml.ui.ActionCreateContainedModelElement} instead. */ @Deprecated public class ActionNewFinalState extends AbstractActionNewModelElement { @@ -65,9 +65,7 @@ putValue(Action.NAME, Translator.localize("button.new-finalstate")); } - /* - * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ + @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); Model.getStateMachinesFactory().buildFinalState(getTarget()); Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewGuard.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewGuard.java?view=diff&pathrev=19433&r1=19432&r2=19433 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewGuard.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewGuard.java 2011-05-15 11:49:49-0700 @@ -54,8 +54,8 @@ * * @since Dec 15, 2002 * @author [email protected] - * @deprecated by Bob Tarling in 0.33.4. This is no longer used - * ActionCreateContainedModelElement can be used instead. + * @deprecated by Bob Tarling in 0.33.4. This is no longer used. + * Use {@link org.argouml.ui.ActionCreateContainedModelElement} instead. */ @Deprecated public class ActionNewGuard extends AbstractActionNewModelElement { @@ -69,9 +69,7 @@ super(); } - /* - * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ + @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); TargetManager.getInstance().setTarget( @@ -85,9 +83,7 @@ return singleton; } - /* - * @see javax.swing.Action#isEnabled() - */ + @Override public boolean isEnabled() { Object t = getTarget(); return t != null Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewPseudoState.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewPseudoState.java?view=diff&pathrev=19433&r1=19432&r2=19433 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewPseudoState.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewPseudoState.java 2011-05-15 11:49:49-0700 @@ -50,8 +50,8 @@ /** * @since Dec 14, 2002 * @author [email protected] - * @deprecated by Bob Tarling in 0.33.4. This is no longer used - * ActionCreateContainedModelElement can be used instead. + * @deprecated by Bob Tarling in 0.33.4. This is no longer used. + * Use {@link org.argouml.ui.ActionCreateContainedModelElement} instead. */ @Deprecated public class ActionNewPseudoState extends AbstractActionNewModelElement { @@ -78,9 +78,7 @@ putValue(Action.NAME, Translator.localize(n)); } - /* - * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ + @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); Object target = TargetManager.getInstance().getModelTarget(); Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewSimpleState.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewSimpleState.java?view=diff&pathrev=19433&r1=19432&r2=19433 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewSimpleState.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewSimpleState.java 2011-05-15 11:49:49-0700 @@ -49,8 +49,8 @@ /** * @since Dec 14, 2002 * @author [email protected] - * @deprecated by Bob Tarling in 0.33.4. This is no longer used - * ActionCreateContainedModelElement can be used instead. + * @deprecated by Bob Tarling in 0.33.4. This is no longer used. + * Use {@link org.argouml.ui.ActionCreateContainedModelElement} instead. */ @Deprecated public class ActionNewSimpleState extends AbstractActionNewModelElement { @@ -65,9 +65,7 @@ putValue(Action.NAME, Translator.localize("button.new-simplestate")); } - /* - * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ + @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); Model.getStateMachinesFactory().buildSimpleState(getTarget()); Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewStubState.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewStubState.java?view=diff&pathrev=19433&r1=19432&r2=19433 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewStubState.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewStubState.java 2011-05-15 11:49:49-0700 @@ -49,8 +49,8 @@ /** * @since Dec 14, 2002 * @author [email protected] - * @deprecated by Bob Tarling in 0.33.4. This is no longer used - * ActionCreateContainedModelElement can be used instead. + * @deprecated by Bob Tarling in 0.33.4. This is no longer used. + * Use {@link org.argouml.ui.ActionCreateContainedModelElement} instead. */ @Deprecated public class ActionNewStubState extends AbstractActionNewModelElement { @@ -67,9 +67,7 @@ "button.new-stubstate")); } - /* - * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ + @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); Model.getStateMachinesFactory().buildStubState(getTarget()); Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewSubmachineState.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewSubmachineState.java?view=diff&pathrev=19433&r1=19432&r2=19433 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewSubmachineState.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewSubmachineState.java 2011-05-15 11:49:49-0700 @@ -49,8 +49,8 @@ /** * @since Dec 14, 2002 * @author [email protected] - * @deprecated by Bob Tarling in 0.33.4. This is no longer used - * ActionCreateContainedModelElement can be used instead. + * @deprecated by Bob Tarling in 0.33.4. This is no longer used. + * Use {@link org.argouml.ui.ActionCreateContainedModelElement} instead. */ @Deprecated public class ActionNewSubmachineState extends AbstractActionNewModelElement { @@ -67,9 +67,7 @@ "button.new-submachinestate")); } - /* - * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ + @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); Model.getStateMachinesFactory().buildSubmachineState(getTarget()); Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewSynchState.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewSynchState.java?view=diff&pathrev=19433&r1=19432&r2=19433 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewSynchState.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewSynchState.java 2011-05-15 11:49:49-0700 @@ -1,6 +1,6 @@ /* $Id$ ***************************************************************************** - * Copyright (c) 2009 Contributors - see below + * Copyright (c) 2009,2011 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 @@ -49,8 +49,8 @@ /** * @since Dec 14, 2002 * @author [email protected] - * @deprecated by Bob Tarling in 0.33.4. This is no longer used - * ActionCreateContainedModelElement can be used instead. + * @deprecated by Bob Tarling in 0.33.4. This is no longer used. + * Use {@link org.argouml.ui.ActionCreateContainedModelElement} instead. */ @Deprecated public class ActionNewSynchState extends AbstractActionNewModelElement { @@ -66,9 +66,7 @@ putValue(Action.NAME, Translator.localize("button.new-synchstate")); } - /* - * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ + @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); Model.getStateMachinesFactory().buildSynchState(getTarget()); Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewTransition.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewTransition.java?view=diff&pathrev=19433&r1=19432&r2=19433 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewTransition.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionNewTransition.java 2011-05-15 11:49:49-0700 @@ -1,6 +1,6 @@ /* $Id$ ***************************************************************************** - * Copyright (c) 2009 Contributors - see below + * Copyright (c) 2009,2011 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 @@ -52,7 +52,7 @@ * @since Dec 15, 2002 * @author [email protected] * @deprecated by Bob Tarling in 0.33.4. This is no longer used - * ActionCreateEdgeModelElement can be used instead. + * Use {@link org.argouml.ui.ActionCreateContainedModelElement} instead. */ @Deprecated public class ActionNewTransition extends AbstractActionNewModelElement { @@ -79,9 +79,7 @@ super(); } - /* - * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ + @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); if (getValue(SOURCE) == null || getValue(DESTINATION) == null) { @@ -94,15 +92,11 @@ } } - /* - * @see javax.swing.AbstractAction#isEnabled() - */ + @Override public boolean isEnabled() { Object target = TargetManager.getInstance().getModelTarget(); return super.isEnabled() && !Model.getStateMachinesHelper().isTopState(target); } - - } Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLStateMachineContextComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLStateMachineContextComboBoxModel.java?view=diff&pathrev=19433&r1=19432&r2=19433 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLStateMachineContextComboBoxModel.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLStateMachineContextComboBoxModel.java 2011-05-15 11:49:49-0700 @@ -1,6 +1,6 @@ /* $Id$ ***************************************************************************** - * Copyright (c) 2009 Contributors - see below + * Copyright (c) 2009,2011 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 @@ -65,9 +65,7 @@ super("context", false); } - /* - * @see org.argouml.uml.ui.UMLModelElementListModel2#buildModelList() - */ + @Override protected void buildModelList() { Collection elements = new ArrayList(); Project p = ProjectManager.getManager().getCurrentProject(); @@ -84,21 +82,18 @@ setElements(elements); } - /* - * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(Object) - */ + @Override protected boolean isValidElement(Object element) { return Model.getFacade().isAClassifier(element) || Model.getFacade().isABehavioralFeature(element); } - /* - * @see org.argouml.uml.ui.UMLComboBoxModel2#getSelectedModelElement() - */ + @Override protected Object getSelectedModelElement() { return Model.getFacade().getContext(getTarget()); } + @Override public void modelChanged(UmlChangeEvent evt) { /* Do nothing by design. */ } Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLStubStateComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLStubStateComboBoxModel.java?view=diff&pathrev=19433&r1=19432&r2=19433 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLStubStateComboBoxModel.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLStubStateComboBoxModel.java 2011-05-15 11:49:49-0700 @@ -1,6 +1,6 @@ /* $Id$ ***************************************************************************** - * Copyright (c) 2009 Contributors - see below + * Copyright (c) 2009,2011 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 @@ -38,16 +38,16 @@ package org.argouml.uml.ui.behavior.state_machines; -import org.argouml.model.Model; -import org.argouml.uml.ui.UMLComboBoxModel2; - import java.util.ArrayList; import java.util.Iterator; +import org.argouml.model.Model; +import org.argouml.uml.ui.UMLComboBoxModel2; + /** * @author [email protected] - * @deprecated by Bob Tarling in 0.33.4. This is no longer used - * ActionCreateContainedModelElement can be used instead. + * @deprecated by Bob Tarling in 0.33.4. This is no longer used. + * Use {@link org.argouml.ui.ActionCreateContainedModelElement} instead. */ @Deprecated public class UMLStubStateComboBoxModel extends UMLComboBoxModel2 { @@ -59,18 +59,14 @@ super("stubstate", true); } - /* - * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(Object) - */ + @Override protected boolean isValidElement(Object element) { return (Model.getFacade().isAStateVertex(element) && !Model.getFacade().isAConcurrentRegion(element) && Model.getFacade().getName(element) != null); } - /* - * @see org.argouml.uml.ui.UMLComboBoxModel2#buildModelList() - */ + @Override protected void buildModelList() { removeAllElements(); Object stateMachine = null; @@ -95,9 +91,7 @@ } } - /* - * @see org.argouml.uml.ui.UMLComboBoxModel2#getSelectedModelElement() - */ + @Override protected Object getSelectedModelElement() { String objectName = null; Object container = null; Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLSubmachineStateComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLSubmachineStateComboBoxModel.java?view=diff&pathrev=19433&r1=19432&r2=19433 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLSubmachineStateComboBoxModel.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLSubmachineStateComboBoxModel.java 2011-05-15 11:49:49-0700 @@ -1,6 +1,6 @@ /* $Id$ ***************************************************************************** - * Copyright (c) 2009 Contributors - see below + * Copyright (c) 2009,2011 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 @@ -58,18 +58,14 @@ super("submachine", true); } - /* - * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(Object) - */ + @Override protected boolean isValidElement(Object element) { return (Model.getFacade().isAStateMachine(element) && element != Model.getStateMachinesHelper() .getStateMachine(getTarget())); } - /* - * @see org.argouml.uml.ui.UMLComboBoxModel2#buildModelList() - */ + @Override protected void buildModelList() { removeAllElements(); Project p = ProjectManager.getManager().getCurrentProject(); @@ -78,9 +74,7 @@ .getAllPossibleStatemachines(model, getTarget())); } - /* - * @see org.argouml.uml.ui.UMLComboBoxModel2#getSelectedModelElement() - */ + @Override protected Object getSelectedModelElement() { if (getTarget() != null) { return Model.getFacade().getSubmachine(getTarget()); Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLSynchStateBoundDocument.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLSynchStateBoundDocument.java?view=diff&pathrev=19433&r1=19432&r2=19433 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLSynchStateBoundDocument.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLSynchStateBoundDocument.java 2011-05-15 11:49:49-0700 @@ -1,6 +1,6 @@ /* $Id$ ***************************************************************************** - * Copyright (c) 2009 Contributors - see below + * Copyright (c) 2009,2011 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 @@ -48,8 +48,8 @@ * The Document/model for the bound of a synch state. * * @author [email protected] - * @deprecated by Bob Tarling in 0.33.4. This is no longer used - * ActionCreateContainedModelElement can be used instead. + * @deprecated by Bob Tarling in 0.33.4. This is no longer used. + * Use {@link org.argouml.ui.ActionCreateContainedModelElement} instead. */ @Deprecated public class UMLSynchStateBoundDocument extends UMLPlainTextDocument { @@ -66,9 +66,7 @@ super("bound"); } - /* - * @see org.argouml.uml.ui.UMLPlainTextDocument#setProperty(java.lang.String) - */ + @Override protected void setProperty(String text) { if (text.equals("")) { Model.getStateMachinesHelper().setBound(getTarget(), 0); @@ -78,9 +76,7 @@ } } - /* - * @see org.argouml.uml.ui.UMLPlainTextDocument#getProperty() - */ + @Override protected String getProperty() { int bound = Model.getFacade().getBound(getTarget()); if (bound <= 0) { @@ -90,10 +86,7 @@ } } - /* - * @see javax.swing.text.Document#insertString(int, java.lang.String, - * javax.swing.text.AttributeSet) - */ + @Override public void insertString(int offset, String str, AttributeSet a) throws BadLocationException { try { @@ -103,7 +96,6 @@ } catch (NumberFormatException e) { // ignored - we just skipped inserting it in our document } - } } ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2737600 To unsubscribe from this discussion, e-mail: [[email protected]].
