Jmol-SwingJS fixes for Hashtable; efficiencies for DataInputStream

BobHanson · BobHanson · commit 9aff277575f8 · 2024-01-31T18:31:49.000-06:00
diff --git a/sources/net.sf.j2s.java.core/dist_to_jsmol/Jmol-j2s-site.zip b/sources/net.sf.j2s.java.core/dist_to_jsmol/Jmol-j2s-site.zip
diff --git a/sources/net.sf.j2s.java.core/src_4.2/java/io/BufferedInputStream.java b/sources/net.sf.j2s.java.core/src_4.2/java/io/BufferedInputStream.java
@@ -235,7 +235,7 @@ else if (pos >= buffer.length)  /* no room left in buffer */
                 buffer = buf = nbuf;
             }
         count = pos;
-        int n = getInIfOpen().read(buffer, pos, buffer.length - pos);
+        int n = isRead(buffer, pos, buffer.length - pos);
         if (n > 0)
             count = n + pos;
     }
@@ -262,6 +262,8 @@ public synchronized int readByteAsInt() throws IOException {
         return getBufIfOpen()[pos++] & 0xff;
     }
 
+    
+    
     /**
      * Read characters into a portion of an array, reading from the underlying
      * stream at most once if necessary.
@@ -279,7 +281,7 @@ private int read1(byte[] b, int off, int len) throws IOException {
                bytes into the local buffer.  In this way buffered streams will
                cascade harmlessly. */
             if (len >= getBufIfOpen().length && markpos < 0) {
-                return getInIfOpen().read(b, off, len);
+            	return isRead(b, off, len);
             }
             fill();
             avail = count - pos;
@@ -291,7 +293,17 @@ private int read1(byte[] b, int off, int len) throws IOException {
         return cnt;
     }
 
-    /**
+    private int isRead(byte[] b, int off, int len) throws IOException {
+        InputStream is = getInIfOpen();
+        /**
+         * @j2sNative
+         * if (is.readBAIS) return is.readBAIS(b, off, len);
+         */
+        {}        
+        return is.read(b, off, len);
+	}
+
+	/**
      * Reads bytes from this byte-input stream into the specified byte array,
      * starting at the given offset.
      *
@@ -332,6 +344,10 @@ private int read1(byte[] b, int off, int len) throws IOException {
     public synchronized int read(byte b[], int off, int len)
         throws IOException
     {
+    	return readBIS(b, off, len);
+    }
+
+    public int readBIS(byte[] b, int off, int len) throws IOException {
         getBufIfOpen(); // Check for closed stream
         if ((off | len | (off + len) | (b.length - (off + len))) < 0) {
             throw new IndexOutOfBoundsException();
@@ -352,9 +368,9 @@ public synchronized int read(byte b[], int off, int len)
             if (input != null && input.available() <= 0)
                 return n;
         }
-    }
+	}
 
-    /**
+	/**
      * See the general contract of the <code>skip</code>
      * method of <code>InputStream</code>.
      *
diff --git a/sources/net.sf.j2s.java.core/src_4.2/java/io/ByteArrayInputStream.java b/sources/net.sf.j2s.java.core/src_4.2/java/io/ByteArrayInputStream.java
@@ -178,6 +178,10 @@ public synchronized int readByteAsInt() {
      */
     @Override
     public synchronized int read(byte b[], int off, int len) {
+    	return readBAIS(b, off, len);
+    }
+
+    public int readBAIS(byte[] b, int off, int len) {
         if (b == null) {
             throw new NullPointerException();
         } else if (off < 0 || len < 0 || len > b.length - off) {
@@ -198,9 +202,9 @@ public synchronized int read(byte b[], int off, int len) {
         System.arraycopy(buf, pos, b, off, len);
         pos += len;
         return len;
-    }
+	}
 
-    /**
+	/**
      * Skips <code>n</code> bytes of input from this input stream. Fewer
      * bytes might be skipped if the end of the input stream is reached.
      * The actual number <code>k</code>
diff --git a/sources/net.sf.j2s.java.core/src_4.2/java/io/DataInputStream.java b/sources/net.sf.j2s.java.core/src_4.2/java/io/DataInputStream.java
@@ -161,6 +161,20 @@ public final int read(byte b[], int off, int len) throws IOException {
     return in.read(b, off, len);
   }
 
+	public final int readDIS(byte b[], int off, int len) throws IOException {
+		InputStream is = this.in;
+		/**
+		 * @j2sNative
+		 * 
+		 * 			if (is.readBIS) return is.readBIS(b, off, len); 
+		 * 			if (is.readBAIS)
+		 *            return is.readBAIS(b, off, len);
+		 */
+		{
+		}
+		return is.read(b, off, len);
+	}
+
 //  /**
 //   * See the general contract of the <code>readFully</code> method of
 //   * <code>DataInput</code>.
diff --git a/sources/net.sf.j2s.java.core/src_4.2/java/util/Hashtable.java b/sources/net.sf.j2s.java.core/src_4.2/java/util/Hashtable.java
@@ -1315,7 +1315,10 @@ public T nextElement() {
 
 							@Override
 							public Object setValue(Object value) {
-								return ht.put(getKey(), value);
+								int m = ht.modCount;
+								Object v = ht.put(getKey(), value);
+								ht.modCount = m;
+								return (T) v;
 							}
 						};
 					}
diff --git a/sources/net.sf.j2s.java.core/src_4.2/test/Test.java b/sources/net.sf.j2s.java.core/src_4.2/test/Test.java
@@ -3,6 +3,9 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 public class Test implements ITest {
 	
@@ -59,7 +62,17 @@ public Test(){
 	public final static void main(String[] args) {
 	
 		new javax.swing.JButton(); 
-
+		
+		ByteArrayInputStream bis = new ByteArrayInputStream(new byte[] {'t','e','s','t'});
+		DataInputStream dis = new DataInputStream(bis);
+		byte[] bytes = new byte[4];
+		try {
+			dis.read(bytes, 0, 4);
+		} catch (IOException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		
 		char ch = '1';
 	    switch (ch) {
 	    case 0b111111:

Original file line number	Diff line number	Diff line change
`@@ -1315,7 +1315,10 @@ public T nextElement() {`
`1315`	`1315`
`1316`	`1316`	`@Override`
`1317`	`1317`	`public Object setValue(Object value) {`
`1318`		`- return ht.put(getKey(), value);`
	`1318`	`+ int m = ht.modCount;`
	`1319`	`+ Object v = ht.put(getKey(), value);`
	`1320`	`+ ht.modCount = m;`
	`1321`	`+ return (T) v;`
`1319`	`1322`	`}`
`1320`	`1323`	`};`
`1321`	`1324`	`}`