Author: mvw
Date: 2007-08-03 12:38:41-0700
New Revision: 13223
Modified:
trunk/src_new/org/argouml/uml/ui/UMLComboBoxNavigator.java
trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelClassifierInState.java
trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelObjectFlowState.java
trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationRole.java
trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelCollaboration.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelCallAction.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelLink.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelCallEvent.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateMachine.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStubState.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelMethod.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java
trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTagDefinition.java
trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTaggedValue.java
Log:
Deprecated and replaced the UMLComboBoxNavigator constructor.
Modified: trunk/src_new/org/argouml/uml/ui/UMLComboBoxNavigator.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/UMLComboBoxNavigator.java?view=diff&rev=13223&p1=trunk/src_new/org/argouml/uml/ui/UMLComboBoxNavigator.java&p2=trunk/src_new/org/argouml/uml/ui/UMLComboBoxNavigator.java&r1=13222&r2=13223
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/UMLComboBoxNavigator.java (original)
+++ trunk/src_new/org/argouml/uml/ui/UMLComboBoxNavigator.java 2007-08-03 12:38:41-0700
@@ -51,8 +51,6 @@
private static ImageIcon icon = ResourceLoaderWrapper
.lookupIconResource("ComboNav");
- // TODO: Get rid of this and adjust/deprecate
- // constructor
private UMLUserInterfaceContainer theContainer;
private JComboBox theComboBox;
@@ -60,7 +58,9 @@
private JButton theButton;
/**
- * Constructor
+ * Constructor.
+ *
+ * @deprecated by MVW in 0.25.3. Use other constructor instead.
*
* @param container
* Container, typically a PropPanel
@@ -71,9 +71,21 @@
*/
public UMLComboBoxNavigator(UMLUserInterfaceContainer container,
String tooltip, JComboBox box) {
+ this(tooltip, box);
+ theContainer = container;
+ }
+
+ /**
+ * Constructor
+ *
+ * @param tooltip
+ * Tooltip key for button
+ * @param box
+ * Associated combo box
+ */
+ public UMLComboBoxNavigator(String tooltip, JComboBox box) {
super(new BorderLayout());
theButton = new JButton(icon);
- theContainer = container;
theComboBox = box;
theButton.setPreferredSize(new Dimension(icon.getIconWidth() + 6, icon
.getIconHeight() + 6));
@@ -86,7 +98,7 @@
Object item = theComboBox.getSelectedItem();
setButtonEnabled(item);
}
-
+
/**
* Enforce that the preferred height is the minimum height.
* This works around a bug in Windows LAF of JRE5 where a change
Modified: trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelClassifierInState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelClassifierInState.java?view=diff&rev=13223&p1=trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelClassifierInState.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelClassifierInState.java&r1=13222&r2=13223
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelClassifierInState.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelClassifierInState.java 2007-08-03 12:38:41-0700
@@ -86,7 +86,6 @@
addField(Translator.localize("label.type"),
new UMLComboBoxNavigator(
- this,
Translator.localize("label.class.navigate.tooltip"),
getClassifierInStateTypeSelector()));
Modified: trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelObjectFlowState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelObjectFlowState.java?view=diff&rev=13223&p1=trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelObjectFlowState.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelObjectFlowState.java&r1=13222&r2=13223
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelObjectFlowState.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelObjectFlowState.java 2007-08-03 12:38:41-0700
@@ -84,7 +84,6 @@
// field for Type (Classifier)
addField(Translator.localize("label.type"),
new UMLComboBoxNavigator(
- this,
Translator.localize("label.classifierinstate.navigate.tooltip"),
getClassifierComboBox()));
Modified: trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationRole.java?view=diff&rev=13223&p1=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationRole.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationRole.java&r1=13222&r2=13223
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationRole.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationRole.java 2007-08-03 12:38:41-0700
@@ -64,7 +64,6 @@
new ActionSetAssociationRoleBase());
addField(Translator.localize("label.base"),
new UMLComboBoxNavigator(
- this,
Translator.localize("label.association.navigate.tooltip"),
baseComboBox));
Modified: trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelCollaboration.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelCollaboration.java?view=diff&rev=13223&p1=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelCollaboration.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelCollaboration.java&r1=13222&r2=13223
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelCollaboration.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelCollaboration.java 2007-08-03 12:38:41-0700
@@ -65,7 +65,6 @@
new ActionSetRepresentedClassifierCollaboration());
addField(Translator.localize("label.represented-classifier"),
new UMLComboBoxNavigator(
- this,
Translator.localize(
"label.represented-classifier."
+ "navigate.tooltip"),
@@ -78,7 +77,6 @@
new ActionSetRepresentedOperationCollaboration());
addField(Translator.localize("label.represented-operation"),
new UMLComboBoxNavigator(
- this,
Translator.localize(
"label.represented-operation."
+ "navigate.tooltip"),
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelCallAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelCallAction.java?view=diff&rev=13223&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelCallAction.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelCallAction.java&r1=13222&r2=13223
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelCallAction.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelCallAction.java 2007-08-03 12:38:41-0700
@@ -64,7 +64,6 @@
new UMLCallActionOperationComboBoxModel());
addFieldBefore(Translator.localize("label.operation"),
new UMLComboBoxNavigator(
- this,
Translator.localize("label.operation.navigate.tooltip"),
operationComboBox),
argumentsScroll);
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelLink.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelLink.java?view=diff&rev=13223&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelLink.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelLink.java&r1=13222&r2=13223
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelLink.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelLink.java 2007-08-03 12:38:41-0700
@@ -100,7 +100,6 @@
new ActionSetLinkAssociation(), true);
}
return new UMLComboBoxNavigator(
- this,
Translator.localize("label.association.navigate.tooltip"),
associationSelector);
}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelCallEvent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelCallEvent.java?view=diff&rev=13223&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelCallEvent.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelCallEvent.java&r1=13222&r2=13223
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelCallEvent.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelCallEvent.java 2007-08-03 12:38:41-0700
@@ -66,7 +66,6 @@
new UMLCallEventOperationComboBoxModel());
addField(Translator.localize("label.operations"),
new UMLComboBoxNavigator(
- this,
Translator.localize("label.operation.navigate.tooltip"),
operationComboBox));
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateMachine.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateMachine.java?view=diff&rev=13223&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateMachine.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateMachine.java&r1=13222&r2=13223
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateMachine.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateMachine.java 2007-08-03 12:38:41-0700
@@ -86,7 +86,6 @@
ActionSetContextStateMachine.getInstance());
addField(Translator.localize("label.context"),
new UMLComboBoxNavigator(
- this,
Translator.localize("label.context.navigate.tooltip"),
contextComboBox));
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStubState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStubState.java?view=diff&rev=13223&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStubState.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStubState.java&r1=13222&r2=13223
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStubState.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStubState.java 2007-08-03 12:38:41-0700
@@ -61,7 +61,6 @@
ActionSetStubStateReferenceState.getInstance());
addField(Translator.localize("label.referencestate"),
new UMLComboBoxNavigator(
- this,
Translator.localize("tooltip.nav-stubstate"),
referencestateBox));
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java?view=diff&rev=13223&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java&r1=13222&r2=13223
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java 2007-08-03 12:38:41-0700
@@ -81,7 +81,7 @@
new UMLSubmachineStateComboBoxModel(),
ActionSetSubmachineStateSubmachine.getInstance());
addField(Translator.localize("label.submachine"),
- new UMLComboBoxNavigator(this, Translator.localize(
+ new UMLComboBoxNavigator(Translator.localize(
"tooltip.nav-submachine"), submachineBox));
addField(Translator.localize("label.entry"),
getEntryScroll());
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java?view=diff&rev=13223&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java&r1=13222&r2=13223
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java 2007-08-03 12:38:41-0700
@@ -84,7 +84,6 @@
addField(Translator.localize("label.type"),
new UMLComboBoxNavigator(
- this,
Translator.localize("label.class.navigate.tooltip"),
getTypeComboBox()));
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelMethod.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelMethod.java?view=diff&rev=13223&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelMethod.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelMethod.java&r1=13222&r2=13223
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelMethod.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelMethod.java 2007-08-03 12:38:41-0700
@@ -77,7 +77,6 @@
/* The specification field shows the Operation: */
addField(Translator.localize("label.specification"),
new UMLComboBoxNavigator(
- this,
Translator
.localize("label.specification.navigate.tooltip"),
getSpecificationComboBox()));
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java?view=diff&rev=13223&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java&r1=13222&r2=13223
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java 2007-08-03 12:38:41-0700
@@ -192,7 +192,6 @@
new ActionSetModelElementNamespace(), true);
}
return new UMLComboBoxNavigator(
- this,
Translator.localize("label.namespace.navigate.tooltip"),
namespaceSelector);
}
Modified: trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTagDefinition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTagDefinition.java?view=diff&rev=13223&p1=trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTagDefinition.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTagDefinition.java&r1=13222&r2=13223
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTagDefinition.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTagDefinition.java 2007-08-03 12:38:41-0700
@@ -106,7 +106,7 @@
addSeparator();
- UMLComboBoxNavigator typeComboBoxNav = new UMLComboBoxNavigator(this,
+ UMLComboBoxNavigator typeComboBoxNav = new UMLComboBoxNavigator(
Translator.localize("label.class.navigate.tooltip"),
getTypeComboBox());
typeComboBoxNav.setEnabled(false);
@@ -142,7 +142,7 @@
protected JComponent getOwnerSelector() {
if (ownerSelector == null) {
ownerSelector = new Box(BoxLayout.X_AXIS);
- ownerSelector.add(new UMLComboBoxNavigator(this,
+ ownerSelector.add(new UMLComboBoxNavigator(
Translator.localize("label.owner.navigate.tooltip"),
new UMLComboBox2(ownerComboBoxModel,
new ActionSetTagDefinitionOwner())
Modified: trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTaggedValue.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTaggedValue.java?view=diff&rev=13223&p1=trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTaggedValue.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTaggedValue.java&r1=13222&r2=13223
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTaggedValue.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTaggedValue.java 2007-08-03 12:38:41-0700
@@ -115,7 +115,7 @@
protected JComponent getModelElementSelector() {
if (modelElementSelector == null) {
modelElementSelector = new Box(BoxLayout.X_AXIS);
- modelElementSelector.add(new UMLComboBoxNavigator(this,
+ modelElementSelector.add(new UMLComboBoxNavigator(
Translator.localize("label.modelelement.navigate.tooltip"),
new UMLComboBox2(
new UMLTaggedValueModelElementComboBoxModel(),
@@ -135,7 +135,7 @@
protected JComponent getTypeSelector() {
if (typeSelector == null) {
typeSelector = new Box(BoxLayout.X_AXIS);
- typeSelector.add(new UMLComboBoxNavigator(this,
+ typeSelector.add(new UMLComboBoxNavigator(
Translator.localize("label.type.navigate.tooltip"),
new UMLComboBox2(
new UMLTaggedValueTypeComboBoxModel(),
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.