Index: openide/src/org/openide/explorer/propertysheet/PropertyPanel.java
===================================================================
RCS file: /cvs/openide/src/org/openide/explorer/propertysheet/PropertyPanel.java,v
retrieving revision 1.100
diff -u -r1.100 PropertyPanel.java
--- openide/src/org/openide/explorer/propertysheet/PropertyPanel.java	13 Feb 2002 18:38:33 -0000	1.100
+++ openide/src/org/openide/explorer/propertysheet/PropertyPanel.java	5 Mar 2002 14:29:30 -0000
@@ -823,7 +823,7 @@
             ErrorManager.getDefault().annotate( e,
                     getString("PS_ExcIn") +
                     " " + editor.getClass ().getName () + // NOI18N
-                    " " + getString ("PS_Editor") + "."
+                    " " + getString ("PS_Editor") + "." // NOI18N
             );
             c = getTextView(getExceptionString(e));
         }
@@ -1112,7 +1112,7 @@
             return getString("CTL_NoPropertyEditor");
         }
         if (clazz.isArray()) {
-            return "[" + getString ("PS_ArrayOf") +" " +
+            return "[" + getString ("PS_ArrayOf") +" " + // NOI18N
                    getTypeString(clazz.getComponentType()) + "]"; // NOI18N
         }
         return "[" + clazz.getName() + "]"; // NOI18N
@@ -1145,7 +1145,7 @@
         }
 
         if (existsCustomEditor) {
-            panel.add(getCustomizeButton(), BorderLayout.EAST); // NOI18N
+            panel.add(getCustomizeButton(), BorderLayout.EAST);
         }
         
         panel.setToolTipText(getPanelToolTipText());
@@ -1189,22 +1189,33 @@
      * <code>setAsText</code> or <code>setValue</code> call 
      * on <code>editor</code>. Helper method. */
     private void notifyExceptionWhileSettingProperty(Exception iae) {
+        if (getPreferences () == 0){
+            PropertyPanel.notifyUser (iae, descriptor.getDisplayName ());
+        } else {
+            ErrorManager.getDefault ().notify (ErrorManager.INFORMATIONAL, iae);
+        }
+    }
+
+    /** Processes <code>Exception</code> thrown from 
+     * <code>setAsText</code> or <code>setValue</code> call 
+     * on <code>editor</code>. Helper method. */
+    static void notifyUser(Exception iae, String propertyName) {
         
-        String userMessage = extractLocalizedMessage(iae);
+        String userMessage = extractLocalizedMessage (iae);
         
         if ((userMessage == null) && (iae instanceof InvocationTargetException)) {
             userMessage = extractLocalizedMessage(
                 ((InvocationTargetException)iae).getTargetException());
         }
-        ErrorManager em = ErrorManager.getDefault();
-        if ((userMessage != null) && (getPreferences() == 0)){
-            em.annotate(iae, NbBundle.getMessage(PropertyPanel.class,
+        ErrorManager em = ErrorManager.getDefault ();
+        if ((userMessage != null)){
+            em.annotate (iae, NbBundle.getMessage(PropertyPanel.class,
 		    "FMT_ErrorSettingProperty", userMessage,
-		    descriptor.getDisplayName()
+		    propertyName
             ));
-            em.notify(ErrorManager.USER, iae);
+            em.notify (ErrorManager.USER, iae);
         } else {
-            em.notify(ErrorManager.INFORMATIONAL, iae);
+            em.notify (ErrorManager.INFORMATIONAL, iae);
         }
     }
 
@@ -1988,11 +1999,11 @@
                 int j = 0;
                 if (model instanceof ExPropertyModel) {
                     Object[] beans = ((ExPropertyModel)model).getBeans();
-                    String delimiter = getString("ACSD_BeanListDelimiter");
+                    String delimiter = getString("ACSD_BeanListDelimiter"); // NOI18N
                     for (int i = 0; i < beans.length; i++) {
                         if (beans[i] instanceof Node) {
                             Node n = ((Node)beans[i]);
-                            beansList = ((beansList == null) ? "" : beansList + delimiter) + n.getDisplayName();
+                            beansList = ((beansList == null) ? "" : beansList + delimiter) + n.getDisplayName(); // NOI18N
                             j++;
                         }
                     }
Index: openide/src/org/openide/explorer/propertysheet/PropertyDialogManager.java
===================================================================
RCS file: /cvs/openide/src/org/openide/explorer/propertysheet/PropertyDialogManager.java,v
retrieving revision 1.52
diff -u -r1.52 PropertyDialogManager.java
--- openide/src/org/openide/explorer/propertysheet/PropertyDialogManager.java	22 Feb 2002 13:28:43 -0000	1.52
+++ openide/src/org/openide/explorer/propertysheet/PropertyDialogManager.java	5 Mar 2002 14:29:37 -0000
@@ -275,26 +275,18 @@
                                 component).getPropertyValue();
                             model.setValue(newValue);
                         } catch (java.lang.reflect.InvocationTargetException ite) {
-                            if (ite.getTargetException() != null) {
-                                PropertyDialogManager.notify(ite.getTargetException());
-                            } else {
-                                PropertyDialogManager.notify(ite);
-                            }
+                            PropertyPanel.notifyUser (ite, prop==null?"":prop.getDisplayName ()); // NOI18N
                         } catch (IllegalStateException ise) {
-                            notifyUser(ise);
+                            notifyUser (ise);
                         }
                     }
                     else if ((env!=null)&&(!env.isChangeImmediate())) {
                         try {
                             model.setValue(lastValueFromEditor);
                         } catch (java.lang.reflect.InvocationTargetException ite) {
-                            if (ite.getTargetException() != null) {
-                                PropertyDialogManager.notify(ite.getTargetException());
-                            } else {
-                                PropertyDialogManager.notify(ite);
-                            }
+                            PropertyPanel.notifyUser (ite, prop==null?"":prop.getDisplayName ()); // NOI18N
                         } catch (IllegalStateException ise) {
-                            notifyUser(ise);
+                            notifyUser (ise);
                         }
                     }
                 }
@@ -382,9 +374,9 @@
                 try {
                     prop.restoreDefaultValue();
                 } catch (IllegalAccessException iae) {
-                    notify(iae);
+                    PropertyPanel.notifyUser (iae, prop.getDisplayName ());
                 } catch (java.lang.reflect.InvocationTargetException ite) {
-                    notify(ite);
+                    PropertyPanel.notifyUser (ite, prop.getDisplayName ());
                 }
             }
         }
@@ -402,14 +394,10 @@
                         component).getPropertyValue();
                     model.setValue(newValue);
                 } catch (java.lang.reflect.InvocationTargetException ite) {
-                    if (ite.getTargetException() != null) {
-                        notify(ite.getTargetException());
-                    } else {
-                        notify(ite);
-                    }
+                    PropertyPanel.notifyUser (ite, prop==null?"":prop.getDisplayName ()); // NOI18N
                     return;
                 } catch (IllegalStateException ise) {
-                    notifyUser(ise);
+                    notifyUser (ise);
                     return;
                 }
             }
@@ -417,14 +405,10 @@
                 try {
                     model.setValue(lastValueFromEditor);
                 } catch (java.lang.reflect.InvocationTargetException ite) {
-                    if (ite.getTargetException() != null) {
-                        notify(ite.getTargetException());
-                    } else {
-                        notify(ite);
-                    }
+                    PropertyPanel.notifyUser (ite, prop==null?"":prop.getDisplayName ()); // NOI18N
                     return;
                 } catch (IllegalStateException ise) {
-                    notifyUser(ise);
+                    notifyUser (ise);
                     return;
                 }
             }