harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r391955 [2/5] - in /incubator/harmony/enhanced/classlib/trunk: make/patternsets/ modules/ modules/archive/META-INF/ modules/archive/src/main/java/java/util/jar/ modules/archive/src/main/java/java/util/zip/ modules/jndi/src/main/java/com/ mo...
Date Thu, 06 Apr 2006 10:42:32 GMT
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java
Thu Apr  6 03:42:13 2006
@@ -28,7 +28,7 @@
 import java.util.IdentityHashMap;
 import java.util.Iterator;
 
-import com.ibm.oti.util.PriviAction;
+import org.apache.harmony.luni.util.PriviAction;
 
 /**
  * An ObjectInputStream can be used to load Java objects from a stream where the
@@ -691,7 +691,7 @@
 		case TC_NULL:
 			return null;
 		default:
-			throw new StreamCorruptedException(com.ibm.oti.util.Msg.getString(
+			throw new StreamCorruptedException(org.apache.harmony.luni.util.Msg.getString(
 					"K00d2", Integer.toHexString(tc & 0xff))); //$NON-NLS-1$
 		}
 	}
@@ -736,13 +736,13 @@
 			return null;
 		case TC_EXCEPTION:
 			Exception exc = readException();
-			throw new WriteAbortedException(com.ibm.oti.util.Msg
+			throw new WriteAbortedException(org.apache.harmony.luni.util.Msg
 					.getString("K00d3"), exc); //$NON-NLS-1$
 		case TC_RESET:
 			resetState();
 			return null;
 		default:
-			throw new StreamCorruptedException(com.ibm.oti.util.Msg.getString(
+			throw new StreamCorruptedException(org.apache.harmony.luni.util.Msg.getString(
 					"K00d2", Integer.toHexString(tc & 0xff))); //$NON-NLS-1$
 		}
 	}
@@ -797,7 +797,7 @@
 				return null;
 			case TC_EXCEPTION:
 				Exception exc = readException();
-				throw new WriteAbortedException(com.ibm.oti.util.Msg
+				throw new WriteAbortedException(org.apache.harmony.luni.util.Msg
 						.getString("K00d3"), exc); //$NON-NLS-1$
 			case TC_RESET:
 				resetState();
@@ -808,7 +808,7 @@
 				e.eof = true;
 				throw e;
 			default:
-				throw new StreamCorruptedException(com.ibm.oti.util.Msg
+				throw new StreamCorruptedException(org.apache.harmony.luni.util.Msg
 						.getString("K00d2", Integer.toHexString(tc & 0xff))); //$NON-NLS-1$
 			}
 			// Only TC_RESET falls through
@@ -1106,7 +1106,7 @@
 								input.readBoolean());
 						break;
 					default:
-						throw new StreamCorruptedException(com.ibm.oti.util.Msg
+						throw new StreamCorruptedException(org.apache.harmony.luni.util.Msg
 								.getString("K00d5", fieldDesc.getTypeCode())); //$NON-NLS-1$
 					}
 				} catch (NoSuchFieldError err) {
@@ -1132,7 +1132,7 @@
 						Class fieldType = field.getType();
 						Class valueType = toSet.getClass();
 						if (!fieldType.isAssignableFrom(valueType))
-							throw new ClassCastException(com.ibm.oti.util.Msg
+							throw new ClassCastException(org.apache.harmony.luni.util.Msg
 									.getString("K00d4", new String[] { //$NON-NLS-1$
 											fieldType.toString(),
 											valueType.toString(),
@@ -1417,7 +1417,7 @@
 		ObjectStreamClass classDesc = readClassDesc();
 
 		if (classDesc == null)
-			throw new InvalidClassException(com.ibm.oti.util.Msg
+			throw new InvalidClassException(org.apache.harmony.luni.util.Msg
 					.getString("K00d1")); //$NON-NLS-1$
 
 		Integer newHandle = new Integer(nextHandle());
@@ -1471,7 +1471,7 @@
 				for (int i = 0; i < size; i++)
 					doubleArray[i] = input.readDouble();
 			} else
-				throw new ClassNotFoundException(com.ibm.oti.util.Msg
+				throw new ClassNotFoundException(org.apache.harmony.luni.util.Msg
 						.getString("K00d7", classDesc.getName())); //$NON-NLS-1$
 		} else {
 			// Array of Objects
@@ -1510,7 +1510,7 @@
 				registerObjectRead(localClass, newHandle);
 			return localClass;
 		}
-		throw new InvalidClassException(com.ibm.oti.util.Msg.getString("K00d1")); //$NON-NLS-1$
+		throw new InvalidClassException(org.apache.harmony.luni.util.Msg.getString("K00d1")); //$NON-NLS-1$
 	}
 
 	/**
@@ -1638,7 +1638,7 @@
 	 */
 	protected Class resolveProxyClass(String[] interfaceNames)
 			throws IOException, ClassNotFoundException {
-		ClassLoader loader = com.ibm.oti.vm.VM.getNonBootstrapClassLoader();
+		ClassLoader loader = org.apache.harmony.kernel.vm.VM.getNonBootstrapClassLoader();
 		Class[] interfaces = new Class[interfaceNames.length];
 		for (int i = 0; i < interfaceNames.length; i++) {
 			interfaces[i] = Class.forName(interfaceNames[i], false, loader);
@@ -1689,7 +1689,7 @@
 		ObjectStreamClass classDesc = readClassDesc();
 
 		if (classDesc == null)
-			throw new InvalidClassException(com.ibm.oti.util.Msg
+			throw new InvalidClassException(org.apache.harmony.luni.util.Msg
 					.getString("K00d1")); //$NON-NLS-1$
 
 		Integer newHandle = new Integer(nextHandle());
@@ -1739,7 +1739,7 @@
 			// Has to have an empty constructor
 			if (constructor == null)
 				throw new InvalidClassException(constructorClass.getName(),
-						com.ibm.oti.util.Msg.getString("K00dc")); //$NON-NLS-1$
+						org.apache.harmony.luni.util.Msg.getString("K00dc")); //$NON-NLS-1$
 
 			int constructorModifiers = constructor.getModifiers();
 
@@ -1749,7 +1749,7 @@
 					|| (wasExternalizable && !Modifier
 							.isPublic(constructorModifiers)))
 				throw new InvalidClassException(constructorClass.getName(),
-						com.ibm.oti.util.Msg.getString("K00dc")); //$NON-NLS-1$
+						org.apache.harmony.luni.util.Msg.getString("K00dc")); //$NON-NLS-1$
 
 			// We know we are testing from a subclass, so the only other case
 			// where the visibility
