Skip to content

Commit e76fa51

Browse files
BobHansonBobHanson
authored
Merge pull request #114 from BobHanson/hanson1
Hanson1 - JTabbedPane fix
2 parents 3622d79 + aae9e15 commit e76fa51

27 files changed

+247
-208
lines changed

‎sources/net.sf.j2s.core/dist/jars/closure-compiler-v20190819.jar‎

7.81 MB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/jars/closure_compiler.jar‎

5.68 MB
Binary file not shown.

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

36.6 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-
20190923090813
1+
20191001111303

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

36.6 KB
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20190923090813
1+
20191001111303

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

36.6 KB
Binary file not shown.

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -109,21 +109,21 @@ public Card(String cardName, Component cardComponent) {
109109
*/
110110
int vgap;
111111

112-
/**
113-
* @serialField tab Hashtable
114-
* deprectated, for forward compatibility only
115-
* @serialField hgap int
116-
* @serialField vgap int
117-
* @serialField vector Vector
118-
* @serialField currentCard int
119-
*/
120-
private static final ObjectStreamField[] serialPersistentFields = {
121-
new ObjectStreamField("tab", Hashtable.class),
122-
new ObjectStreamField("hgap", Integer.TYPE),
123-
new ObjectStreamField("vgap", Integer.TYPE),
124-
new ObjectStreamField("vector", Vector.class),
125-
new ObjectStreamField("currentCard", Integer.TYPE)
126-
};
112+
// /**
113+
// * @serialField tab Hashtable
114+
// * deprectated, for forward compatibility only
115+
// * @serialField hgap int
116+
// * @serialField vgap int
117+
// * @serialField vector Vector
118+
// * @serialField currentCard int
119+
// */
120+
// private static final ObjectStreamField[] serialPersistentFields = {
121+
// new ObjectStreamField("tab", Hashtable.class),
122+
// new ObjectStreamField("hgap", Integer.TYPE),
123+
// new ObjectStreamField("vgap", Integer.TYPE),
124+
// new ObjectStreamField("vector", Vector.class),
125+
// new ObjectStreamField("currentCard", Integer.TYPE)
126+
// };
127127

128128
/**
129129
* Creates a new card layout with gaps of size zero.

‎sources/net.sf.j2s.java.core/src/java/io/InputStreamReader.java‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030

3131
import java.io.IOException;
3232
import java.io.UnsupportedEncodingException;
33+
import java.nio.charset.Charset;
34+
import java.nio.charset.CharsetDecoder;
3335

3436
/**
3537
* An InputStreamReader is a bridge from byte streams to character streams: It
@@ -103,37 +105,38 @@ public InputStreamReader(InputStream in, String charsetName)
103105
//sd = StreamDecoder.forInputStreamReader(in, this, charsetName);
104106
}
105107

106-
// /**
107-
// * Creates an InputStreamReader that uses the given charset. </p>
108-
// *
109-
// * @param in An InputStream
110-
// * @param cs A charset
111-
// *
112-
// * @since 1.4
113-
// * @spec JSR-51
114-
// */
115-
// public InputStreamReader(InputStream in, Charset cs) {
116-
// super(in);
117-
// if (cs == null)
118-
// throw new NullPointerException("charset");
108+
/**
109+
* Creates an InputStreamReader that uses the given charset. </p>
110+
*
111+
* @param in An InputStream
112+
* @param cs A charset
113+
*
114+
* @since 1.4
115+
* @spec JSR-51
116+
*/
117+
public InputStreamReader(InputStream in, Charset cs) {
118+
super(in);
119+
if (cs == null)
120+
throw new NullPointerException("charset");
119121
// sd = StreamDecoder.forInputStreamReader(in, this, cs);
120-
// }
122+
}
121123

122-
// /**
123-
// * Creates an InputStreamReader that uses the given charset decoder. </p>
124-
// *
125-
// * @param in An InputStream
126-
// * @param dec A charset decoder
127-
// *
128-
// * @since 1.4
129-
// * @spec JSR-51
130-
// */
131-
// public InputStreamReader(InputStream in, CharsetDecoder dec) {
132-
// super(in);
133-
// if (dec == null)
134-
// throw new NullPointerException("charset decoder");
124+
/**
125+
* Creates an InputStreamReader that uses the given charset decoder. </p>
126+
*
127+
* @param in An InputStream
128+
* @param dec A charset decoder
129+
*
130+
* @since 1.4
131+
* @spec JSR-51
132+
*/
133+
public InputStreamReader(InputStream in, CharsetDecoder dec) {
134+
super(in);
135+
System.err.println("SwingJS java.io.InputStreamReader(InputStream, CharsetDecoder) is not implemented");
136+
if (dec == null)
137+
throw new NullPointerException("charset decoder");
135138
// sd = StreamDecoder.forInputStreamReader(in, this, dec);
136-
// }
139+
}
137140

138141
/**
139142
* Returns the name of the character encoding being used by this stream.

‎sources/net.sf.j2s.java.core/src/java/io/OutputStreamWriter.java‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import java.io.IOException;
3333
import java.io.StringWriter;
3434
import java.io.UnsupportedEncodingException;
35+
import java.nio.charset.Charset;
3536
//import java.nio.charset.Charset;
3637
//import java.nio.charset.CharsetEncoder;
3738
//import sun.nio.cs.StreamEncoder;
@@ -138,24 +139,24 @@ public OutputStreamWriter(OutputStream out) {
138139
}
139140
}
140141

141-
// /**
142-
// * Creates an OutputStreamWriter that uses the given charset. </p>
143-
// *
144-
// * @param out
145-
// * An OutputStream
146-
// *
147-
// * @param cs
148-
// * A charset
149-
// *
150-
// * @since 1.4
151-
// * @spec JSR-51
152-
// */
153-
// public OutputStreamWriter(OutputStream out, Charset cs) {
154-
// super(out);
155-
// if (cs == null)
156-
// throw new NullPointerException("charset");
142+
/**
143+
* Creates an OutputStreamWriter that uses the given charset. </p>
144+
*
145+
* @param out
146+
* An OutputStream
147+
*
148+
* @param cs
149+
* A charset
150+
*
151+
* @since 1.4
152+
* @spec JSR-51
153+
*/
154+
public OutputStreamWriter(OutputStream out, Charset cs) {
155+
super(out);
156+
if (cs == null)
157+
throw new NullPointerException("charset");
157158
// se = StreamEncoder.forOutputStreamWriter(out, this, cs);
158-
// }
159+
}
159160

160161
/**
161162
* Creates an OutputStreamWriter that uses the given charset encoder. </p>

0 commit comments

Comments
 (0)