Author: tfmorris
Date: 2007-06-18 09:52:46-0700
New Revision: 12875
Modified:
trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelPartition.java
trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationEndRole.java
trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelCollaboration.java
trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelInteraction.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelStimulus.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelGuard.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java
Log:
Use SingleRow list class where appropriate so we can fix this all in one place
Modified: trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelPartition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelPartition.java?view=diff&rev=12875&p1=trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelPartition.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelPartition.java&r1=12874&r2=12875
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelPartition.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelPartition.java 2007-06-18 09:52:46-0700
@@ -38,6 +38,7 @@
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.UMLModelElementListModel2;
import org.argouml.uml.ui.UMLMutableLinkedList;
+import org.argouml.uml.ui.UMLSingleRowLinkedList;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
import org.argouml.util.ConfigLoader;
@@ -65,9 +66,8 @@
addField(Translator.localize("label.name"), getNameTextField());
- JList activityGraphList = new UMLLinkedList(
+ JList activityGraphList = new UMLSingleRowLinkedList(
new UMLPartitionActivityGraphListModel());
- activityGraphList.setVisibleRowCount(1);
activityGraphScroll = new JScrollPane(activityGraphList);
addField(Translator.localize("label.activity-graph"),
getActivityGraphField());
Modified: trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationEndRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationEndRole.java?view=diff&rev=12875&p1=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationEndRole.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationEndRole.java&r1=12874&r2=12875
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationEndRole.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationEndRole.java 2007-06-18 09:52:46-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 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
@@ -28,19 +28,17 @@
import javax.swing.JScrollPane;
import org.argouml.i18n.Translator;
-import org.argouml.uml.ui.UMLLinkedList;
+import org.argouml.uml.ui.UMLSingleRowLinkedList;
import org.argouml.uml.ui.foundation.core.PropPanelAssociationEnd;
import org.argouml.util.ConfigLoader;
/**
- * The properties panel for an associationend.
- *
+ * The property panel for an AssociationEnd.
*/
public class PropPanelAssociationEndRole extends PropPanelAssociationEnd {
/**
* Constructs the proppanel and places all scrollpanes etc. on the canvas.
- * @see java.lang.Object#Object()
*/
public PropPanelAssociationEndRole() {
super("AssociationEndRole", ConfigLoader.getTabPropsOrientation());
@@ -53,15 +51,16 @@
/*
* @see org.argouml.uml.ui.foundation.core.PropPanelAssociationEnd#positionControls()
*/
+ @Override
protected void positionControls() {
JList baseList =
- new UMLLinkedList(new UMLAssociationEndRoleBaseListModel());
- baseList.setVisibleRowCount(1);
+ new UMLSingleRowLinkedList(
+ new UMLAssociationEndRoleBaseListModel());
addField(Translator.localize("label.base"),
new JScrollPane(baseList));
super.positionControls();
}
-} /* end class PropPanelAssociationEndRole */
+}
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=12875&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=12874&r2=12875
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelCollaboration.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelCollaboration.java 2007-06-18 09:52:46-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 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
@@ -31,6 +31,7 @@
import org.argouml.uml.ui.UMLComboBox2;
import org.argouml.uml.ui.UMLComboBoxNavigator;
import org.argouml.uml.ui.UMLLinkedList;
+import org.argouml.uml.ui.UMLSingleRowLinkedList;
import org.argouml.uml.ui.foundation.core.PropPanelNamespace;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
import org.argouml.util.ConfigLoader;
@@ -87,8 +88,8 @@
addSeparator();
UMLLinkedList interactionList =
- new UMLLinkedList(new UMLCollaborationInteractionListModel());
- interactionList.setVisibleRowCount(1);
+ new UMLSingleRowLinkedList(
+ new UMLCollaborationInteractionListModel());
addField(Translator.localize("label.interaction"),
new JScrollPane(interactionList));
Modified: trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelInteraction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelInteraction.java?view=diff&rev=12875&p1=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelInteraction.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelInteraction.java&r1=12874&r2=12875
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelInteraction.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelInteraction.java 2007-06-18 09:52:46-0700
@@ -30,6 +30,7 @@
import org.argouml.i18n.Translator;
import org.argouml.uml.ui.ActionNavigateContext;
import org.argouml.uml.ui.UMLLinkedList;
+import org.argouml.uml.ui.UMLSingleRowLinkedList;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
import org.argouml.util.ConfigLoader;
@@ -58,8 +59,7 @@
getNamespaceSelector());
JList contextList =
- new UMLLinkedList(new UMLInteractionContextListModel());
- contextList.setVisibleRowCount(1);
+ new UMLSingleRowLinkedList(new UMLInteractionContextListModel());
JScrollPane contextScroll = new JScrollPane(contextList);
addField(Translator.localize("label.context"),
contextScroll);
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java?view=diff&rev=12875&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java&r1=12874&r2=12875
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java 2007-06-18 09:52:46-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 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
@@ -28,7 +28,7 @@
import javax.swing.JList;
import javax.swing.JScrollPane;
-import org.argouml.uml.ui.UMLLinkedList;
+import org.argouml.uml.ui.UMLSingleRowLinkedList;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
import org.tigris.swidgets.Orientation;
@@ -66,8 +66,8 @@
*/
protected JScrollPane getStimuliSenderScroll() {
if (stimuliSenderScroll == null) {
- JList stimuliSenderList = new UMLLinkedList(stimuliSenderListModel);
- stimuliSenderList.setVisibleRowCount(1);
+ JList stimuliSenderList = new UMLSingleRowLinkedList(
+ stimuliSenderListModel);
stimuliSenderScroll = new JScrollPane(stimuliSenderList);
}
return stimuliSenderScroll;
@@ -78,11 +78,10 @@
*/
protected JScrollPane getStimuliReceiverScroll() {
if (stimuliReceiverScroll == null) {
- JList stimuliReceiverList = new UMLLinkedList(
+ JList stimuliReceiverList = new UMLSingleRowLinkedList(
stimuliReceiverListModel);
- stimuliReceiverList.setVisibleRowCount(1);
stimuliReceiverScroll = new JScrollPane(stimuliReceiverList);
}
return stimuliReceiverScroll;
}
-} /* end class PropPanelInstance */
+}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelStimulus.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelStimulus.java?view=diff&rev=12875&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelStimulus.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelStimulus.java&r1=12874&r2=12875
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelStimulus.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelStimulus.java 2007-06-18 09:52:46-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 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
@@ -30,7 +30,7 @@
import org.argouml.i18n.Translator;
import org.argouml.model.Model;
import org.argouml.uml.ui.ActionNavigateNamespace;
-import org.argouml.uml.ui.UMLLinkedList;
+import org.argouml.uml.ui.UMLSingleRowLinkedList;
import org.argouml.uml.ui.UMLStimulusActionTextField;
import org.argouml.uml.ui.UMLStimulusActionTextProperty;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
@@ -62,14 +62,13 @@
new UMLStimulusActionTextField(this,
new UMLStimulusActionTextProperty("name")));
- JList senderList = new UMLLinkedList(new UMLStimulusSenderListModel());
- senderList.setVisibleRowCount(1);
+ JList senderList =
+ new UMLSingleRowLinkedList(new UMLStimulusSenderListModel());
JScrollPane senderScroll = new JScrollPane(senderList);
addField(Translator.localize("label.sender"), senderScroll);
JList receiverList =
- new UMLLinkedList(new UMLStimulusReceiverListModel());
- receiverList.setVisibleRowCount(1);
+ new UMLSingleRowLinkedList(new UMLStimulusReceiverListModel());
JScrollPane receiverScroll = new JScrollPane(receiverList);
addField(Translator.localize("label.receiver"),
receiverScroll);
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelGuard.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelGuard.java?view=diff&rev=12875&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelGuard.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelGuard.java&r1=12874&r2=12875
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelGuard.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelGuard.java 2007-06-18 09:52:46-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 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
@@ -36,7 +36,7 @@
import org.argouml.uml.ui.UMLExpressionExpressionModel;
import org.argouml.uml.ui.UMLExpressionLanguageField;
import org.argouml.uml.ui.UMLExpressionModel2;
-import org.argouml.uml.ui.UMLLinkedList;
+import org.argouml.uml.ui.UMLSingleRowLinkedList;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
import org.argouml.util.ConfigLoader;
@@ -63,9 +63,8 @@
addField(Translator.localize("label.name"), getNameTextField());
- JList transitionList = new UMLLinkedList(
+ JList transitionList = new UMLSingleRowLinkedList(
new UMLGuardTransitionListModel());
- transitionList.setVisibleRowCount(1);
addField(Translator.localize("label.transition"), new JScrollPane(
transitionList));
@@ -87,4 +86,4 @@
addAction(getDeleteAction());
}
-} /* end class PropPanelGuard */
+}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java?view=diff&rev=12875&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java&r1=12874&r2=12875
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java 2007-06-18 09:52:46-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 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
@@ -30,6 +30,7 @@
import org.argouml.uml.ui.ActionNavigateContainerElement;
import org.argouml.uml.ui.UMLLinkedList;
+import org.argouml.uml.ui.UMLSingleRowLinkedList;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
import org.tigris.swidgets.Orientation;
@@ -64,9 +65,8 @@
new UMLStateVertexOutgoingListModel());
outgoingScroll = new JScrollPane(outgoingList);
- JList compositeList = new UMLLinkedList(
+ JList compositeList = new UMLSingleRowLinkedList(
new UMLStateVertexContainerListModel());
- compositeList.setVisibleRowCount(1);
containerScroll = new JScrollPane(compositeList);
addAction(new ActionNavigateContainerElement());
@@ -99,5 +99,5 @@
return containerScroll;
}
-} /* end class PropPanelStateVertex */
+}
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.