@@ -1762,7 +1762,7 @@
 				// visibility. Check if same package
 				if (!inSamePackage(constructorClass, objectClass))
 					throw new InvalidClassException(constructorClass.getName(),
-							com.ibm.oti.util.Msg.getString("K00dc")); //$NON-NLS-1$
+							org.apache.harmony.luni.util.Msg.getString("K00dc")); //$NON-NLS-1$
 			}
 
 			// Now we know which class to instantiate and which constructor to
@@ -1966,7 +1966,7 @@
 			// original/outside caller
 			if (++nestedLevels == 1) {
 				// Remember the caller's class loader
-				callerClassLoader = com.ibm.oti.vm.VM
+				callerClassLoader = org.apache.harmony.kernel.vm.VM
 						.getNonBootstrapClassLoader();
 			}
 
@@ -2182,7 +2182,7 @@
 			} else
 				throw new NotActiveException();
 		} else
-			throw new InvalidObjectException(com.ibm.oti.util.Msg
+			throw new InvalidObjectException(org.apache.harmony.luni.util.Msg
 					.getString("K00d9")); //$NON-NLS-1$
 	}
 
@@ -2545,7 +2545,7 @@
 		if (loadedStreamClass.getSerialVersionUID() != localStreamClass
 				.getSerialVersionUID())
 			throw new InvalidClassException(loadedStreamClass.getName(),
-					com.ibm.oti.util.Msg.getString("K00da", loadedStreamClass, //$NON-NLS-1$
+					org.apache.harmony.luni.util.Msg.getString("K00da", loadedStreamClass, //$NON-NLS-1$
 							localStreamClass));
 	}
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectOutputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectOutputStream.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectOutputStream.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectOutputStream.java
Thu Apr  6 03:42:13 2006
@@ -22,7 +22,7 @@
 import java.security.AccessController;
 import java.util.IdentityHashMap;
 
