Skip to content

Commit b464dce

Browse files
BobHansonBobHanson
committed
minor issues with UI; still needs a bit of work on JComboBox and
JPopupMenu
1 parent 419336c commit b464dce

11 files changed

Lines changed: 26 additions & 6 deletions

File tree

‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎

-420 KB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20200529133959
1+
20200602150211

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9-j11/SwingJS-site.zip‎

-1.78 KB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9-j11/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20200528154316
1+
20200602150211

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip‎

-420 KB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20200529133959
1+
20200601144428

‎sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompiler.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.util.Properties;
2020

2121
import org.eclipse.core.resources.IFile;
22-
import org.eclipse.core.resources.IProject;
2322
import org.eclipse.jdt.core.IJavaProject;
2423
import org.eclipse.jdt.core.JavaCore;
2524
import org.eclipse.jdt.core.dom.AST;

‎sources/net.sf.j2s.java.core/build-zipoonly.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<project name="JSmol" default="zip" basedir=".">
2+
3+
<target name="zip" id="zip">
4+
5+
<echo>creating dist/SwingJS-site.zip </echo>
6+
<zip destfile="dist/SwingJS-site.zip" basedir="site" >
7+
<exclude name="swingjs/j2s/test/**"/>
8+
<exclude name="*.html"/>
9+
</zip>
10+
11+
</target>
12+
</project>

‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎

-420 KB
Binary file not shown.

‎sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1403,8 +1403,11 @@ protected void propertyChangedCUI(PropertyChangeEvent e, String prop) {
14031403
return;
14041404
case "text":
14051405
String val = ((AbstractButton) c).getText();
1406-
if (val == null ? currentText != null : !val.equals(currentText))
1406+
if (val == null ? currentText != null : !val.equals(currentText)) {
14071407
setIconAndText(prop, currentIcon, currentGap, (String) val);
1408+
if (isMenuItem && textNode != null)
1409+
this.setAlignments((AbstractButton) c, true);
1410+
}
14081411
return;
14091412
case "iconTextGap":
14101413
if (iconNode != null) {

0 commit comments

Comments
 (0)