svn commit: r16261 - trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core

Author: tfmorris
Date: 2008-12-06 11:37:46-0800
New Revision: 16261

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelClass.java
   trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java

Log:
Issue 4683: Add placeholders for list of template parameters 

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelClass.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelClass.java?view=diff&pathrev=16261&r1=16260&r2=16261
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelClass.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelClass.java	2008-12-06 11:37:46-0800
@@ -50,27 +50,18 @@
         add(getVisibilityPanel());
 
         addSeparator();
-
-        addField("label.client-dependencies",
-                getClientDependencyScroll());
-        addField("label.supplier-dependencies",
-                getSupplierDependencyScroll());
-        addField("label.generalizations",
-                getGeneralizationScroll());
-        addField("label.specializations",
-                getSpecializationScroll());
+        addField("label.client-dependencies", getClientDependencyScroll());
+        addField("label.supplier-dependencies", getSupplierDependencyScroll());
+        addField("label.generalizations", getGeneralizationScroll());
+        addField("label.specializations", getSpecializationScroll());
 
         addSeparator();
-
-        addField("label.attributes",
-                getAttributeScroll());
-        addField("label.association-ends",
-                getAssociationEndScroll());
-        addField("label.operations",
-                getOperationScroll());
-        addField("label.owned-elements",
-                getOwnedElementsScroll());
-
+        addField("label.attributes", getAttributeScroll());
+        addField("label.association-ends", getAssociationEndScroll());
+        addField("label.operations", getOperationScroll());
+        addField("label.owned-elements", getOwnedElementsScroll());
+//        addField("label.template-parameters", getTemplateParameterScroll());
+        
         addAction(new ActionNavigateNamespace());
         addAction(new ActionAddAttribute());
         addAction(new ActionAddOperation());
@@ -78,7 +69,9 @@
         addAction(new ActionNewInnerClass());
         addAction(new ActionNewClass());
         addAction(new ActionNewStereotype());
+//        addAction(new ActionAddTemplateParameter());
         addAction(getDeleteAction());
+        
     }
 
 }

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&pathrev=16261&r1=16260&r2=16261
==============================================================================
--- 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-12-06 11:37:46-0800
@@ -73,7 +73,7 @@
     private JScrollPane elementResidenceScroll;
 
     private JTextField nameTextField;
-
+    
     private UMLModelElementNamespaceComboBoxModel namespaceComboBoxModel =
 	new UMLModelElementNamespaceComboBoxModel();
 
@@ -97,6 +97,16 @@
     private static UMLModelElementTargetFlowListModel targetFlowListModel =
 	new UMLModelElementTargetFlowListModel();
 
+//    private JScrollPane templateParameterScroll;
+//    
+//    private UMLModelElementTemplateParameterListModel templateParameterListModel
+//        = new UMLModelElementTemplateParameterListModel();
+//    
+//    private UMLModelElementTemplateBindingComboBoxModel 
+//    templateBindingComboBoxModel;
+//
+//    private JComboBox templateBindingSelector;
+
 
     /**
      * The constructor.
@@ -329,4 +339,42 @@
         return nameDocument;
     }
 
+    /**
+     * @return a scrollpane for template parameters
+     */
+//    protected JComponent getTemplateParameterScroll() {
+//        if (templateParameterScroll == null) {
+//
+//            templateParameterScroll = new ScrollList(
+//                    templateParameterListModel, false, false);
+//
+//            // TODO: Use some kind of list to allow user to select type for
+//            // new parameters to be added
+////            JList list = new UMLMutableLinkedList(
+////                    templateParameterListModel,
+////                    new ActionAddClientDependencyAction(),
+////                    null,
+////                    null,
+////                    true);
+////            templateParameterScroll = new JScrollPane(list);
+//        }
+//        return templateParameterScroll;
+//    }
+    
+    /**
+     * Returns the template selector. This is a component which allows the
+     * user to select a single item as the template to be used.
+     *
+     * @return a component for selecting the template binding
+     */
+//    protected JComponent getTemplateBindingSelector() {
+//        if (templateBindingSelector == null) {
+//            templateBindingSelector = new UMLSearchableComboBox(
+//                    templateBindingComboBoxModel,
+//                    new ActionSetModelElementTemplateBinding(), true);
+//        }
+//        return new UMLComboBoxNavigator(
+//                Translator.localize("label.namespace.navigate.tooltip"),
+//                templateBindingSelector);
+//    }
 }

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=980574

To unsubscribe from this discussion, e-mail: [[email protected]].