Skip to content

Commit 840fdf9

Browse files
BobHansonBobHanson
authored
Merge pull request #77 from BobHanson/hanson1
Hanson1 - table/label work
2 parents 933f0b1 + b44fad9 commit 840fdf9

33 files changed

+21069
-21085
lines changed

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

6.01 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-
20181216002450
1+
20181217223342

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

6.01 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-
20181216002450
1+
20181217223342

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

6.01 KB
Binary file not shown.

‎sources/net.sf.j2s.java.core/src/components/TableDemo.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import javax.swing.JPanel;
4141
import javax.swing.JScrollPane;
4242
import javax.swing.JTable;
43+
import javax.swing.SwingConstants;
4344
import javax.swing.border.LineBorder;
4445
import javax.swing.table.AbstractTableModel;
4546
import javax.swing.table.TableCellRenderer;
@@ -65,7 +66,8 @@ public Component getTableCellRendererComponent(JTable table, Object value, boole
6566
int row, int column) {
6667
setOpaque(true);
6768
setBackground(colors[row % 3]);
68-
setText(" " + row);
69+
setText("" + row);
70+
setHorizontalAlignment(SwingConstants.CENTER);
6971
setBorder(new LineBorder(Color.white, 3));
7072
return this;
7173
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -847,9 +847,10 @@ public Component getInvoker() {
847847
public void setInvoker(Component invoker) {
848848
Component oldInvoker = this.invoker;
849849
this.invoker = invoker;
850-
if ((oldInvoker != this.invoker) && (ui != null)) {
851-
((JSComponentUI) ui).reinstallUI(this, (JComponent) invoker);
852-
}
850+
// SwingJS does not do this
851+
// if ((oldInvoker != this.invoker) && (ui != null)) {
852+
// ((JSComponentUI) ui).reinstallUI(this, (JComponent) invoker);
853+
// }
853854
invalidate();
854855
}
855856

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -970,9 +970,6 @@ private static String layoutCompoundLabelImpl(
970970
/* Initialize the icon bounds rectangle iconR.
971971
*/
972972

973-
System.out.println("SwingUtil tiv0 " + text + "\n" + textR + "\n" + iconR + "\n" + viewR + "\n"
974-
+ fm.getDescent() + " " + fm.getAscent() + " " + fm.getHeight() + " " + fm.getMaxAscent());
975-
976973
if (icon != null) {
977974
iconR.width = icon.getIconWidth();
978975
iconR.height = icon.getIconHeight();
@@ -1017,11 +1014,15 @@ private static String layoutCompoundLabelImpl(
10171014
(int) v.getPreferredSpan(View.X_AXIS));
10181015
textR.height = (int) v.getPreferredSpan(View.Y_AXIS);
10191016
} else {
1020-
Dimension d = ui.getHTMLSize(ui.textNode);
1021-
textR.width = d.width;
1022-
textR.height = d.height;
1023-
System.out.println("swingutil " + text + " " + d + " " + fm.getHeight());
1024-
// Take into account the left and right side bearings.
1017+
if (ui.textNode == null) {
1018+
textR.width = fm.stringWidth(text);
1019+
textR.height = fm.getHeight();
1020+
} else {
1021+
Dimension d = ui.getHTMLSize(ui.textNode);
1022+
textR.width = d.width;
1023+
textR.height = d.height;
1024+
}
1025+
// Take into account the left and right side bearings.
10251026
// This gives more space than it is actually needed,
10261027
// but there are two reasons:
10271028
// 1. If we set the width to the actual bounds,
@@ -1148,9 +1149,7 @@ else if (horizontalAlignment == RIGHT) {
11481149
// SwingJS, for JSGraphicsUtil setting preferred button size;
11491150
viewR.width = labelR_width;
11501151
viewR.height = labelR_height;
1151-
}
1152-
1153-
System.out.println("SwingUtil tiv " + text + "\n" + textR + "\n" + iconR + "\n" + viewR + "\n");
1152+
}
11541153
return text;
11551154
}
11561155

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

Lines changed: 54 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import java.awt.event.MouseAdapter;
3636
import java.awt.event.MouseEvent;
3737
import java.awt.event.MouseListener;
38-
import java.io.Serializable;
3938

4039
import javax.accessibility.AccessibleContext;
4140
import javax.swing.Icon;
@@ -76,7 +75,8 @@ public DefaultSwatchChooserPanel() {
7675
setInheritsPopupMenu(true);
7776
}
7877

79-
public String getDisplayName() {
78+
@Override
79+
public String getDisplayName() {
8080
return "Swatches";//UIManager.getString("ColorChooser.swatchesNameText");
8181
}
8282

@@ -99,7 +99,8 @@ public String getDisplayName() {
9999
* @see #getDisplayedMnemonicIndex
100100
* @since 1.4
101101
*/
102-
public int getMnemonic() {
102+
@Override
103+
public int getMnemonic() {
103104
return getInt("ColorChooser.swatchesMnemonic", -1);
104105
}
105106

@@ -127,27 +128,32 @@ public int getMnemonic() {
127128
* @see #getMnemonic
128129
* @since 1.4
129130
*/
130-
public int getDisplayedMnemonicIndex() {
131+
@Override
132+
public int getDisplayedMnemonicIndex() {
131133
return getInt("ColorChooser.swatchesDisplayedMnemonicIndex", -1);
132134
}
133135

134-
public Icon getSmallDisplayIcon() {
136+
@Override
137+
public Icon getSmallDisplayIcon() {
135138
return null;
136139
}
137140

138-
public Icon getLargeDisplayIcon() {
141+
@Override
142+
public Icon getLargeDisplayIcon() {
139143
return null;
140144
}
141145

142146
/**
143147
* The background color, foreground color, and font are already set to the
144148
* defaults from the defaults table before this method is called.
145149
*/
146-
public void installChooserPanel(JColorChooser enclosingChooser) {
150+
@Override
151+
public void installChooserPanel(JColorChooser enclosingChooser) {
147152
super.installChooserPanel(enclosingChooser);
148153
}
149154

150-
protected void buildChooser() {
155+
@Override
156+
protected void buildChooser() {
151157

152158
GridBagLayout gb = new GridBagLayout();
153159
GridBagConstraints gbc = new GridBagConstraints();
@@ -205,7 +211,8 @@ protected void buildChooser() {
205211
add(superHolder);
206212
}
207213

208-
public void uninstallChooserPanel(JColorChooser enclosingChooser) {
214+
@Override
215+
public void uninstallChooserPanel(JColorChooser enclosingChooser) {
209216
super.uninstallChooserPanel(enclosingChooser);
210217
swatchPanel.removeMouseListener(mainSwatchListener);
211218
recentSwatchPanel.removeMouseListener(recentSwatchListener);
@@ -216,21 +223,24 @@ public void uninstallChooserPanel(JColorChooser enclosingChooser) {
216223
removeAll(); // strip out all the sub-components
217224
}
218225

219-
public void updateChooser() {
226+
@Override
227+
public void updateChooser() {
220228

221229
}
222230

223231

224-
class RecentSwatchListener extends MouseAdapter implements Serializable {
225-
public void mousePressed(MouseEvent e) {
232+
class RecentSwatchListener extends MouseAdapter {
233+
@Override
234+
public void mousePressed(MouseEvent e) {
226235
Color color = recentSwatchPanel.getColorForLocation(e.getX(), e.getY());
227236
getColorSelectionModel().setSelectedColor(color);
228237

229238
}
230239
}
231240

232-
class MainSwatchListener extends MouseAdapter implements Serializable {
233-
public void mousePressed(MouseEvent e) {
241+
class MainSwatchListener extends MouseAdapter {
242+
@Override
243+
public void mousePressed(MouseEvent e) {
234244
Color color = swatchPanel.getColorForLocation(e.getX(), e.getY());
235245
getColorSelectionModel().setSelectedColor(color);
236246
recentSwatchPanel.setMostRecentColor(color);
@@ -259,15 +269,17 @@ public SwatchPanel() {
259269
setInheritsPopupMenu(true);
260270
}
261271

262-
public boolean isFocusTraversable() {
272+
@Override
273+
public boolean isFocusTraversable() {
263274
return false;
264275
}
265276

266277
protected void initValues() {
267278

268279
}
269280

270-
public void paintComponent(Graphics g) {
281+
@Override
282+
public void paintComponent(Graphics g) {
271283
g.setColor(getBackground());
272284
g.fillRect(0,0,getWidth(), getHeight());
273285
for (int row = 0; row < numSwatches.height; row++) {
@@ -290,7 +302,8 @@ public void paintComponent(Graphics g) {
290302
}
291303
}
292304

293-
public Dimension getPreferredSize() {
305+
@Override
306+
public Dimension getPreferredSize() {
294307
int x = numSwatches.width * (swatchSize.width + gap.width) - 1;
295308
int y = numSwatches.height * (swatchSize.height + gap.height) - 1;
296309
return new Dimension( x, y );
@@ -301,7 +314,8 @@ protected void initColors() {
301314

302315
}
303316

304-
public String getToolTipText(MouseEvent e) {
317+
@Override
318+
public String getToolTipText(MouseEvent e) {
305319
Color color = getColorForLocation(e.getX(), e.getY());
306320
return color.getRed()+", "+ color.getGreen() + ", " + color.getBlue();
307321
}
@@ -328,21 +342,30 @@ private Color getColorForCell( int column, int row) {
328342
}
329343

330344
class RecentSwatchPanel extends SwatchPanel {
331-
protected void initValues() {
345+
346+
static Color[] recentColors; // BH SwingJS adds static recentColors just for fun
347+
348+
@Override
349+
protected void initValues() {
332350
swatchSize = UIManager.getDimension("ColorChooser.swatchesRecentSwatchSize");
333351
numSwatches = new Dimension( 5, 7 );
334352
gap = new Dimension(1, 1);
335353
}
336354

337355

338-
protected void initColors() {
339-
Color defaultRecentColor = UIManager.getColor("ColorChooser.swatchesDefaultRecentColor");
340-
int numColors = numSwatches.width * numSwatches.height;
341-
342-
colors = new Color[numColors];
343-
for (int i = 0; i < numColors ; i++) {
344-
colors[i] = defaultRecentColor;
345-
}
356+
@Override
357+
protected void initColors() {
358+
if (recentColors == null) {
359+
Color defaultRecentColor = UIManager.getColor("ColorChooser.swatchesDefaultRecentColor");
360+
int numColors = numSwatches.width * numSwatches.height;
361+
colors = new Color[numColors];
362+
for (int i = 0; i < numColors ; i++) {
363+
colors[i] = defaultRecentColor;
364+
}
365+
recentColors = colors;
366+
} else {
367+
colors = recentColors;
368+
}
346369
}
347370

348371
public void setMostRecentColor(Color c) {
@@ -357,13 +380,15 @@ public void setMostRecentColor(Color c) {
357380
class MainSwatchPanel extends SwatchPanel {
358381

359382

360-
protected void initValues() {
383+
@Override
384+
protected void initValues() {
361385
swatchSize = UIManager.getDimension("ColorChooser.swatchesSwatchSize");
362386
numSwatches = new Dimension( 31, 9 );
363387
gap = new Dimension(1, 1);
364388
}
365389

366-
protected void initColors() {
390+
@Override
391+
protected void initColors() {
367392
int[] rawValues = initRawValues();
368393
int numColors = rawValues.length / 3;
369394

‎sources/net.sf.j2s.java.core/src/swingjs/JSGraphics2D.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,24 @@ public class JSGraphics2D // extends SunGraphics2D
8282

8383
// private Color currentColor;
8484

85+
private static float pixelRatio = /** @j2sNative
86+
(function () {
87+
var ctx = document.createElement("canvas").getContext("2d"),
88+
dpr = window.devicePixelRatio || 1,
89+
bsr = ctx.webkitBackingStorePixelRatio ||
90+
ctx.mozBackingStorePixelRatio ||
91+
ctx.msBackingStorePixelRatio ||
92+
ctx.oBackingStorePixelRatio ||
93+
ctx.backingStorePixelRatio || 1;
94+
return dpr / bsr;
95+
})() || */1;
96+
// this is 1.5 for Windows
97+
// nice, but now how would be do raw pixel setting, say, from images?
98+
// can.width = w * pixelRatio;
99+
// can.height = h * pixelRatio;
100+
// can.getContext("2d").setTransform(pixelRatio, 0, 0, pixelRatio, 0, 0);
101+
102+
85103
public JSGraphics2D(Object canvas) { // this must be Object, because we are
86104
// passing an actual HTML5 canvas
87105
hints = new RenderingHints(new Hashtable());

0 commit comments

Comments
 (0)