jdk-sandbox: comparison jdk/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferences.java

equal deleted inserted replaced

-:3dba338b5d00
+:701f6f90dc0b
 private static PlatformLogger logger;
 /**
 * Windows registry path to <tt>Preferences</tt>'s root nodes.
 */
-private static final byte[] WINDOWS_ROOT_PATH
+private static final byte[] WINDOWS_ROOT_PATH =
-= stringToByteArray("Software\\JavaSoft\\Prefs");
+stringToByteArray("Software\\JavaSoft\\Prefs");
 /**
 * Windows handles to <tt>HKEY_CURRENT_USER</tt> and
 * <tt>HKEY_LOCAL_MACHINE</tt> hives.
 */
 /**
 * Java wrapper for Windows registry API RegOpenKey()
 */
 private static native int[] WindowsRegOpenKey(int hKey, byte[] subKey,
 int securityMask);
 /**
 * Retries RegOpenKey() MAX_ATTEMPTS times before giving up.
 */
 private static int[] WindowsRegOpenKey1(int hKey, byte[] subKey,
 int securityMask) {
 int[] result = WindowsRegOpenKey(hKey, subKey, securityMask);
 if (result[ERROR_CODE] == ERROR_SUCCESS) {
 return result;
 } else if (result[ERROR_CODE] == ERROR_FILE_NOT_FOUND) {
 logger().warning("Trying to recreate Windows registry node " +
 WindowsRegCloseKey(handle);
 return WindowsRegOpenKey(hKey, subKey, securityMask);
 } else if (result[ERROR_CODE] != ERROR_ACCESS_DENIED) {
 long sleepTime = INIT_SLEEP_TIME;
 for (int i = 0; i < MAX_ATTEMPTS; i++) {
 try {
 Thread.sleep(sleepTime);
 } catch(InterruptedException e) {
 return result;
 }
 sleepTime *= 2;
 result = WindowsRegOpenKey(hKey, subKey, securityMask);
 if (result[ERROR_CODE] == ERROR_SUCCESS) {
 return result;
 }
 }
 }
 return result;
 }
 * Retries RegCreateKeyEx() MAX_ATTEMPTS times before giving up.
 */
 private static int[] WindowsRegCreateKeyEx1(int hKey, byte[] subKey) {
 int[] result = WindowsRegCreateKeyEx(hKey, subKey);
 if (result[ERROR_CODE] == ERROR_SUCCESS) {
 return result;
 } else {
 long sleepTime = INIT_SLEEP_TIME;
 for (int i = 0; i < MAX_ATTEMPTS; i++) {
 try {
 Thread.sleep(sleepTime);
 } catch(InterruptedException e) {
 return result;
 }
 sleepTime *= 2;
 result = WindowsRegCreateKeyEx(hKey, subKey);
 if (result[ERROR_CODE] == ERROR_SUCCESS) {
 return result;
 }
 }
 }
 return result;
 }
 * Retries RegFlushKey() MAX_ATTEMPTS times before giving up.
 */
 private static int WindowsRegFlushKey1(int hKey) {
 int result = WindowsRegFlushKey(hKey);
 if (result == ERROR_SUCCESS) {
 return result;
 } else {
 long sleepTime = INIT_SLEEP_TIME;
 for (int i = 0; i < MAX_ATTEMPTS; i++) {
 try {
 Thread.sleep(sleepTime);
 } catch(InterruptedException e) {
 return result;
 }
 sleepTime *= 2;
 result = WindowsRegFlushKey(hKey);
 if (result == ERROR_SUCCESS) {
 return result;
 }
 }
 }
 return result;
 }
 /**
 * Java wrapper for Windows registry API RegQueryValueEx()
 */
 private static native byte[] WindowsRegQueryValueEx(int hKey,
 byte[] valueName);
 /**
 * Java wrapper for Windows registry API RegSetValueEx()
 */
 private static native int WindowsRegSetValueEx(int hKey, byte[] valueName,
 byte[] value);
 /**
 * Retries RegSetValueEx() MAX_ATTEMPTS times before giving up.
 */
 private static int WindowsRegSetValueEx1(int hKey, byte[] valueName,
 byte[] value) {
 int result = WindowsRegSetValueEx(hKey, valueName, value);
 if (result == ERROR_SUCCESS) {
 return result;
 } else {
 long sleepTime = INIT_SLEEP_TIME;
 for (int i = 0; i < MAX_ATTEMPTS; i++) {
 try {
 Thread.sleep(sleepTime);
 } catch(InterruptedException e) {
 return result;
 }
 sleepTime *= 2;
 result = WindowsRegSetValueEx(hKey, valueName, value);
 if (result == ERROR_SUCCESS) {
 return result;
 }
 }
 }
 return result;
 }
 * Retries RegQueryInfoKey() MAX_ATTEMPTS times before giving up.
 */
 private static int[] WindowsRegQueryInfoKey1(int hKey) {
 int[] result = WindowsRegQueryInfoKey(hKey);
 if (result[ERROR_CODE] == ERROR_SUCCESS) {
 return result;
 } else {
 long sleepTime = INIT_SLEEP_TIME;
 for (int i = 0; i < MAX_ATTEMPTS; i++) {
 try {
 Thread.sleep(sleepTime);
 } catch(InterruptedException e) {
 return result;
 }
 sleepTime *= 2;
 result = WindowsRegQueryInfoKey(hKey);
 if (result[ERROR_CODE] == ERROR_SUCCESS) {
 return result;
 }
 }
 }
 return result;
 }
 /**
 * Java wrapper for Windows registry API RegEnumKeyEx()
 */
 private static native byte[] WindowsRegEnumKeyEx(int hKey, int subKeyIndex,
 int maxKeyLength);
 /**
 * Retries RegEnumKeyEx() MAX_ATTEMPTS times before giving up.
 */
 private static byte[] WindowsRegEnumKeyEx1(int hKey, int subKeyIndex,
 int maxKeyLength) {
 byte[] result = WindowsRegEnumKeyEx(hKey, subKeyIndex, maxKeyLength);
 if (result != null) {
 return result;
 } else {
 long sleepTime = INIT_SLEEP_TIME;
 for (int i = 0; i < MAX_ATTEMPTS; i++) {
 try {
 Thread.sleep(sleepTime);
 } catch(InterruptedException e) {
 return result;
 }
 sleepTime *= 2;
 result = WindowsRegEnumKeyEx(hKey, subKeyIndex, maxKeyLength);
 if (result != null) {
 return result;
 }
 }
 }
 return result;
 }
 /**
 * Java wrapper for Windows registry API RegEnumValue()
 */
 private static native byte[] WindowsRegEnumValue(int hKey, int valueIndex,
 int maxValueNameLength);
 /**
 * Retries RegEnumValueEx() MAX_ATTEMPTS times before giving up.
 */
 private static byte[] WindowsRegEnumValue1(int hKey, int valueIndex,
 int maxValueNameLength) {
 byte[] result = WindowsRegEnumValue(hKey, valueIndex,
 maxValueNameLength);
 if (result != null) {
 return result;
 } else {
 long sleepTime = INIT_SLEEP_TIME;
 for (int i = 0; i < MAX_ATTEMPTS; i++) {
 try {
 Thread.sleep(sleepTime);
 } catch(InterruptedException e) {
 return result;
 }
 sleepTime *= 2;
 result = WindowsRegEnumValue(hKey, valueIndex,
 maxValueNameLength);
 if (result != null) {
 return result;
 }
 }
 }
 return result;
 }
 return;
 }
 int[] result =
 WindowsRegCreateKeyEx1(parentNativeHandle, toWindowsName(name));
 if (result[ERROR_CODE] != ERROR_SUCCESS) {
-logger().warning("Could not create windows registry "
+logger().warning("Could not create windows registry node " +
-+ "node " + byteArrayToString(windowsAbsolutePath()) +
+byteArrayToString(windowsAbsolutePath()) +
 " at root 0x" + Integer.toHexString(rootNativeHandle()) +
 ". Windows RegCreateKeyEx(...) returned error code " +
 result[ERROR_CODE] + ".");
 isBackingStoreAvailable = false;
 return;
 }
 newNode = (result[DISPOSITION] == REG_CREATED_NEW_KEY);
 closeKey(parentNativeHandle);
 * Logs a warning message, if Windows Registry is unavailable.
 * @param rootNativeHandle Native handle to one of Windows top level keys.
 * @param rootDirectory Path to root directory, as a byte-encoded string.
 */
 private  WindowsPreferences(int rootNativeHandle, byte[] rootDirectory) {
-super(null,"");
+super(null, "");
 int[] result =
 WindowsRegCreateKeyEx1(rootNativeHandle, rootDirectory);
 if (result[ERROR_CODE] != ERROR_SUCCESS) {
 logger().warning("Could not open/create prefs root node " +
-byteArrayToString(windowsAbsolutePath()) + " at root 0x" +
+byteArrayToString(windowsAbsolutePath()) +
-Integer.toHexString(rootNativeHandle()) +
+" at root 0x" + Integer.toHexString(rootNativeHandle()) +
 ". Windows RegCreateKeyEx(...) returned error code " +
 result[ERROR_CODE] + ".");
 isBackingStoreAvailable = false;
 return;
 }
 // Check if a new node
 newNode = (result[DISPOSITION] == REG_CREATED_NEW_KEY);
 * @see Preferences#absolutePath()
 */
 private byte[] windowsAbsolutePath() {
 ByteArrayOutputStream bstream = new ByteArrayOutputStream();
 bstream.write(WINDOWS_ROOT_PATH, 0, WINDOWS_ROOT_PATH.length-1);
-StringTokenizer tokenizer = new StringTokenizer(absolutePath(),"/");
+StringTokenizer tokenizer = new StringTokenizer(absolutePath(), "/");
 while (tokenizer.hasMoreTokens()) {
 bstream.write((byte)'\\');
 String nextName = tokenizer.nextToken();
 byte[] windowsNextName = toWindowsName(nextName);
 bstream.write(windowsNextName, 0, windowsNextName.length-1);
 */
 private int openKey(byte[] windowsAbsolutePath, int mask1, int mask2) {
 /*  Check if key's path is short enough be opened at once
 otherwise use a path-splitting procedure */
 if (windowsAbsolutePath.length <= MAX_WINDOWS_PATH_LENGTH + 1) {
 int[] result = WindowsRegOpenKey1(rootNativeHandle(),
 windowsAbsolutePath, mask1);
 if (result[ERROR_CODE] == ERROR_ACCESS_DENIED && mask2 != mask1)
 result = WindowsRegOpenKey1(rootNativeHandle(),
 windowsAbsolutePath, mask2);
 if (result[ERROR_CODE] != ERROR_SUCCESS) {
-logger().warning("Could not open windows "
+logger().warning("Could not open windows registry node " +
-+ "registry node " + byteArrayToString(windowsAbsolutePath()) +
+byteArrayToString(windowsAbsolutePath()) +
-" at root 0x" + Integer.toHexString(rootNativeHandle()) +
+" at root 0x" +
-". Windows RegOpenKey(...) returned error code " +
+Integer.toHexString(rootNativeHandle()) +
-result[ERROR_CODE] + ".");
+". Windows RegOpenKey(...) returned error code " +
+result[ERROR_CODE] + ".");
 result[NATIVE_HANDLE] = NULL_NATIVE_HANDLE;
 if (result[ERROR_CODE] == ERROR_ACCESS_DENIED) {
-throw new SecurityException("Could not open windows "
+throw new SecurityException(
-+ "registry node " + byteArrayToString(windowsAbsolutePath()) +
+"Could not open windows registry node " +
-" at root 0x" + Integer.toHexString(rootNativeHandle()) +
+byteArrayToString(windowsAbsolutePath()) +
-": Access denied");
+" at root 0x" +
-}
+Integer.toHexString(rootNativeHandle()) +
-}
+": Access denied");
-return result[NATIVE_HANDLE];
+}
+}
+return result[NATIVE_HANDLE];
 } else {
 return openKey(rootNativeHandle(), windowsAbsolutePath, mask1, mask2);
 }
 }
 */
 private int openKey(int nativeHandle, byte[] windowsRelativePath,
 int mask1, int mask2) {
 /* If the path is short enough open at once. Otherwise split the path */
 if (windowsRelativePath.length <= MAX_WINDOWS_PATH_LENGTH + 1 ) {
 int[] result = WindowsRegOpenKey1(nativeHandle,
 windowsRelativePath, mask1);
 if (result[ERROR_CODE] == ERROR_ACCESS_DENIED && mask2 != mask1)
 result = WindowsRegOpenKey1(nativeHandle,
 windowsRelativePath, mask2);
 if (result[ERROR_CODE] != ERROR_SUCCESS) {
-logger().warning("Could not open windows "
+logger().warning("Could not open windows registry node " +
-+ "registry node " + byteArrayToString(windowsAbsolutePath()) +
+byteArrayToString(windowsAbsolutePath()) +
 " at root 0x" + Integer.toHexString(nativeHandle) +
 ". Windows RegOpenKey(...) returned error code " +
 result[ERROR_CODE] + ".");
 result[NATIVE_HANDLE] = NULL_NATIVE_HANDLE;
 }
 return result[NATIVE_HANDLE];
 } else {
 int separatorPosition = -1;
 // Be greedy - open the longest possible path
 for (int i = MAX_WINDOWS_PATH_LENGTH; i > 0; i--) {
 if (windowsRelativePath[i] == ((byte)'\\')) {
 * @see #openKey(int, byte[],int)
 */
 private void closeKey(int nativeHandle) {
 int result = WindowsRegCloseKey(nativeHandle);
 if (result != ERROR_SUCCESS) {
-logger().warning("Could not close windows "
+logger().warning("Could not close windows registry node " +
-+ "registry node " + byteArrayToString(windowsAbsolutePath()) +
+byteArrayToString(windowsAbsolutePath()) +
-" at root 0x" + Integer.toHexString(rootNativeHandle()) +
+" at root 0x" +
-". Windows RegCloseKey(...) returned error code " + result + ".");
+Integer.toHexString(rootNativeHandle()) +
+". Windows RegCloseKey(...) returned error code " +
+result + ".");
 }
 }
 /**
 * Implements <tt>AbstractPreferences</tt> <tt>putSpi()</tt> method.
 }
 int result = WindowsRegSetValueEx1(nativeHandle,
 toWindowsName(javaName), toWindowsValueString(value));
 if (result != ERROR_SUCCESS) {
 logger().warning("Could not assign value to key " +
-byteArrayToString(toWindowsName(javaName))+ " at Windows registry node "
+byteArrayToString(toWindowsName(javaName)) +
-+ byteArrayToString(windowsAbsolutePath()) + " at root 0x"
+" at Windows registry node " +
-+ Integer.toHexString(rootNativeHandle()) +
+byteArrayToString(windowsAbsolutePath()) +
-". Windows RegSetValueEx(...) returned error code " + result + ".");
+" at root 0x" +
+Integer.toHexString(rootNativeHandle()) +
+". Windows RegSetValueEx(...) returned error code " +
+result + ".");
 isBackingStoreAvailable = false;
 }
 closeKey(nativeHandle);
 }
 return;
 }
 int result =
 WindowsRegDeleteValue(nativeHandle, toWindowsName(key));
 if (result != ERROR_SUCCESS && result != ERROR_FILE_NOT_FOUND) {
-logger().warning("Could not delete windows registry "
+logger().warning("Could not delete windows registry value " +
-+ "value " + byteArrayToString(windowsAbsolutePath())+ "\\" +
+byteArrayToString(windowsAbsolutePath()) + "\\" +
 toWindowsName(key) + " at root 0x" +
 Integer.toHexString(rootNativeHandle()) +
 ". Windows RegDeleteValue(...) returned error code " +
 result + ".");
 isBackingStoreAvailable = false;
 }
 closeKey(nativeHandle);
 }
 */
 protected String[] keysSpi() throws BackingStoreException{
 // Find out the number of values
 int nativeHandle = openKey(KEY_QUERY_VALUE);
 if (nativeHandle == NULL_NATIVE_HANDLE) {
-throw new BackingStoreException("Could not open windows"
+throw new BackingStoreException(
-+ "registry node " + byteArrayToString(windowsAbsolutePath()) +
+"Could not open windows registry node " +
-" at root 0x" + Integer.toHexString(rootNativeHandle()) + ".");
+byteArrayToString(windowsAbsolutePath()) +
+" at root 0x" +
+Integer.toHexString(rootNativeHandle()) + ".");
 }
 int[] result =  WindowsRegQueryInfoKey1(nativeHandle);
 if (result[ERROR_CODE] != ERROR_SUCCESS) {
-String info = "Could not query windows"
+String info = "Could not query windows registry node " +
-+ "registry node " + byteArrayToString(windowsAbsolutePath()) +
+byteArrayToString(windowsAbsolutePath()) +
-" at root 0x" + Integer.toHexString(rootNativeHandle()) +
+" at root 0x" +
-". Windows RegQueryInfoKeyEx(...) returned error code " +
+Integer.toHexString(rootNativeHandle()) +
-result[ERROR_CODE] + ".";
+". Windows RegQueryInfoKeyEx(...) returned error code " +
+result[ERROR_CODE] + ".";
 logger().warning(info);
 throw new BackingStoreException(info);
 }
 int maxValueNameLength = result[MAX_VALUE_NAME_LENGTH];
 int valuesNumber = result[VALUES_NUMBER];
 if (valuesNumber == 0) {
 closeKey(nativeHandle);
 return new String[0];
 }
 // Get the values
 String[] valueNames = new String[valuesNumber];
 for (int i = 0; i < valuesNumber; i++) {
 byte[] windowsName = WindowsRegEnumValue1(nativeHandle, i,
 maxValueNameLength+1);
 if (windowsName == null) {
 String info =
 "Could not enumerate value #" + i + "  of windows node " +
 byteArrayToString(windowsAbsolutePath()) + " at root 0x" +
 Integer.toHexString(rootNativeHandle()) + ".";
 logger().warning(info);
 throw new BackingStoreException(info);
 }
 valueNames[i] = toJavaName(windowsName);
 }
 * Throws a BackingStoreException and logs a warning message,
 * if Windows registry is not available.
 */
 protected String[] childrenNamesSpi() throws BackingStoreException {
 // Open key
-int nativeHandle = openKey(KEY_ENUMERATE_SUB_KEYS| KEY_QUERY_VALUE);
+int nativeHandle = openKey(KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE);
 if (nativeHandle == NULL_NATIVE_HANDLE) {
-throw new BackingStoreException("Could not open windows"
+throw new BackingStoreException(
-+ "registry node " + byteArrayToString(windowsAbsolutePath()) +
+"Could not open windows registry node " +
-" at root 0x" + Integer.toHexString(rootNativeHandle()) + ".");
+byteArrayToString(windowsAbsolutePath()) +
+" at root 0x" +
+Integer.toHexString(rootNativeHandle()) + ".");
 }
 // Get number of children
 int[] result =  WindowsRegQueryInfoKey1(nativeHandle);
 if (result[ERROR_CODE] != ERROR_SUCCESS) {
-String info = "Could not query windows"
+String info = "Could not query windows registry node " +
-+ "registry node " + byteArrayToString(windowsAbsolutePath()) +
+byteArrayToString(windowsAbsolutePath()) +
 " at root 0x" + Integer.toHexString(rootNativeHandle()) +
 ". Windows RegQueryInfoKeyEx(...) returned error code " +
 result[ERROR_CODE] + ".";
 logger().warning(info);
 throw new BackingStoreException(info);
 }
 int maxKeyLength = result[MAX_KEY_LENGTH];
 int subKeysNumber = result[SUBKEYS_NUMBER];
 String[] subkeys = new String[subKeysNumber];
 String[] children = new String[subKeysNumber];
 // Get children
 for (int i = 0; i < subKeysNumber; i++) {
 byte[] windowsName = WindowsRegEnumKeyEx1(nativeHandle, i,
 maxKeyLength+1);
 if (windowsName == null) {
 String info =
 "Could not enumerate key #" + i + "  of windows node " +
 byteArrayToString(windowsAbsolutePath()) + " at root 0x" +
 Integer.toHexString(rootNativeHandle()) + ". ";
 logger().warning(info);
 throw new BackingStoreException(info);
 }
 String javaName = toJavaName(windowsName);
 children[i] = javaName;
 parent.flush();
 return;
 }
 if (!isBackingStoreAvailable) {
 throw new BackingStoreException(
 "flush(): Backing store not available.");
 }
 int nativeHandle = openKey(KEY_READ);
 if (nativeHandle == NULL_NATIVE_HANDLE) {
-throw new BackingStoreException("Could not open windows"
+throw new BackingStoreException(
-+ "registry node " + byteArrayToString(windowsAbsolutePath()) +
+"Could not open windows registry node " +
-" at root 0x" + Integer.toHexString(rootNativeHandle()) + ".");
+byteArrayToString(windowsAbsolutePath()) +
+" at root 0x" +
+Integer.toHexString(rootNativeHandle()) + ".");
 }
 int result = WindowsRegFlushKey1(nativeHandle);
 if (result != ERROR_SUCCESS) {
-String info = "Could not flush windows "
+String info = "Could not flush windows registry node " +
-+ "registry node " + byteArrayToString(windowsAbsolutePath())
+byteArrayToString(windowsAbsolutePath()) +
-+ " at root 0x" + Integer.toHexString(rootNativeHandle()) +
+" at root 0x" +
-". Windows RegFlushKey(...) returned error code " + result + ".";
+Integer.toHexString(rootNativeHandle()) +
+". Windows RegFlushKey(...) returned error code " +
+result + ".";
 logger().warning(info);
 throw new BackingStoreException(info);
 }
 closeKey(nativeHandle);
 }
 * given name and creates its underlying Windows registry node,
 * if it does not exist.
 * Logs a warning message, if Windows Registry is unavailable.
 */
 protected AbstractPreferences childSpi(String name) {
 return new WindowsPreferences(this, name);
 }
 /**
 * Implements <tt>AbstractPreferences</tt> <tt>removeNodeSpi()</tt> method.
 * Deletes underlying Windows registry node.
 * Throws a BackingStoreException and logs a warning, if Windows registry
 * is not available.
 */
 public void removeNodeSpi() throws BackingStoreException {
 int parentNativeHandle =
 ((WindowsPreferences)parent()).openKey(DELETE);
 if (parentNativeHandle == NULL_NATIVE_HANDLE) {
-throw new BackingStoreException("Could not open parent windows"
+throw new BackingStoreException(
-+ "registry node of " + byteArrayToString(windowsAbsolutePath()) +
+"Could not open parent windows registry node of " +
-" at root 0x" + Integer.toHexString(rootNativeHandle()) + ".");
+byteArrayToString(windowsAbsolutePath()) +
+" at root 0x" +
+Integer.toHexString(rootNativeHandle()) + ".");
 }
 int result =
 WindowsRegDeleteKey(parentNativeHandle, toWindowsName(name()));
 if (result != ERROR_SUCCESS) {
-String info = "Could not delete windows "
+String info = "Could not delete windows registry node " +
-+ "registry node " + byteArrayToString(windowsAbsolutePath()) +
+byteArrayToString(windowsAbsolutePath()) +
 " at root 0x" + Integer.toHexString(rootNativeHandle()) +
 ". Windows RegDeleteKeyEx(...) returned error code " +
 result + ".";
 logger().warning(info);
 throw new BackingStoreException(info);
 }
 closeKey(parentNativeHandle);
 }
 * @param windowsNameArray Null-terminated byte array.
 */
 private static String toJavaName(byte[] windowsNameArray) {
 String windowsName = byteArrayToString(windowsNameArray);
 // check if Alt64
-if ((windowsName.length()>1) &&
+if ((windowsName.length() > 1) &&
-(windowsName.substring(0,2).equals("/!"))) {
+(windowsName.substring(0, 2).equals("/!"))) {
 return toJavaAlt64Name(windowsName);
 }
-StringBuffer javaName = new StringBuffer();
+StringBuilder javaName = new StringBuilder();
 char ch;
 // Decode from simple encoding
-for (int i = 0; i < windowsName.length(); i++){
+for (int i = 0; i < windowsName.length(); i++) {
 if ((ch = windowsName.charAt(i)) == '/') {
 char next = ' ';
 if ((windowsName.length() > i + 1) &&
-((next = windowsName.charAt(i+1)) >= 'A') && (next <= 'Z')) {
+((next = windowsName.charAt(i+1)) >= 'A') &&
-ch = next;
+(next <= 'Z')) {
-i++;
+ch = next;
-} else  if ((windowsName.length() > i + 1) && (next == '/')) {
+i++;
-ch = '\\';
+} else if ((windowsName.length() > i + 1) &&
-i++;
+(next == '/')) {
+ch = '\\';
+i++;
 }
 } else if (ch == '\\') {
 ch = '/';
 }
 javaName.append(ch);
 * description of encoding conventions.
 */
 private static String toJavaAlt64Name(String windowsName) {
 byte[] byteBuffer =
 Base64.altBase64ToByteArray(windowsName.substring(2));
-StringBuffer result = new StringBuffer();
+StringBuilder result = new StringBuilder();
 for (int i = 0; i < byteBuffer.length; i++) {
 int firstbyte = (byteBuffer[i++] & 0xff);
 int secondbyte =  (byteBuffer[i] & 0xff);
 result.append((char)((firstbyte << 8) + secondbyte));
 }
 * Windows string to '/!'. The java name is then encoded using
 * byteArrayToAltBase64() method from
 * Base64 class.
 */
 private static byte[] toWindowsName(String javaName) {
-StringBuffer windowsName = new StringBuffer();
+StringBuilder windowsName = new StringBuilder();
 for (int i = 0; i < javaName.length(); i++) {
-char ch =javaName.charAt(i);
+char ch = javaName.charAt(i);
-if ((ch < 0x0020)||(ch > 0x007f)) {
+if ((ch < 0x0020) || (ch > 0x007f)) {
 // If a non-trivial character encountered, use altBase64
 return toWindowsAlt64Name(javaName);
 }
 if (ch == '\\') {
 windowsName.append("//");
 } else if (ch == '/') {
 windowsName.append('\\');
 } else if ((ch >= 'A') && (ch <='Z')) {
-windowsName.append("/" + ch);
+windowsName.append('/').append(ch);
 } else {
 windowsName.append(ch);
 }
 }
 return stringToByteArray(windowsName.toString());
 private static byte[] toWindowsAlt64Name(String javaName) {
 byte[] javaNameArray = new byte[2*javaName.length()];
 // Convert to byte pairs
 int counter = 0;
 for (int i = 0; i < javaName.length();i++) {
 int ch = javaName.charAt(i);
 javaNameArray[counter++] = (byte)(ch >>> 8);
 javaNameArray[counter++] = (byte)ch;
 }
-return stringToByteArray(
+return stringToByteArray("/!" +
-"/!" + Base64.byteArrayToAltBase64(javaNameArray));
+Base64.byteArrayToAltBase64(javaNameArray));
 }
 /**
 * Converts value string from its Windows representation
 * to java string.  See
 * description of the encoding algorithm.
 */
 private static String toJavaValueString(byte[] windowsNameArray) {
 // Use modified native2ascii algorithm
 String windowsName = byteArrayToString(windowsNameArray);
-StringBuffer javaName = new StringBuffer();
+StringBuilder javaName = new StringBuilder();
 char ch;
 for (int i = 0; i < windowsName.length(); i++){
 if ((ch = windowsName.charAt(i)) == '/') {
 char next = ' ';
 if (windowsName.length() > i + 1 &&
 (next = windowsName.charAt(i + 1)) == 'u') {
-if (windowsName.length() < i + 6){
+if (windowsName.length() < i + 6) {
 break;
 } else {
-ch = (char)Integer.parseInt
+ch = (char)Integer.parseInt(
-(windowsName.substring(i + 2, i + 6), 16);
+windowsName.substring(i + 2, i + 6), 16);
 i += 5;
 }
 } else
 if ((windowsName.length() > i + 1) &&
-((windowsName.charAt(i+1)) >= 'A') && (next <= 'Z')) {
+((windowsName.charAt(i+1)) >= 'A') &&
-ch = next;
+(next <= 'Z')) {
-i++;
+ch = next;
-} else  if ((windowsName.length() > i + 1) &&
+i++;
-(next == '/')) {
+} else if ((windowsName.length() > i + 1) &&
-ch = '\\';
+(next == '/')) {
-i++;
+ch = '\\';
+i++;
 }
 } else if (ch == '\\') {
 ch = '/';
 }
 javaName.append(ch);
 * '/' is encoded as  '\'.
 * Then encoding scheme similar to jdk's native2ascii converter is used
 * to convert java string to a byte array of ASCII characters.
 */
 private static byte[] toWindowsValueString(String javaName) {
-StringBuffer windowsName = new StringBuffer();
+StringBuilder windowsName = new StringBuilder();
 for (int i = 0; i < javaName.length(); i++) {
-char ch =javaName.charAt(i);
+char ch = javaName.charAt(i);
-if ((ch < 0x0020)||(ch > 0x007f)){
+if ((ch < 0x0020) || (ch > 0x007f)){
 // write \udddd
 windowsName.append("/u");
 String hex = Integer.toHexString(javaName.charAt(i));
-StringBuffer hex4 = new StringBuffer(hex);
+StringBuilder hex4 = new StringBuilder(hex);
 hex4.reverse();
 int len = 4 - hex4.length();
 for (int j = 0; j < len; j++){
 hex4.append('0');
 }
 } else if (ch == '\\') {
 windowsName.append("//");
 } else if (ch == '/') {
 windowsName.append('\\');
 } else if ((ch >= 'A') && (ch <='Z')) {
-windowsName.append("/" + ch);
+windowsName.append('/').append(ch);
 } else {
 windowsName.append(ch);
 }
 }
 return stringToByteArray(windowsName.toString());
 /**
 * Returns native handle for the top Windows node for this node.
 */
 private int rootNativeHandle() {
-return (isUserNode()? USER_ROOT_NATIVE_HANDLE :
+return (isUserNode()
-SYSTEM_ROOT_NATIVE_HANDLE);
+? USER_ROOT_NATIVE_HANDLE
+: SYSTEM_ROOT_NATIVE_HANDLE);
 }
 /**
 * Returns this java string as a null-terminated byte array
 */
 /**
 * Converts a null-terminated byte array to java string
 */
 private static String byteArrayToString(byte[] array) {
-StringBuffer result = new StringBuffer();
+StringBuilder result = new StringBuilder();
 for (int i = 0; i < array.length - 1; i++) {
 result.append((char)array[i]);
 }
 return result.toString();
 }

changeset 30641	701f6f90dc0b
parent 30043	b0dd05ec3db1
child 30789	9eca83469588