JFileChooser set to allow itself to be the property listener

BobHanson · BobHanson · commit 3b77bf86b9d8 · 2018-06-26T18:44:38.000+01:00
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/ClientPropertyKey.java b/sources/net.sf.j2s.java.core/src/javax/swing/ClientPropertyKey.java
@@ -1,7 +1,4 @@
 /*
- * Some portions of this file have been modified by Robert Hanson hansonr.at.stolaf.edu 2012-2017
- * for use in SwingJS via transpilation into JavaScript using Java2Script.
- *
  * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -28,7 +25,7 @@
 
 package javax.swing;
 
-//import sun.awt.AWTAccessor;
+import sun.awt.AWTAccessor;
 
 /**
  * An enumeration for keys used as client properties within the Swing
@@ -84,22 +81,22 @@ enum ClientPropertyKey {
     PopupFactory_FORCE_HEAVYWEIGHT_POPUP(true);
 
 
-//    /**
-//     * Whether or not a {@code NotSerializableException} should be thrown
-//     * during serialization, when the value associated with this key does
-//     * not implement {@code Serializable}.
-//     */
-//    private final boolean reportValueNotSerializable;
-//
+    /**
+     * Whether or not a {@code NotSerializableException} should be thrown
+     * during serialization, when the value associated with this key does
+     * not implement {@code Serializable}.
+     */
+    private final boolean reportValueNotSerializable;
+
 //    static {
 //        AWTAccessor.setClientPropertyKeyAccessor(
 //            new AWTAccessor.ClientPropertyKeyAccessor() {
-//                public Object getJComponent_TRANSFER_HANDLER() {
-//                    return JComponent_TRANSFER_HANDLER;
-//                }
+                public Object getJComponent_TRANSFER_HANDLER() {
+                    return JComponent_TRANSFER_HANDLER;
+                }
 //            });
 //    }
-//
+
     /**
      * Constructs a key with the {@code reportValueNotSerializable} property
      * set to {@code false}.
@@ -113,15 +110,15 @@ private ClientPropertyKey() {
      * set to the given value.
      */
     private ClientPropertyKey(boolean reportValueNotSerializable) {
-//        this.reportValueNotSerializable = reportValueNotSerializable;
+        this.reportValueNotSerializable = reportValueNotSerializable;
     }
 
-//    /**
-//     * Returns whether or not a {@code NotSerializableException} should be thrown
-//     * during serialization, when the value associated with this key does
-//     * not implement {@code Serializable}.
-//     */
-//    public boolean getReportValueNotSerializable() {
-//        return reportValueNotSerializable;
-//    }
+    /**
+     * Returns whether or not a {@code NotSerializableException} should be thrown
+     * during serialization, when the value associated with this key does
+     * not implement {@code Serializable}.
+     */
+    public boolean getReportValueNotSerializable() {
+        return reportValueNotSerializable;
+    }
 }
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JFileChooser.java b/sources/net.sf.j2s.java.core/src/javax/swing/JFileChooser.java
@@ -763,12 +763,17 @@ public int showDialog(Component parent, String approveButtonText) {
 			JSUtil.notImplemented("JFileChooser.CUSTOM_DIALOG");
 			return CANCEL_OPTION;
 		case OPEN_DIALOG:
-			if (!(parent instanceof PropertyChangeListener)) {
+			if (!(parent instanceof PropertyChangeListener) && !(this instanceof PropertyChangeListener)) {
 				warnJSDeveloper();
 				return CANCEL_OPTION;
 			}
-			removePropertyChangeListener((PropertyChangeListener) parent);
-			addPropertyChangeListener((PropertyChangeListener) parent);
+			if (this instanceof PropertyChangeListener) {
+				removePropertyChangeListener((PropertyChangeListener) this);
+				addPropertyChangeListener((PropertyChangeListener) this);
+			} else {
+				removePropertyChangeListener((PropertyChangeListener) parent);
+				addPropertyChangeListener((PropertyChangeListener) parent);
+			}
 			Runnable r = new Runnable() {
 
 				@Override
@@ -817,7 +822,7 @@ public void windowClosing(WindowEvent e) {
 	}
 
 	private static void warnJSDeveloper() {
-		System.err.println("JFileChooser: Component does not implement PropertyChangeListener.");
+		System.err.println("JFileChooser: Neither component nor this implements PropertyChangeListener.");
 	}
 
     private void closeDialog() {
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JOptionPane.java b/sources/net.sf.j2s.java.core/src/javax/swing/JOptionPane.java
