Author: bobtarling
Date: 2011-02-13 10:17:19-0800
New Revision: 19036
Added:
trunk/src/argouml-app/src/org/argouml/uml/ui/UMLStereotypeList.java
- copied, changed from r19035,
/trunk/src/argouml-app/src/org/argouml/uml/ui/UMLLinkedList.java
trunk/src/argouml-app/src/org/argouml/uml/ui/UMLStereotypeList2.java
- copied, changed from r19035,
/trunk/src/argouml-app/src/org/argouml/uml/ui/UMLList2.java
Removed:
trunk/src/argouml-app/src/org/argouml/uml/ui/UMLLinkedList.java
trunk/src/argouml-app/src/org/argouml/uml/ui/UMLList2.java
Modified:
trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java
trunk/src/argouml-app/src/org/argouml/uml/ui/TabStereotype.java
Log:
Rename old classes to indicate what they are still currently used for
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=19036&r1=19035&r2=19036
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java 2011-02-13
10:17:19-0800
@@ -267,9 +267,9 @@
component.setFont(stdFont);
add(jlabel);
add(component);
- if (component instanceof UMLLinkedList) {
+ if (component instanceof UMLStereotypeList) {
UMLModelElementListModel2 list =
- (UMLModelElementListModel2) ((UMLLinkedList)
component).getModel();
+ (UMLModelElementListModel2) ((UMLStereotypeList)
component).getModel();
ActionCreateContainedModelElement newAction =
new ActionCreateContainedModelElement(
list.getMetaType(),
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/TabStereotype.java
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/TabStereotype.java?view=diff&pathrev=19036&r1=19035&r2=19036
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/TabStereotype.java
(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/TabStereotype.java
2011-02-13 10:17:19-0800
@@ -124,7 +124,7 @@
private JPanel makePanel() {
// make lists
selectedListModel = new UMLModelElementStereotypeListModel();
- selectedList = new UMLLinkedList(selectedListModel);
+ selectedList = new UMLStereotypeList(selectedListModel);
selectedScroll = new JScrollPane(selectedList);
selectedScroll.setBorder(BorderFactory.createEmptyBorder(
INSET_PX, INSET_PX, INSET_PX, INSET_PX));
@@ -132,7 +132,7 @@
Translator.localize("label.applied-stereotypes")));
availableListModel = new UMLModelStereotypeListModel();
- availableList = new UMLLinkedList(availableListModel);
+ availableList = new UMLStereotypeList(availableListModel);
availableScroll = new JScrollPane(availableList);
availableScroll.setBorder(BorderFactory.createEmptyBorder(
INSET_PX, INSET_PX, INSET_PX, INSET_PX));
Removed: trunk/src/argouml-app/src/org/argouml/uml/ui/UMLLinkedList.java
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/UMLLinkedList.java?view=markup&pathrev=19035
Removed: trunk/src/argouml-app/src/org/argouml/uml/ui/UMLList2.java
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/UMLList2.java?view=markup&pathrev=19035
Copied: trunk/src/argouml-app/src/org/argouml/uml/ui/UMLStereotypeList.java
(from r19035, /trunk/src/argouml-app/src/org/argouml/uml/ui/UMLLinkedList.java)
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/UMLStereotypeList.java?view=diff&pathrev=19036&r1=19035&r2=19036
==============================================================================
--- /trunk/src/argouml-app/src/org/argouml/uml/ui/UMLLinkedList.java
(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/UMLStereotypeList.java
2011-02-13 10:17:19-0800
@@ -56,7 +56,7 @@
* @since Oct 2, 2002
* @author [email protected]
*/
-class UMLLinkedList extends UMLList2 {
+class UMLStereotypeList extends UMLStereotypeList2 {
/**
@@ -66,7 +66,7 @@
* @param showIcon true if an icon should be shown
* @param showPath true if containment path should be shown
*/
- public UMLLinkedList(ListModel dataModel,
+ public UMLStereotypeList(ListModel dataModel,
boolean showIcon, boolean showPath) {
super(dataModel, new UMLLinkedListCellRenderer(showIcon, showPath));
setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -82,7 +82,7 @@
*
* @param dataModel the data model
*/
- public UMLLinkedList(ListModel dataModel) {
+ public UMLStereotypeList(ListModel dataModel) {
this(dataModel, true);
}
@@ -92,7 +92,7 @@
* @param dataModel the data model
* @param showIcon true if an icon should be shown
*/
- public UMLLinkedList(ListModel dataModel,
+ public UMLStereotypeList(ListModel dataModel,
boolean showIcon) {
this(dataModel, showIcon, true);
}
Copied: trunk/src/argouml-app/src/org/argouml/uml/ui/UMLStereotypeList2.java
(from r19035, /trunk/src/argouml-app/src/org/argouml/uml/ui/UMLList2.java)
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/UMLStereotypeList2.java?view=diff&pathrev=19036&r1=19035&r2=19036
==============================================================================
--- /trunk/src/argouml-app/src/org/argouml/uml/ui/UMLList2.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/UMLStereotypeList2.java
2011-02-13 10:17:19-0800
@@ -66,18 +66,18 @@
* @since Oct 2, 2002
* @author [email protected]
*/
-abstract class UMLList2
+abstract class UMLStereotypeList2
extends JList
implements TargettableModelView, MouseListener {
- private static final Logger LOG = Logger.getLogger(UMLList2.class);
+ private static final Logger LOG =
Logger.getLogger(UMLStereotypeList2.class);
/**
* Constructor for UMLList2. Used by subclasses that want to add their own
* renderer to the list.
* @param dataModel the data model
* @param renderer the renderer
*/
- protected UMLList2(ListModel dataModel, ListCellRenderer renderer) {
+ protected UMLStereotypeList2(ListModel dataModel, ListCellRenderer
renderer) {
super(dataModel);
setDoubleBuffered(true);
if (renderer != null) {
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2703710
To unsubscribe from this discussion, e-mail:
[[email protected]].
