Author: tfmorris
Date: 2008-11-29 14:04:58-0800
New Revision: 16206
Modified:
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelEvent.java
trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelAssociationEnd.java
trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelClassifier.java
trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelFeature.java
trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java
trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelNamespace.java
trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelRelationship.java
trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelStructuralFeature.java
Log:
Remove deprecated constructors
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java?view=diff&rev=16206&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java&r1=16205&r2=16206
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java 2008-11-29 14:04:58-0800
@@ -26,10 +26,8 @@
import javax.swing.ImageIcon;
import javax.swing.JPanel;
-import javax.swing.JScrollPane;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
-import org.tigris.swidgets.Orientation;
/**
* The abstract properties panel for any type of Instance.
@@ -59,22 +57,6 @@
super(name, icon);
}
- /**
- * Construct a property panel for an Instance with the given name, icon and
- * orientation.
- *
- * @param name the name for the properties panel
- * @param icon the icon shown next to the name
- * @param orientation the orientation
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanelInstance(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- public PropPanelInstance(String name, ImageIcon icon,
- Orientation orientation) {
- super(name, icon, orientation);
- }
/**
* @return the scrollpane for stimuli sender
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelEvent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelEvent.java?view=diff&rev=16206&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelEvent.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelEvent.java&r1=16205&r2=16206
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelEvent.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/PropPanelEvent.java 2008-11-29 14:04:58-0800
@@ -34,7 +34,6 @@
import org.argouml.uml.ui.foundation.core.ActionNewParameter;
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 an Event.
@@ -47,21 +46,6 @@
private UMLEventParameterListModel paramListModel;
- /**
- * Constructor for PropPanelEvent.
- *
- * @param name the name string of the properties panel
- * @param icon the icon to be shown next to the name
- * @param orientation the orientation
- * @deprecated for 0.25.4 by tfmorris. Use constructor without Orientation
- * argument and use setOrientation after instantiation.
- */
- @Deprecated
- public PropPanelEvent(String name, ImageIcon icon,
- Orientation orientation) {
- super(name, icon, orientation);
- initialize();
- }
/**
* Construct a property panel for an Event.
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelAssociationEnd.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelAssociationEnd.java?view=diff&rev=16206&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelAssociationEnd.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelAssociationEnd.java&r1=16205&r2=16206
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelAssociationEnd.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelAssociationEnd.java 2008-11-29 14:04:58-0800
@@ -39,7 +39,6 @@
import org.argouml.uml.ui.UMLMutableLinkedList;
import org.argouml.uml.ui.UMLSingleRowSelector;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.tigris.swidgets.Orientation;
/**
* The properties panel for an association end.
@@ -123,22 +122,6 @@
* etc. but excluding placing them on the proppanel itself.
*
* @param name name/title of the property panel
- * @param orientation orientation of the panel
- * @see org.argouml.uml.ui.PropPanel#PropPanel(String, Orientation)
- * @deprecated for 0.25.4 by tfmorris. Use setOrientation after
- * instantiation to select orientation.
- */
- @Deprecated
- protected PropPanelAssociationEnd(String name, Orientation orientation) {
- super(name, orientation);
- }
-
-
- /**
- * Constructs the proppanel including initializing all scrollpanes, panels
- * etc. but excluding placing them on the proppanel itself.
- *
- * @param name name/title of the property panel
* @param icon the icon
* @see org.argouml.uml.ui.PropPanel#PropPanel(String, ImageIcon)
*/
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelClassifier.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelClassifier.java?view=diff&rev=16206&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelClassifier.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelClassifier.java&r1=16205&r2=16206
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelClassifier.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelClassifier.java 2008-11-29 14:04:58-0800
@@ -32,7 +32,6 @@
import org.argouml.uml.ui.ScrollList;
import org.argouml.uml.ui.UMLDerivedCheckBox;
import org.argouml.uml.ui.behavior.common_behavior.ActionNewReception;
-import org.tigris.swidgets.Orientation;
/**
* The abstract properties panel for Classifiers.
@@ -93,37 +92,6 @@
initialize();
}
- /**
- * The constructor.
- *
- * @param title the title of the properties panel
- * @param orientation the orientation of the panel
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanelClassifier(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- public PropPanelClassifier(String title, Orientation orientation) {
- super(title, orientation);
- initialize();
- }
-
- /**
- * The constructor.
- *
- * @param name the title of the properties panel
- * @param orientation the orientation of the panel
- * @param icon the icon shown next to the name
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanelClassifier(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- public PropPanelClassifier(String name, ImageIcon icon,
- Orientation orientation) {
- super(name, icon, orientation);
- initialize();
- }
/**
* Initialize the panel with the common fields and stuff.
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelFeature.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelFeature.java?view=diff&rev=16206&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelFeature.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelFeature.java&r1=16205&r2=16206
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelFeature.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelFeature.java 2008-11-29 14:04:58-0800
@@ -26,10 +26,8 @@
import javax.swing.ImageIcon;
import javax.swing.JPanel;
-import javax.swing.JScrollPane;
import org.argouml.i18n.Translator;
-import org.tigris.swidgets.Orientation;
/**
* Abstract class for the properties panel of a Feature.
@@ -59,35 +57,6 @@
super(name, icon);
}
- /**
- * Constructor.
- *
- * @param name name
- * @param icon icon
- * @param orientation orientation
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanelFeature(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- protected PropPanelFeature(String name, ImageIcon icon,
- Orientation orientation) {
- super(name, icon, orientation);
- }
-
- /**
- * Constructor for PropPanelFeature.
- *
- * @param name the name to be shown at the top of the panel
- * @param orientation the orientation of the panel
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanelFeature(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- protected PropPanelFeature(String name, Orientation orientation) {
- super(name, orientation);
- }
/**
* Returns the ownerScroll.
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java?view=diff&rev=16206&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java&r1=16205&r2=16206
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java 2008-11-29 14:04:58-0800
@@ -25,7 +25,6 @@
package org.argouml.uml.ui.foundation.core;
import java.awt.Component;
-import java.awt.Container;
import java.util.ArrayList;
import java.util.List;
@@ -51,7 +50,6 @@
import org.argouml.uml.ui.UMLPlainTextDocument;
import org.argouml.uml.ui.UMLSearchableComboBox;
import org.argouml.uml.ui.UMLTextField2;
-import org.tigris.swidgets.Orientation;
/**
* The properties panel for a modelelement.
@@ -99,38 +97,6 @@
private static UMLModelElementTargetFlowListModel targetFlowListModel =
new UMLModelElementTargetFlowListModel();
- /**
- * Construct a property panel for a model element with the given name, icon,
- * and orientation.
- *
- * @param name the name of the properties panel
- * @param icon the icon to be shown next to the name
- * @param orientation the orientation
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanelModelElement(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- public PropPanelModelElement(String name, ImageIcon icon,
- Orientation orientation) {
- super(name, icon);
- setOrientation(orientation);
- }
-
- /**
- * Construct a property panel for a model element with the given name and
- * icon.
- *
- * @param name the name of the properties panel
- * @param orientation the orientation
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanelModelElement(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- public PropPanelModelElement(String name, Orientation orientation) {
- super(name, orientation);
- }
/**
* The constructor.
@@ -213,11 +179,11 @@
List actions = super.getActions();
if (Model.getFacade().isAUMLElement(getTarget())
&& Model.getModelManagementHelper().isReadOnly(getTarget())) {
- final List filteredActions = new ArrayList(2);
+ final List<Action> filteredActions = new ArrayList<Action>(2);
for (Object o : actions) {
if (o instanceof Action && !o.getClass().isAnnotationPresent(
UmlModelMutator.class)) {
- filteredActions.add(o);
+ filteredActions.add((Action) o);
}
}
return filteredActions;
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelNamespace.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelNamespace.java?view=diff&rev=16206&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelNamespace.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelNamespace.java&r1=16205&r2=16206
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelNamespace.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelNamespace.java 2008-11-29 14:04:58-0800
@@ -30,7 +30,6 @@
import org.argouml.model.Model;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.ui.ScrollList;
-import org.tigris.swidgets.Orientation;
/**
* The abstract properties panel for a Namespace.
@@ -52,36 +51,6 @@
public PropPanelNamespace(String panelName, ImageIcon icon) {
super(panelName, icon);
}
-
- /**
- * The constructor.
- *
- * @param panelName the name of the 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 #PropPanelNamespace(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- public PropPanelNamespace(String panelName, ImageIcon icon,
- Orientation orientation) {
- super(panelName, icon, orientation);
- }
-
- /**
- * The constructor.
- *
- * @param title the name of the panel to be shown at the top
- * @param orientation the orientation of the panel
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanelNamespace(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- public PropPanelNamespace(String title, Orientation orientation) {
- super(title, orientation);
- }
/**
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelRelationship.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelRelationship.java?view=diff&rev=16206&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelRelationship.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelRelationship.java&r1=16205&r2=16206
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelRelationship.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelRelationship.java 2008-11-29 14:04:58-0800
@@ -26,11 +26,9 @@
import javax.swing.ImageIcon;
-import org.tigris.swidgets.Orientation;
-
/**
* Added this class to give as much information to the user as possible
- * if the lookup mechanisme for proppanels fails.
+ * if the lookup mechanism for proppanels fails.
*
* @since Oct 12, 2002
* @author [email protected]
@@ -48,21 +46,6 @@
super(name, icon);
}
- /**
- * The constructor.
- *
- * @param name The name of the panel to be shown at the top.
- * @param orientation The orientation of the panel.
- * @param icon The icon to be shown next to the name.
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanelRelationship(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- public PropPanelRelationship(String name, ImageIcon icon,
- Orientation orientation) {
- super(name, icon, orientation);
- }
/**
* Constructor for PropPanelRelationship.
@@ -72,20 +55,6 @@
}
/**
- * The constructor.
- *
- * @param name the name of the panel to be shown at the top
- * @param orientation the orientation of the panel
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanelRelationship(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- public PropPanelRelationship(String name, Orientation orientation) {
- super(name, orientation);
- }
-
- /**
* The UID.
*/
private static final long serialVersionUID = -1610200799419501588L;
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelStructuralFeature.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelStructuralFeature.java?view=diff&rev=16206&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelStructuralFeature.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelStructuralFeature.java&r1=16205&r2=16206
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelStructuralFeature.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelStructuralFeature.java 2008-11-29 14:04:58-0800
@@ -32,7 +32,6 @@
import org.argouml.uml.ui.UMLComboBox2;
import org.argouml.uml.ui.UMLMultiplicityPanel;
import org.argouml.uml.ui.UMLRadioButtonPanel;
-import org.tigris.swidgets.Orientation;
/**
* @since Nov 6, 2002
@@ -50,24 +49,10 @@
/**
* Constructor for PropPanelStructuralFeature.
* @param name the name of the panel, to be shown at the top
+ * @param icon the icon for the property panel
*/
protected PropPanelStructuralFeature(String name, ImageIcon icon) {
super(name, icon);
-
- }
-
- /**
- * Constructor for PropPanelStructuralFeature.
- * @param name the name of the panel, to be shown at the top
- * @param orientation the orientation of the panel
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #PropPanelStructuralFeature(String, ImageIcon)} and
- * setOrientation() after instantiation.
- */
- @Deprecated
- protected PropPanelStructuralFeature(String name,
- Orientation orientation) {
- super(name, orientation);
}
/**
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.