-import com.ibm.oti.util.PriviAction;
+import org.apache.harmony.luni.util.PriviAction;
 
 /**
  * An ObjectOutputStream can be used to save Java objects into a stream where
@@ -1223,7 +1223,7 @@
 								fieldDesc.getName()));
 						break;
 					default:
-						throw new IOException(com.ibm.oti.util.Msg.getString(
+						throw new IOException(org.apache.harmony.luni.util.Msg.getString(
 								"K00d5", fieldDesc.getTypeCode())); //$NON-NLS-1$
 					}
 				} else {
@@ -1446,7 +1446,7 @@
 				for (int i = 0; i < doubleArray.length; i++)
 					output.writeDouble(doubleArray[i]);
 			} else {
-				throw new InvalidClassException(com.ibm.oti.util.Msg.getString(
+				throw new InvalidClassException(org.apache.harmony.luni.util.Msg.getString(
 						"K00d7", arrayClass.getName())); //$NON-NLS-1$
 			}
 		} else {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectStreamClass.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectStreamClass.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectStreamClass.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectStreamClass.java
Thu Apr  6 03:42:13 2006
@@ -26,7 +26,7 @@
 
 import org.apache.harmony.luni.util.Sorter;
 
-import com.ibm.oti.util.PriviAction;
+import org.apache.harmony.luni.util.PriviAction;
 
 /**
  * Instances of ObjectStreamClass are used to describe classes of objects used
@@ -323,7 +323,7 @@
 							return field.getLong(null); // Static field,
 														// parameter is ignored
 						} catch (IllegalAccessException iae) {
-							throw new RuntimeException(com.ibm.oti.util.Msg
+							throw new RuntimeException(org.apache.harmony.luni.util.Msg
 									.getString("K0071", iae.toString())); //$NON-NLS-1$
 						}
 					}
@@ -493,7 +493,7 @@
 				}
 			}
 		} catch (IOException e) {
-			throw new RuntimeException(com.ibm.oti.util.Msg.getString("K0072", //$NON-NLS-1$
+			throw new RuntimeException(org.apache.harmony.luni.util.Msg.getString("K0072", //$NON-NLS-1$
 					e.toString()));
 		}
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/OutputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/OutputStream.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/OutputStream.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/OutputStream.java
Thu Apr  6 03:42:13 2006
@@ -99,7 +99,7 @@
 			for (int i = offset; i < offset + count; i++)
 				write(buffer[i]);
 		} else
-			throw new ArrayIndexOutOfBoundsException(com.ibm.oti.util.Msg
+			throw new ArrayIndexOutOfBoundsException(org.apache.harmony.luni.util.Msg
 					.getString("K002f")); //$NON-NLS-1$
 	}
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/OutputStreamWriter.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/OutputStreamWriter.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/OutputStreamWriter.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/OutputStreamWriter.java
Thu Apr  6 03:42:13 2006
@@ -13,7 +13,8 @@
  * limitations under the License.
  */
 
-package java.io;
+package java.io; 
+
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
@@ -23,7 +24,7 @@
 import java.nio.charset.CodingErrorAction;
 import java.security.AccessController;
 
