Skip to content

Commit 2ff777d

Browse files
hansonrhansonr
hansonr
authored and
hansonr
committed
GUI fixes
- LineBorder missing - ColorChooser RGB panel broken - JSlider issues
1 parent 016fd75 commit 2ff777d

File tree

18 files changed

+259
-116
lines changed

18 files changed

+259
-116
lines changed

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

1.23 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-
20181121134911
1+
20181122145931

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

1.23 KB
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20181121134911
1+
20181122145931

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

1.23 KB
Binary file not shown.

‎sources/net.sf.j2s.java.core/src/javax/swing/border/LineBorder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public LineBorder(Color color, int thickness, boolean roundedCorners) {
123123
*/
124124
@Override
125125
public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
126-
if ((this.thickness > 0) && (g instanceof Graphics2D)) {
126+
if ((this.thickness > 0)/* && (g instanceof Graphics2D)*/) {
127127
Graphics2D g2d = (Graphics2D) g;
128128

129129
Color oldColor = g2d.getColor();

‎sources/net.sf.j2s.java.core/src/javax/swing/colorchooser/DefaultRGBChooserPanel.java‎

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030

3131
import java.awt.BorderLayout;
3232
import java.awt.Color;
33+
import java.awt.Font;
34+
3335
import javax.swing.Icon;
3436
import javax.swing.JColorChooser;
3537
import javax.swing.JLabel;
@@ -204,38 +206,25 @@ protected void buildChooser() {
204206
JLabel l = new JLabel(redString);
205207
l.setDisplayedMnemonic(AbstractColorChooserPanel.getInt("ColorChooser.rgbRedMnemonic", -1));
206208
enclosure.add(l);
207-
redSlider = new JSlider(JSlider.HORIZONTAL, 0, 255, color.getRed());
208-
redSlider.setMajorTickSpacing( 85 );
209-
redSlider.setMinorTickSpacing( 17 );
210-
redSlider.setPaintTicks( true );
211-
redSlider.setPaintLabels( true );
212-
redSlider.setInheritsPopupMenu(true);
213-
enclosure.add( redSlider );
209+
redSlider = newSlider(color.getRed(), l);
210+
enclosure.add(redSlider);
214211
redField = new JSpinner(
215212
new SpinnerNumberModel(color.getRed(), minValue, maxValue, 1));
216-
l.setLabelFor(redSlider);
217213
redField.setInheritsPopupMenu(true);
218214
JPanel redFieldHolder = new JPanel(new CenterLayout());
219215
redFieldHolder.setInheritsPopupMenu(true);
220216
redField.addChangeListener(this);
221217
redFieldHolder.add(redField);
222218
enclosure.add(redFieldHolder);
223219

224-
225220
// The row for the green value
226221
l = new JLabel(greenString);
227222
l.setDisplayedMnemonic(AbstractColorChooserPanel.getInt("ColorChooser.rgbGreenMnemonic", -1));
228223
enclosure.add(l);
229-
greenSlider = new JSlider(JSlider.HORIZONTAL, 0, 255, color.getGreen());
230-
greenSlider.setMajorTickSpacing( 85 );
231-
greenSlider.setMinorTickSpacing( 17 );
232-
greenSlider.setPaintTicks( true );
233-
greenSlider.setPaintLabels( true );
234-
greenSlider.setInheritsPopupMenu(true);
224+
greenSlider = newSlider(color.getGreen(), l);
235225
enclosure.add(greenSlider);
236226
greenField = new JSpinner(
237227
new SpinnerNumberModel(color.getGreen(), minValue, maxValue, 1));
238-
l.setLabelFor(greenSlider);
239228
greenField.setInheritsPopupMenu(true);
240229
JPanel greenFieldHolder = new JPanel(new CenterLayout());
241230
greenFieldHolder.add(greenField);
@@ -247,16 +236,10 @@ protected void buildChooser() {
247236
l = new JLabel(blueString);
248237
l.setDisplayedMnemonic(AbstractColorChooserPanel.getInt("ColorChooser.rgbBlueMnemonic", -1));
249238
enclosure.add(l);
250-
blueSlider = new JSlider(JSlider.HORIZONTAL, 0, 255, color.getBlue());
251-
blueSlider.setMajorTickSpacing( 85 );
252-
blueSlider.setMinorTickSpacing( 17 );
253-
blueSlider.setPaintTicks( true );
254-
blueSlider.setPaintLabels( true );
255-
blueSlider.setInheritsPopupMenu(true);
239+
blueSlider = newSlider(color.getBlue(), l);
256240
enclosure.add(blueSlider);
257241
blueField = new JSpinner(
258242
new SpinnerNumberModel(color.getBlue(), minValue, maxValue, 1));
259-
l.setLabelFor(blueSlider);
260243
blueField.setInheritsPopupMenu(true);
261244
JPanel blueFieldHolder = new JPanel(new CenterLayout());
262245
blueFieldHolder.add(blueField);
@@ -273,7 +256,19 @@ protected void buildChooser() {
273256
blueSlider.putClientProperty("JSlider.isFilled", Boolean.TRUE);
274257
}
275258

276-
@Override
259+
private JSlider newSlider(int val, JLabel l) {
260+
JSlider s = new JSlider(JSlider.HORIZONTAL, 0, 255, val);
261+
s.setFont(new Font("Helvetica", Font.PLAIN, 8));
262+
s.setMajorTickSpacing( 85 );
263+
s.setMinorTickSpacing( 17 );
264+
s.setPaintTicks( true );
265+
s.setPaintLabels( true );
266+
s.setInheritsPopupMenu(true);
267+
l.setLabelFor(s);
268+
return s;
269+
}
270+
271+
@Override
277272
public void uninstallChooserPanel(JColorChooser enclosingChooser) {
278273
super.uninstallChooserPanel(enclosingChooser);
279274
removeAll();

‎sources/net.sf.j2s.java.core/src/swingjs/api/js/DOMNode.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ public abstract class DOMNode {
2929

3030
public abstract void appendChild(DOMNode node);
3131

32+
public abstract void insertBefore(DOMNode node, DOMNode refNode);
33+
3234
public abstract DOMNode removeChild(DOMNode node);
3335

3436
public abstract boolean hasFocus();

‎sources/net.sf.j2s.java.core/src/swingjs/api/js/JQueryObject.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ public interface JQueryObject {
3636

3737
public abstract JQueryObject find(String selector);
3838

39+
public abstract void before(Object obj);
40+
3941
public abstract void appendTo(Object obj);
4042

4143
public abstract JQueryObject css(String key, String value);

‎sources/net.sf.j2s.java.core/src/swingjs/jquery/JQueryUI.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
* This "class" simply checks for jQuery.ui having been loaded and loads it if it has not been loaded.
55
* Used by swingjs.plaf.JSSliderUI
66
*
7+
* Note that if you change one of the JavaScript files in this directory,
8+
* the transpiler will not transfer it to the site directory unless you touch this java file.
79
*
810
* @author Bob Hanson
911
*

0 commit comments

Comments
 (0)