removes unnecessary synthetic reference for inner class ref

hansonr · hansonr · commit b70e70e15139 · 2018-11-14T08:08:18.000-06:00
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
@@ -3440,6 +3440,9 @@ private String getThisRefOrSyntheticReference(ASTNode node, ITypeBinding binding
 		ASTNode classNode = (node == null ? null : getAbstractOrAnonymousParentForNode(node));
 		if (class_isAnonymousOrLocal || classNode != null && classNode.getParent() != null // CompilationUnit
 				&& classNode.getParent().getParent() != null) {
+			// not the top level, but "this" refers to this class
+			if (binding.getBinaryName().equals(class_typeBinding.getBinaryName()))
+				return ref;
 			// not the top level -- add the synthetic reference.
 			// anonymous and local will not have fully qualified names
 			return getSyntheticReference(getJavaClassNameQualified(binding));
@@ -6432,7 +6435,6 @@ private static void addImplicitJAXBFieldsAndMethods(int accessType, TrailingBuff
 				}
 				return;
 			default:
-				System.out.println(">>>addImplicitJAXB accessType: " + accessType + " f=" + fields.size() + " m=" + methods.size());
 				boolean isUnspecified = (accessType == JAXB_TYPE_UNSPECIFIED);
 				boolean publicOnly = (accessType == JAXB_TYPE_PUBLIC_MEMBER);
 				if (accessType != JAXB_TYPE_PROPERTY) {
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java
@@ -1589,7 +1589,7 @@ protected void setHorizontalButtonAlignments(JComponent b, int pos, int align) {
 		//
 		boolean ltr = jc.getComponentOrientation().isLeftToRight();
 		boolean alignLeft, alignRight, centered, text0;
-		
+		String px0 = "0px";
 		if (menuAnchorNode == null) {
 			alignLeft = (align == SwingConstants.LEFT
 					|| align == (ltr ? SwingConstants.LEADING : SwingConstants.TRAILING));
@@ -1608,6 +1608,13 @@ protected void setHorizontalButtonAlignments(JComponent b, int pos, int align) {
 			alignRight = !ltr;
 			centered = false;
 			text0 = false;
+			if (alignRight) {
+				if (buttonNode != null) {
+					DOMNode.setStyles(buttonNode, "right","0");
+				} else {
+					System.out.println("HHHMMM");
+				}
+			}
 		}
 
 		String poslr = (alignRight ? "right" : "left");				
