Moving a2s.A2SEvent to java.awt

hansonr · hansonr · commit 700bc4e3f563 · 2018-10-23T18:16:44.000-05:00
a2s.A2SEvent calls component.getMouseEventTarget, which is package-local
in Java 8.
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20181020060436 
+20181023112705 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp
@@ -1 +1 @@
-20181020060436 
+20181023112705 
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/src/a2s/A2SContainer.java b/sources/net.sf.j2s.java.core/src/a2s/A2SContainer.java
@@ -1,7 +1,7 @@
 package a2s;
 
-interface A2SContainer {
+public interface A2SContainer {
 
-   A2SListener getA2SListener();
+   public A2SListener getA2SListener();
 
 }
diff --git a/sources/net.sf.j2s.java.core/src/a2s/A2SListener.java b/sources/net.sf.j2s.java.core/src/a2s/A2SListener.java
@@ -1,5 +1,6 @@
 package 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/a2s/Button.java b/sources/net.sf.j2s.java.core/src/a2s/Button.java
@@ -1,5 +1,6 @@
 package a2s;
 
+import java.awt.A2SEvent;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
 
diff --git a/sources/net.sf.j2s.java.core/src/a2s/Checkbox.java b/sources/net.sf.j2s.java.core/src/a2s/Checkbox.java
@@ -1,5 +1,6 @@
 package a2s;
 
+import java.awt.A2SEvent;
 import java.awt.HeadlessException;
 import java.awt.event.ActionEvent;
 
diff --git a/sources/net.sf.j2s.java.core/src/a2s/Scrollbar.java b/sources/net.sf.j2s.java.core/src/a2s/Scrollbar.java
@@ -1,5 +1,6 @@
 package a2s;
 
+import java.awt.A2SEvent;
 import java.awt.event.AdjustmentEvent;
 
 import javax.swing.JScrollBar;
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/A2SEvent.java b/sources/net.sf.j2s.java.core/src/java/awt/A2SEvent.java
@@ -1,10 +1,5 @@
-package a2s;
+package java.awt;
 
-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;
@@ -23,6 +18,15 @@
 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 {
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package a2s;`
`2`	`2`
`3`		`-interface A2SContainer {`
	`3`	`+public interface A2SContainer {`
`4`	`4`
`5`		`- A2SListener getA2SListener();`
	`5`	`+ public A2SListener getA2SListener();`
`6`	`6`
`7`	`7`	`}`