Return-Path:
- * A
- * The property "jndi.syntax.direction" specifies the direction in which the name
- * is read. Permitted values are "right_to_left", "left_to_right" and "flat". A
- * flat name does not have a hierarchical structure. If this property is not
- * specified then the default is "flat". If this property is specified with an
- * invalid value then an
- * Each element can be accessed using its position. The first element is at
- * position 0. The direction of the name is important. When direction is
- * "left_to_right" then the leftmost element is at position 0. Conversely when
- * the direction is "right_to_left" then the rightmost element is at position 0.
+ * A
+ * The property "jndi.syntax.direction" specifies the direction in which the
+ * name is read. Permitted values are "right_to_left", "left_to_right" and
+ * "flat". A flat name does not have a hierarchical structure. If this property
+ * is not specified then the default is "flat". If this property is specified
+ * with an invalid value then an
+ * Each element can be accessed using its position. The first element is at
+ * position 0. The direction of the name is important. When direction is
+ * "left_to_right" then the leftmost element is at position 0. Conversely when
+ * the direction is "right_to_left" then the rightmost element is at position 0.
+ *
- * There are other properties which affect the syntax of a
- * When a non-escaped quote appears at the start of an element it must be matched at the
- * end. That element can then be said to be quoted. When an escape sequence appears
- * within a quoted element then it is treated as normal characters unless it precedes
- * an occurrence of the quote in which case it is assumed that the quoted element
- * contains a quote which is escaped.
- * If the element does not start with a quote, then any quote strings within that
- * element are just normal characters.CompoundName
is a series of string elements, and it represents
- * a name in a naming service within a single namespace. Typically these
- * names have a structure which is hierarchical.
- * CompoundName
has a sequence of zero or more elements delimited
- * by the char specified in the property "jndi.syntax.separator". This property
- * is required except when the direction of the name is "flat"
- * (see jndi.syntax.direction). The property "jndi.syntax.separator2" allows for
- * the specification of an additional separator. A separator string will be
- * treated as normal characters if it is preceded by the escape string or is
- * within quotes.IllegalArgumentException
should be raised.CompoundName
is a series of string elements, and it
+ * represents a name in a naming service within a single namespace. Typically
+ * these names have a structure which is hierarchical.
+ * CompoundName
has a sequence of zero or more elements
+ * delimited by the char specified in the property "jndi.syntax.separator". This
+ * property is required except when the direction of the name is "flat" (see
+ * jndi.syntax.direction). The property "jndi.syntax.separator2" allows for the
+ * specification of an additional separator. A separator string will be treated
+ * as normal characters if it is preceded by the escape string or is within
+ * quotes.
+ * IllegalArgumentException
should
+ * be raised.
+ * CompoundName
.
- * The following properties are all optional:
+ * There are other properties which affect the syntax of a
+ * CompoundName
. The following properties are all optional:
*
- *
*
+ * If the element does not start with a quote, then any quote strings within + * that element are just normal characters. + *
**
- * These 2 properties relate to names where the syntax includes attribute/content - * pairs. + * These 2 properties relate to names where the syntax includes + * attribute/content pairs. *
- * The jndi.syntax.separator.ava is not used when manipulating CompoundName
.
- * The jndi.syntax.separator is still used to separate elements.
- * The CompoundName
needs to be aware of the jndi.syntax.separator.typeval
- * in case of the instance where a quoted string is used to provide the content
- * of a pair.
+ * The jndi.syntax.separator.ava is not used when manipulating
+ * CompoundName
. The jndi.syntax.separator is still used to
+ * separate elements.
+ *
+ * The CompoundName
needs to be aware of the
+ * jndi.syntax.separator.typeval in case of the instance where a quoted string
+ * is used to provide the content of a pair.
+ *
* Consider the string "CN=$Mandy Jennings, O=Apache, C=UK" with *
CompoundName
- * with 3 elements.
+ * When no jndi.syntax.beginquote is set then this creates a valid
+ * CompoundName
with 3 elements.
+ *
* * If jndi.syntax.beginquote is then set to "$" the name becomes invalid as the - * content part of the pair CN=$Mandy Jennings has a mismatched quote.
+ * content part of the pair CN=$Mandy Jennings has a mismatched quote. + * *- * The string "CN=$Mandy Jennings$, O=Apache, C=UK" would be fine as the $ quotes - * round Mandy Jennings now balance.
- *
- * A CompoundName
may be empty. An empty CompoundName
has no elements.
- * Elements may also be empty.
+ * A CompoundName
may be empty. An empty
+ * CompoundName
has no elements. Elements may also be empty.
+ *
* Some Examples: * ============== * * Consider the following compound name from the file system namespace: - * "home/jenningm-abc/.profile" + * "home/jenningm-abc/.profile" * * jndi.syntax.separator is set to '/' as in the UNIX filesystem. * This name has 3 elements: @@ -141,85 +149,84 @@ * The direction should be left_to_right as in the UNIX filesystem * The element at position 0 would be home. * - * * Consider if jndi.syntax.separator had been set to '-' then this name * would have 2 elements: * home/jenningm and abc/.profile * If the direction was right_to_left then the element at position 0 * would be abc/.profile. * - * Consider the name "<ab<cd>ef>" where jndi.syntax.beginquote is < + * Consider the name "<ab<cd>ef>" where jndi.syntax.beginquote is < * and jndi.syntax.endquote is >. This will give rise to an * InvalidNameException because a close quote was encountered before - * the end of an element. The same is also true for "<abcd>ef>". - * If the name was "ab<cd>ef" then this would be valid and there would + * the end of an element. The same is also true for "<abcd>ef>". + * If the name was "ab<cd>ef" then this would be valid and there would * be one element ab<cd>ef. - * However if the name was "<abcdef>" there would be one element abcdef. + * However if the name was "<abcdef>" there would be one element abcdef. * - * An empty- * - * */ - public class CompoundName implements Name { /* - *Note: For serialization purposes, the specified serialVersionUID must be used. - *This class does not have serializable fields specified. Instead the readObject - *and writeObject methods are overridden. + * Note: For serialization purposes, the specified serialVersionUID must be + * used. This class does not have serializable fields specified. Instead the + * readObject and writeObject methods are overridden. */ - private static final long serialVersionUID = 3513100557083972036L; // J2SE 1.4.2 + private static final long serialVersionUID = 3513100557083972036L; - //const for property key + // const for property key private static final String SEPARATOR = "jndi.syntax.separator"; //$NON-NLS-1$ private static final String SEPARATOR_AVA = "jndi.syntax.separator.ava"; //$NON-NLS-1$ @@ -244,7 +251,7 @@ private static final String SEPARATOR2 = "jndi.syntax.separator2"; //$NON-NLS-1$ - //const for direction + // const for direction private static final String LEFT_TO_RIGHT = "left_to_right"; //$NON-NLS-1$ private static final String RIGHT_TO_LEFT = "right_to_left"; //$NON-NLS-1$ @@ -254,7 +261,7 @@ // alphabets consts private static final String NULL_STRING = ""; //$NON-NLS-1$ - //states consts + // states consts private static final int NORMAL_STATUS = 0; private static final int QUOTE1_STATUS = 1; @@ -265,7 +272,7 @@ private static final int QUOTEEND_STATUS = 4; - //properties variables + // properties variables private transient String separatorString; private transient String separatorString2; @@ -292,27 +299,29 @@ private transient boolean flat; - //elements of compound name + // elements of compound name private transient VectorCompoundName
is the name "" and has no elements. + * An empty + *+ * CompoundName + *
+ * is the name "" and has no elements. * - * When jndi.syntax.beginquote is set to " and beginquote2 is set to ' + * When jndi.syntax.beginquote is set to " and beginquote2 is set to ' * the behaviour is similar to CompositeName - - * The name "\"abcd" gives an InvalidNameException as there is no closing quote. - * The name "'\"abcd'" gives one element of value "abcd. - * The name "\\abcd" gives one element of value \abcd. + * The name "\"abcd" gives an InvalidNameException as there is no closing quote. + * The name "'\"abcd'" gives one element of value "abcd. + * The name "\\abcd" gives one element of value \abcd. * * Assuming: - * jndi.syntax.separator is "/" - * jndi.syntax.direction is "left_to_right" + * jndi.syntax.separator is "/" + * jndi.syntax.direction is "left_to_right" * then - * "" is empty. It has no elements. - * "/" has one empty element. - * "//" has 2 empty elements. - * "/a/" has 3 elements the middle one is set to a. - * "///" has 3 empty elements. - * "//a/" has 4 elements, the last but one is set to a. + * "" is empty. It has no elements. + * "/" has one empty element. + * "//" has 2 empty elements. + * "/a/" has 3 elements the middle one is set to a. + * "///" has 3 empty elements. + * "//a/" has 4 elements, the last but one is set to a. + * * - * * Assuming the only properties set are: - * jndi.syntax.separator is "/" - * jndi.syntax.direction is "left_to_right" + * jndi.syntax.separator is "/" + * jndi.syntax.direction is "left_to_right" * then the String - * "\"" has one element with the value " - * "\\\"" has one element with the value \" - * "\\\"'" has one element with the value \"' + * "\"" has one element with the value " + * "\\\"" has one element with the value \" + * "\\\"'" has one element with the value \"' * * Assuming the only properties set are: - * jndi.syntax.separator is "/" - * jndi.syntax.direction is "left_to_right" - * jndi.syntax.beginquote is "\"" + * jndi.syntax.separator is "/" + * jndi.syntax.direction is "left_to_right" + * jndi.syntax.beginquote is "\"" * * then the String - * "\"" is invalid because of no closing quote - * "\\\"" has one element with the value \" - * "\\\"'" has one element with the value \"' - * + * "\"" is invalid because of no closing quote + * "\\\"" has one element with the value \" + * "\\\"'" has one element with the value \"' * * Assuming the only properties set are: - * jndi.syntax.separator is "/" - * jndi.syntax.direction is "left_to_right" - * jndi.syntax.beginquote is "\"" - * jndi.syntax.beginquote2 is "\'" + * jndi.syntax.separator is "/" + * jndi.syntax.direction is "left_to_right" + * jndi.syntax.beginquote is "\"" + * jndi.syntax.beginquote2 is "\'" * then the String - * "\"" is invalid because of no closing quote - * "\\\"" has one element with the value \" - * "\\\"'" has one element with the value \"' - * "'\\" is invalid because of no closing quote + * "\"" is invalid because of no closing quote + * "\\\"" has one element with the value \" + * "\\\"'" has one element with the value \"' + * "'\\" is invalid because of no closing quote *
CompoundName
with supplied Enumeration
- * and Properties
+ * Constructs a CompoundName
with supplied
+ * Enumeration
and Properties
*
- * @param elements an enumeration of name elements, cannot be null
- * @param props the properties, cannot be null but may be empty.
- * If empty, the direction defaults to flat and no
- * other properties are required.
+ * @param elements
+ * an enumeration of name elements, cannot be null
+ * @param props
+ * the properties, cannot be null but may be empty. If empty, the
+ * direction defaults to flat and no other properties are
+ * required.
*/
protected CompoundName(EnumerationCompoundName
with supplied String
- * and Properties
, taking the supplied s
and
- * breaking it down into its elements.
- *
- * @param s a string containing the full compound name
- * @param props the properties, cannot be null but may be empty for a flat name
- * @throws InvalidNameException
- * thrown if the supplied String s
is invalid
- * @throws NullPointerException
- * thrown if the supplied String s
is null
+ * Constructs a CompoundName
with supplied
+ * String
and Properties
, taking the supplied
+ * s
and breaking it down into its elements.
+ *
+ * @param s
+ * a string containing the full compound name
+ * @param props
+ * the properties, cannot be null but may be empty for a flat
+ * name
+ * @throws InvalidNameException
+ * thrown if the supplied String s
is invalid
+ * @throws NullPointerException
+ * thrown if the supplied String s
is null
*/
public CompoundName(String s, Properties props) throws InvalidNameException {
if (null == s || null == props) {
@@ -354,31 +366,34 @@
this.mySyntax = props;
String property;
- //read property settings
+ // read property settings
// direction's default value is FLAT
direction = null == (property = props.getProperty(DIRECTION)) ? FLAT
: property;
- //if direction value must equals to one of FLAT, LEFT_TO_RIGHT and RIGHT_TO_LEFT, exception threw
+ // if direction value must equals to one of FLAT, LEFT_TO_RIGHT and
+ // RIGHT_TO_LEFT, exception threw
if (!LEFT_TO_RIGHT.equals(direction)
&& !RIGHT_TO_LEFT.equals(direction) && !FLAT.equals(direction)) {
- // jndi.04=Illegal direction property value, which must be one of right_to_left, left_to_right or flat
- throw new IllegalArgumentException(Messages.getString("jndi.04")); //$NON-NLS-1$
+ // jndi.04=Illegal direction property value, which must be one of
+ // right_to_left, left_to_right or flat
+ throw new IllegalArgumentException(Messages.getString("jndi.04")); //$NON-NLS-1$
}
flat = FLAT.equals(direction);
separatorString = flat ? NULL_STRING : props.getProperty(SEPARATOR);
- // if direction is not FLAT, separator must be set
+ // if direction is not FLAT, separator must be set
if (null == separatorString && !flat) {
- // jndi.05=jndi.syntax.separator property must be set when jndi.syntax.direction is not flat
- throw new IllegalArgumentException(Messages.getString("jndi.05")); //$NON-NLS-1$
+ // jndi.05=jndi.syntax.separator property must be set when
+ // jndi.syntax.direction is not flat
+ throw new IllegalArgumentException(Messages.getString("jndi.05")); //$NON-NLS-1$
}
separatorString2 = (flat || null == (property = props
.getProperty(SEPARATOR2))) ? NULL_STRING : property;
- //ignorecase default value is false
+ // ignorecase default value is false
ignoreCase = null == (property = props.getProperty(IGNORE_CASE)) ? false
: Boolean.valueOf(property).booleanValue();
- //trimblanks default value is false
+ // trimblanks default value is false
trimBlanks = null == (property = props.getProperty(TRIM_BLANKS)) ? false
: Boolean.valueOf(property).booleanValue();
escapeString = null == (property = props.getProperty(ESCAPE)) ? NULL_STRING
@@ -387,17 +402,17 @@
: property;
beginQuoteString2 = null == (property = props.getProperty(BEGIN_QUOTE2)) ? NULL_STRING
: property;
- //end quote string default value is begin quote string
+ // end quote string default value is begin quote string
endQuoteString = null == (property = props.getProperty(END_QUOTE)) ? beginQuoteString
: property;
- //begin quote string default value is end quote string
+ // begin quote string default value is end quote string
if (NULL_STRING.equals(beginQuoteString)) {
beginQuoteString = endQuoteString;
}
- //end quote string2 default value is begin quote string2
+ // end quote string2 default value is begin quote string2
endQuoteString2 = null == (property = props.getProperty(END_QUOTE2)) ? beginQuoteString2
: property;
- //begin quote string2 default value is end quote string2
+ // begin quote string2 default value is end quote string2
if (NULL_STRING.equals(beginQuoteString2)) {
beginQuoteString2 = endQuoteString2;
}
@@ -418,7 +433,7 @@
return;
}
- //init variables
+ // init variables
int status = INIT_STATUS;
StringBuilder element = new StringBuilder();
int pos = 0;
@@ -426,7 +441,7 @@
boolean hasNotNullElement = false;
boolean includeQuote = false;
- //scan name
+ // scan name
while (pos < length) {
if (startsWithFromPos(s, pos, endQuoteString)
&& status == QUOTE1_STATUS) {
@@ -465,9 +480,10 @@
} else if (startsWithFromPos(s, pos, escapeString)) {
pos += escapeString.length();
if (pos == s.length()) {
- //if this escape char is last character, throw exception
+ // if this escape char is last character, throw exception
// jndi.06=The {0} cannot be at end of the component
- throw new InvalidNameException(Messages.getString("jndi.06", escapeString)); //$NON-NLS-1$
+ throw new InvalidNameException(Messages.getString(
+ "jndi.06", escapeString)); //$NON-NLS-1$
}
// if one escape char followed by a special char, append the
// special char to current element
@@ -491,8 +507,9 @@
pos += addBuffer(element, sepAvaString, true);
status = INIT_STATUS;
} else if (status == QUOTEEND_STATUS) {
- // jndi.07={0}: close quote must appears at end of component in quoted string
- throw new InvalidNameException(Messages.getString("jndi.07", s)); //$NON-NLS-1$
+ // jndi.07={0}: close quote must appears at end of component in
+ // quoted string
+ throw new InvalidNameException(Messages.getString("jndi.07", s)); //$NON-NLS-1$
} else {
status = status == INIT_STATUS ? NORMAL_STATUS : status;
element.append(s.charAt(pos++));
@@ -503,7 +520,7 @@
addElement(element);
} else {
// jndi.08={0}: close quote is required for quoted string
- throw new InvalidNameException(Messages.getString("jndi.08", s)); //$NON-NLS-1$
+ throw new InvalidNameException(Messages.getString("jndi.08", s)); //$NON-NLS-1$
}
if (!hasNotNullElement) {
elem.remove(elem.size() - 1);
@@ -521,7 +538,7 @@
}
/*
- * add current content of supplied string buffer as one element of this
+ * add current content of supplied string buffer as one element of this
* CompoundName and reset the string buffer to empty
*/
private void addElement(StringBuilder element) {
@@ -534,8 +551,8 @@
}
/*
- * find string to be escaped, if cannot find special string(which means,
- * quote, separator and escape), return null
+ * find string to be escaped, if cannot find special string(which means,
+ * quote, separator and escape), return null
*/
private String extractEscapedString(String s, int pos, int status) {
String result = null;
@@ -567,10 +584,6 @@
/*
* justify if string src start with des from position pos
- * @param src
- * @param pos
- * @param des
- * @return
*/
private boolean startsWithFromPos(String src, int pos, String des) {
if (null == src || null == des || NULL_STRING.equals(des)
@@ -580,16 +593,11 @@
int length = des.length();
int i = -1;
while (++i < length && src.charAt(pos + i) == des.charAt(i)) {
- //empty body
+ // empty body
}
return i == length;
}
- /*
- * -------------------------------------------------------------------
- * Methods of interface Name
- * -------------------------------------------------------------------
- */
public EnumerationCompoundName
.
- * @param element the String to insert
- * @param index the index of the element to insert - must be greater
- * than or equal to 0 and less than size().
- * @throws ArrayIndexOutOfBoundsException
- * thrown when the index is invalid.
- * @throws InvalidNameException
- * thrown if the insertion of the element results in
- * this CompoundName
becoming invalid.
+ *
+ * @return this CompoundName
.
+ * @param element
+ * the String to insert
+ * @param index
+ * the index of the element to insert - must be greater than or
+ * equal to 0 and less than size().
+ * @throws ArrayIndexOutOfBoundsException
+ * thrown when the index is invalid.
+ * @throws InvalidNameException
+ * thrown if the insertion of the element results in this
+ * CompoundName
becoming invalid.
*/
public Name add(int index, String element) throws InvalidNameException {
if (element == null) {
@@ -689,14 +701,15 @@
/**
* Delete an element from this CompoundName
.
*
- * @return the deleted element
- * @param index the index of the element to delete - must be greater
- * than or equal to 0 and less than size().
- * @throws ArrayIndexOutOfBoundsException
- * thrown when the index is invalid.
- * @throws InvalidNameException
- * thrown if the deletion of the element results in
- * this CompoundName
becoming invalid.
+ * @return the deleted element
+ * @param index
+ * the index of the element to delete - must be greater than or
+ * equal to 0 and less than size().
+ * @throws ArrayIndexOutOfBoundsException
+ * thrown when the index is invalid.
+ * @throws InvalidNameException
+ * thrown if the deletion of the element results in this
+ * CompoundName
becoming invalid.
*/
public Object remove(int index) throws InvalidNameException {
validateIndex(index, false);
@@ -727,8 +740,7 @@
if (!(name instanceof CompoundName)) {
return false;
}
- return equals(name, this.size() - name.size(), name
- .size());
+ return equals(name, this.size() - name.size(), name.size());
}
/**
@@ -746,9 +758,11 @@
/**
* Writes a serialized representation of the CompoundName. It starts with
- * the properties, followed by an int which is the number of elements
- * in the name, and is followed by a String for each element.
- * @throws java.io.IOException if an error is encountered writing to the stream.
+ * the properties, followed by an int which is the number of elements in the
+ * name, and is followed by a String for each element.
+ *
+ * @throws java.io.IOException
+ * if an error is encountered writing to the stream.
*/
private void writeObject(ObjectOutputStream oos) throws IOException {
oos.defaultWriteObject();
@@ -762,15 +776,15 @@
/**
* Recreate a CompoundName from the data in the supplied stream.
- * Additionally there are 2 protected fields which are not serializable.
- * One of them is of a type which is a private class and cannot therefore
- * be specified or implemented and so will be excluded from our deliverable.
+ * Additionally there are 2 protected fields which are not serializable. One
+ * of them is of a type which is a private class and cannot therefore be
+ * specified or implemented and so will be excluded from our deliverable.
* The one protected field which we can spec and implement is as follows:
- * protected Properties mySyntax - The properties associated with a CompoundName.
-
-
+ * protected Properties mySyntax - The properties associated with a
+ * CompoundName.
*
- * @throws java.io.IOException if an error is encountered reading from the stream.
+ * @throws java.io.IOException
+ * if an error is encountered reading from the stream.
* @throws ClassNotFoundException.
*/
private void readObject(ObjectInputStream ois)
@@ -780,28 +794,30 @@
int size = ois.readInt();
elem = new VectorCompoundName
with the one supplied as a param.
+ * Compare this CompoundName
with the one supplied as a
+ * param.
*
- * See the definition of the equals()
method to see how the
- * direction, ignorecase and trimblanks properties affect the comparison of
- * a CompoundName
. Other than that the comparison is the same
- * as that for a CompositeName
.
equals()
method to see how the
+ * direction, ignorecase and trimblanks properties affect the comparison of
+ * a CompoundName
. Other than that the comparison is the
+ * same as that for a CompositeName
.
+ *
*
- * @return a negative number means this is less than the
- * supplied Object o
.
- * a positive number means this is greater than the
- * supplied Object o
.
- * zero means the two objects are equal.
- * @param o the object to compare - cannot be null.
- * @throws ClassCastException
- * when o
is not a compatible class that
- * can be compared or if the object to compare
- * o
is null.
+ * @return a negative number means this is less than the supplied Object
+ * o
. a positive number means this is greater than
+ * the supplied Object o
. zero means the two objects
+ * are equal.
+ * @param o
+ * the object to compare - cannot be null.
+ * @throws ClassCastException
+ * when o
is not a compatible class that can be
+ * compared or if the object to compare o
is
+ * null.
*/
public int compareTo(Object o) {
if (!(o instanceof CompoundName)) {
@@ -815,9 +831,10 @@
int i;
for (i = 0; i < size() && otherEnum.hasMoreElements(); i++) {
thisElement = preProcess(elem.get(i), ignoreCase, trimBlanks);
- otherElement = preProcess(otherEnum.nextElement(), ignoreCase, trimBlanks);
- result = (null == thisElement ? (null == otherElement ? 0 : -1) : thisElement
- .compareTo(otherElement));
+ otherElement = preProcess(otherEnum.nextElement(), ignoreCase,
+ trimBlanks);
+ result = (null == thisElement ? (null == otherElement ? 0 : -1)
+ : thisElement.compareTo(otherElement));
if (0 != result) {
return result;
}
@@ -831,23 +848,26 @@
}
/**
- * Calculate the hashcode of this CompoundName
by summing
- * the hashcodes of all of its elements.
+ * Calculate the hashcode of this CompoundName
by summing the
+ * hashcodes of all of its elements.
* - * If jndi.syntax.trimblanks is set to true then remove any leading and - * trailing blanks from the elements before calculating the hashcode.
+ * If jndi.syntax.trimblanks is set to true then remove any leading and + * trailing blanks from the elements before calculating the hashcode. + * *- * If jndi.syntax.ignorecase is set to true then use the lowercase version - * of the element to calculate its hashcode.
+ * If jndi.syntax.ignorecase is set to true then use the lowercase version + * of the element to calculate its hashcode. + * * - * @return the hashcode of this object. + * @return the hashcode of this object. */ @Override public int hashCode() { int result = 0; Enumerationname
from position
+ * compare this name to the supplied name
from position
* start
to position start
+
- * length
-1
- *
+ * length
-1
*/
private boolean equals(Name name, int start, int length) {
if (length > this.size()) {
@@ -1004,8 +1025,8 @@
for (int i = 0; i < length; i++) {
thisElement = preProcess(elem.get(i + start), ignoreCase,
trimBlanks);
- otherElement = preProcess(otherEnum.nextElement(),
- ignoreCase, trimBlanks);
+ otherElement = preProcess(otherEnum.nextElement(), ignoreCase,
+ trimBlanks);
if (!(null == thisElement ? null == otherElement : thisElement
.equals(otherElement))) {
return false;
@@ -1013,4 +1034,5 @@
}
return true;
}
+
}
Modified: harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ConfigurationException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ConfigurationException.java?view=diff&rev=549955&r1=549954&r2=549955
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ConfigurationException.java (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ConfigurationException.java Fri Jun 22 13:48:49 2007
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
package javax.naming;
/**
@@ -23,35 +22,34 @@
* encountered with the configuration.
* * Multithreaded access to an instance is only safe when client code locks the - * object first.
- * + * object first. + * */ -public class ConfigurationException extends NamingException{ +public class ConfigurationException extends NamingException { /* - * This constant is used during deserialization to check the J2SE version - * which created the serialized object. + * This constant is used during deserialization to check the version which + * created the serialized object. */ - static final long serialVersionUID = -2535156726228855704L; // J2SE 1.4.2 - + static final long serialVersionUID = -2535156726228855704L; + /** - * Constructs aConfigurationException
instance
- * with all data initialized to null.
+ * Constructs a ConfigurationException
instance with all data
+ * initialized to null.
*/
public ConfigurationException() {
super();
}
-
+
/**
- * Constructs a ConfigurationException
instance
- * with the specified message.
+ * Constructs a ConfigurationException
instance with the
+ * specified message.
*
- * @param s The detail message for the exception. It may be null.
+ * @param s
+ * The detail message for the exception. It may be null.
*/
- public ConfigurationException(String s){
- super(s);
+ public ConfigurationException(String s) {
+ super(s);
}
}
-
-