BobHanson · BobHanson · Feb 5, 2019 · Jan 21, 2019 · Jan 22, 2019 · Jan 22, 2019
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20190121000416 
+20190204180153 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp
@@ -1 +1 @@
-20190121000416 
+20190204180153 
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java
@@ -19,7 +19,9 @@ public class CorePlugin extends Plugin {
 	 * register the bundle version properly. So we use VERSION here instead.
 	 * 
 	 */
-	public static String VERSION = "3.2.4.06";
+	public static String VERSION = "3.2.4.07";
+	// TODO/NOTE final static int FOO = (/**@j2sNative 5 || */3) stated but not recognized when used as its new value 
+	// BH 2/3/2019 -- 3.2.4.07 fixes "final static Float = (float)" missing definition
 	// BH 1/2/2019 -- 3.2.4.06 fixes try(resources) with more than one resource missing semicolon
 	// BH 12/13/2018 -- 3.2.4.05 fixes problem with OuterClass.this.foo() not using .apply()
 	// BH 11/10/2018 -- 3.2.4.04 additional support for JAXB

diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java
@@ -2198,13 +2198,13 @@ private boolean addFieldDeclaration(FieldDeclaration field, int mode) {
 		VariableDeclarationFragment identifier = (VariableDeclarationFragment) fragments.get(0);
 		IVariableBinding var = identifier.resolveBinding();
 		Type nodeType = (var != null && var.getType().isArray() ? null : field.getType());
-		Code code = (nodeType == null || !nodeType.isPrimitiveType() ? null
-				: ((PrimitiveType) nodeType).getPrimitiveTypeCode());
+		boolean isPrimitive = (nodeType != null && nodeType.isPrimitiveType());
+		Code code = (isPrimitive ? ((PrimitiveType) nodeType).getPrimitiveTypeCode() : null);
 		// have to check here for final Object = "foo", as that must not be ignored.
-		boolean checkFinalConstant = (isStatic && Modifier.isFinal(field.getModifiers()) && var != null
-				&& !var.getType().getQualifiedName().equals("java.lang.Object"));
+		boolean checkFinalConstant = ((isPrimitive || var != null && var.getType().getQualifiedName().equals("java.lang.String")) 
+				&& isStatic && Modifier.isFinal(field.getModifiers()));
 		if (needDefault)
-			addJ2SDoc(field);
+			addJ2SDoc(field);		
 		int len0 = buffer.length();
 		for (Iterator<?> iter = fragments.iterator(); iter.hasNext();) {
 			VariableDeclarationFragment fragment = (VariableDeclarationFragment) iter.next();

diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Component.java b/sources/net.sf.j2s.java.core/src/java/awt/Component.java
@@ -2679,7 +2679,7 @@ protected void invalidateComp() {
 		if (!isMaximumSizeSet()) {
 			maxSize = null;
 		}
-		if (parent != null) {
+		if (parent != null && _j2sInvalidateOnAdd) {
 			parent.invalidateIfValid();
 		}
 		// }
@@ -5046,7 +5046,9 @@ protected final void disableEvents(long eventsToDisable) {
 	 * @see #isCoalescingEnabled
 	 * @see #checkCoalescing
 	 */
-	transient private boolean coalescingEnabled = checkCoalescing();
+	transient private boolean coalescingEnabled = checkCoalescing(); 
+
+	public boolean _j2sInvalidateOnAdd = true; // not for menu items?
 
 	/**
 	 * Weak map of known coalesceEvent overriders. Value indicates whether
@@ -5827,7 +5829,8 @@ protected void addNotifyComp() {
 			// relocateComponent();
 			// }
 			// }
-			invalidate();
+			if (_j2sInvalidateOnAdd )
+				invalidate();
 
 			// int npopups = (popups != null? popups.size() : 0);
 			// SwingJS TODO
@@ -6872,31 +6875,34 @@ boolean isAutoFocusTransferOnDisposal() {
 		return autoFocusTransferOnDisposal;
 	}
 
-	// /**
-	// * Adds the specified popup menu to the component.
-	// * @param popup the popup menu to be added to the component.
-	// * @see #remove(MenuComponent)
-	// * @exception NullPointerException if {@code popup} is {@code null}
-	// * @since JDK1.1
-	// */
-	// public void add(PopupMenu popup) {
-	// synchronized (getTreeLock()) {
-	// if (popup.parent != null) {
-	// popup.parent.remove(popup);
-	// }
-	// if (popups == null) {
-	// popups = new Vector();
-	// }
-	// popups.addElement(popup);
-	// popup.parent = this;
-	//
-	// if (peer != null) {
-	// if (popup.peer == null) {
-	// popup.addNotify();
-	// }
-	// }
-	// }
-	// }
+	/**
+	 * Adds the specified popup menu to the component.
+	 * 
+	 * @param popup the popup menu to be added to the component.
+	 * @see #remove(MenuComponent)
+	 * @exception NullPointerException if {@code popup} is {@code null}
+	 * @since JDK1.1
+	 */
+	public void add(PopupMenu popup) {
+		popup.setInvoker(this); 
+//		synchronized (getTreeLock()) {
+//			if (popup.parent != null) {
+//				popup.parent.remove(popup);
+//			}
+//			if (popups == null) {
+//				popups = new Vector();
+//			}
+//			popups.addElement(popup);
+//			popup.setInvoker(this);
+////			popup.parent = (JComponent) this;
+//
+//			if (peer != null) {
+//				if (popup.peer == null) {
+//					popup.addNotify();
+//				}
+//			}
+//		}
+	}
 
 	// /**
 	// * Removes the specified popup menu from the component.

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/JSFrame.java b/sources/net.sf.j2s.java.core/src/java/awt/JSFrame.java
@@ -833,12 +833,12 @@ public Rectangle getMaximizedBounds() {
      */
     public void setUndecorated(boolean undecorated) {
         /* Make sure we don't run in the middle of peer creation.*/
-        synchronized (getTreeLock()) {
-            if (isDisplayable()) {
-                throw new IllegalComponentStateException("The frame is displayable.");
-            }
+//        synchronized (getTreeLock()) {
+//            if (isDisplayable()) {
+//                throw new IllegalComponentStateException("The frame is displayable.");
+//            }
             this.undecorated = undecorated;
-        }
+//        }
     }
 
     /**

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/MenuComponent.java b/sources/net.sf.j2s.java.core/src/java/awt/MenuComponent.java
@@ -0,0 +1,77 @@
+package java.awt;
+
+public interface MenuComponent {
+
+    public void addFocusListener(java.awt.event.FocusListener l);
+
+	public boolean contains(Point p);
+
+	public void dispatchEvent(AWTEvent e);
+
+	public Color getBackground();
+
+	public Rectangle getBounds();
+
+	public Cursor getCursor();
+
+	public FontMetrics getFontMetrics(Font f);
+
+	public Color getForeground();
+
+	public java.util.Locale getLocale();
+
+	public Point getLocation();
+
+	public Point getLocationOnScreen();
+
+	public String getName();
+
+//	public MenuContainer getParent();
+
+	public Dimension getSize();
+
+	public boolean isEnabled();
+
+	public boolean isFocusTraversable();
+
+	public boolean isShowing();
+
+	public boolean isVisible();
+
+	public void removeFocusListener(java.awt.event.FocusListener l);
+
+	public void removeNotify();
+
+	public void requestFocus();
+
+	public void setBackground(Color c);
+
+	public void setBounds(Rectangle r);
+
+	public void setCursor(Cursor cursor);
+
+	public void setEnabled(boolean b);
+
+	public void setFont(Font f);
+
+	public void setForeground(Color c);
+
+	public void setLocation(Point p);
+
+	public void setName(String name);
+
+	public void setSize(Dimension d);
+
+	public void setVisible(boolean b);
+
+	// original MenuContainer
+    Font getFont();
+
+    @Deprecated
+    boolean postEvent(Event evt);
+
+    void remove(MenuComponent comp);
+
+
+
+}
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/MenuContainer.java b/sources/net.sf.j2s.java.core/src/java/awt/MenuContainer.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved.
+ * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+package java.awt;
+
+/**
+ * The super class of all menu related containers.
+ *
+ * @author      Arthur van Hoff
+ */
+
+public interface MenuContainer {
+    Font getFont();
+    void remove(MenuComponent comp);
+
+    /**
+     * @deprecated As of JDK version 1.1
+     * replaced by dispatchEvent(AWTEvent).
+     */
+    @Deprecated
+    boolean postEvent(Event evt);
+}