Skip to content

Commit 11a8a89

Browse files
BobHansonBobHanson
committed
new SwingJS-site.zip; includes modified JSTextUI
1 parent e847410 commit 11a8a89

File tree

11 files changed

+128
-36
lines changed

11 files changed

+128
-36
lines changed

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

5.91 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-
20200206160631
1+
20200210082355

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

5.91 KB
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20200206160631
1+
20200210082355

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

5.91 KB
Binary file not shown.

‎sources/net.sf.j2s.java.core/src/test/TApp2_Swing.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.awt.Button;
66
import java.awt.Color;
77
import java.awt.Component;
8+
import java.awt.Dimension;
89
import java.awt.Font;
910
import java.awt.Graphics;
1011
import java.awt.Graphics2D;
@@ -22,6 +23,7 @@
2223
import java.awt.event.MouseListener;
2324
import java.awt.geom.Line2D;
2425

26+
import javax.swing.ImageIcon;
2527
import javax.swing.InputMap;
2628
import javax.swing.JApplet;
2729
import javax.swing.JButton;
@@ -33,6 +35,7 @@
3335
import javax.swing.JScrollPane;
3436
import javax.swing.JTextArea;
3537
import javax.swing.JTextField;
38+
import javax.swing.SwingConstants;
3639

3740
public class TApp2_Swing extends JApplet {
3841

@@ -89,9 +92,11 @@ private void setLBBounds(Component b, Component l, int i, int j) {
8992

9093
@Override
9194
public void init() {
92-
95+
this.setLayout(null);
96+
getContentPane().setBackground(Color.red);
9397
setSize(800, 600);
9498
addButtonTest();
99+
95100
setFont(new Font(Font.MONOSPACED, Font.PLAIN, 14));
96101
setBackground(Color.yellow);
97102
setLayout(null);

‎sources/net.sf.j2s.java.core/src/test/Test_Applet_Scroll.java‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
import javax.swing.JTextField;
4242
import javax.swing.JToggleButton;
4343
import javax.swing.SwingConstants;
44+
import javax.swing.border.EmptyBorder;
45+
import javax.swing.border.LineBorder;
4446
import javax.swing.event.ChangeEvent;
4547
import javax.swing.event.ChangeListener;
4648

@@ -69,6 +71,8 @@ public class Test_Applet_Scroll extends JApplet implements ChangeListener, Mouse
6971

7072
private JPanel vp;
7173

74+
private JScrollPane sp;
75+
7276
void setSize(JComponent c, int x, int y) {
7377
if (preferred)
7478
c.setPreferredSize(new Dimension(x, y));
@@ -201,12 +205,11 @@ public void actionPerformed(ActionEvent event) {
201205
JPanel p = new JPanel();
202206

203207
// p.setLayout(new GridLayout(2, 2, 2, 2));
204-
JScrollPane sp = new JScrollPane();
205-
208+
sp = new JScrollPane();
209+
sp.setBorder(new LineBorder(Color.GREEN,5));
210+
sp.setViewportBorder(new EmptyBorder(5,5,5,5));
206211
sp.addMouseMotionListener(this);
207212
sp.addMouseListener(this);
208-
209-
210213
panel2 = new JPanel();
211214
panel2.add(new JTextArea(10,10));
212215
panel2.setSize(100,100);
@@ -247,6 +250,8 @@ public void actionPerformed(ActionEvent event) {
247250
slider.setForeground(Color.BLUE);
248251

249252
mkSlider(p, tf, Adjustable.HORIZONTAL, 100, 20).setInverted(true);
253+
System.out.println("Test_AppletScroll sp pref size " + sp.getPreferredSize());
254+
250255
}
251256

252257
JScrollBar mkBar(JPanel p, final JTextField tf, int orient, int x, int y) {
@@ -360,6 +365,7 @@ public void mouseReleased(MouseEvent e) {
360365

361366
@Override
362367
public void mouseEntered(MouseEvent e) {
368+
System.out.println("Test_AppletScroll sp size " + sp.getSize());
363369
System.out.println("Test_Applet_Scroll mouseEntered " + e);
364370

365371
}

‎sources/net.sf.j2s.java.core/src/test/Test_Applet_Split.java‎

Lines changed: 64 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
package test;
22

33
import java.awt.Color;
4+
import java.awt.Dimension;
5+
import java.awt.Frame;
46
import java.awt.Label;
57
import java.beans.PropertyChangeEvent;
68
import java.beans.PropertyChangeListener;
79

810
import javax.swing.JApplet;
911
import javax.swing.JComboBox;
10-
import javax.swing.JLabel;
12+
import javax.swing.JDialog;
13+
import javax.swing.JFrame;
1114
import javax.swing.JPanel;
15+
import javax.swing.JScrollPane;
1216
import javax.swing.JSplitPane;
17+
import javax.swing.border.EmptyBorder;
18+
import javax.swing.border.LineBorder;
1319

1420
public class Test_Applet_Split extends JApplet {
1521

@@ -24,8 +30,15 @@ public class Test_Applet_Split extends JApplet {
2430
*/
2531
}
2632

33+
private JScrollPane sp;
34+
2735
@Override
2836
public void init() {
37+
add(newSplitPane());
38+
resize(500,400);
39+
}
40+
41+
private JPanel newSplitPane() {
2942
JPanel top = new JPanel();
3043
top.setBackground(Color.green);
3144
top.add(new Label("testing"));
@@ -37,18 +50,23 @@ public void init() {
3750
JSplitPane pleft = new JSplitPane(JSplitPane.VERTICAL_SPLIT, top, bottom);
3851
pleft.setDividerSize(3);
3952

40-
JPanel right = new JPanel();
41-
right.add(new Label("here"));
42-
right.setBackground(Color.red);
43-
JSplitPane p = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, pleft, right);
44-
p.setSize(500, 400);
45-
p.setDividerLocation(0.24);
46-
p.setDividerSize(3);
4753
JComboBox cb = new JComboBox();
4854
cb.addItem("test1");
4955
cb.addItem("test2");
5056
cb.addItem("test3");
51-
right.add(cb);
57+
sp = new JScrollPane();
58+
sp.setBorder(new LineBorder(Color.GREEN,5));
59+
sp.setViewportBorder(new EmptyBorder(5,5,5,5));
60+
JPanel jp = new JPanel();
61+
jp.add(cb);
62+
jp.add(new Label("here"));
63+
sp.getViewport().add(jp);
64+
sp.getViewport().setBackground(Color.yellow);
65+
sp.setBackground(Color.red);
66+
JSplitPane p = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, pleft, sp);
67+
p.setSize(500, 400);
68+
//p.setDividerLocation(0.24);
69+
p.setDividerSize(3);
5270
p.addPropertyChangeListener(new PropertyChangeListener() {
5371

5472
@Override
@@ -69,7 +87,42 @@ public void propertyChange(PropertyChangeEvent evt) {
6987
}
7088

7189
});
72-
add(p);
73-
resize(500,400);
90+
JPanel pp = new JPanel();
91+
pp.add(p);
92+
return pp;
93+
}
94+
95+
public static void main(String[] args) {
96+
JPanel p = new Test_Applet_Split().newSplitPane();
97+
JFrame f = new JFrame();
98+
JDialog jd;
99+
int mode = 3;
100+
switch (mode) {
101+
case 0:
102+
f.add(p);
103+
f.pack();
104+
f.setVisible(true);
105+
break;
106+
case 1:
107+
jd = new JDialog((Frame) f, "test", true);
108+
jd.add(p);
109+
jd.setSize(new Dimension(600, 300));
110+
jd.setVisible(true);
111+
break;
112+
case 2:
113+
jd = new JDialog((Frame) null, true);
114+
jd.add(p);
115+
jd.setSize(new Dimension(600, 300));
116+
jd.setVisible(true);
117+
break;
118+
case 3:
119+
jd = new JDialog((Frame) null, true);
120+
jd.setContentPane(p);
121+
jd.setSize(new Dimension(600, 300));
122+
jd.pack();
123+
jd.setVisible(true);
124+
}
125+
126+
74127
}
75128
}

‎sources/net.sf.j2s.java.core/src/test/Test_Label.java‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,9 @@ Container getVisualPaneContent() {
116116
// }
117117
// };
118118
//
119-
Icon icon = getImage("test2.png");
119+
120+
121+
Icon icon = getImage("zoom.gif");
120122
JLabel l3 = new JLabel(icon);
121123
l3.setOpaque(true);
122124
l3.setBackground(Color.red);
@@ -190,8 +192,22 @@ Container getVisualPaneContent() {
190192
// rb3.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
191193
// rb3.setHorizontalTextPosition(SwingConstants.RIGHT);
192194

193-
// firstColumn.add(l1);
194-
// firstColumn.add(l2);
195+
ImageIcon icon1 = new ImageIcon("test/zoom.gif");
196+
JLabel l = new JLabel("TEST?", icon1, SwingConstants.LEADING);
197+
l.setBounds(300,300,20,20);
198+
add(l);
199+
200+
ImageIcon icon2 = new ImageIcon("test/zoom.gif");
201+
JButton ib = new JButton(icon2);
202+
ib.setPreferredSize(new Dimension(50,20));
203+
ib.setBounds(300,360,20,20);
204+
add(ib);
205+
ib.setBackground(null);
206+
ib.setOpaque(false);
207+
208+
firstColumn.add(l);
209+
firstColumn.add(ib);
210+
195211
firstColumn.add(l3);
196212
firstColumn.add(l4);
197213
firstColumn.add(b1);
@@ -249,6 +265,7 @@ private ImageIcon getImage(String name) {
249265
Thread.sleep(10);
250266
} catch (InterruptedException e) {
251267
}
268+
System.out.println("getImage " + name + " status=" + icon.getImageLoadStatus());
252269
return icon;
253270
}
254271

‎sources/net.sf.j2s.java.core/src/test/zoom.gif‎

1.3 KB
Loading

0 commit comments

Comments
 (0)