svn commit: r16295 - trunk/src/argouml-app/src/org/argouml/uml/ui: . behavior/activity_graphs behavior/state_machines foundation/core model_management
Tom Morris <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: tfmorris
Date: 2008-12-07 13:14:11-0800
New Revision: 16295
Modified:
trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelActionState.java
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelCallState.java
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/AbstractPropPanelState.java
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/PropPanelSimpleState.java
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelStateMachine.java
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java
trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelAssociation.java
trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelDataType.java
trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelDependency.java
trunk/src/argouml-app/src/org/argouml/uml/ui/model_management/PropPanelPackage.java
Log:
Remove deprecated PropPanel constructors which take an orientation parameter
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java?view=diff&pathrev=16295&r1=16294&r2=16295
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java 2008-12-07 13:14:11-0800
@@ -66,9 +66,7 @@
import org.argouml.ui.targetmanager.TargettableModelView;
import org.tigris.gef.presentation.Fig;
import org.tigris.swidgets.GridLayout2;
-import org.tigris.swidgets.Horizontal;
import org.tigris.swidgets.Orientation;
-import org.tigris.swidgets.Vertical;
import org.tigris.toolbar.ToolBarFactory;
/**
@@ -126,19 +124,11 @@
* <p>
* @param icon The icon to display for the panel
* @param label The label for the title of the panel (to be localized).
- * @param orientation the orientation
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanel(String, ImageIcon)} and
- * setOrientation() after instantiation.
*/
- @Deprecated
- public PropPanel(String label, ImageIcon icon, Orientation orientation) {
+ public PropPanel(String label, ImageIcon icon) {
super(Translator.localize(label));
-
- setOrientation(orientation);
-
- LabelledLayout layout =
- new LabelledLayout(orientation == Vertical.getInstance());
+
+ LabelledLayout layout = new LabelledLayout();
layout.setHgap(5);
setLayout(layout);
@@ -155,31 +145,6 @@
addComponentListener(this);
}
- /**
- * Constructs a new Proppanel without an icon. If there is an icon it's
- * updated at runtime via settarget.
- * <p>
- * @param label The label for the title of the PropPanel (to be localized).
- * @param orientation the orientation
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanel(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- public PropPanel(String label, Orientation orientation) {
- this(label, (ImageIcon) null, orientation);
- }
-
- /**
- * Constructs a new Proppanel with default orientation.<p>
- *
- * @param label
- * The label for the title of the PropPanel (to be localized).
- * @param icon icon to use for panel
- */
- public PropPanel(String label, ImageIcon icon) {
- this(label, icon, Horizontal.getInstance());
- }
/*
* @see org.tigris.swidgets.Orientable#setOrientation(org.tigris.swidgets.Orientation)
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelActionState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelActionState.java?view=diff&pathrev=16295&r1=16294&r2=16295
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelActionState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelActionState.java 2008-12-07 13:14:11-0800
@@ -28,7 +28,6 @@
import org.argouml.i18n.Translator;
import org.argouml.uml.ui.behavior.state_machines.AbstractPropPanelState;
-import org.tigris.swidgets.Orientation;
/**
* User interface panel shown at the bottom of the screen that allows the user
@@ -48,22 +47,6 @@
this("label.action-state", lookupIcon("ActionState"));
}
- /**
- * Construct a property panel for an Action State with the given params.
- *
- * @param name the name of the properties panel
- * @param icon the icon to be shown next to the name
- * @param orientation the orientation of the panel
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanelActionState(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- public PropPanelActionState(String name, ImageIcon icon,
- Orientation orientation) {
- this(name, icon);
- setOrientation(orientation);
- }
/**
* Construct a property panel for an Action State with the given params.
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelCallState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelCallState.java?view=diff&pathrev=16295&r1=16294&r2=16295
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelCallState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelCallState.java 2008-12-07 13:14:11-0800
@@ -34,7 +34,6 @@
import org.argouml.i18n.Translator;
import org.argouml.uml.ui.behavior.state_machines.AbstractPropPanelState;
import org.argouml.uml.ui.behavior.state_machines.UMLStateEntryListModel;
-import org.tigris.swidgets.Orientation;
/**
* The properties panel for a CallState.
@@ -54,20 +53,6 @@
this("label.call-state", lookupIcon("CallState"));
}
- /**
- * @param name the name of the properties panel
- * @param icon the icon to be shown next to the name
- * @param orientation the orientation of the panel
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanelCallState(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- public PropPanelCallState(String name, ImageIcon icon,
- Orientation orientation) {
- this(name, icon);
- setOrientation(orientation);
- }
/**
* @param name the name of the properties panel
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/AbstractPropPanelState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/AbstractPropPanelState.java?view=diff&pathrev=16295&r1=16294&r2=16295
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/AbstractPropPanelState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/AbstractPropPanelState.java 2008-12-07 13:14:11-0800
@@ -34,7 +34,6 @@
import org.argouml.i18n.Translator;
import org.argouml.uml.ui.ScrollList;
import org.argouml.uml.ui.UMLMutableLinkedList;
-import org.tigris.swidgets.Orientation;
/**
* The abstract properties panel for a State.
@@ -50,22 +49,6 @@
/**
- * Constructor for AbstractPropPanelState.
- * @param name the name of the properties panel, to be shown at the top
- * @param icon the icon to be shown next to the name
- * @param orientation the orientation of the panel
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #AbstractPropPanelState(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- public AbstractPropPanelState(String name, ImageIcon icon,
- Orientation orientation) {
- this(name, icon);
- setOrientation(orientation);
- }
-
- /**
* Construct a property panel for a State. Since State is abstract, this
* will never be instantiated directly, but rather as part of the
* instantiation of one of its concrete subclasses.
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&pathrev=16295&r1=16294&r2=16295
==============================================================================
--- 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-12-07 13:14:11-0800
@@ -33,7 +33,6 @@
import org.argouml.model.Model;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ui.ActionAddConcurrentRegion;
-import org.tigris.swidgets.Orientation;
/**
* The properties panel for a Composite State.
@@ -50,22 +49,6 @@
private JList subverticesList = null;
private Action addConcurrentRegion;
- /**
- * Constructor for PropPanelCompositeState.
- * @param name the name of the properties panel
- * @param icon the icon to be shown next to the name
- * @param orientation the orientation of the panel
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanelCompositeState(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- public PropPanelCompositeState(final String name, final ImageIcon icon,
- final Orientation orientation) {
- super(name, icon);
- setOrientation(orientation);
- initialize();
- }
/**
* Constructor for PropPanelCompositeState.
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelSimpleState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelSimpleState.java?view=diff&pathrev=16295&r1=16294&r2=16295
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelSimpleState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelSimpleState.java 2008-12-07 13:14:11-0800
@@ -26,8 +26,6 @@
import javax.swing.ImageIcon;
-import org.tigris.swidgets.Orientation;
-
/**
* The properties panel for a State.
*
@@ -47,23 +45,6 @@
this("label.simple.state", lookupIcon("SimpleState"));
}
- /**
- * Construct a new property panel for a Simple State with the given
- * attributes.
- *
- * @param name the name of the properties panel, shown at the top
- * @param icon the icon shown at the top
- * @param orientation the orientation of the panel
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanelSimpleState(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- public PropPanelSimpleState(String name, ImageIcon icon,
- Orientation orientation) {
- this(name, icon);
- setOrientation(orientation);
- }
/**
* Construct a new property panel for a Simple State with the given
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelStateMachine.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelStateMachine.java?view=diff&pathrev=16295&r1=16294&r2=16295
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelStateMachine.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelStateMachine.java 2008-12-07 13:14:11-0800
@@ -36,7 +36,6 @@
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.tigris.swidgets.Orientation;
/**
* The properties panel for a Statemachine.
@@ -62,27 +61,13 @@
* The constructor.
*
* @param name the title of the properties panel, to be shown at the top
+ * @param icon icon for property panel
*/
public PropPanelStateMachine(String name, ImageIcon icon) {
super(name, icon);
initialize();
}
- /**
- * The constructor.
- *
- * @param name the title of the properties panel, to be shown at the top
- * @param orient the orientation of the panel
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanelStateMachine(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- public PropPanelStateMachine(String name, Orientation orient) {
- super(name, lookupIcon(name));
- setOrientation(orient);
- initialize();
- }
/**
* Initialize the panel with fields and stuff.
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java?view=diff&pathrev=16295&r1=16294&r2=16295
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java 2008-12-07 13:14:11-0800
@@ -33,7 +33,6 @@
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.tigris.swidgets.Orientation;
/**
* The properties tab panel for StateVertex and family.
@@ -48,22 +47,6 @@
private JPanel containerScroll;
- /**
- * Constructor for PropPanelStateVertex.
- *
- * @param name the name of the tabpanel shown at the top
- * @param icon the icon of the tabpanel shown at the top
- * @param orientation the orientation
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanelStateVertex(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- public PropPanelStateVertex(String name, ImageIcon icon,
- Orientation orientation) {
- this(name, icon);
- setOrientation(orientation);
- }
/**
* Constructor for PropPanelStateVertex.
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&pathrev=16295&r1=16294&r2=16295
==============================================================================
--- 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-12-07 13:14:11-0800
@@ -45,27 +45,6 @@
*/
private static final long serialVersionUID = 2384673708664550264L;
- /**
- * Construct a property panel for SubmachineState elements with the given
- * params.
- *
- * @param name
- * the name of the properties panel
- * @param icon
- * the icon to be shown next to the name
- * @param orientation
- * the orientation of the panel
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanelSubmachineState(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- public PropPanelSubmachineState(final String name, final ImageIcon icon,
- final Orientation orientation) {
- super(name, icon);
- setOrientation(orientation);
- initialize();
- }
/**
* Construct a property panel for SubmachineState elements with the given
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelAssociation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelAssociation.java?view=diff&pathrev=16295&r1=16294&r2=16295
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelAssociation.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelAssociation.java 2008-12-07 13:14:11-0800
@@ -32,7 +32,6 @@
import org.argouml.uml.ui.ActionNavigateContainerElement;
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.tigris.swidgets.Orientation;
/**
* The properties panel for a Association.
@@ -91,19 +90,7 @@
addAction(getDeleteAction());
}
- /**
- * Construct a property panel for an Association.
- *
- * @param title the title of the panel
- * @param orientation the orientation of the panel
- * @deprecated for 0.25.4 by tfmorris. Use {@link #PropPanelAssociation()}.
- */
- @Deprecated
- protected PropPanelAssociation(String title, Orientation orientation) {
- this(title);
- setOrientation(orientation);
- }
-
+
/**
* Construct a property panel for an Association.
*
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelDataType.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelDataType.java?view=diff&pathrev=16295&r1=16294&r2=16295
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelDataType.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelDataType.java 2008-12-07 13:14:11-0800
@@ -39,7 +39,6 @@
import org.argouml.uml.ui.ActionNavigateContainerElement;
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.tigris.swidgets.Orientation;
/**
* The properties panel for a Datatype.
@@ -51,22 +50,6 @@
private static UMLClassOperationListModel operationListModel =
new UMLClassOperationListModel();
- /**
- * Construct a property panel for UML DataType elements.
- *
- * @param title title string for the property panel
- * @param icon icon
- * @param orientation horizontal or vertical orientation
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanelDataType(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- public PropPanelDataType(String title, ImageIcon icon,
- Orientation orientation) {
- this(title, icon);
- setOrientation(orientation);
- }
/**
* Construct a property panel for UML DataType elements.
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelDependency.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelDependency.java?view=diff&pathrev=16295&r1=16294&r2=16295
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelDependency.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelDependency.java 2008-12-07 13:14:11-0800
@@ -32,7 +32,6 @@
import org.argouml.uml.ui.ActionNavigateNamespace;
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.tigris.swidgets.Orientation;
/**
* The properties panel for a Dependency.
@@ -84,20 +83,6 @@
/**
* Constructor that should be used by subclasses to initialize the
* attributes a dependency has.
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanelDependency(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- protected PropPanelDependency(String name, Orientation orientation) {
- this(name, lookupIcon(name));
- setOrientation(orientation);
- }
-
-
- /**
- * Constructor that should be used by subclasses to initialize the
- * attributes a dependency has.
* {@inheritDoc}
*
* @see org.argouml.uml.ui.PropPanel#PropPanel(String, ImageIcon)
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/model_management/PropPanelPackage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/model_management/PropPanelPackage.java?view=diff&pathrev=16295&r1=16294&r2=16295
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/model_management/PropPanelPackage.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/model_management/PropPanelPackage.java 2008-12-07 13:14:11-0800
@@ -57,7 +57,6 @@
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewTagDefinition;
import org.argouml.util.ArgoFrame;
import org.tigris.gef.undo.UndoableAction;
-import org.tigris.swidgets.Orientation;
/**
@@ -99,23 +98,6 @@
placeElements();
}
- /**
- * Construct a property panel for UML Packages with the given parameters.
- *
- * @param title the title for this panel
- * @param orientation the orientation
- * @param icon the icon to show next to the title
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanelPackage(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- public PropPanelPackage(String title, ImageIcon icon,
- Orientation orientation) {
- super(title, icon);
- setOrientation(orientation);
- placeElements();
- }
/**
* Via this method, the GUI elements are added to the proppanel. Subclasses
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=980904
To unsubscribe from this discussion, e-mail: [[email protected]].