Skip to content

Commit 1e4c730

Browse files
BobHansonBobHanson
committed
refactoring almost complete
1 parent 0aac80a commit 1e4c730

26 files changed

Lines changed: 60 additions & 61 deletions

‎sources/net.sf.j2s.java.core/src/java/awt/image/MemoryImageSource.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737

3838
import javajs.util.AU;
3939

40-
import javajs.J2SRequireImport;
41-
4240
/**
4341
* This class is an implementation of the ImageProducer interface which
4442
* uses an array to produce pixel values for an Image. Here is an example
@@ -111,7 +109,7 @@
111109
* @author Animation capabilities inspired by the
112110
* MemoryAnimationSource class written by Garth Dickie
113111
*/
114-
@J2SRequireImport (java.awt.image.ColorModel.class)
112+
//@J2SRequireImport (java.awt.image.ColorModel.class)
115113
@SuppressWarnings({"rawtypes", "unchecked"})
116114
public class MemoryImageSource implements ImageProducer {
117115
int width;

‎sources/net.sf.j2s.java.core/src/java/awt/image/Raster.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939

4040
package java.awt.image;
41-
import javajs.J2SRequireImport;
41+
////import javajs.J2SRequireImport;
4242
import swingjs.api.Interface;
4343
import java.awt.Rectangle;
4444
import java.awt.Point;
@@ -124,7 +124,7 @@
124124
* @see java.awt.image.MultiPixelPackedSampleModel
125125
*/
126126

127-
@J2SRequireImport({ java.awt.image.MultiPixelPackedSampleModel.class, java.awt.image.SinglePixelPackedSampleModel.class })
127+
//@J2SRequireImport({ java.awt.image.MultiPixelPackedSampleModel.class, java.awt.image.SinglePixelPackedSampleModel.class })
128128
public class Raster {
129129

130130
/**

‎sources/net.sf.j2s.java.core/src/java/beans/PropertyChangeSupport.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*/
2828
package java.beans;
2929

30-
import javajs.J2SRequireImport;
30+
//import javajs.J2SRequireImport;
3131

3232
/**
3333
* This is a utility class that can be used by beans that support bound
@@ -38,7 +38,7 @@
3838
* (and restore) any listeners that are themselves serializable. Any
3939
* non-serializable listeners will be skipped during serialization.
4040
*/
41-
@J2SRequireImport(PropertyChangeListener.class)
41+
//@J2SRequireImport(PropertyChangeListener.class)
4242
public class PropertyChangeSupport {
4343
private PropertyChangeListenerMap map = new PropertyChangeListenerMap();
4444

‎sources/net.sf.j2s.java.core/src/java/lang/Class.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525

2626
package java.lang;
27-
//DEPRECATED -- SEE J2SSwingJS.js
27+
2828
import java.io.InputStream;
2929
import java.lang.reflect.Constructor;
3030
import java.lang.reflect.Field;
@@ -1690,7 +1690,7 @@ public Method getMethod(String name, Class<?>... paramTypes) throws NoSuchMethod
16901690
/**
16911691
* @j2sNative
16921692
*
1693-
* return Clazz.$new(java.lang.reflect.Method.construct$Class$S$ClassA$Class$ClassA$I, [this, name,
1693+
* return Clazz.$new(java.lang.reflect.Method.c$$Class$S$ClassA$Class$ClassA$I, [this, name,
16941694
* paramTypes, java.lang.Void, [], 0]);
16951695
*/
16961696
{
@@ -1758,7 +1758,7 @@ public Constructor<T> getConstructor(Class<?>... parameterTypes) throws NoSuchMe
17581758
/**
17591759
* @j2sNative
17601760
*
1761-
* return Clazz.$new(java.lang.reflect.Constructor.construct$Class$ClassA$ClassA$I, [this, parameterTypes || [], [], java.lang.reflect.Modifier.PUBLIC]);
1761+
* return Clazz.$new(java.lang.reflect.Constructor.c$$Class$ClassA$ClassA$I, [this, parameterTypes || [], [], java.lang.reflect.Modifier.PUBLIC]);
17621762
*/
17631763
{
17641764
return null;
@@ -2137,7 +2137,7 @@ public Constructor<T> getDeclaredConstructor(Class<?>... parameterTypes)
21372137
public InputStream getResourceAsStream(String name) {
21382138
// allows an optional second argument to be a base directory in JavaScript
21392139
@SuppressWarnings("unused")
2140-
String clazzName = this.$clazz$.__CLASS_NAME__;
2140+
String clazzName = $clazz$.__CLASS_NAME__;
21412141
/**
21422142
* @j2sNative
21432143
if (!name)
@@ -2183,7 +2183,7 @@ public InputStream getResourceAsStream(String name) {
21832183
fname = d.join("/");
21842184
}
21852185
Clazz.loadClass("java.net.URL");
2186-
url = Clazz.$new(java.net.URL.construct$S,[fname]);
2186+
url = Clazz.$new(java.net.URL.c$$S,[fname]);
21872187
} catch (e) {
21882188
return null;
21892189
}
@@ -2198,7 +2198,7 @@ public InputStream getResourceAsStream(String name) {
21982198
var bytes = (data.__BYTESIZE == 1 ? data : J2S._strToBytes(data));
21992199
Clazz.loadClass("java.io.BufferedInputStream");
22002200
Clazz.loadClass("java.io.ByteArrayInputStream");
2201-
var is = Clazz.$new(java.io.BufferedInputStream.construct$java_io_InputStream, [Clazz.$new(java.io.ByteArrayInputStream.construct$BA, [bytes])]);
2201+
var is = Clazz.$new(java.io.BufferedInputStream.c$$java_io_InputStream, [Clazz.$new(java.io.ByteArrayInputStream.c$$BA, [bytes])]);
22022202
is.url = url;
22032203
url._streamData = is;
22042204
return is;

‎sources/net.sf.j2s.java.core/src/java/lang/reflect/Constructor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* constructor. Information about the constructor can be accessed, and the
2323
* constructor can be invoked dynamically.
2424
*
25-
* @j2sRequireImport java.lang.Void
25+
* @//j2sRequireImport java.lang.Void
2626
*/
2727
public final class Constructor<T> extends AccessibleObject implements GenericDeclaration, Member {
2828

‎sources/net.sf.j2s.java.core/src/java/lang/reflect/Method.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* Information about the method can be accessed, and the method can be invoked
2323
* dynamically.
2424
*
25-
* @j2sRequireImport java.lang.Void
25+
*@//j2sRequireImport java.lang.Void
2626
*/
2727
public final class Method extends AccessibleObject implements GenericDeclaration, Member {
2828

‎sources/net.sf.j2s.java.core/src/java/text/DateFormatSymbols.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import java.util.Locale;
4747
import java.util.ResourceBundle;
4848

49-
import javajs.J2SRequireImport;
49+
//import javajs.J2SRequireImport;
5050
import sun.util.resources.LocaleData;
5151

5252
/**
@@ -94,7 +94,7 @@
9494
* @see java.util.SimpleTimeZone
9595
* @author Chen-Lieh Huang
9696
*/
97-
@J2SRequireImport(LocaleData.class)
97+
//@J2SRequireImport(LocaleData.class)
9898
public class DateFormatSymbols implements Cloneable {
9999

100100
/**

‎sources/net.sf.j2s.java.core/src/java/text/DecimalFormat.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
//import java.util.Currency;
5050
import java.util.Hashtable;
5151

52-
import javajs.J2SRequireImport;
52+
//import javajs.J2SRequireImport;
5353
import java.util.Locale;
5454
import java.util.ResourceBundle;
5555
//import java.util.concurrent.atomic.AtomicInteger;
@@ -377,7 +377,7 @@
377377
* @author Mark Davis
378378
* @author Alan Liu
379379
*/
380-
@J2SRequireImport(DecimalFormatSymbols.class)
380+
//@J2SRequireImport(DecimalFormatSymbols.class)
381381
public class DecimalFormat extends NumberFormat {
382382

383383
/**

‎sources/net.sf.j2s.java.core/src/java/text/DecimalFormatSymbols.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
//import java.text.spi.DecimalFormatSymbolsProvider;
4545
import java.util.Hashtable;
4646

47-
import javajs.J2SRequireImport;
47+
//import javajs.J2SRequireImport;
4848

4949
import java.util.Locale;
5050
import java.util.ResourceBundle;
@@ -65,7 +65,7 @@
6565
* @author Mark Davis
6666
* @author Alan Liu
6767
*/
68-
@J2SRequireImport(LocaleData.class)
68+
//@J2SRequireImport(LocaleData.class)
6969
public class DecimalFormatSymbols implements Cloneable {
7070

7171
/**

‎sources/net.sf.j2s.java.core/src/java/text/NumberFormat.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
import java.util.Locale;
5050
import java.util.Map;
5151

52-
import javajs.J2SRequireImport;
52+
//import javajs.J2SRequireImport;
5353
import java.util.ResourceBundle;
5454
//import java.util.concurrent.atomic.AtomicInteger;
5555
//import java.util.concurrent.atomic.AtomicLong;
@@ -179,7 +179,7 @@
179179
* @author Mark Davis
180180
* @author Helena Shih
181181
*/
182-
@J2SRequireImport(LocaleData.class)
182+
//@J2SRequireImport(LocaleData.class)
183183
public abstract class NumberFormat extends Format {
184184

185185
/**

0 commit comments

Comments
 (0)