dev-noA2S -- moving a2s/ to swingjs/a2s

hansonr · hansonr · commit c1a13c822ae8 · 2018-10-23T18:51:07.000-05:00
-- no longer required outside of SwingJS context.
diff --git a/sources/net.sf.j2s.java.core/src/java/applet/Applet.java b/sources/net.sf.j2s.java.core/src/java/applet/Applet.java
@@ -47,7 +47,7 @@
  * @author      Chris Warth
  * @since       JDK1.0
  */
-public class Applet extends a2s.Applet {//Panel {
+public class Applet extends swingjs.a2s.Applet {//Panel {
 
     /**
      * Constructs a new Applet.
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Button.java b/sources/net.sf.j2s.java.core/src/java/awt/Button.java
@@ -69,7 +69,7 @@
  * @see java.awt.Component#addMouseListener
  * @since JDK1.0
  */
-public class Button extends a2s.Button {// Component implements Accessible {
+public class Button extends swingjs.a2s.Button {// Component implements Accessible {
 
 	/**
 	 * Constructs a button with an empty string for its label.
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Canvas.java b/sources/net.sf.j2s.java.core/src/java/awt/Canvas.java
@@ -41,7 +41,7 @@
  * @author      Sami Shaio
  * @since       JDK1.0
  */
-public class Canvas extends a2s.Canvas {//Component implements Accessible {
+public class Canvas extends swingjs.a2s.Canvas {//Component implements Accessible {
 
 //    private static final String base = "canvas";
 //    private static int nameCounter = 0;
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Checkbox.java b/sources/net.sf.j2s.java.core/src/java/awt/Checkbox.java
@@ -64,7 +64,7 @@
  * @see         java.awt.CheckboxGroup
  * @since       JDK1.0
  */
-public class Checkbox extends a2s.Checkbox {//Component implements ItemSelectable, Accessible {
+public class Checkbox extends swingjs.a2s.Checkbox {//Component implements ItemSelectable, Accessible {
 
 //    static {
 //        /* ensure that the necessary native libraries are loaded */
@@ -188,7 +188,7 @@ public Checkbox(String label, boolean state) throws HeadlessException {
      */
     public Checkbox(String label, boolean state, CheckboxGroup group)
         throws HeadlessException {
-    	super(label, state, (a2s.CheckboxGroup) (Object) group);
+    	super(label, state, (swingjs.a2s.CheckboxGroup) (Object) group);
 //        GraphicsEnvironment.checkHeadless();
 //        this.label = label;
 //        this.state = state;
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/CheckboxGroup.java b/sources/net.sf.j2s.java.core/src/java/awt/CheckboxGroup.java
@@ -54,7 +54,7 @@
  * @see         java.awt.Checkbox
  * @since       JDK1.0
  */
-public class CheckboxGroup extends a2s.CheckboxGroup {//implements java.io.Serializable {
+public class CheckboxGroup extends swingjs.a2s.CheckboxGroup {//implements java.io.Serializable {
 //    /**
 //     * The current choice.
 //     * @serial
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/CheckboxMenuItem.java b/sources/net.sf.j2s.java.core/src/java/awt/CheckboxMenuItem.java
@@ -51,7 +51,7 @@
  * @see         java.awt.event.ItemListener
  * @since       JDK1.0
  */
-public class CheckboxMenuItem extends a2s.CheckboxMenuItem {//MenuItem implements ItemSelectable, Accessible {
+public class CheckboxMenuItem extends swingjs.a2s.CheckboxMenuItem {//MenuItem implements ItemSelectable, Accessible {
 //
 //    static {
 //        /* ensure that the necessary native libraries are loaded */
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Choice.java b/sources/net.sf.j2s.java.core/src/java/awt/Choice.java
@@ -59,7 +59,7 @@
  * @author      Arthur van Hoff
  * @since       JDK1.0
  */
-public class Choice extends a2s.Choice {//Component implements ItemSelectable, Accessible {
+public class Choice extends swingjs.a2s.Choice {//Component implements ItemSelectable, Accessible {
 //    /**
 //     * The items for the <code>Choice</code>.
 //     * This can be a <code>null</code> value.
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Dialog.java b/sources/net.sf.j2s.java.core/src/java/awt/Dialog.java
@@ -79,7 +79,7 @@
  * @author      Arthur van Hoff
  * @since       JDK1.0
  */
-public class Dialog extends a2s.Dialog {
+public class Dialog extends swingjs.a2s.Dialog {
 
 //    static {
 //        /* ensure that the necessary native libraries are loaded */
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Frame.java b/sources/net.sf.j2s.java.core/src/java/awt/Frame.java
@@ -118,7 +118,7 @@
  * @see Window#addWindowListener
  * @since       JDK1.0
  */
-public class Frame extends a2s.Frame {//Window implements MenuContainer {
+public class Frame extends swingjs.a2s.Frame {//Window implements MenuContainer {
 
 //    /* Note: These are being obsoleted;  programs should use the Cursor class
 //     * variables going forward. See Cursor and Component.setCursor.
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Label.java b/sources/net.sf.j2s.java.core/src/java/awt/Label.java
@@ -46,7 +46,7 @@
  * @author      Sami Shaio
  * @since       JDK1.0
  */
-public class Label extends a2s.Label {//Component implements Accessible {
+public class Label extends swingjs.a2s.Label {//Component implements Accessible {
 
 //    static {
 //        /* ensure that the necessary native libraries are loaded */
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Menu.java b/sources/net.sf.j2s.java.core/src/java/awt/Menu.java
@@ -46,7 +46,7 @@
  * @see     java.awt.CheckboxMenuItem
  * @since   JDK1.0
  */
-public class Menu extends a2s.Menu {//MenuItem implements MenuContainer, Accessible {
+public class Menu extends swingjs.a2s.Menu {//MenuItem implements MenuContainer, Accessible {
 //
 //    static {
 //        /* ensure that the necessary native libraries are loaded */
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/MenuBar.java b/sources/net.sf.j2s.java.core/src/java/awt/MenuBar.java
@@ -58,7 +58,7 @@
  * @see        java.awt.MenuShortcut
  * @since      JDK1.0
  */
-public class MenuBar extends a2s.MenuBar {//{MenuComponent implements MenuContainer, Accessible {
+public class MenuBar extends swingjs.a2s.MenuBar {//{MenuComponent implements MenuContainer, Accessible {
 
 //    static {
 //        /* ensure that the necessary native libraries are loaded */
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/MenuItem.java b/sources/net.sf.j2s.java.core/src/java/awt/MenuItem.java
@@ -59,7 +59,7 @@
  *
  * @author Sami Shaio
  */
-public class MenuItem extends a2s.MenuItem {//MenuComponent implements Accessible {
+public class MenuItem extends swingjs.a2s.MenuItem {//MenuComponent implements Accessible {
 //
 //    static {
 //        /* ensure that the necessary native libraries are loaded */
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/ModalEventFilter.java b/sources/net.sf.j2s.java.core/src/java/awt/ModalEventFilter.java
@@ -107,7 +107,7 @@ int compareTo(ModalEventFilter another) {
             c = c.getParent_NoClientCode();
         }
         // check if one dialog blocks (directly or indirectly) another
-        Dialog blocker = ((a2s.Dialog) modalDialog).getModalBlocker();
+        Dialog blocker = ((swingjs.a2s.Dialog) modalDialog).getModalBlocker();
         while (blocker != null) {
             if (blocker == anotherDialog) {
                 return -1;
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Panel.java b/sources/net.sf.j2s.java.core/src/java/awt/Panel.java
@@ -36,7 +36,7 @@
  * @see     java.awt.FlowLayout
  * @since   JDK1.0
  */
-public class Panel extends a2s.Panel {//Container implements Accessible {
+public class Panel extends swingjs.a2s.Panel {//Container implements Accessible {
 //    private static final String base = "panel";
 //    private static int nameCounter = 0;
 //
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/PopupMenu.java b/sources/net.sf.j2s.java.core/src/java/awt/PopupMenu.java
@@ -37,7 +37,7 @@
  *
  * @author      Amy Fowler
  */
-public class PopupMenu extends a2s.PopupMenu {//Menu {
+public class PopupMenu extends swingjs.a2s.PopupMenu {//Menu {
 
 //    private static final String base = "popup";
 //    static int nameCounter = 0;
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/ScrollPane.java b/sources/net.sf.j2s.java.core/src/java/awt/ScrollPane.java
@@ -79,7 +79,7 @@
  * @author      Amy Fowler
  * @author      Tim Prinzing
  */
-public class ScrollPane extends a2s.ScrollPane {//Container implements Accessible {
+public class ScrollPane extends swingjs.a2s.ScrollPane {//Container implements Accessible {
 
 //
 //    /**
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Scrollbar.java b/sources/net.sf.j2s.java.core/src/java/awt/Scrollbar.java
@@ -154,7 +154,7 @@
  * @see         java.awt.event.AdjustmentListener
  * @since       JDK1.0
  */
-public class Scrollbar extends a2s.Scrollbar {//Component implements Adjustable, Accessible {
+public class Scrollbar extends swingjs.a2s.Scrollbar {//Component implements Adjustable, Accessible {
 //
 //    /**
 //     * A constant that indicates a horizontal scroll bar.
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/TextArea.java b/sources/net.sf.j2s.java.core/src/java/awt/TextArea.java
@@ -53,7 +53,7 @@
  * @author      Sami Shaio
  * @since       JDK1.0
  */
-public class TextArea extends a2s.TextArea {//TextComponent {
+public class TextArea extends swingjs.a2s.TextArea {//TextComponent {
 
 //    /**
 //     * The number of rows in the <code>TextArea</code>.
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/TextField.java b/sources/net.sf.j2s.java.core/src/java/awt/TextField.java
@@ -85,7 +85,7 @@
  * @see         java.awt.TextField#addActionListener
  * @since       JDK1.0
  */
-public class TextField extends a2s.TextField {//TextComponent {
+public class TextField extends swingjs.a2s.TextField {//TextComponent {
 
 //    /**
 //     * The number of columns in the text field.
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/A2SContainer.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/A2SContainer.java
@@ -1,4 +1,4 @@
-package a2s;
+package swingjs.a2s;
 
 public interface A2SContainer {
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/A2SEvent.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/A2SEvent.java
@@ -1,5 +1,10 @@
-package java.awt;
+package swingjs.a2s;
 
+import java.awt.AWTEvent;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Event;
+import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.AdjustmentEvent;
@@ -18,15 +23,6 @@
 import javax.swing.JComponent;
 import javax.swing.JScrollBar;
 
-import a2s.A2SContainer;
-import a2s.A2SListener;
-import a2s.Choice;
-import a2s.Dialog;
-import a2s.Frame;
-import a2s.List;
-import a2s.MenuItem;
-import a2s.TextField;
-
 
 public class A2SEvent implements Runnable {
 
@@ -35,10 +31,9 @@ public class A2SEvent implements Runnable {
 
 	public A2SEvent(AWTEvent e) {
 		this.target = e.getSource();
-		this.e = A2SEvent.convertToOld(e);
+		this.e = convertToOld(e);
 	}
 
-
 	@SuppressWarnings("deprecation")
 	@Override
 	public void run() {
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/A2SListener.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/A2SListener.java
@@ -1,6 +1,5 @@
-package a2s;
+package swingjs.a2s;
 
-import java.awt.A2SEvent;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.AdjustmentEvent;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Applet.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Applet.java
@@ -1,4 +1,4 @@
-package a2s;
+package swingjs.a2s;
 
 import java.awt.Color;
 import java.awt.Graphics;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Button.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Button.java
@@ -1,6 +1,5 @@
-package a2s;
+package swingjs.a2s;
 
-import java.awt.A2SEvent;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Canvas.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Canvas.java
@@ -1,4 +1,4 @@
-package a2s;
+package swingjs.a2s;
 
 import java.awt.Color;
 import java.awt.Graphics;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Checkbox.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Checkbox.java
@@ -1,6 +1,5 @@
-package a2s;
+package swingjs.a2s;
 
-import java.awt.A2SEvent;
 import java.awt.HeadlessException;
 import java.awt.event.ActionEvent;
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/CheckboxGroup.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/CheckboxGroup.java
@@ -1,4 +1,4 @@
-package a2s;
+package swingjs.a2s;
 
 import java.util.Enumeration;
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/CheckboxMenuItem.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/CheckboxMenuItem.java
@@ -1,4 +1,4 @@
-package a2s;
+package swingjs.a2s;
 
 import javax.swing.JCheckBoxMenuItem;
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Choice.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Choice.java
@@ -1,4 +1,4 @@
-package a2s;
+package swingjs.a2s;
 
 import javax.swing.JComboBox;
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Dialog.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Dialog.java
@@ -1,4 +1,4 @@
-package a2s;
+package swingjs.a2s;
 
 import java.awt.GraphicsConfiguration;
 import java.awt.Window;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Frame.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Frame.java
@@ -1,4 +1,4 @@
-package a2s;
+package swingjs.a2s;
 
 import java.awt.GraphicsConfiguration;
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Label.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Label.java
@@ -1,4 +1,4 @@
-package a2s;
+package swingjs.a2s;
 
 import java.awt.Color;
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/List.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/List.java
@@ -1,4 +1,4 @@
-package a2s;
+package swingjs.a2s;
 
 import javax.swing.JList;
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Menu.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Menu.java
@@ -1,4 +1,4 @@
-package a2s;
+package swingjs.a2s;
 
 import javax.swing.JMenu;
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/MenuBar.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/MenuBar.java
@@ -1,4 +1,4 @@
-package a2s;
+package swingjs.a2s;
 
 import javax.swing.JMenuBar;
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/MenuItem.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/MenuItem.java
@@ -1,4 +1,4 @@
-package a2s;
+package swingjs.a2s;
 
 import java.awt.MenuShortcut;
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Panel.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Panel.java
@@ -1,4 +1,4 @@
-package a2s;
+package swingjs.a2s;
 
 import java.awt.Color;
 import java.awt.LayoutManager;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/PopupMenu.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/PopupMenu.java
@@ -1,4 +1,4 @@
-package a2s;
+package swingjs.a2s;
 
 import javax.swing.JPopupMenu;
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/ScrollPane.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/ScrollPane.java
@@ -1,4 +1,4 @@
-package a2s;
+package swingjs.a2s;
 
 import java.awt.Component;
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Scrollbar.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Scrollbar.java
@@ -1,6 +1,5 @@
-package a2s;
+package swingjs.a2s;
 
-import java.awt.A2SEvent;
 import java.awt.event.AdjustmentEvent;
 
 import javax.swing.JScrollBar;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/TextArea.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/TextArea.java
@@ -1,4 +1,4 @@
-package a2s;
+package swingjs.a2s;
 
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/TextField.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/TextField.java
@@ -1,4 +1,4 @@
-package a2s;
+package swingjs.a2s;
 
 import java.awt.event.TextEvent;
 import java.awt.event.TextListener;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Util.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Util.java
@@ -1,4 +1,4 @@
-package a2s;
+package swingjs.a2s;
 
 import java.awt.Graphics;
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/_README.txt b/sources/net.sf.j2s.java.core/src/swingjs/a2s/_README.txt
