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

Author: bobtarling
Date: 2008-08-03 16:56:37-0700
New Revision: 15504

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

Log:
Issues 5264 5271: use setTarget to enable/disable

targetSet isn't always called.

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&rev=15504&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java&r1=15503&r2=15504
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/PropPanel.java	2008-08-03 16:56:37-0700
@@ -135,6 +135,7 @@
     @Deprecated
     public PropPanel(String label, ImageIcon icon, Orientation orientation) {
         super(Translator.localize(label));
+        
         setOrientation(orientation);
         
         LabelledLayout layout =
@@ -405,6 +406,7 @@
             dispatch = new UMLChangeDispatch(this,
                     UMLChangeDispatch.TARGET_CHANGED_ADD);
 
+            buildToolbar();
         } else {
             dispatch = new UMLChangeDispatch(this,
                     UMLChangeDispatch.TARGET_REASSERTED);
@@ -606,7 +608,6 @@
         if (isVisible()) {
             fireTargetSet(e);
         }
-        buildToolbar();
     }
 
     private void fireTargetSet(TargetEvent targetEvent) {

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=15504&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=15503&r2=15504
==============================================================================
--- 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-08-03 16:56:37-0700
@@ -181,10 +181,10 @@
     /*
      * @see TargetListener#targetSet(TargetEvent)
      */
-    public void targetSet(TargetEvent e) {
-        super.targetSet(e);
+    public void setTarget(Object target) {
+        super.setTarget(target);
         boolean enable =
-            !Model.getModelManagementHelper().isReadOnly(e.getNewTarget());
+            !Model.getModelManagementHelper().isReadOnly(target);
         for (final Component component : getComponents()) {
             if (!(component instanceof JLabel)) {
                 component.setEnabled(enable);