svn commit: r390246 [5/15] - in /incubator/harmony/enhanced/classlib/trunk: archive/modules/security/src/main/java/java/security/ modules/archive/src/main/java/java/util/jar/ modules/archive/src/test/java/tests/api/java/util/zip/ modules/beans/src/main...

[te...@apache.org]

Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/src/main/java/java/util/prefs/Preferences.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/prefs/src/main/java/java/util/prefs/Preferences.java?rev=390246&r1=390245&r2=390246&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/src/main/java/java/util/prefs/Preferences.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/src/main/java/java/util/prefs/Preferences.java Thu Mar 30 13:34:23 2006
@@ -11,18 +11,18 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-
-package java.util.prefs;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
+ */
+
+
+package java.util.prefs;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.MalformedURLException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
 
 
 /**
@@ -87,760 +87,760 @@
  * 
  * @since 1.4
  */
-public abstract class Preferences {
-    
-    /**
-     * ---------------------------------------------------------
-     * Constants
-     * ---------------------------------------------------------
-     */
-	/**
-	 * Maximum size in characters of preferences key  
-	 */
-	public static final int MAX_KEY_LENGTH = 80;
-	
-	/**
-	 * Maximum size in characters of preferences name
-	 */
-	public static final int MAX_NAME_LENGTH = 80;
-	
-	/**
-	 * Maximum size in characters of preferences value
-	 */
-	public static final int MAX_VALUE_LENGTH = 8192;
-
-	//permission
-	private static final RuntimePermission perm = new RuntimePermission("preferences"); //$NON-NLS-1$
-	//factory used to get user/system prefs root
-	private static final PreferencesFactory factory;
-	
-    /**
-     * ---------------------------------------------------------
-     * Static init
-     * ---------------------------------------------------------
-     */		
-	static{
-	    String factoryClassName = (String)AccessController.doPrivileged(new PrivilegedAction(){
-            public Object run() {
-                return System.getProperty("java.util.prefs.PreferencesFactory"); //$NON-NLS-1$
-            }
-	    });
-	    try {
-	        ClassLoader loader = Thread.currentThread().getContextClassLoader();
-	        if(loader == null){
-	            loader = ClassLoader.getSystemClassLoader();
-	        }
-	        Class factoryClass = loader.loadClass(factoryClassName);
-	        factory = (PreferencesFactory) factoryClass.newInstance();
-        } catch (Exception e) {
-            throw new InternalError("Cannot initiate PreferencesFactory: "+factoryClassName+". Caused by "+ e);  //$NON-NLS-1$//$NON-NLS-2$
-        }
-	    
-	}
-	
-    /**
-     * ---------------------------------------------------------
-     * Constructors
-     * ---------------------------------------------------------
-     */	
-	/**
-	 *	Default constructor, just for using by subclass.
-	 */
-	protected Preferences() {//empty constructor
-	}
-	
-    /**
-     * ---------------------------------------------------------
-     * Methods
-     * ---------------------------------------------------------
-     */	
-	/**
-	 * Get this preference node's absolute path string.
-	 * 
-	 * @return this preference node's absolute path string.
-	 */
-	public abstract String absolutePath();
-	
-	/**
-	 * Return names of all children of this node, or empty string if this node 
-	 * has no children. 
-	 * 
-	 * @return 		names of all children of this node
-	 * @throws BackingStoreException
-	 * 				if backing store is unavailable or causes operation failure
-	 * @throws IllegalStateException
-	 * 				if this node has been removed
-	 */
-	public abstract String[] childrenNames() throws BackingStoreException;
-	
-	/**
-	 * Remove all preferences of this node. 
-	 * 
-	 * @throws BackingStoreException
-	 * 				if backing store is unavailable or causes operation failure
-	 * @throws IllegalStateException
-	 * 				if this node has been removed
-	 */
-	public abstract void clear() throws BackingStoreException;
-	
-	/**
-	 * Export all preferences of this node to the given output stream in XML 
-	 * document. 
-	 * <p>
-	 * This XML document has the following DOCTYPE declaration:
-	 * <pre>
-	 * &lt;!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd"&gt;</pre>
-	 * And the utf-8 encoding will be used. Please note that this node is not 
-	 * thread-safe, which is an exception of this class. 
-	 * </p>
-	 * @param  ostream
-	 * 				the output stream to export the XML
-	 * @throws IOException
-	 * 				if export operation caused an <code>IOException</code>
-	 * @throws BackingStoreException
-	 * 				if backing store is unavailable or causes operation failure
-	 * @throws IllegalStateException
-	 * 				if this node has been removed
-	 */
-	public abstract void exportNode (OutputStream ostream) throws IOException, BackingStoreException;
-	
-	/**
-	 * Export all preferences of this node and its all descendants to the given 
-	 * output stream in XML document. 
-	 * <p>
-	 * This XML document has the following DOCTYPE declaration:
-	 * <pre>
-	 * &lt;!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd"&gt;</pre>	 * 
-	 * And the utf-8 encoding will be used. Please note that this node is not 
-	 * thread-safe, which is an exception of this class. 
-	 * </p>
-	 * @param  ostream
-	 * 				the output stream to export the XML
-	 * @throws IOException
-	 * 				if export operation caused an <code>IOException</code>
-	 * @throws BackingStoreException
-	 * 				if backing store is unavailable or causes operation failure
-	 * @throws IllegalStateException
-	 * 				if this node has been removed
-	 */
-	public abstract void exportSubtree (OutputStream ostream) throws IOException, BackingStoreException;
-	
-	/**
-	 * Force the updates to this node and its descendants to the backing store. 
-	 * <p>
-	 * If this node has been removed, then the invocation of this method only 
-	 * flush this node without descendants.
-	 * </p> 
-	 * @throws BackingStoreException
-	 * 				if backing store is unavailable or causes operation failure
-	 */
-	public abstract void flush() throws BackingStoreException;
-	
-	/**
-	 * Return the string value mapped to the given key, or default value if no 
-	 * value is mapped or backing store is unavailable.
-	 * <p>
-	 * Some implementations may store default values in backing stores. In this case, 
-	 * if there is no value mapped to the given key, the stored default value is 
-	 * returned.
-	 * </p>
-	 * 
-	 * @param key	the preference key
-	 * @param deflt	the default value, which will be returned if no value is 
-	 * 				mapped to the given key or backing store unavailable 
-	 * @return 		the preference value mapped to the given key, or default value if 
-	 * 				no value is mapped or backing store unavailable 
-	 * @throws IllegalStateException
-	 * 				if this node has been removed
-	 * @throws NullPointerException
-	 * 				if parameter key is null 
-	 */
-	public abstract String get (String key, String deflt);
-	
-	/**
-	 * Return the boolean value mapped to the given key, or default value if no 
-	 * value is mapped, backing store is unavailable, or the value is invalid.
-	 * <p>
-	 * The valid value is string equals "true", which represents true, or "false", 
-	 * which represents false, case is ignored. 
-	 * </p>  
-	 * <p>
-	 * Some implementations may store default values in backing stores. In this case, 
-	 * if there is no value mapped to the given key, the stored default value is 
-	 * returned.
-	 * </p>
-	 * 
-	 * @param key	the preference key
-	 * @param deflt	the default value, which will be returned if no value is 
-	 * 				mapped to the given key, backing store unavailable or value 
-	 * 				is invalid 
-	 * @return 		the boolean value mapped to the given key, or default value if 
-	 * 				no value is mapped, backing store unavailable or value is invalid
-	 * @throws IllegalStateException
-	 * 				if this node has been removed
-	 * @throws NullPointerException
-	 * 				if parameter key is null 
-	 */
-	public abstract boolean getBoolean (String key, boolean deflt);
-	
-	/**
-	 * Return the byte array value mapped to the given key, or default value if no 
-	 * value is mapped, backing store is unavailable, or the value is invalid string.
-	 * <p>
-	 * The valid value string is Base64 encoded binary data. The Base64 encoding 
-	 * is as defined in <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>, 
-	 * section 6.8.
-	 * </p>  
-	 * <p>
-	 * Some implementations may store default values in backing stores. In this case, 
-	 * if there is no value mapped to the given key, the stored default value is 
-	 * returned.
-	 * </p>
-	 * 
-	 * @param key	the preference key
-	 * @param deflt	the default value, which will be returned if no value is 
-	 * 				mapped to the given key, backing store unavailable or value 
-	 * 				is invalid 
-	 * @return 		the byte array value mapped to the given key, or default value if 
-	 * 				no value is mapped, backing store unavailable or value is invalid
-	 * @throws IllegalStateException
-	 * 				if this node has been removed
-	 * @throws NullPointerException
-	 * 				if parameter key is null 
-	 */
-	public abstract byte[] getByteArray (String key, byte[] deflt);
-	
-	/**
-	 * Return the double value mapped to the given key, or default value if no 
-	 * value is mapped, backing store is unavailable, or the value is invalid string.
-	 * <p>
-	 * The valid value string can be converted to double number by 
-	 * {@link Double#parseDouble(String) Double.parseDouble(String)}.
-	 * </p>  
-	 * <p>
-	 * Some implementations may store default values in backing stores. In this case, 
-	 * if there is no value mapped to the given key, the stored default value is 
-	 * returned.
-	 * </p>
-	 * 
-	 * @param key	the preference key
-	 * @param deflt	the default value, which will be returned if no value is 
-	 * 				mapped to the given key, backing store unavailable or value 
-	 * 				is invalid 
-	 * @return 		the double value mapped to the given key, or default value if 
-	 * 				no value is mapped, backing store unavailable or value is invalid
-	 * @throws IllegalStateException
-	 * 				if this node has been removed
-	 * @throws NullPointerException
-	 * 				if parameter key is null 
-	 */
-	public abstract double getDouble (String key, double deflt);
-	
-	/**
-	 * Return the float value mapped to the given key, or default value if no 
-	 * value is mapped, backing store is unavailable, or the value is invalid string.
-	 * <p>
-	 * The valid value string can be converted to float number by 
-	 * {@link Float#parseFloat(String) Float.parseFloat(String)}.
-	 * </p>  
-	 * <p>
-	 * Some implementations may store default values in backing stores. In this case, 
-	 * if there is no value mapped to the given key, the stored default value is 
-	 * returned.
-	 * </p>
-	 * 
-	 * @param key	the preference key
-	 * @param deflt	the default value, which will be returned if no value is 
-	 * 				mapped to the given key, backing store unavailable or value 
-	 * 				is invalid 
-	 * @return 		the float value mapped to the given key, or default value if 
-	 * 				no value is mapped, backing store unavailable or value is invalid
-	 * @throws IllegalStateException
-	 * 				if this node has been removed
-	 * @throws NullPointerException
-	 * 				if parameter key is null 
-	 */
-	public abstract float getFloat (String key, float deflt);
-	
-	/**
-	 * Return the float value mapped to the given key, or default value if no 
-	 * value is mapped, backing store is unavailable, or the value is invalid string.
-	 * <p>
-	 * The valid value string can be converted to integer by 
-	 * {@link Integer#parseInt(String) Integer.parseInt(String)}.
-	 * </p>  
-	 * <p>
-	 * Some implementations may store default values in backing stores. In this case, 
-	 * if there is no value mapped to the given key, the stored default value is 
-	 * returned.
-	 * </p>
-	 * 
-	 * @param key	the preference key
-	 * @param deflt	the default value, which will be returned if no value is 
-	 * 				mapped to the given key, backing store unavailable or value 
-	 * 				is invalid 
-	 * @return 		the integer value mapped to the given key, or default value if 
-	 * 				no value is mapped, backing store unavailable or value is invalid
-	 * @throws IllegalStateException
-	 * 				if this node has been removed
-	 * @throws NullPointerException
-	 * 				if parameter key is null 
-	 */
-	public abstract int getInt (String key, int deflt);
-	
-	/**
-	 * Return the long value mapped to the given key, or default value if no 
-	 * value is mapped, backing store is unavailable, or the value is invalid string.
-	 * <p>
-	 * The valid value string can be converted to long integer by 
-	 * {@link Long#parseLong(String) Long.parseLong(String)}.
-	 * </p>  
-	 * <p>
-	 * Some implementations may store default values in backing stores. In this case, 
-	 * if there is no value mapped to the given key, the stored default value is 
-	 * returned.
-	 * </p>
-	 * 
-	 * @param key	the preference key
-	 * @param deflt	the default value, which will be returned if no value is 
-	 * 				mapped to the given key, backing store unavailable or value 
-	 * 				is invalid 
-	 * @return 		the long value mapped to the given key, or default value if 
-	 * 				no value is mapped, backing store unavailable or value is invalid
-	 * @throws IllegalStateException
-	 * 				if this node has been removed
-	 * @throws NullPointerException
-	 * 				if parameter key is null 
-	 */
-	public abstract long getLong (String key, long deflt);
-	
-	/**
-	 * Import all preferences from the given input stream in XML document. 
-	 * <p>
-	 * This XML document has the following DOCTYPE declaration:
-	 * <pre>
-	 * &lt;!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd"&gt;</pre>	 * 
-	 * Please note that this node is not thread-safe, which is an exception of 
-	 * this class. 
-	 * </p>
-	 * 
-	 * @param istream
-	 * 				the given input stream to read data
-	 * @throws InvalidPreferencesFormatException
-	 * 				if the data read from given input stream is not valid XML 
-	 * 				document
-	 * @throws IOException
-	 * 				if import operation caused an <code>IOException</code>
-	 * @throws SecurityException
-	 * 				if <code>RuntimePermission("preferences")</code> is denied 
-	 * 				by a <code>SecurityManager</code>
-	 */
-	public static void importPreferences (InputStream istream) throws InvalidPreferencesFormatException, IOException {
-	    checkSecurity();
-	    if(null == istream){
-	        throw new MalformedURLException("Inputstream cannot be null!");
-	    }
-	    XMLParser.importPrefs(istream);
-	}
-	
-	/**
-	 * Return true if this is a user preferences, false if this is a system 
-	 * perferences
-	 * 
-	 * @return 		true if this is a user preferences, false if this is a 
-	 * 				system perferences
-	 */
-	public abstract boolean isUserNode();
-	
-	/**
-	 * Return all preferences keys stored in this node, or empty array if no 
-	 * key is found.
-	 * 
-	 * @return 		all preferences keys in this node
-	 * @throws BackingStoreException
-	 * 				if backing store is unavailable or causes operation failure
-	 * @throws IllegalStateException
-	 * 				if this node has been removed
-	 */
-	public abstract String[] keys() throws BackingStoreException;
-	
-	/**
-	 * Return name of this node.
-	 * 
-	 * @return 		the name of this node
-	 */
-	public abstract String name();
-	
-	/**
-	 * Return the preferences node with the given path name. The path name can 
-	 * be relative or absolute. The dictated preferences and its ancestors will 
-	 * be created if they do not exist.
-	 * <p>
-	 * The path is treated as relative to this node if it doesn't start with 
-	 * slash, or as absolute otherwise.</p>  
-	 *  
-	 * @param path	the path name of dictated preferences
-	 * @return 		the dictated preferences node
-	 * @throws IllegalStateException
-	 * 				if this node has been removed.
-	 * @throws IllegalArgumentException
-	 * 				if the path name is invalid.
-	 * @throws NullPointerException
-	 * 				if given path is null.
-	 */
-	public abstract Preferences node (String path);
-	
-	/**
-	 * Return the preferences node with the given path name. The path is treated 
-	 * as relative to this node if it doesn't start with slash, or as absolute 
-	 * otherwise.
-	 * <p>
-	 * Please note that if this node has been removed, invocation of this node 
-	 * will throw <code>IllegalStateException</code> except the given path is 
-	 * empty string, which will return false.
-	 * </p>
-	 * 
-	 * @param path	the path name of dictated preferences
-	 * @return 		true if the dictated preferences node exists
-	 * @throws IllegalStateException
-	 * 				if this node has been removed and the path is not empty string.
-	 * @throws IllegalArgumentException
-	 * 				if the path name is invalid.
-	 * @throws NullPointerException
-	 * 				if given path is null.
-	 * @throws BackingStoreException
-	 * 				if backing store is unavailable or causes operation failure
-	 */
-	public abstract boolean nodeExists (String path) throws BackingStoreException;
-	
-	/**
-	 * Return the parent preferences node of this node, or null if this node is root.
-	 * 
-	 * @return the parent preferences node of this node.
-	 * @throws IllegalStateException
-	 * 			if this node has been removed	
-	 */
-	public abstract Preferences parent();
-	
-	/**
-	 * Add new preferences to this node using given key and value, or update 
-	 * value if preferences with given key has already existed.
-	 * 
-	 * @param key	the preferences key to be added or be updated 
-	 * @param value	the preferences value for the given key
-	 * @throws NullPointerException
-	 * 				if the given key or value is null
-	 * @throws IllegalArgumentException
-	 * 				if the given key's length is bigger than 
-	 * 				<code>MAX_KEY_LENGTH</code>, or the value's length is bigger 
-	 * 				than <code>MAX_VALUE_LENGTH</code>
-	 * @throws IllegalStateException
-	 * 			if this node has been removed	
-	 */
-	public abstract void put (String key, String value);
-	
-	/**
-	 * Add new preferences to this node using given key and string form of given 
-	 * value, or update value if preferences with given key has already existed. 
-	 * 
-	 * @param key	the preferences key to be added or be updated 
-	 * @param value	the preferences value for the given key
-	 * @throws NullPointerException
-	 * 				if the given key is null
-	 * @throws IllegalArgumentException
-	 * 				if the given key's length is bigger than 
-	 * 				<code>MAX_KEY_LENGTH</code>
-	 * @throws IllegalStateException
-	 * 			if this node has been removed	
-	 */
-	public abstract void putBoolean (String key, boolean value);
-	
-	/**
-	 * Add new preferences to this node using given key and string form of given 
-	 * value, or update value if preferences with given key has already existed. 
-	 * <p>
-	 * The string form of value is the Base64 encoded binary data of the given 
-	 * byte array. The Base64 encoding is as defined in 
-	 * <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>, section 6.8.</p>
-	 * 
-	 * @param key	the preferences key to be added or be updated 
-	 * @param value	the preferences value for the given key
-	 * @throws NullPointerException
-	 * 				if the given key or value is null
-	 * @throws IllegalArgumentException
-	 * 				if the given key's length is bigger than 
-	 * 				<code>MAX_KEY_LENGTH</code> or value's length is bigger than  
-	 * 				three quaters of <code>MAX_KEY_LENGTH</code>
-	 * @throws IllegalStateException
-	 * 			if this node has been removed	
-	 */
-	public abstract void putByteArray (String key, byte[] value);
-	
-	/**
-	 * Add new preferences to this node using given key and string form of given 
-	 * value, or update value if preferences with given key has already existed. 
-	 * <p>
-	 * The string form of given value is the result of invoking 
-	 * {@link Double#toString(double) Double.toString(double)}</p>
-	 * 
-	 * @param key	the preferences key to be added or be updated 
-	 * @param value	the preferences value for the given key
-	 * @throws NullPointerException
-	 * 				if the given key is null
-	 * @throws IllegalArgumentException
-	 * 				if the given key's length is bigger than 
-	 * 				<code>MAX_KEY_LENGTH</code>
-	 * @throws IllegalStateException
-	 * 			if this node has been removed	
-	 */
-	public abstract void putDouble (String key, double value);
-	
-	/**
-	 * Add new preferences to this node using given key and string form of given 
-	 * value, or update value if preferences with given key has already existed. 
-	 * <p>
-	 * The string form of given value is the result of invoking 
-	 * {@link Float#toString(float) Float.toString(float)}</p>
-	 * 
-	 * @param key	the preferences key to be added or be updated 
-	 * @param value	the preferences value for the given key
-	 * @throws NullPointerException
-	 * 				if the given key is null
-	 * @throws IllegalArgumentException
-	 * 				if the given key's length is bigger than 
-	 * 				<code>MAX_KEY_LENGTH</code>
-	 * @throws IllegalStateException
-	 * 			if this node has been removed	
-	 */
-	public abstract void putFloat (String key, float value);
-	
-	/**
-	 * Add new preferences to this node using given key and string form of given 
-	 * value, or update value if preferences with given key has already existed. 
-	 * <p>
-	 * The string form of given value is the result of invoking 
-	 * {@link Integer#toString(int) Integer.toString(int)}</p>
-	 * 
-	 * @param key	the preferences key to be added or be updated 
-	 * @param value	the preferences value for the given key
-	 * @throws NullPointerException
-	 * 				if the given key is null
-	 * @throws IllegalArgumentException
-	 * 				if the given key's length is bigger than 
-	 * 				<code>MAX_KEY_LENGTH</code>
-	 * @throws IllegalStateException
-	 * 			if this node has been removed	
-	 */
-	public abstract void putInt (String key, int value);
-	
-	/**
-	 * Add new preferences to this node using given key and string form of given 
-	 * value, or update value if preferences with given key has already existed. 
-	 * <p>
-	 * The string form of given value is the result of invoking 
-	 * {@link Long#toString(long) Long.toString(long)}</p>
-	 * 
-	 * @param key	the preferences key to be added or be updated 
-	 * @param value	the preferences value for the given key
-	 * @throws NullPointerException
-	 * 				if the given key is null
-	 * @throws IllegalArgumentException
-	 * 				if the given key's length is bigger than 
-	 * 				<code>MAX_KEY_LENGTH</code>
-	 * @throws IllegalStateException
-	 * 			if this node has been removed	
-	 */
-	public abstract void putLong (String key, long value);
-
-	/**
-	 * Remove the preferences mapped to the given key from this node.
-	 * 
-	 * @param key	the given preferences key to removed 
-	 * @throws NullPointerException
-	 * 				if the given key is null
-	 * @throws IllegalStateException
-	 * 			if this node has been removed	
-	 */
-	public abstract void remove (String key);
-	
-	/**
-	 * Remove this preferences node and its all descendents. The removal maybe
-	 * won't be persisted until the <code>flush()</code> method is invoked. 
-	 * 
-	 * @throws BackingStoreException
-	 * 				if backing store is unavailable or causes operation failure 
-	 * @throws IllegalStateException
-	 * 				if this node has been removed
-	 * @throws UnsupportedOperationException
-	 * 				if this is a root node
-	 */
-	public abstract void removeNode() throws BackingStoreException;
-	
-	/**
-	 * Register an <code>NodeChangeListener</code> instance for this node, which 
-	 * will receive <code>NodeChangeEvent</code>. <code>NodeChangeEvent</code> will 
-	 * be produced when direct child node is added to or removed from this node. 
-	 * 
-	 * @param ncl	the given listener to be registered
-	 * @throws NullPointerException
-	 * 				if the given listener is null
-	 * @throws IllegalStateException
-	 * 				if this node has been removed
-	 */
-	public abstract void addNodeChangeListener (NodeChangeListener ncl);
-	
-	/**
-	 * Register an <code>PreferenceChangeListener</code> instance for this node, which 
-	 * will receive <code>PreferenceChangeEvent</code>. <code>PreferenceChangeEvent</code> will 
-	 * be produced when preference is added to, removed from or updated for this node. 
-	 * 
-	 * @param pcl	the given listener to be registered
-	 * @throws NullPointerException
-	 * 				if the given listener is null
-	 * @throws IllegalStateException
-	 * 				if this node has been removed
-	 */
-	public abstract void addPreferenceChangeListener (PreferenceChangeListener pcl);
-	
-	/**
-	 * Remove the given <code>NodeChangeListener</code> instance from this node. 
-	 * 
-	 * @param ncl	the given listener to be removed
-	 * @throws IllegalArgumentException
-	 * 				if the given listener 
-	 * @throws IllegalStateException
-	 * 				if this node has been removed
-	 */
-	public abstract void removeNodeChangeListener (NodeChangeListener ncl);
-	
-	/**
-	 * Remove the given <code>PreferenceChangeListener</code> instance from this node. 
-	 * 
-	 * @param pcl	the given listener to be removed
-	 * @throws IllegalArgumentException
-	 * 				if the given listener 
-	 * @throws IllegalStateException
-	 * 				if this node has been removed
-	 */
-	public abstract void removePreferenceChangeListener (PreferenceChangeListener pcl);
-	
-	/**
-	 * Synchronize this prefernces node and its descendants' data with the back 
-	 * end prefernces store. The changes of back end should be reflect by this 
-	 * node and its descendants, meanwhile, the changes of this node and descendants 
-	 * should be persisted.
-	 * 
-	 * @throws BackingStoreException
-	 * 				if backing store is unavailable or causes operation failure
-	 * @throws IllegalStateException
-	 * 				if this node has been removed
-	 */
-	public abstract void sync() throws BackingStoreException;
-	
-    /**
-     * Return the system preference node for the package of given class. The 
-     * absolute path of the returned node is one slash followed by the given 
-     * class's full package name with replacing each period ('.') with slash.
-     * For example, the preference's associated with class <code>Object<code> 
-     * has absolute path like "/java/lang". As a special case, the unnamed 
-     * package is associated with preference node "/<unnamed>". 
-     *  
-	 * This method will create node and its ancestors if needed, and the new 
-	 * created nodes maybe won't be persisted until the <code>flush()</code> 
-	 * is invoked.
-	 * 
-	 * @param c		the given class 
-	 * @return 		the system preference node for the package of given class. 
-	 * @throws NullPointerException
-	 * 				if the given class is null
-	 * @throws SecurityException
-	 * 				if <code>RuntimePermission("preferences")</code> is denied 
-	 * 				by a <code>SecurityManager</code>
-	 */
-	public static Preferences systemNodeForPackage (Class c) {
-	    checkSecurity();
-		return factory.systemRoot().node(getNodeName(c));
-	}
-	
-	/**
-	 * Return the root node for system preference hierarchy.
-	 * 
-	 * @return 		the root node for system preference hierarchy
-	 * @throws SecurityException
-	 * 				if <code>RuntimePermission("preferences")</code> is denied 
-	 * 				by a <code>SecurityManager</code>
-	 */
-	public static Preferences systemRoot() {
-	    checkSecurity();
-	    return factory.systemRoot();
-	}
-	
-	//check the RuntimePermission("preferences")
-    private static void checkSecurity() {
-        SecurityManager manager = System.getSecurityManager();
-        if(null != manager){
-            manager.checkPermission(perm);
-        }
-        
-    }
-
-    /**
-     * Return the user preference node for the package of given class. The 
-     * absolute path of the returned node is one slash followed by the given 
-     * class's full package name with replacing each period ('.') with slash.
-     * For example, the preference's associated with class <code>Object<code> 
-     * has absolute path like "/java/lang". As a special case, the unnamed 
-     * package is associated with preference node "/<unnamed>". 
-     *  
-	 * This method will create node and its ancestors if needed, and the new 
-	 * created nodes maybe won't be persisted until the <code>flush()</code> 
-	 * is invoked.
-	 * 
-	 * @param c	the given class 
-	 * @return 		the user preference node for the package of given class. 
-	 * @throws NullPointerException
-	 * 	 				if the given class is null
-	 * @throws SecurityException
-	 * 				if <code>RuntimePermission("preferences")</code> is denied 
-	 * 				by a <code>SecurityManager</code>
-	 */
-	public static Preferences userNodeForPackage (Class c) {
-	    checkSecurity();
-		return factory.userRoot().node(getNodeName(c));
-	}
-	
-	//parse node's absolute path from class instance
-	private static String getNodeName(Class c){
-	    Package p = c.getPackage();
-	    if(null == p){
-	        return "/<unnamed>"; //$NON-NLS-1$
-	    }
-	    return "/"+p.getName().replace('.', '/'); //$NON-NLS-1$
-	}
-
-	/**
-	 * Return the root node for user preference hierarchy.
-	 * 
-	 * @return 		the root node for user preference hierarchy
-	 * @throws SecurityException
-	 * 				if <code>RuntimePermission("preferences")</code> is denied 
-	 * 				by a <code>SecurityManager</code>
-	 */
-	public static Preferences userRoot() {
-	    checkSecurity();
-	    return factory.userRoot();
-	}
-	
-	/**
-	 * Return a string description of this node. The format is "User/System 
-	 * Preference Node: " followed by this node's absolute path.
-	 * 
-	 * @return a string description of this node
-	 * 
-	 */
-	public abstract String toString();
-}
-
-
-
- 
+public abstract class Preferences {
+    
+    /**
+     * ---------------------------------------------------------
+     * Constants
+     * ---------------------------------------------------------
+     */
+	/**
+	 * Maximum size in characters of preferences key  
+	 */
+	public static final int MAX_KEY_LENGTH = 80;
+	
+	/**
+	 * Maximum size in characters of preferences name
+	 */
+	public static final int MAX_NAME_LENGTH = 80;
+	
+	/**
+	 * Maximum size in characters of preferences value
+	 */
+	public static final int MAX_VALUE_LENGTH = 8192;
+
+	//permission
+	private static final RuntimePermission perm = new RuntimePermission("preferences"); //$NON-NLS-1$
+	//factory used to get user/system prefs root
+	private static final PreferencesFactory factory;
+	
+    /**
+     * ---------------------------------------------------------
+     * Static init
+     * ---------------------------------------------------------
+     */		
+	static{
+	    String factoryClassName = (String)AccessController.doPrivileged(new PrivilegedAction(){
+            public Object run() {
+                return System.getProperty("java.util.prefs.PreferencesFactory"); //$NON-NLS-1$
+            }
+	    });
+	    try {
+	        ClassLoader loader = Thread.currentThread().getContextClassLoader();
+	        if(loader == null){
+	            loader = ClassLoader.getSystemClassLoader();
+	        }
+	        Class factoryClass = loader.loadClass(factoryClassName);
+	        factory = (PreferencesFactory) factoryClass.newInstance();
+        } catch (Exception e) {
+            throw new InternalError("Cannot initiate PreferencesFactory: "+factoryClassName+". Caused by "+ e);  //$NON-NLS-1$//$NON-NLS-2$
+        }
+	    
+	}
+	
+    /**
+     * ---------------------------------------------------------
+     * Constructors
+     * ---------------------------------------------------------
+     */	
+	/**
+	 *	Default constructor, just for using by subclass.
+	 */
+	protected Preferences() {//empty constructor
+	}
+	
+    /**
+     * ---------------------------------------------------------
+     * Methods
+     * ---------------------------------------------------------
+     */	
+	/**
+	 * Get this preference node's absolute path string.
+	 * 
+	 * @return this preference node's absolute path string.
+	 */
+	public abstract String absolutePath();
+	
+	/**
+	 * Return names of all children of this node, or empty string if this node 
+	 * has no children. 
+	 * 
+	 * @return 		names of all children of this node
+	 * @throws BackingStoreException
+	 * 				if backing store is unavailable or causes operation failure
+	 * @throws IllegalStateException
+	 * 				if this node has been removed
+	 */
+	public abstract String[] childrenNames() throws BackingStoreException;
+	
+	/**
+	 * Remove all preferences of this node. 
+	 * 
+	 * @throws BackingStoreException
+	 * 				if backing store is unavailable or causes operation failure
+	 * @throws IllegalStateException
+	 * 				if this node has been removed
+	 */
+	public abstract void clear() throws BackingStoreException;
+	
+	/**
+	 * Export all preferences of this node to the given output stream in XML 
+	 * document. 
+	 * <p>
+	 * This XML document has the following DOCTYPE declaration:
+	 * <pre>
+	 * &lt;!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd"&gt;</pre>
+	 * And the utf-8 encoding will be used. Please note that this node is not 
+	 * thread-safe, which is an exception of this class. 
+	 * </p>
+	 * @param  ostream
+	 * 				the output stream to export the XML
+	 * @throws IOException
+	 * 				if export operation caused an <code>IOException</code>
+	 * @throws BackingStoreException
+	 * 				if backing store is unavailable or causes operation failure
+	 * @throws IllegalStateException
+	 * 				if this node has been removed
+	 */
+	public abstract void exportNode (OutputStream ostream) throws IOException, BackingStoreException;
+	
+	/**
+	 * Export all preferences of this node and its all descendants to the given 
+	 * output stream in XML document. 
+	 * <p>
+	 * This XML document has the following DOCTYPE declaration:
+	 * <pre>
+	 * &lt;!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd"&gt;</pre>	 * 
+	 * And the utf-8 encoding will be used. Please note that this node is not 
+	 * thread-safe, which is an exception of this class. 
+	 * </p>
+	 * @param  ostream
+	 * 				the output stream to export the XML
+	 * @throws IOException
+	 * 				if export operation caused an <code>IOException</code>
+	 * @throws BackingStoreException
+	 * 				if backing store is unavailable or causes operation failure
+	 * @throws IllegalStateException
+	 * 				if this node has been removed
+	 */
+	public abstract void exportSubtree (OutputStream ostream) throws IOException, BackingStoreException;
+	
+	/**
+	 * Force the updates to this node and its descendants to the backing store. 
+	 * <p>
+	 * If this node has been removed, then the invocation of this method only 
+	 * flush this node without descendants.
+	 * </p> 
+	 * @throws BackingStoreException
+	 * 				if backing store is unavailable or causes operation failure
+	 */
+	public abstract void flush() throws BackingStoreException;
+	
+	/**
+	 * Return the string value mapped to the given key, or default value if no 
+	 * value is mapped or backing store is unavailable.
+	 * <p>
+	 * Some implementations may store default values in backing stores. In this case, 
+	 * if there is no value mapped to the given key, the stored default value is 
+	 * returned.
+	 * </p>
+	 * 
+	 * @param key	the preference key
+	 * @param deflt	the default value, which will be returned if no value is 
+	 * 				mapped to the given key or backing store unavailable 
+	 * @return 		the preference value mapped to the given key, or default value if 
+	 * 				no value is mapped or backing store unavailable 
+	 * @throws IllegalStateException
+	 * 				if this node has been removed
+	 * @throws NullPointerException
+	 * 				if parameter key is null 
+	 */
+	public abstract String get (String key, String deflt);
+	
+	/**
+	 * Return the boolean value mapped to the given key, or default value if no 
+	 * value is mapped, backing store is unavailable, or the value is invalid.
+	 * <p>
+	 * The valid value is string equals "true", which represents true, or "false", 
+	 * which represents false, case is ignored. 
+	 * </p>  
+	 * <p>
+	 * Some implementations may store default values in backing stores. In this case, 
+	 * if there is no value mapped to the given key, the stored default value is 
+	 * returned.
+	 * </p>
+	 * 
+	 * @param key	the preference key
+	 * @param deflt	the default value, which will be returned if no value is 
+	 * 				mapped to the given key, backing store unavailable or value 
+	 * 				is invalid 
+	 * @return 		the boolean value mapped to the given key, or default value if 
+	 * 				no value is mapped, backing store unavailable or value is invalid
+	 * @throws IllegalStateException
+	 * 				if this node has been removed
+	 * @throws NullPointerException
+	 * 				if parameter key is null 
+	 */
+	public abstract boolean getBoolean (String key, boolean deflt);
+	
+	/**
+	 * Return the byte array value mapped to the given key, or default value if no 
+	 * value is mapped, backing store is unavailable, or the value is invalid string.
+	 * <p>
+	 * The valid value string is Base64 encoded binary data. The Base64 encoding 
+	 * is as defined in <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>, 
+	 * section 6.8.
+	 * </p>  
+	 * <p>
+	 * Some implementations may store default values in backing stores. In this case, 
+	 * if there is no value mapped to the given key, the stored default value is 
+	 * returned.
+	 * </p>
+	 * 
+	 * @param key	the preference key
+	 * @param deflt	the default value, which will be returned if no value is 
+	 * 				mapped to the given key, backing store unavailable or value 
+	 * 				is invalid 
+	 * @return 		the byte array value mapped to the given key, or default value if 
+	 * 				no value is mapped, backing store unavailable or value is invalid
+	 * @throws IllegalStateException
+	 * 				if this node has been removed
+	 * @throws NullPointerException
+	 * 				if parameter key is null 
+	 */
+	public abstract byte[] getByteArray (String key, byte[] deflt);
+	
+	/**
+	 * Return the double value mapped to the given key, or default value if no 
+	 * value is mapped, backing store is unavailable, or the value is invalid string.
+	 * <p>
+	 * The valid value string can be converted to double number by 
+	 * {@link Double#parseDouble(String) Double.parseDouble(String)}.
+	 * </p>  
+	 * <p>
+	 * Some implementations may store default values in backing stores. In this case, 
+	 * if there is no value mapped to the given key, the stored default value is 
+	 * returned.
+	 * </p>
+	 * 
+	 * @param key	the preference key
+	 * @param deflt	the default value, which will be returned if no value is 
+	 * 				mapped to the given key, backing store unavailable or value 
+	 * 				is invalid 
+	 * @return 		the double value mapped to the given key, or default value if 
+	 * 				no value is mapped, backing store unavailable or value is invalid
+	 * @throws IllegalStateException
+	 * 				if this node has been removed
+	 * @throws NullPointerException
+	 * 				if parameter key is null 
+	 */
+	public abstract double getDouble (String key, double deflt);
+	
+	/**
+	 * Return the float value mapped to the given key, or default value if no 
+	 * value is mapped, backing store is unavailable, or the value is invalid string.
+	 * <p>
+	 * The valid value string can be converted to float number by 
+	 * {@link Float#parseFloat(String) Float.parseFloat(String)}.
+	 * </p>  
+	 * <p>
+	 * Some implementations may store default values in backing stores. In this case, 
+	 * if there is no value mapped to the given key, the stored default value is 
+	 * returned.
+	 * </p>
+	 * 
+	 * @param key	the preference key
+	 * @param deflt	the default value, which will be returned if no value is 
+	 * 				mapped to the given key, backing store unavailable or value 
+	 * 				is invalid 
+	 * @return 		the float value mapped to the given key, or default value if 
+	 * 				no value is mapped, backing store unavailable or value is invalid
+	 * @throws IllegalStateException
+	 * 				if this node has been removed
+	 * @throws NullPointerException
+	 * 				if parameter key is null 
+	 */
+	public abstract float getFloat (String key, float deflt);
+	
+	/**
+	 * Return the float value mapped to the given key, or default value if no 
+	 * value is mapped, backing store is unavailable, or the value is invalid string.
+	 * <p>
+	 * The valid value string can be converted to integer by 
+	 * {@link Integer#parseInt(String) Integer.parseInt(String)}.
+	 * </p>  
+	 * <p>
+	 * Some implementations may store default values in backing stores. In this case, 
+	 * if there is no value mapped to the given key, the stored default value is 
+	 * returned.
+	 * </p>
+	 * 
+	 * @param key	the preference key
+	 * @param deflt	the default value, which will be returned if no value is 
+	 * 				mapped to the given key, backing store unavailable or value 
+	 * 				is invalid 
+	 * @return 		the integer value mapped to the given key, or default value if 
+	 * 				no value is mapped, backing store unavailable or value is invalid
+	 * @throws IllegalStateException
+	 * 				if this node has been removed
+	 * @throws NullPointerException
+	 * 				if parameter key is null 
+	 */
+	public abstract int getInt (String key, int deflt);
+	
+	/**
+	 * Return the long value mapped to the given key, or default value if no 
+	 * value is mapped, backing store is unavailable, or the value is invalid string.
+	 * <p>
+	 * The valid value string can be converted to long integer by 
+	 * {@link Long#parseLong(String) Long.parseLong(String)}.
+	 * </p>  
+	 * <p>
+	 * Some implementations may store default values in backing stores. In this case, 
+	 * if there is no value mapped to the given key, the stored default value is 
+	 * returned.
+	 * </p>
+	 * 
+	 * @param key	the preference key
+	 * @param deflt	the default value, which will be returned if no value is 
+	 * 				mapped to the given key, backing store unavailable or value 
+	 * 				is invalid 
+	 * @return 		the long value mapped to the given key, or default value if 
+	 * 				no value is mapped, backing store unavailable or value is invalid
+	 * @throws IllegalStateException
+	 * 				if this node has been removed
+	 * @throws NullPointerException
+	 * 				if parameter key is null 
+	 */
+	public abstract long getLong (String key, long deflt);
+	
+	/**
+	 * Import all preferences from the given input stream in XML document. 
+	 * <p>
+	 * This XML document has the following DOCTYPE declaration:
+	 * <pre>
+	 * &lt;!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd"&gt;</pre>	 * 
+	 * Please note that this node is not thread-safe, which is an exception of 
+	 * this class. 
+	 * </p>
+	 * 
+	 * @param istream
+	 * 				the given input stream to read data
+	 * @throws InvalidPreferencesFormatException
+	 * 				if the data read from given input stream is not valid XML 
+	 * 				document
+	 * @throws IOException
+	 * 				if import operation caused an <code>IOException</code>
+	 * @throws SecurityException
+	 * 				if <code>RuntimePermission("preferences")</code> is denied 
+	 * 				by a <code>SecurityManager</code>
+	 */
+	public static void importPreferences (InputStream istream) throws InvalidPreferencesFormatException, IOException {
+	    checkSecurity();
+	    if(null == istream){
+	        throw new MalformedURLException("Inputstream cannot be null!");
+	    }
+	    XMLParser.importPrefs(istream);
+	}
+	
+	/**
+	 * Return true if this is a user preferences, false if this is a system 
+	 * perferences
+	 * 
+	 * @return 		true if this is a user preferences, false if this is a 
+	 * 				system perferences
+	 */
+	public abstract boolean isUserNode();
+	
+	/**
+	 * Return all preferences keys stored in this node, or empty array if no 
+	 * key is found.
+	 * 
+	 * @return 		all preferences keys in this node
+	 * @throws BackingStoreException
+	 * 				if backing store is unavailable or causes operation failure
+	 * @throws IllegalStateException
+	 * 				if this node has been removed
+	 */
+	public abstract String[] keys() throws BackingStoreException;
+	
+	/**
+	 * Return name of this node.
+	 * 
+	 * @return 		the name of this node
+	 */
+	public abstract String name();
+	
+	/**
+	 * Return the preferences node with the given path name. The path name can 
+	 * be relative or absolute. The dictated preferences and its ancestors will 
+	 * be created if they do not exist.
+	 * <p>
+	 * The path is treated as relative to this node if it doesn't start with 
+	 * slash, or as absolute otherwise.</p>  
+	 *  
+	 * @param path	the path name of dictated preferences
+	 * @return 		the dictated preferences node
+	 * @throws IllegalStateException
+	 * 				if this node has been removed.
+	 * @throws IllegalArgumentException
+	 * 				if the path name is invalid.
+	 * @throws NullPointerException
+	 * 				if given path is null.
+	 */
+	public abstract Preferences node (String path);
+	
+	/**
+	 * Return the preferences node with the given path name. The path is treated 
+	 * as relative to this node if it doesn't start with slash, or as absolute 
+	 * otherwise.
+	 * <p>
+	 * Please note that if this node has been removed, invocation of this node 
+	 * will throw <code>IllegalStateException</code> except the given path is 
+	 * empty string, which will return false.
+	 * </p>
+	 * 
+	 * @param path	the path name of dictated preferences
+	 * @return 		true if the dictated preferences node exists
+	 * @throws IllegalStateException
+	 * 				if this node has been removed and the path is not empty string.
+	 * @throws IllegalArgumentException
+	 * 				if the path name is invalid.
+	 * @throws NullPointerException
+	 * 				if given path is null.
+	 * @throws BackingStoreException
+	 * 				if backing store is unavailable or causes operation failure
+	 */
+	public abstract boolean nodeExists (String path) throws BackingStoreException;
+	
+	/**
+	 * Return the parent preferences node of this node, or null if this node is root.
+	 * 
+	 * @return the parent preferences node of this node.
+	 * @throws IllegalStateException
+	 * 			if this node has been removed	
+	 */
+	public abstract Preferences parent();
+	
+	/**
+	 * Add new preferences to this node using given key and value, or update 
+	 * value if preferences with given key has already existed.
+	 * 
+	 * @param key	the preferences key to be added or be updated 
+	 * @param value	the preferences value for the given key
+	 * @throws NullPointerException
+	 * 				if the given key or value is null
+	 * @throws IllegalArgumentException
+	 * 				if the given key's length is bigger than 
+	 * 				<code>MAX_KEY_LENGTH</code>, or the value's length is bigger 
+	 * 				than <code>MAX_VALUE_LENGTH</code>
+	 * @throws IllegalStateException
+	 * 			if this node has been removed	
+	 */
+	public abstract void put (String key, String value);
+	
+	/**
+	 * Add new preferences to this node using given key and string form of given 
+	 * value, or update value if preferences with given key has already existed. 
+	 * 
+	 * @param key	the preferences key to be added or be updated 
+	 * @param value	the preferences value for the given key
+	 * @throws NullPointerException
+	 * 				if the given key is null
+	 * @throws IllegalArgumentException
+	 * 				if the given key's length is bigger than 
+	 * 				<code>MAX_KEY_LENGTH</code>
+	 * @throws IllegalStateException
+	 * 			if this node has been removed	
+	 */
+	public abstract void putBoolean (String key, boolean value);
+	
+	/**
+	 * Add new preferences to this node using given key and string form of given 
+	 * value, or update value if preferences with given key has already existed. 
+	 * <p>
+	 * The string form of value is the Base64 encoded binary data of the given 
+	 * byte array. The Base64 encoding is as defined in 
+	 * <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>, section 6.8.</p>
+	 * 
+	 * @param key	the preferences key to be added or be updated 
+	 * @param value	the preferences value for the given key
+	 * @throws NullPointerException
+	 * 				if the given key or value is null
+	 * @throws IllegalArgumentException
+	 * 				if the given key's length is bigger than 
+	 * 				<code>MAX_KEY_LENGTH</code> or value's length is bigger than  
+	 * 				three quaters of <code>MAX_KEY_LENGTH</code>
+	 * @throws IllegalStateException
+	 * 			if this node has been removed	
+	 */
+	public abstract void putByteArray (String key, byte[] value);
+	
+	/**
+	 * Add new preferences to this node using given key and string form of given 
+	 * value, or update value if preferences with given key has already existed. 
+	 * <p>
+	 * The string form of given value is the result of invoking 
+	 * {@link Double#toString(double) Double.toString(double)}</p>
+	 * 
+	 * @param key	the preferences key to be added or be updated 
+	 * @param value	the preferences value for the given key
+	 * @throws NullPointerException
+	 * 				if the given key is null
+	 * @throws IllegalArgumentException
+	 * 				if the given key's length is bigger than 
+	 * 				<code>MAX_KEY_LENGTH</code>
+	 * @throws IllegalStateException
+	 * 			if this node has been removed	
+	 */
+	public abstract void putDouble (String key, double value);
+	
+	/**
+	 * Add new preferences to this node using given key and string form of given 
+	 * value, or update value if preferences with given key has already existed. 
+	 * <p>
+	 * The string form of given value is the result of invoking 
+	 * {@link Float#toString(float) Float.toString(float)}</p>
+	 * 
+	 * @param key	the preferences key to be added or be updated 
+	 * @param value	the preferences value for the given key
+	 * @throws NullPointerException
+	 * 				if the given key is null
+	 * @throws IllegalArgumentException
+	 * 				if the given key's length is bigger than 
+	 * 				<code>MAX_KEY_LENGTH</code>
+	 * @throws IllegalStateException
+	 * 			if this node has been removed	
+	 */
+	public abstract void putFloat (String key, float value);
+	
+	/**
+	 * Add new preferences to this node using given key and string form of given 
+	 * value, or update value if preferences with given key has already existed. 
+	 * <p>
+	 * The string form of given value is the result of invoking 
+	 * {@link Integer#toString(int) Integer.toString(int)}</p>
+	 * 
+	 * @param key	the preferences key to be added or be updated 
+	 * @param value	the preferences value for the given key
+	 * @throws NullPointerException
+	 * 				if the given key is null
+	 * @throws IllegalArgumentException
+	 * 				if the given key's length is bigger than 
+	 * 				<code>MAX_KEY_LENGTH</code>
+	 * @throws IllegalStateException
+	 * 			if this node has been removed	
+	 */
+	public abstract void putInt (String key, int value);
+	
+	/**
+	 * Add new preferences to this node using given key and string form of given 
+	 * value, or update value if preferences with given key has already existed. 
+	 * <p>
+	 * The string form of given value is the result of invoking 
+	 * {@link Long#toString(long) Long.toString(long)}</p>
+	 * 
+	 * @param key	the preferences key to be added or be updated 
+	 * @param value	the preferences value for the given key
+	 * @throws NullPointerException
+	 * 				if the given key is null
+	 * @throws IllegalArgumentException
+	 * 				if the given key's length is bigger than 
+	 * 				<code>MAX_KEY_LENGTH</code>
+	 * @throws IllegalStateException
+	 * 			if this node has been removed	
+	 */
+	public abstract void putLong (String key, long value);
+
+	/**
+	 * Remove the preferences mapped to the given key from this node.
+	 * 
+	 * @param key	the given preferences key to removed 
+	 * @throws NullPointerException
+	 * 				if the given key is null
+	 * @throws IllegalStateException
+	 * 			if this node has been removed	
+	 */
+	public abstract void remove (String key);
+	
+	/**
+	 * Remove this preferences node and its all descendants. The removal maybe
+	 * won't be persisted until the <code>flush()</code> method is invoked. 
+	 * 
+	 * @throws BackingStoreException
+	 * 				if backing store is unavailable or causes operation failure 
+	 * @throws IllegalStateException
+	 * 				if this node has been removed
+	 * @throws UnsupportedOperationException
+	 * 				if this is a root node
+	 */
+	public abstract void removeNode() throws BackingStoreException;
+	
+	/**
+	 * Register an <code>NodeChangeListener</code> instance for this node, which 
+	 * will receive <code>NodeChangeEvent</code>. <code>NodeChangeEvent</code> will 
+	 * be produced when direct child node is added to or removed from this node. 
+	 * 
+	 * @param ncl	the given listener to be registered
+	 * @throws NullPointerException
+	 * 				if the given listener is null
+	 * @throws IllegalStateException
+	 * 				if this node has been removed
+	 */
+	public abstract void addNodeChangeListener (NodeChangeListener ncl);
+	
+	/**
+	 * Register an <code>PreferenceChangeListener</code> instance for this node, which 
+	 * will receive <code>PreferenceChangeEvent</code>. <code>PreferenceChangeEvent</code> will 
+	 * be produced when preference is added to, removed from or updated for this node. 
+	 * 
+	 * @param pcl	the given listener to be registered
+	 * @throws NullPointerException
+	 * 				if the given listener is null
+	 * @throws IllegalStateException
+	 * 				if this node has been removed
+	 */
+	public abstract void addPreferenceChangeListener (PreferenceChangeListener pcl);
+	
+	/**
+	 * Remove the given <code>NodeChangeListener</code> instance from this node. 
+	 * 
+	 * @param ncl	the given listener to be removed
+	 * @throws IllegalArgumentException
+	 * 				if the given listener 
+	 * @throws IllegalStateException
+	 * 				if this node has been removed
+	 */
+	public abstract void removeNodeChangeListener (NodeChangeListener ncl);
+	
+	/**
+	 * Remove the given <code>PreferenceChangeListener</code> instance from this node. 
+	 * 
+	 * @param pcl	the given listener to be removed
+	 * @throws IllegalArgumentException
+	 * 				if the given listener 
+	 * @throws IllegalStateException
+	 * 				if this node has been removed
+	 */
+	public abstract void removePreferenceChangeListener (PreferenceChangeListener pcl);
+	
+	/**
+	 * Synchronize this preferences node and its descendants' data with the back 
+	 * end preferences store. The changes of back end should be reflect by this 
+	 * node and its descendants, meanwhile, the changes of this node and descendants 
+	 * should be persisted.
+	 * 
+	 * @throws BackingStoreException
+	 * 				if backing store is unavailable or causes operation failure
+	 * @throws IllegalStateException
+	 * 				if this node has been removed
+	 */
+	public abstract void sync() throws BackingStoreException;
+	
+    /**
+     * Return the system preference node for the package of given class. The 
+     * absolute path of the returned node is one slash followed by the given 
+     * class's full package name with replacing each period ('.') with slash.
+     * For example, the preference's associated with class <code>Object<code> 
+     * has absolute path like "/java/lang". As a special case, the unnamed 
+     * package is associated with preference node "/<unnamed>". 
+     *  
+	 * This method will create node and its ancestors if needed, and the new 
+	 * created nodes maybe won't be persisted until the <code>flush()</code> 
+	 * is invoked.
+	 * 
+	 * @param c		the given class 
+	 * @return 		the system preference node for the package of given class. 
+	 * @throws NullPointerException
+	 * 				if the given class is null
+	 * @throws SecurityException
+	 * 				if <code>RuntimePermission("preferences")</code> is denied 
+	 * 				by a <code>SecurityManager</code>
+	 */
+	public static Preferences systemNodeForPackage (Class c) {
+	    checkSecurity();
+		return factory.systemRoot().node(getNodeName(c));
+	}
+	
+	/**
+	 * Return the root node for system preference hierarchy.
+	 * 
+	 * @return 		the root node for system preference hierarchy
+	 * @throws SecurityException
+	 * 				if <code>RuntimePermission("preferences")</code> is denied 
+	 * 				by a <code>SecurityManager</code>
+	 */
+	public static Preferences systemRoot() {
+	    checkSecurity();
+	    return factory.systemRoot();
+	}
+	
+	//check the RuntimePermission("preferences")
+    private static void checkSecurity() {
+        SecurityManager manager = System.getSecurityManager();
+        if(null != manager){
+            manager.checkPermission(perm);
+        }
+        
+    }
+
+    /**
+     * Return the user preference node for the package of given class. The 
+     * absolute path of the returned node is one slash followed by the given 
+     * class's full package name with replacing each period ('.') with slash.
+     * For example, the preference's associated with class <code>Object<code> 
+     * has absolute path like "/java/lang". As a special case, the unnamed 
+     * package is associated with preference node "/<unnamed>". 
+     *  
+	 * This method will create node and its ancestors if needed, and the new 
+	 * created nodes maybe won't be persisted until the <code>flush()</code> 
+	 * is invoked.
+	 * 
+	 * @param c	the given class 
+	 * @return 		the user preference node for the package of given class. 
+	 * @throws NullPointerException
+	 * 	 				if the given class is null
+	 * @throws SecurityException
+	 * 				if <code>RuntimePermission("preferences")</code> is denied 
+	 * 				by a <code>SecurityManager</code>
+	 */
+	public static Preferences userNodeForPackage (Class c) {
+	    checkSecurity();
+		return factory.userRoot().node(getNodeName(c));
+	}
+	
+	//parse node's absolute path from class instance
+	private static String getNodeName(Class c){
+	    Package p = c.getPackage();
+	    if(null == p){
+	        return "/<unnamed>"; //$NON-NLS-1$
+	    }
+	    return "/"+p.getName().replace('.', '/'); //$NON-NLS-1$
+	}
+
+	/**
+	 * Return the root node for user preference hierarchy.
+	 * 
+	 * @return 		the root node for user preference hierarchy
+	 * @throws SecurityException
+	 * 				if <code>RuntimePermission("preferences")</code> is denied 
+	 * 				by a <code>SecurityManager</code>
+	 */
+	public static Preferences userRoot() {
+	    checkSecurity();
+	    return factory.userRoot();
+	}
+	
+	/**
+	 * Return a string description of this node. The format is "User/System 
+	 * Preference Node: " followed by this node's absolute path.
+	 * 
+	 * @return a string description of this node
+	 * 
+	 */
+	public abstract String toString();
+}
+
+
+
+ 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex-beans-math/src/common/javasrc/java/util/regex/MatchResultImpl.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/regex-beans-math/src/common/javasrc/java/util/regex/MatchResultImpl.java?rev=390246&r1=390245&r2=390246&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex-beans-math/src/common/javasrc/java/util/regex/MatchResultImpl.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex-beans-math/src/common/javasrc/java/util/regex/MatchResultImpl.java Thu Mar 30 13:34:23 2006
@@ -1,261 +1,261 @@
-/*
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-/**
- * @author Nikolay A. Kuznetsov
- * @version $Revision: 1.15.2.2 $
- */
-package java.util.regex;
-
-import java.util.Arrays;
-
-/**
- * Match result implementaion
- * Note: probably it might make sense to combine this class with Matcher.
- *  
- * @author Nikolay A. Kuznetsov
- * @version $Revision: 1.15.2.2 $
- */
-class MatchResultImpl implements MatchResult {
-
-    private int[] groupBounds = null;
-
-    private int[] consumers = null;
-
-    private int[] compQuantCounters = null;
-
-    private CharSequence string = null;
-
-    private int groupCount = 0;
-
-    private boolean valid = false;
-
-    private int leftBound;
-
-    private int rightBound;
-
-    int startIndex;
-
-    private boolean transparentBounds = false;
-
-    private boolean anchoringBounds = false;
-
-    boolean hitEnd = false;
-
-    boolean requireEnd = false;
-
-    int previousMatch = -1;
-
-    private int mode;
-
-    MatchResultImpl(CharSequence string, int leftBound, int rightBound,
-            int groupCount, int compQuantCount, int consumersCount) {
-        this.groupCount = ++groupCount;
-        this.groupBounds = new int[groupCount * 2];
-
-        this.consumers = new int[consumersCount];
-        Arrays.fill(consumers, -1);
-
-        if (compQuantCount > 0)
-            this.compQuantCounters = new int[compQuantCount];
-        Arrays.fill(groupBounds, -1);
-        reset(string, leftBound, rightBound);
-    }
-
-    MatchResult cloneImpl() {
-        MatchResultImpl res = new MatchResultImpl(this.string, this.leftBound,
-                this.rightBound, this.groupCount - 1, 0, 0);
-
-        System.arraycopy(groupBounds, 0, res.groupBounds, 0,
-                this.groupBounds.length);
-
-        return res;
-    }
-
-    public void setConsumed(int counter, int value) {
-        this.consumers[counter] = value;
-    }
-
-    public int getConsumed(int counter) {
-        return this.consumers[counter];
-    }
-
-    public int end() {
-        return end(0);
-    }
-
-    public int end(int group) {
-        checkGroup(group);
-        return groupBounds[group * 2 + 1];
-    }
-
-    void setStart(int group, int offset) {
-        groupBounds[group * 2] = offset;
-    }
-
-    void setEnd(int group, int offset) {
-        groupBounds[group * 2 + 1] = offset;
-    }
-
-    int getStart(int group) {
-        return groupBounds[group * 2];
-    }
-
-    int getEnd(int group) {
-        return groupBounds[group * 2 + 1];
-    }
-
-    public String group() {
-        return group(0);
-    }
-
-    public String group(int group) {
-        if (start(group) < 0)
-            return null;
-        return string.subSequence(start(group), end(group)).toString();
-    }
-
-    String getGroupNoCheck(int group) {
-        int st = getStart(group);
-        int end = getEnd(group);
-        if ((end | st | (end - st)) < 0 || end > string.length())
-            return null;
-
-        return string.subSequence(st, end).toString();
-    }
-
-    public int groupCount() {
-        return groupCount - 1;
-    }
-
-    public int start() {
-        return start(0);
-    }
-
-    public int start(int group) {
-        checkGroup(group);
-        return groupBounds[group * 2];
-    }
-
-    /*
-     * This method being called after any successfull match; For now it's being
-     * used to check zero group for empty match;
-     */
-    public void finalizeMatch() {
-        if (this.groupBounds[0] == -1) {
-            this.groupBounds[0] = this.startIndex;
-            this.groupBounds[1] = this.startIndex;
-        }
-
-        previousMatch = end();
-    }
-
-    public int getEnterCounter(int setCounter) {
-        return compQuantCounters[setCounter];
-    }
-
-    public void setEnterCounter(int setCounter, int value) {
-        compQuantCounters[setCounter] = value;
-    }
-
-    private void checkGroup(int group) {
-        if (!valid) {
-            throw new IllegalStateException(I18n.getMessage("No match found"));
-        }
-
-        if (group < 0 || group > groupCount) {
-            throw new IndexOutOfBoundsException(I18n.getFormattedMessage(
-                    "Group index out of bounds: {0}", new Integer(group)));
-        }
-    }
-
-    void updateGroup(int index, int srtOffset, int endOffset) {
-        checkGroup(index);
-        groupBounds[index * 2] = srtOffset;
-        groupBounds[index * 2 + 1] = endOffset;
-    }
-
-    protected void setValid() {
-        this.valid = true;
-    }
-
-    protected boolean isValid() {
-        return this.valid;
-    }
-
-    protected void reset(CharSequence newSequence, int leftBound, int rightBound) {
-        valid = false;
-        mode = Matcher.MODE_MATCH;
-        Arrays.fill(groupBounds, -1);
-        Arrays.fill(consumers, -1);
-
-        if (newSequence != null)
-            this.string = newSequence;
-        if (leftBound >= 0)
-            this.setBounds(leftBound, rightBound);
-        this.startIndex = this.leftBound;
-    }
-
-    protected void reset() {
-        reset(null, -1, -1);
-    }
-
-    private void setBounds(int leftBound, int rightBound) {
-        this.leftBound = leftBound;
-        this.rightBound = rightBound;
-    }
-
-    protected void setStartIndex(int startIndex) {
-        this.startIndex = startIndex;
-        previousMatch = previousMatch >= 0 ? previousMatch : startIndex;
-    }
-
-    public int getLeftBound() {
-        return this.leftBound;
-    }
-
-    public int getRightBound() {
-        return this.rightBound;
-    }
-
-    protected void setMode(int mode) {
-        this.mode = mode;
-    }
-
-    protected int mode() {
-        return mode;
-    }
-
-    protected void useAnchoringBounds(boolean value) {
-        this.anchoringBounds = value;
-    }
-
-    protected boolean hasAnchoringBounds() {
-        return this.anchoringBounds;
-    }
-
-    protected void useTransparentBounds(boolean value) {
-        this.transparentBounds = value;
-    }
-
-    protected boolean hasTransparentBounds() {
-        return this.transparentBounds;
-    }
-
-    int getPreviousMatchEnd() {
-        return previousMatch;
-    }
-}
+/*
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ * @author Nikolay A. Kuznetsov
+ * @version $Revision: 1.15.2.2 $
+ */
+package java.util.regex;
+
+import java.util.Arrays;
+
+/**
+ * Match result implementaion
+ * Note: probably it might make sense to combine this class with Matcher.
+ *  
+ * @author Nikolay A. Kuznetsov
+ * @version $Revision: 1.15.2.2 $
+ */
+class MatchResultImpl implements MatchResult {
+
+    private int[] groupBounds = null;
+
+    private int[] consumers = null;
+
+    private int[] compQuantCounters = null;
+
+    private CharSequence string = null;
+
+    private int groupCount = 0;
+
+    private boolean valid = false;
+
+    private int leftBound;
+
+    private int rightBound;
+
+    int startIndex;
+
+    private boolean transparentBounds = false;
+
+    private boolean anchoringBounds = false;
+
+    boolean hitEnd = false;
+
+    boolean requireEnd = false;
+
+    int previousMatch = -1;
+
+    private int mode;
+
+    MatchResultImpl(CharSequence string, int leftBound, int rightBound,
+            int groupCount, int compQuantCount, int consumersCount) {
+        this.groupCount = ++groupCount;
+        this.groupBounds = new int[groupCount * 2];
+
+        this.consumers = new int[consumersCount];
+        Arrays.fill(consumers, -1);
+
+        if (compQuantCount > 0)
+            this.compQuantCounters = new int[compQuantCount];
+        Arrays.fill(groupBounds, -1);
+        reset(string, leftBound, rightBound);
+    }
+
+    MatchResult cloneImpl() {
+        MatchResultImpl res = new MatchResultImpl(this.string, this.leftBound,
+                this.rightBound, this.groupCount - 1, 0, 0);
+
+        System.arraycopy(groupBounds, 0, res.groupBounds, 0,
+                this.groupBounds.length);
+
+        return res;
+    }
+
+    public void setConsumed(int counter, int value) {
+        this.consumers[counter] = value;
+    }
+
+    public int getConsumed(int counter) {
+        return this.consumers[counter];
+    }
+
+    public int end() {
+        return end(0);
+    }
+
+    public int end(int group) {
+        checkGroup(group);
+        return groupBounds[group * 2 + 1];
+    }
+
+    void setStart(int group, int offset) {
+        groupBounds[group * 2] = offset;
+    }
+
+    void setEnd(int group, int offset) {
+        groupBounds[group * 2 + 1] = offset;
+    }
+
+    int getStart(int group) {
+        return groupBounds[group * 2];
+    }
+
+    int getEnd(int group) {
+        return groupBounds[group * 2 + 1];
+    }
+
+    public String group() {
+        return group(0);
+    }
+
+    public String group(int group) {
+        if (start(group) < 0)
+            return null;
+        return string.subSequence(start(group), end(group)).toString();
+    }
+
+    String getGroupNoCheck(int group) {
+        int st = getStart(group);
+        int end = getEnd(group);
+        if ((end | st | (end - st)) < 0 || end > string.length())
+            return null;
+
+        return string.subSequence(st, end).toString();
+    }
+
+    public int groupCount() {
+        return groupCount - 1;
+    }
+
+    public int start() {
+        return start(0);
+    }
+
+    public int start(int group) {
+        checkGroup(group);
+        return groupBounds[group * 2];
+    }
+
+    /*
+     * This method being called after any successful match; For now it's being
+     * used to check zero group for empty match;
+     */
+    public void finalizeMatch() {
+        if (this.groupBounds[0] == -1) {
+            this.groupBounds[0] = this.startIndex;
+            this.groupBounds[1] = this.startIndex;
+        }
+
+        previousMatch = end();
+    }
+
+    public int getEnterCounter(int setCounter) {
+        return compQuantCounters[setCounter];
+    }
+
+    public void setEnterCounter(int setCounter, int value) {
+        compQuantCounters[setCounter] = value;
+    }
+
+    private void checkGroup(int group) {
+        if (!valid) {
+            throw new IllegalStateException(I18n.getMessage("No match found"));
+        }
+
+        if (group < 0 || group > groupCount) {
+            throw new IndexOutOfBoundsException(I18n.getFormattedMessage(
+                    "Group index out of bounds: {0}", new Integer(group)));
+        }
+    }
+
+    void updateGroup(int index, int srtOffset, int endOffset) {
+        checkGroup(index);
+        groupBounds[index * 2] = srtOffset;
+        groupBounds[index * 2 + 1] = endOffset;
+    }
+
+    protected void setValid() {
+        this.valid = true;
+    }
+
+    protected boolean isValid() {
+        return this.valid;
+    }
+
+    protected void reset(CharSequence newSequence, int leftBound, int rightBound) {
+        valid = false;
+        mode = Matcher.MODE_MATCH;
+        Arrays.fill(groupBounds, -1);
+        Arrays.fill(consumers, -1);
+
+        if (newSequence != null)
+            this.string = newSequence;
+        if (leftBound >= 0)
+            this.setBounds(leftBound, rightBound);
+        this.startIndex = this.leftBound;
+    }
+
+    protected void reset() {
+        reset(null, -1, -1);
+    }
+
+    private void setBounds(int leftBound, int rightBound) {
+        this.leftBound = leftBound;
+        this.rightBound = rightBound;
+    }
+
+    protected void setStartIndex(int startIndex) {
+        this.startIndex = startIndex;
+        previousMatch = previousMatch >= 0 ? previousMatch : startIndex;
+    }
+
+    public int getLeftBound() {
+        return this.leftBound;
+    }
+
+    public int getRightBound() {
+        return this.rightBound;
+    }
+
+    protected void setMode(int mode) {
+        this.mode = mode;
+    }
+
+    protected int mode() {
+        return mode;
+    }
+
+    protected void useAnchoringBounds(boolean value) {
+        this.anchoringBounds = value;
+    }
+
+    protected boolean hasAnchoringBounds() {
+        return this.anchoringBounds;
+    }
+
+    protected void useTransparentBounds(boolean value) {
+        this.transparentBounds = value;
+    }
+
+    protected boolean hasTransparentBounds() {
+        return this.transparentBounds;
+    }
+
+    int getPreviousMatchEnd() {
+        return previousMatch;
+    }
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/common/javasrc/java/security/AlgorithmParameterGenerator.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/common/javasrc/java/security/AlgorithmParameterGenerator.java?rev=390246&r1=390245&r2=390246&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/common/javasrc/java/security/AlgorithmParameterGenerator.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/common/javasrc/java/security/AlgorithmParameterGenerator.java Thu Mar 30 13:34:23 2006
@@ -1,183 +1,183 @@
-/*
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-/**
-* @author Vera Y. Petrashkova
-* @version $Revision$
-*/
-
-package java.security;
-
-import java.security.spec.AlgorithmParameterSpec;
-
-import org.apache.harmony.security.fortress.Engine;
-
-
-/**
- * @com.intel.drl.spec_ref
- * 
- */
-
-public class AlgorithmParameterGenerator {
-
-    // Store spi service name
-    private static final String SERVICE = "AlgorithmParameterGenerator";
-
-    // Used to accesess common engine functionality
-    private static Engine engine = new Engine(SERVICE);
-
-    // Store SecureRandom
-    private static SecureRandom randm = new SecureRandom();
-
-    // Store used provider
-    private final Provider provider;
-
-    // Store used AlgorithmParameterGeneratorSpi implementation
-    private final AlgorithmParameterGeneratorSpi spiImpl;
-
-    //Store used algorithm
-    private final String algorithm;
-
-    /**
-     * @com.intel.drl.spec_ref
-     *  
-     */
-    protected AlgorithmParameterGenerator(
-            AlgorithmParameterGeneratorSpi paramGenSpi, Provider provider,
-            String algorithm) {
-        this.provider = provider;
-        this.algorithm = algorithm;
-        this.spiImpl = paramGenSpi;
-    }
-
-    /**
-     * @com.intel.drl.spec_ref
-     *  
-     */
-    public final String getAlgorithm() {
-        return algorithm;
-    }
-
-    /**
-     * @com.intel.drl.spec_ref
-     * 
-     * throws NullPointerException when algorithm is null
-     */
-    public static AlgorithmParameterGenerator getInstance(String algorithm)
-            throws NoSuchAlgorithmException {
-        if (algorithm == null) {
-            throw new NullPointerException("Algorithm is null");
-        }
-        synchronized (engine) {
-            engine.getInstance(algorithm, null);
-            return new AlgorithmParameterGenerator(
-                    (AlgorithmParameterGeneratorSpi) engine.spi, engine.provider,
-                    algorithm);
-        }
-    }
-
-    /**
-     * @com.intel.drl.spec_ref
-     * 
-     * throws NullPointerException if algorithm is null (instead of
-     * NoSuchAlgorithmException) as in 1.4 release
-     */
-    public static AlgorithmParameterGenerator getInstance(String algorithm,
-            String provider) throws NoSuchAlgorithmException,
-            NoSuchProviderException {
-        if ((provider == null) || (provider.length() == 0)) {
-            throw new IllegalArgumentException(
-                    "Provider is null or empty string");
-        }
-        Provider impProvider = Security.getProvider(provider);
-        if (impProvider == null) {
-            throw new NoSuchProviderException(provider);
-        }
-        return getInstance(algorithm, impProvider);
-    }
-
-    /**
-     * @com.intel.drl.spec_ref
-     * 
-     * throws NullPointerException if algorithm is null (instead of
-     * NoSuchAlgorithmException) as in 1.4 release
-     */
-    public static AlgorithmParameterGenerator getInstance(String algorithm,
-            Provider provider) throws NoSuchAlgorithmException {
-        if (provider == null) {
-            throw new IllegalArgumentException("Provider is null");
-        }
-        if (algorithm == null) {
-            throw new NullPointerException("Algorithm is null");
-        }
-        synchronized (engine) {
-            engine.getInstance(algorithm, provider, null);
-            return new AlgorithmParameterGenerator(
-                    (AlgorithmParameterGeneratorSpi) engine.spi, provider,
-                    algorithm);
-        }
-    }
-
-    /**
-     * @com.intel.drl.spec_ref
-     *  
-     */
-    public final Provider getProvider() {
-        return provider;
-    }
-
-    /**
-     * @com.intel.drl.spec_ref
-     *  
-     */
-    public final void init(int size) {
-        spiImpl.engineInit(size, randm);
-    }
-
-    /**
-     * @com.intel.drl.spec_ref
-     *  
-     */
-    public final void init(int size, SecureRandom random) {
-        spiImpl.engineInit(size, random);
-    }
-
-    /**
-     * @com.intel.drl.spec_ref
-     *  
-     */
-    public final void init(AlgorithmParameterSpec genParamSpec)
-            throws InvalidAlgorithmParameterException {
-        spiImpl.engineInit(genParamSpec, randm);
-    }
-
-    /**
-     * @com.intel.drl.spec_ref
-     *  
-     */
-    public final void init(AlgorithmParameterSpec genParamSpec,
-            SecureRandom random) throws InvalidAlgorithmParameterException {
-        spiImpl.engineInit(genParamSpec, random);
-    }
-
-    /**
-     * @com.intel.drl.spec_ref
-     *  
-     */
-    public final AlgorithmParameters generateParameters() {
-        return spiImpl.engineGenerateParameters();
-    }
+/*
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+* @author Vera Y. Petrashkova
+* @version $Revision$
+*/
+
+package java.security;
+
+import java.security.spec.AlgorithmParameterSpec;
+
+import org.apache.harmony.security.fortress.Engine;
+
+
+/**
+ * @com.intel.drl.spec_ref
+ * 
+ */
+
+public class AlgorithmParameterGenerator {
+
+    // Store spi service name
+    private static final String SERVICE = "AlgorithmParameterGenerator";
+
+    // Used to access common engine functionality
+    private static Engine engine = new Engine(SERVICE);
+
+    // Store SecureRandom
+    private static SecureRandom randm = new SecureRandom();
+
+    // Store used provider
+    private final Provider provider;
+
+    // Store used AlgorithmParameterGeneratorSpi implementation
+    private final AlgorithmParameterGeneratorSpi spiImpl;
+
+    //Store used algorithm
+    private final String algorithm;
+
+    /**
+     * @com.intel.drl.spec_ref
+     *  
+     */
+    protected AlgorithmParameterGenerator(
+            AlgorithmParameterGeneratorSpi paramGenSpi, Provider provider,
+            String algorithm) {
+        this.provider = provider;
+        this.algorithm = algorithm;
+        this.spiImpl = paramGenSpi;
+    }
+
+    /**
+     * @com.intel.drl.spec_ref
+     *  
+     */
+    public final String getAlgorithm() {
+        return algorithm;
+    }
+
+    /**
+     * @com.intel.drl.spec_ref
+     * 
+     * throws NullPointerException when algorithm is null
+     */
+    public static AlgorithmParameterGenerator getInstance(String algorithm)
+            throws NoSuchAlgorithmException {
+        if (algorithm == null) {
+            throw new NullPointerException("Algorithm is null");
+        }
+        synchronized (engine) {
+            engine.getInstance(algorithm, null);
+            return new AlgorithmParameterGenerator(
+                    (AlgorithmParameterGeneratorSpi) engine.spi, engine.provider,
+                    algorithm);
+        }
+    }
+
+    /**
+     * @com.intel.drl.spec_ref
+     * 
+     * throws NullPointerException if algorithm is null (instead of
+     * NoSuchAlgorithmException) as in 1.4 release
+     */
+    public static AlgorithmParameterGenerator getInstance(String algorithm,
+            String provider) throws NoSuchAlgorithmException,
+            NoSuchProviderException {
+        if ((provider == null) || (provider.length() == 0)) {
+            throw new IllegalArgumentException(
+                    "Provider is null or empty string");
+        }
+        Provider impProvider = Security.getProvider(provider);
+        if (impProvider == null) {
+            throw new NoSuchProviderException(provider);
+        }
+        return getInstance(algorithm, impProvider);
+    }
+
+    /**
+     * @com.intel.drl.spec_ref
+     * 
+     * throws NullPointerException if algorithm is null (instead of
+     * NoSuchAlgorithmException) as in 1.4 release
+     */
+    public static AlgorithmParameterGenerator getInstance(String algorithm,
+            Provider provider) throws NoSuchAlgorithmException {
+        if (provider == null) {
+            throw new IllegalArgumentException("Provider is null");
+        }
+        if (algorithm == null) {
+            throw new NullPointerException("Algorithm is null");
+        }
+        synchronized (engine) {
+            engine.getInstance(algorithm, provider, null);
+            return new AlgorithmParameterGenerator(
+                    (AlgorithmParameterGeneratorSpi) engine.spi, provider,
+                    algorithm);
+        }
+    }
+
+    /**
+     * @com.intel.drl.spec_ref
+     *  
+     */
+    public final Provider getProvider() {
+        return provider;
+    }
+
+    /**
+     * @com.intel.drl.spec_ref
+     *  
+     */
+    public final void init(int size) {
+        spiImpl.engineInit(size, randm);
+    }
+
+    /**
+     * @com.intel.drl.spec_ref
+     *  
+     */
+    public final void init(int size, SecureRandom random) {
+        spiImpl.engineInit(size, random);
+    }
+
+    /**
+     * @com.intel.drl.spec_ref
+     *  
+     */
+    public final void init(AlgorithmParameterSpec genParamSpec)
+            throws InvalidAlgorithmParameterException {
+        spiImpl.engineInit(genParamSpec, randm);
+    }
+
+    /**
+     * @com.intel.drl.spec_ref
+     *  
+     */
+    public final void init(AlgorithmParameterSpec genParamSpec,
+            SecureRandom random) throws InvalidAlgorithmParameterException {
+        spiImpl.engineInit(genParamSpec, random);
+    }
+
+    /**
+     * @com.intel.drl.spec_ref
+     *  
+     */
+    public final AlgorithmParameters generateParameters() {
+        return spiImpl.engineGenerateParameters();
+    }
 }