-import com.ibm.oti.util.PriviAction;
+import org.apache.harmony.luni.util.PriviAction;
 
 /**
  * OutputStreamWriter is a class for turning a character output stream into a
@@ -229,15 +230,15 @@
 	private void convert(CharBuffer chars) throws IOException {
 		synchronized (lock) {
 			checkStatus();
-			CoderResult result = encoder.encode(chars, bytes, true);
+            CoderResult result = encoder.encode(chars, bytes, true);
 			while (true) {
 				if (result.isError()) {
 					throw new IOException(result.toString());
 				} else if (result.isOverflow()) {
-					// flush the output buffer
+					//flush the output buffer
 					flush();
 					result = encoder.encode(chars, bytes, true);
-					continue;
+                    continue;
 				}
 				break;
 			}
@@ -294,3 +295,4 @@
 		convert(chars);
 	}
 }
+

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedInputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedInputStream.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedInputStream.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedInputStream.java
Thu Apr  6 03:42:13 2006
@@ -156,7 +156,7 @@
 							return -1;
 						if (!first && lastWriter != null
 								&& !lastWriter.isAlive())
-							throw new IOException(com.ibm.oti.util.Msg
+							throw new IOException(org.apache.harmony.luni.util.Msg
 									.getString("K0076")); //$NON-NLS-1$
 						first = false;
 						// Notify callers of receive()
@@ -177,9 +177,9 @@
 				}
 				return result & 0xff;
 			}
-			throw new IOException(com.ibm.oti.util.Msg.getString("K0075")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0075")); //$NON-NLS-1$
 		}
-		throw new IOException(com.ibm.oti.util.Msg.getString("K0074")); //$NON-NLS-1$
+		throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0074")); //$NON-NLS-1$
 	}
 
 	/**
@@ -224,7 +224,7 @@
 							return -1;
 						if (!first && lastWriter != null
 								&& !lastWriter.isAlive())
-							throw new IOException(com.ibm.oti.util.Msg
+							throw new IOException(org.apache.harmony.luni.util.Msg
 									.getString("K0076")); //$NON-NLS-1$
 						first = false;
 						// Notify callers of receive()
@@ -273,9 +273,9 @@
 				return bytesCopied + copyLength;
 			}
 			if (!isConnected) {
-				throw new IOException(com.ibm.oti.util.Msg.getString("K0074")); //$NON-NLS-1$
+				throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0074")); //$NON-NLS-1$
 			}
-			throw new IOException(com.ibm.oti.util.Msg.getString("K0075")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0075")); //$NON-NLS-1$
 		}
 		if (bytes == null) {
 			throw new NullPointerException();
@@ -311,7 +311,7 @@
 					notifyAll();
 					wait(1000);
 					if (lastReader != null && !lastReader.isAlive())
-						throw new IOException(com.ibm.oti.util.Msg
+						throw new IOException(org.apache.harmony.luni.util.Msg
 								.getString("K0076")); //$NON-NLS-1$
 				}
 			} catch (InterruptedException e) {
@@ -326,7 +326,7 @@
 				return;
 			}
 		}
-		throw new IOException(com.ibm.oti.util.Msg.getString("K0078")); //$NON-NLS-1$
+		throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0078")); //$NON-NLS-1$
 	}
 
 	synchronized void done() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedOutputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedOutputStream.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedOutputStream.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedOutputStream.java
Thu Apr  6 03:42:13 2006
@@ -87,9 +87,9 @@
 				stream.isConnected = true;
 				this.dest = stream;
 			} else
-				throw new IOException(com.ibm.oti.util.Msg.getString("K007a")); //$NON-NLS-1$
+				throw new IOException(org.apache.harmony.luni.util.Msg.getString("K007a")); //$NON-NLS-1$
 		} else
-			throw new IOException(com.ibm.oti.util.Msg.getString("K0079")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0079")); //$NON-NLS-1$
 	}
 
 	/**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedReader.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedReader.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedReader.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedReader.java
Thu Apr  6 03:42:13 2006
@@ -122,11 +122,11 @@
 	void establishConnection(PipedWriter src) throws IOException {
 		synchronized (lock) {
 			if (data == null)
-				throw new IOException(com.ibm.oti.util.Msg.getString("K0078")); //$NON-NLS-1$
+				throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0078")); //$NON-NLS-1$
 			if (!isConnected) {
 				isConnected = true;
 			} else
-				throw new IOException(com.ibm.oti.util.Msg.getString("K007a")); //$NON-NLS-1$
+				throw new IOException(org.apache.harmony.luni.util.Msg.getString("K007a")); //$NON-NLS-1$
 		}
 	}
 
@@ -195,7 +195,7 @@
 								return -1;
 							if (!first && lastWriter != null
 									&& !lastWriter.isAlive())
-								throw new IOException(com.ibm.oti.util.Msg
+								throw new IOException(org.apache.harmony.luni.util.Msg
 										.getString("K0076")); //$NON-NLS-1$
 							first = false;
 							// Notify callers of receive()
@@ -244,10 +244,10 @@
 					return charsCopied + copyLength;
 				}
 				if (!isConnected) {
-					throw new IOException(com.ibm.oti.util.Msg
+					throw new IOException(org.apache.harmony.luni.util.Msg
 							.getString("K007b")); //$NON-NLS-1$
 				}
-				throw new IOException(com.ibm.oti.util.Msg.getString("K0078")); //$NON-NLS-1$
+				throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0078")); //$NON-NLS-1$
 			}
 		}
 		throw new ArrayIndexOutOfBoundsException();
@@ -268,9 +268,9 @@
 				if (data != null) {
 					return in != -1;
 				}
-				throw new IOException(com.ibm.oti.util.Msg.getString("K0078")); //$NON-NLS-1$
+				throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0078")); //$NON-NLS-1$
 			}
-			throw new IOException(com.ibm.oti.util.Msg.getString("K007b")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K007b")); //$NON-NLS-1$
 		}
 	}
 
@@ -302,7 +302,7 @@
 						notifyAll();
 						wait(1000);
 						if (lastReader != null && !lastReader.isAlive())
-							throw new IOException(com.ibm.oti.util.Msg
+							throw new IOException(org.apache.harmony.luni.util.Msg
 									.getString("K0076")); //$NON-NLS-1$
 					}
 				} catch (InterruptedException e) {
@@ -317,7 +317,7 @@
 					return;
 				}
 			}
-			throw new IOException(com.ibm.oti.util.Msg.getString("K0078")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0078")); //$NON-NLS-1$
 		}
 	}
 
@@ -354,7 +354,7 @@
 							notifyAll();
 							wait(1000);
 							if (lastReader != null && !lastReader.isAlive())
-								throw new IOException(com.ibm.oti.util.Msg
+								throw new IOException(org.apache.harmony.luni.util.Msg
 										.getString("K0076")); //$NON-NLS-1$
 						}
 					} catch (InterruptedException e) {
@@ -388,7 +388,7 @@
 				if (count == 0)
 					return;
 			}
-			throw new IOException(com.ibm.oti.util.Msg.getString("K0078")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0078")); //$NON-NLS-1$
 		}
 	}
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedWriter.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedWriter.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedWriter.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedWriter.java
Thu Apr  6 03:42:13 2006
@@ -91,10 +91,10 @@
 					stream.establishConnection(this);
 					this.dest = stream;
 				} else
-					throw new IOException(com.ibm.oti.util.Msg
+					throw new IOException(org.apache.harmony.luni.util.Msg
 							.getString("K0078")); //$NON-NLS-1$
 			} else
-				throw new IOException(com.ibm.oti.util.Msg.getString("K0079")); //$NON-NLS-1$
+				throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0079")); //$NON-NLS-1$
 		}
 	}
 
@@ -146,10 +146,10 @@
 					if (dest != null)
 						dest.receive(buffer, offset, count);
 					else
-						throw new IOException(com.ibm.oti.util.Msg
+						throw new IOException(org.apache.harmony.luni.util.Msg
 								.getString("K007b")); //$NON-NLS-1$
 				} else
-					throw new IOException(com.ibm.oti.util.Msg
+					throw new IOException(org.apache.harmony.luni.util.Msg
 							.getString("K0078")); //$NON-NLS-1$
 			}
 		} else
@@ -182,10 +182,10 @@
 				if (dest != null)
 					dest.receive((char) c);
 				else
-					throw new IOException(com.ibm.oti.util.Msg
+					throw new IOException(org.apache.harmony.luni.util.Msg
 							.getString("K007b")); //$NON-NLS-1$
 			} else
-				throw new IOException(com.ibm.oti.util.Msg.getString("K0078")); //$NON-NLS-1$
+				throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0078")); //$NON-NLS-1$
 		}
 	}
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PrintStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PrintStream.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PrintStream.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PrintStream.java
Thu Apr  6 03:42:13 2006
@@ -19,7 +19,7 @@
 import java.nio.charset.Charset;
 import java.security.AccessController;
 
-import com.ibm.oti.util.PriviAction;
+import org.apache.harmony.luni.util.PriviAction;
 
 /**
  * PrintStream is a class which takes an OutputStream and provides convenience
@@ -451,7 +451,7 @@
 					}
 				}
 			} else
-				throw new ArrayIndexOutOfBoundsException(com.ibm.oti.util.Msg
+				throw new ArrayIndexOutOfBoundsException(org.apache.harmony.luni.util.Msg
 						.getString("K002f")); //$NON-NLS-1$
 		} else
 			throw new NullPointerException();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PrintWriter.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PrintWriter.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PrintWriter.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PrintWriter.java
Thu Apr  6 03:42:13 2006
@@ -18,7 +18,7 @@
 
 import java.security.AccessController;
 
-import com.ibm.oti.util.PriviAction;
+import org.apache.harmony.luni.util.PriviAction;
 
 /**
  * PrintWriter is a class which takes either an OutputStream or Writer and

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PushbackInputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PushbackInputStream.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PushbackInputStream.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PushbackInputStream.java
Thu Apr  6 03:42:13 2006
@@ -15,6 +15,7 @@
 
 package java.io;
 
+
 /**
  * PushbackInputStream is a filter class which allows bytes read to be pushed
  * back into the stream so that they can be reread. Parsers may find this
@@ -65,7 +66,7 @@
 			buf = new byte[size];
 			pos = size;
 		} else
-			throw new IllegalArgumentException(com.ibm.oti.util.Msg
+			throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
 					.getString("K0058")); //$NON-NLS-1$
 	}
 
@@ -219,7 +220,7 @@
 			}
 			return numSkipped;
 		}
-		throw new IOException(com.ibm.oti.util.Msg.getString("K0059")); //$NON-NLS-1$
+		throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0059")); //$NON-NLS-1$
 	}
 
 	/**
@@ -261,7 +262,7 @@
 			throws IOException {
 		if (length > pos)
 			// Pushback buffer full
-			throw new IOException(com.ibm.oti.util.Msg.getString("K007e"));
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K007e"));
 		// avoid int overflow
 		if (0 <= offset && offset <= buffer.length && 0 <= length
 				&& length <= buffer.length - offset) {
@@ -287,7 +288,7 @@
 			if (pos != 0)
 				buf[--pos] = (byte) oneByte;
 			else
-				throw new IOException(com.ibm.oti.util.Msg.getString("K007e")); //$NON-NLS-1$
+				throw new IOException(org.apache.harmony.luni.util.Msg.getString("K007e")); //$NON-NLS-1$
 		} else
 			throw new IOException();
 	}
@@ -304,7 +305,7 @@
 	public void mark(int readlimit) {
 		return;
 	}
-
+	
 	/**
 	 * Reset current position to the mark made previously int the stream, but
 	 * the reset method will throw IOException and do nothing else if called.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PushbackReader.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PushbackReader.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PushbackReader.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PushbackReader.java
Thu Apr  6 03:42:13 2006
@@ -67,7 +67,7 @@
 			buf = new char[size];
 			pos = size;
 		} else
-			throw new IllegalArgumentException(com.ibm.oti.util.Msg
+			throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
 					.getString("K0058")); //$NON-NLS-1$
 	}
 
@@ -97,7 +97,7 @@
 	 *             Since mark is not supported byt PushbackReader.
 	 */
 	public void mark(int readAheadLimit) throws IOException {
-		throw new IOException(com.ibm.oti.util.Msg.getString("K007f")); //$NON-NLS-1$
+		throw new IOException(org.apache.harmony.luni.util.Msg.getString("K007f")); //$NON-NLS-1$
 	}
 
 	/**
@@ -216,7 +216,7 @@
 		synchronized (lock) {
 			if (buf != null)
 				return (buf.length - pos > 0 || in.ready());
-			throw new IOException(com.ibm.oti.util.Msg.getString("K0080")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0080")); //$NON-NLS-1$
 		}
 	}
 
@@ -228,7 +228,7 @@
 	 *             Since mark is not supported.
 	 */
 	public void reset() throws IOException {
-		throw new IOException(com.ibm.oti.util.Msg.getString("K007f")); //$NON-NLS-1$
+		throw new IOException(org.apache.harmony.luni.util.Msg.getString("K007f")); //$NON-NLS-1$
 	}
 
 	/**
@@ -269,7 +269,7 @@
 	public void unread(char[] buffer, int offset, int count) throws IOException {
 		if (count > pos)
 			// Pushback buffer full
-			throw new IOException(com.ibm.oti.util.Msg.getString("K007e"));
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K007e"));
 		// avoid int overflow
 		if (0 <= offset && offset <= buffer.length && 0 <= count
 				&& count <= buffer.length - offset) {
@@ -298,7 +298,7 @@
 				if (pos != 0)
 					buf[--pos] = (char) oneChar;
 				else
-					throw new IOException(com.ibm.oti.util.Msg
+					throw new IOException(org.apache.harmony.luni.util.Msg
 							.getString("K007e")); //$NON-NLS-1$
 			} else
 				throw new IOException();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/RandomAccessFile.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/RandomAccessFile.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/RandomAccessFile.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/RandomAccessFile.java
Thu Apr  6 03:42:13 2006
@@ -88,7 +88,7 @@
             }
             
         } else {
-            throw new IllegalArgumentException(com.ibm.oti.util.Msg
+            throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
                     .getString("K0081")); //$NON-NLS-1$
         }
 
@@ -433,7 +433,7 @@
 			} else
 				throw new IndexOutOfBoundsException();
 		} else
-			throw new NullPointerException(com.ibm.oti.util.Msg
+			throw new NullPointerException(org.apache.harmony.luni.util.Msg
 					.getString("K0047")); //$NON-NLS-1$
 	}
 
@@ -592,7 +592,7 @@
 		}
 		byte[] buf = new byte[utfSize];
 		if (read(buf, 0, buf.length) == buf.length) {
-			return com.ibm.oti.util.Util.convertFromUTF8(buf, 0, utfSize);
+			return org.apache.harmony.luni.util.Util.convertFromUTF8(buf, 0, utfSize);
 		}
 		throw new EOFException();
 	}
@@ -997,7 +997,7 @@
 			utfBytes[1] = (byte) utfCount;
 			write(utfBytes);
 		} else
-			throw new UTFDataFormatException(com.ibm.oti.util.Msg
+			throw new UTFDataFormatException(org.apache.harmony.luni.util.Msg
 					.getString("K0068")); //$NON-NLS-1$
 	}
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/SequenceInputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/SequenceInputStream.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/SequenceInputStream.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/SequenceInputStream.java
Thu Apr  6 03:42:13 2006
@@ -99,7 +99,7 @@
 				nextStream();
 			e = null;
 		} else
-			throw new IOException(com.ibm.oti.util.Msg.getString("K00b7")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K00b7")); //$NON-NLS-1$
 	}
 
 	/**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/StringBufferInputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/StringBufferInputStream.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/StringBufferInputStream.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/StringBufferInputStream.java
Thu Apr  6 03:42:13 2006
@@ -110,7 +110,7 @@
 			}
 			throw new ArrayIndexOutOfBoundsException();
 		}
-		throw new NullPointerException(com.ibm.oti.util.Msg.getString("K0047")); //$NON-NLS-1$
+		throw new NullPointerException(org.apache.harmony.luni.util.Msg.getString("K0047")); //$NON-NLS-1$
 	}
 
 	/**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/StringReader.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/StringReader.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/StringReader.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/StringReader.java
Thu Apr  6 03:42:13 2006
@@ -81,7 +81,7 @@
 				if (isOpen())
 					markpos = pos;
 				else
-					throw new IOException(com.ibm.oti.util.Msg
+					throw new IOException(org.apache.harmony.luni.util.Msg
 							.getString("K0083")); //$NON-NLS-1$
 			}
 		} else
@@ -118,7 +118,7 @@
 				}
 				return -1;
 			}
-			throw new IOException(com.ibm.oti.util.Msg.getString("K0083")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0083")); //$NON-NLS-1$
 		}
 	}
 
@@ -142,7 +142,7 @@
 					pos = end;
 					return read;
 				}
-				throw new IOException(com.ibm.oti.util.Msg.getString("K0083")); //$NON-NLS-1$
+				throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0083")); //$NON-NLS-1$
 			}
 		}
 		throw new ArrayIndexOutOfBoundsException();
@@ -167,7 +167,7 @@
 		synchronized (lock) {
 			if (isOpen())
 				return true;
-			throw new IOException(com.ibm.oti.util.Msg.getString("K0083")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0083")); //$NON-NLS-1$
 		}
 	}
 
@@ -185,7 +185,7 @@
 			if (isOpen())
 				pos = markpos != -1 ? markpos : 0;
 			else
-				throw new IOException(com.ibm.oti.util.Msg.getString("K0083")); //$NON-NLS-1$
+				throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0083")); //$NON-NLS-1$
 		}
 	}
 
@@ -210,7 +210,7 @@
 				}
 				return skipped;
 			}
-			throw new IOException(com.ibm.oti.util.Msg.getString("K0083")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0083")); //$NON-NLS-1$
 		}
 	}
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/ArrayIndexOutOfBoundsException.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/ArrayIndexOutOfBoundsException.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/ArrayIndexOutOfBoundsException.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/ArrayIndexOutOfBoundsException.java
Thu Apr  6 03:42:13 2006
@@ -16,7 +16,7 @@
 package java.lang;
 
 
-import com.ibm.oti.util.Msg;
+import org.apache.harmony.luni.util.Msg;
 
 /**
  * This runtime exception is thrown when the an array is indexed with a value

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/ClassCastException.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/ClassCastException.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/ClassCastException.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/ClassCastException.java
Thu Apr  6 03:42:13 2006
@@ -54,7 +54,7 @@
 	 *            Class The class being cast to.
 	 */
 	ClassCastException(Class instanceClass, Class castClass) {
-		super(com.ibm.oti.util.Msg.getString("K0340", instanceClass.getName(),
+		super(org.apache.harmony.luni.util.Msg.getString("K0340", instanceClass.getName(),
 				castClass.getName()));
 	}
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Double.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Double.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Double.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Double.java
Thu Apr  6 03:42:13 2006
@@ -300,7 +300,7 @@
 	 */
 	public static double parseDouble(String string)
 			throws NumberFormatException {
-		return com.ibm.oti.util.FloatingPointParser.parseDouble(string);
+		return org.apache.harmony.luni.util.FloatingPointParser.parseDouble(string);
 	}
 
 	/**
@@ -330,7 +330,7 @@
 	 * @return a printable representation of the argument.
 	 */
 	public static String toString(double d) {
-		return com.ibm.oti.util.NumberConverter.convert(d);
+		return org.apache.harmony.luni.util.NumberConverter.convert(d);
 	}
 
 	/**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Float.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Float.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Float.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Float.java
Thu Apr  6 03:42:13 2006
@@ -15,6 +15,7 @@
 
 package java.lang;
 
+
 /**
  * <p>
  * Float is the wrapper for the primitive type <code>float</code>.
@@ -32,11 +33,11 @@
 	 */
 	private final float value;
 
-    /**
+	/**
      * <p>
      * Constant for the maximum <code>float</code> value, (2 - 2<sup>-23</sup>)
* 2<sup>127</sup>.
      * </p>
-     */
+	 */
 	public static final float MAX_VALUE = 3.40282346638528860e+38f;
 
     /**
@@ -46,18 +47,18 @@
      */
 	public static final float MIN_VALUE = 1.40129846432481707e-45f;
 
-    /**
+	/**
      * <p>
      * Constant for the Not-a-Number (NaN) value of the <code>float</code> type.
      * </p>
-     */
+	 */
 	public static final float NaN = 0.0f / 0.0f;
 
-    /**
+	/**
      * <p>
      * Constant for the Positive Infinity value of the <code>float</code> type.
      * </p>
-     */
+	 */
 	public static final float POSITIVE_INFINITY = 1.0f / 0.0f;
 
     /**
@@ -75,8 +76,8 @@
 
 	// Note: This can't be set to "float.class", since *that* is
 	// defined to be "java.lang.Float.TYPE";
-    
-    /**
+
+	/**
      * <p>
      * Constant for the number of bits to represent a <code>float</code> in
      * two's compliment form.
@@ -339,7 +340,7 @@
      * @since 1.2
 	 */
 	public static float parseFloat(String string) throws NumberFormatException {
-		return com.ibm.oti.util.FloatingPointParser.parseFloat(string);
+		return org.apache.harmony.luni.util.FloatingPointParser.parseFloat(string);
 	}
 
 	/**
@@ -370,7 +371,7 @@
 	 * @return a printable representation of the argument.
 	 */
 	public static String toString(float f) {
-		return com.ibm.oti.util.NumberConverter.convert(f);
+		return org.apache.harmony.luni.util.NumberConverter.convert(f);
 	}
 
 	/**
@@ -435,8 +436,8 @@
      */
     public static Float valueOf(float f) {
         return new Float(f);
-    }
-
+	}
+	
     /**
      * <p>
      * Converts a <code>float</code> into a hexadecimal string representation.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/SecurityManager.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/SecurityManager.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/SecurityManager.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/SecurityManager.java
Thu Apr  6 03:42:13 2006
@@ -33,7 +33,7 @@
 import java.util.PropertyPermission;
 import java.util.StringTokenizer;
 
-import com.ibm.oti.util.PriviAction;
+import org.apache.harmony.luni.util.PriviAction;
 
 /**
  * SecurityManager is the abstract superclass of the classes which can provide



Mime
View raw message