Skip to content

Commit c6f6d20

Browse files
BobHansonBobHanson
authored
Merge pull request #76 from BobHanson/master
upgrade; refactoring Java2ScriptVisitor for much simple final variable processing
2 parents e4d6f01 + ca822b4 commit c6f6d20

30 files changed

+886
-795
lines changed

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

-142 Bytes
Binary file not shown.

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

-708 Bytes
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-
20180816081255
1+
20180819230621

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

-142 Bytes
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/net.sf.j2s.core.jar‎

-708 Bytes
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20180816081255
1+
20180819230621

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

Lines changed: 530 additions & 650 deletions
Large diffs are not rendered by default.

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

-134 Bytes
Binary file not shown.

‎sources/net.sf.j2s.java.core/src/java/awt/Color.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,6 +821,8 @@ public static Color getColor(String nm, int v) {
821821
return new Color((i >> 16) & 0xFF, (i >> 8) & 0xFF, (i >> 0) & 0xFF);
822822
}
823823

824+
825+
824826
/**
825827
* Converts the components of a color, as specified by the HSB
826828
* model, to an equivalent set of values for the default RGB model.
@@ -854,7 +856,7 @@ public static int HSBtoRGB(float hue, float saturation, float brightness) {
854856
r = g = b = (int) (brightness * 255.0f + 0.5f);
855857
} else {
856858
float h = (hue - (float)Math.floor(hue)) * 6.0f;
857-
float f = h - (float)java.lang.Math.floor(h);
859+
float f = h - (float)Math.floor(h);
858860
float p = brightness * (1.0f - saturation);
859861
float q = brightness * (1.0f - saturation * f);
860862
float t = brightness * (1.0f - (saturation * (1.0f - f)));

‎sources/net.sf.j2s.java.core/src/java/awt/datatransfer/DataFlavor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ static private DataFlavor createConstant(String mt, String prn) {
165165
* mimeType = "application/x-java-serialized-object"
166166
* </pre>
167167
*/
168-
public static final DataFlavor stringFlavor = createConstant(java.lang.String.class, "Unicode String");
168+
public static final DataFlavor stringFlavor = createConstant(String.class, "Unicode String");
169169

170170
/**
171171
* The <code>DataFlavor</code> representing a Java Image class, where:

0 commit comments

Comments
 (0)