Skip to content

Commit 3396203

Browse files
BobHansonBobHanson
committed
testing .j2s unqualifed class setting
1 parent 2d3c1db commit 3396203

File tree

4 files changed

+103
-77
lines changed

4 files changed

+103
-77
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ j2s.compiler.read.annotations=true
99
# customizable list for what annotations to skip
1010
j2s.compiler.ignored.annotations=CallerSensitive;ConstructorProperties;Deprecated;Override;SafeVarargs;SuppressWarnings;FunctionalInterface;Documented;Inherited;Native;Repeatable;Retention;Transient;
1111

12-
#j2s.compiler.nonqualified.packages=org.w3c.dom
12+
j2s.compiler.nonqualified.packages=test.js
1313

1414
#output file name for logging methods declared - delete the file to regenerate a listing
1515
#j2s.log.methods.declared=methodsDeclared.csv

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -695,9 +695,12 @@ public String toString() {
695695
}
696696

697697
public String 秘toString() {
698-
// SwingJS just the keycode, avoiding VKCollection.js
699-
return getModifiersText(modifiers)
700-
+ (onKeyRelease ? "released" : "pressed") + " " + keyCode;
698+
if (keyCode == KeyEvent.VK_UNDEFINED) {
699+
return getModifiersText(modifiers) + "typed " + keyChar;
700+
} else {
701+
return getModifiersText(modifiers) +
702+
(onKeyRelease ? "released" : "pressed") + " " + keyCode;
703+
}
701704
}
702705

703706
static private String getModifiersText(int modifiers) {

‎sources/net.sf.j2s.java.core/src/test/components/MouseEventDemo_AWT.java‎

Lines changed: 82 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,17 @@
6161
import java.awt.Component;
6262
import java.awt.DefaultKeyboardFocusManager;
6363
import java.awt.Dimension;
64-
import java.awt.Frame;
64+
import java.awt.Graphics;
6565
import java.awt.GridLayout;
6666
import java.awt.KeyboardFocusManager;
67-
import java.awt.Label;
68-
import java.awt.Panel;
6967
import java.awt.Toolkit;
7068
import java.awt.event.AWTEventListener;
7169
import java.awt.event.ActionEvent;
70+
import java.awt.event.ActionListener;
7271
import java.awt.event.FocusEvent;
7372
import java.awt.event.FocusListener;
73+
import java.awt.event.KeyEvent;
74+
import java.awt.event.KeyListener;
7475
import java.awt.event.MouseEvent;
7576
import java.awt.event.MouseListener;
7677
import java.util.logging.ConsoleHandler;
@@ -80,10 +81,18 @@
8081
import javax.swing.AbstractAction;
8182
import javax.swing.BorderFactory;
8283
import javax.swing.InputMap;
84+
import javax.swing.JButton;
8385
import javax.swing.JComponent;
86+
import javax.swing.JFrame;
87+
import javax.swing.JLabel;
88+
import javax.swing.JPanel;
89+
import javax.swing.JScrollPane;
90+
import javax.swing.JSplitPane;
8491
import javax.swing.JTextArea;
8592
import javax.swing.KeyStroke;
8693
import javax.swing.SwingUtilities;
94+
import javax.swing.UIManager;
95+
import javax.swing.border.Border;
8796

8897

8998

@@ -94,7 +103,7 @@
94103
* @see https
95104
* ://docs.oracle.com/javase/tutorial/uiswing/events/mouselistener.html
96105
*/
97-
public class MouseEventDemo_AWT extends Panel implements MouseListener {
106+
public class MouseEventDemo_AWT extends JPanel implements MouseListener {
98107

99108

100109
private static void logClass(String name) {
@@ -128,7 +137,7 @@ private void setLogging() {
128137

129138

130139

131-
private class BlankArea extends Label {
140+
private class BlankArea extends JLabel {
132141
Dimension minSize = new Dimension(200, 100);
133142

134143
public BlankArea(Color color) {
@@ -194,7 +203,7 @@ public void run() {
194203
*/
195204
private static void createAndShowGUI() {
196205
// Create and set up the window.
197-
Frame frame = new Frame("MouseEventDemo (C to clear)");
206+
JFrame frame = new JFrame("MouseEventDemo (C to clear)");
198207
//frame.setDefaultCloseOperation(Frame.DISPOSE_ON_CLOSE);
199208

200209
// Create and set up the content pane.
@@ -238,76 +247,76 @@ public void eventDispatched(AWTEvent event) {
238247

239248
setFocusable(false); // in AWT now Frame
240249

241-
// textArea = new JTextArea();
242-
// textArea.setEditable(false);
243-
// JScrollPane scrollPane = new JScrollPane(textArea);
244-
// scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
245-
// scrollPane.setPreferredSize(new Dimension(400, 75));
246-
//
247-
//
248-
// blankArea = new BlankArea(Color.YELLOW);
249-
// JPanel panel = new JPanel() {
250+
textArea = new JTextArea();
251+
textArea.setEditable(false);
252+
JScrollPane scrollPane = new JScrollPane(textArea);
253+
scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
254+
scrollPane.setPreferredSize(new Dimension(400, 75));
255+
256+
257+
blankArea = new BlankArea(Color.YELLOW);
258+
JPanel panel = new JPanel() {
259+
protected void paintBorder(Graphics g) {
260+
System.out.println("MED JPanel painting border " + getBorder());
261+
super.paintBorder(g);
262+
}
263+
public void setBorder(Border b) {
264+
super.setBorder(b);
265+
}
266+
};
267+
268+
System.out.println(UIManager.getBorder("Panel.border") + " " + panel.getBorder());
269+
// panel.setBorder(new BevelBorder(1));
270+
panel.add(blankArea);
271+
JButton btn = new JButton("clear");
272+
btn.setMnemonic('l');
273+
btn.addActionListener(new ActionListener() {
274+
275+
@Override
276+
public void actionPerformed(ActionEvent e) {
277+
textArea.setText("");
278+
log("");
279+
}
280+
281+
});
282+
283+
panel.add(btn);
284+
// JPanel scrollPane = new JPanel() {
250285
// protected void paintBorder(Graphics g) {
251-
// System.out.println("MED JPanel painting border " + getBorder());
286+
// System.out.println("MED.scrollPanePanel painting border " + getBorder());
252287
// super.paintBorder(g);
253288
// }
254-
// public void setBorder(Border b) {
255-
// super.setBorder(b);
256-
// }
257289
// };
258-
//
259-
// System.out.println(UIManager.getBorder("Panel.border") + " " + panel.getBorder());
260-
//// panel.setBorder(new BevelBorder(1));
261-
// panel.add(blankArea);
262-
// JButton btn = new JButton("clear");
263-
// btn.setMnemonic('l');
264-
// btn.addActionListener(new ActionListener() {
265-
//
266-
// @Override
267-
// public void actionPerformed(ActionEvent e) {
268-
// textArea.setText("");
269-
// log("");
270-
// }
271-
//
272-
// });
273-
//
274-
// panel.add(btn);
275-
//// JPanel scrollPane = new JPanel() {
276-
//// protected void paintBorder(Graphics g) {
277-
//// System.out.println("MED.scrollPanePanel painting border " + getBorder());
278-
//// super.paintBorder(g);
279-
//// }
280-
//// };
281-
//// scrollPane.add(j);
282-
// JSplitPane splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, panel, scrollPane);
283-
// splitPane.setVisible(true);
284-
// splitPane.setDividerLocation(0.2d);
285-
// splitPane.setResizeWeight(0.5d);
286-
// add(splitPane);
287-
//
288-
// addKeyBinding();
289-
//
290-
// addKeyListener(new KeyListener() {
291-
//
292-
// @Override
293-
// public void keyTyped(KeyEvent e) {
294-
// System.out.println(e);
295-
// }
296-
//
297-
// @Override
298-
// public void keyPressed(KeyEvent e) {
299-
// }
300-
//
301-
// @Override
302-
// public void keyReleased(KeyEvent e) {
303-
// // TODO Auto-generated method stub
304-
//
305-
// }
306-
//
307-
// });
308-
// blankArea.addMouseListener(this);
309-
// addMouseListener(this);
310-
// setBorder(BorderFactory.createEmptyBorder(20, 20, 20, 20));
290+
// scrollPane.add(j);
291+
JSplitPane splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, panel, scrollPane);
292+
splitPane.setVisible(true);
293+
splitPane.setDividerLocation(0.2d);
294+
splitPane.setResizeWeight(0.5d);
295+
add(splitPane);
296+
297+
addKeyBinding();
298+
299+
addKeyListener(new KeyListener() {
300+
301+
@Override
302+
public void keyTyped(KeyEvent e) {
303+
System.out.println(e);
304+
}
305+
306+
@Override
307+
public void keyPressed(KeyEvent e) {
308+
}
309+
310+
@Override
311+
public void keyReleased(KeyEvent e) {
312+
// TODO Auto-generated method stub
313+
314+
}
315+
316+
});
317+
blankArea.addMouseListener(this);
318+
addMouseListener(this);
319+
setBorder(BorderFactory.createEmptyBorder(20, 20, 20, 20));
311320
}
312321

313322
private void addKeyBinding() {
@@ -339,7 +348,7 @@ void addKeyBinding(final KeyStroke ks) {
339348
this.getActionMap().put(ks, new AbstractAction() {
340349
@Override
341350
public void actionPerformed(ActionEvent e) {
342-
textArea.setText("");
351+
textArea.setText("" + e);
343352
log("");
344353
}
345354
});

‎sources/net.sf.j2s.java.core/src/test/js/TestJS.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package test.js;
2+
3+
public class TestJS {
4+
5+
/** @j2sAlias TESTJS_TEST */
6+
public void test() {
7+
System.out.println("test");
8+
}
9+
10+
public void test2() {
11+
System.out.println("test2");
12+
}
13+
14+
}

0 commit comments

Comments
 (0)