You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ml...@apache.org on 2007/02/26 08:08:56 UTC
svn commit: r511743 - in
/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java:
javax/naming/ldap/ org/apache/harmony/jndi/internal/parser/
Author: mloenko
Date: Sun Feb 25 23:08:56 2007
New Revision: 511743
URL: http://svn.apache.org/viewvc?view=rev&rev=511743
Log:
generification and style improvements
Modified:
harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/LdapName.java
harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/Rdn.java
harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/parser/LdapNameParser.java
harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/parser/LdapRdnParser.java
Modified: harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/LdapName.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/LdapName.java?view=diff&rev=511743&r1=511742&r2=511743
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/LdapName.java (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/LdapName.java Sun Feb 25 23:08:56 2007
@@ -17,6 +17,7 @@
package javax.naming.ldap;
+import javax.naming.ldap.Rdn;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Iterator;
@@ -38,15 +39,18 @@
private static final long serialVersionUID = -1595520034788997356L;
- private List rdns;
+ private List<Rdn> rdns;
/**
* @ar.org.fitc.spec_ref
*/
- public LdapName(List rdns) {
- if (rdns == null)
- throw new NullPointerException("rdns "+Messages.getString("ldap.00"));
- init(rdns);
+ public LdapName(List<Rdn> rdns) {
+ if (rdns == null) {
+ throw new NullPointerException("rdns "
+ + Messages.getString("ldap.00"));
+ }
+
+ this.rdns = rdns;
}
/**
@@ -54,23 +58,24 @@
*/
public LdapName(String name) throws InvalidNameException {
LdapNameParser parser = new LdapNameParser(name);
- init(parser.getList());
- }
- private void init(List rdns) {
- this.rdns = rdns;
+ this.rdns = parser.getList();
}
/**
* @ar.org.fitc.spec_ref
*/
public Name add(int posn, Rdn comp) {
- if (comp == null)
- throw new NullPointerException("comp "+Messages.getString("ldap.00"));
- if (posn < 0 || posn > rdns.size())
- throw new IndexOutOfBoundsException(
- Messages.getString("ldap.05"));
- getRdns().add(posn, comp);
+ if (comp == null) {
+ throw new NullPointerException("comp "
+ + Messages.getString("ldap.00"));
+ }
+
+ if (posn < 0 || posn > rdns.size()) {
+ throw new IndexOutOfBoundsException(Messages.getString("ldap.05"));
+ }
+
+ rdns.add(posn, comp);
return this;
}
@@ -85,25 +90,30 @@
* @ar.org.fitc.spec_ref
*/
public Name add(Rdn comp) {
- return add(getRdns().size(), comp);
+ return add(rdns.size(), comp);
}
/**
* @ar.org.fitc.spec_ref
*/
public Name add(String comp) throws InvalidNameException {
- return add(getRdns().size(), comp);
+ return add(rdns.size(), comp);
}
/**
* @ar.org.fitc.spec_ref
*/
public Name addAll(int posn, List suffixRdns) {
- if (suffixRdns == null)
- throw new NullPointerException("suffixRdns "+Messages.getString("ldap.00"));
- if (posn < 0 || posn > rdns.size())
+ if (suffixRdns == null) {
+ throw new NullPointerException("suffixRdns "
+ + Messages.getString("ldap.00"));
+ }
+
+ if (posn < 0 || posn > rdns.size()) {
throw new IndexOutOfBoundsException(Messages.getString("ldap.00"));
- getRdns().addAll(posn, suffixRdns);
+ }
+
+ rdns.addAll(posn, suffixRdns);
return this;
}
@@ -112,12 +122,11 @@
*/
public Name addAll(int posn, Name suffix) throws InvalidNameException {
if (suffix instanceof LdapName) {
- return addAll(posn, ((LdapName) suffix).getRdns());
+ return addAll(posn, ((LdapName) suffix).rdns);
} else {
List rdns = new ArrayList();
- for (Enumeration iter = ((Name) suffix).getAll(); iter
- .hasMoreElements();) {
- rdns.add(new Rdn((String)iter.nextElement()));
+ for (Enumeration iter = suffix.getAll(); iter.hasMoreElements();) {
+ rdns.add(new Rdn((String) iter.nextElement()));
}
return addAll(posn, rdns);
}
@@ -127,14 +136,14 @@
* @ar.org.fitc.spec_ref
*/
public Name addAll(List suffixRdns) {
- return addAll(getRdns().size(), suffixRdns);
+ return addAll(rdns.size(), suffixRdns);
}
/**
* @ar.org.fitc.spec_ref
*/
public Name addAll(Name suffix) throws InvalidNameException {
- return addAll(getRdns().size(), suffix);
+ return addAll(rdns.size(), suffix);
}
/**
@@ -142,8 +151,8 @@
*/
public Object clone() {
List lista = new ArrayList();
- for (int i = 0; i < getRdns().size(); i++) {
- lista.add(getRdns().get(i));
+ for (int i = 0; i < rdns.size(); i++) {
+ lista.add(rdns.get(i));
}
return new LdapName(lista);
}
@@ -153,25 +162,34 @@
*/
public int compareTo(Object obj) {
LdapName ln = null;
- if (obj == null)
- throw new ClassCastException("obj "+Messages.getString("ldap.01"));
+ if (obj == null) {
+ throw new ClassCastException("obj " + Messages.getString("ldap.01"));
+ }
+
try {
ln = (LdapName) obj;
} catch (ClassCastException e) {
- throw new ClassCastException("obj "+Messages.getString("ldap.01"));
+ throw new ClassCastException("obj " + Messages.getString("ldap.01"));
}
+
String s1 = new String(), s2 = new String();
- for (Iterator iter = getRdns().iterator(); iter.hasNext();) {
+ for (Iterator iter = rdns.iterator(); iter.hasNext();) {
s1 = s1 + iter.next().toString() + ",";
}
- for (Iterator iter = ln.getRdns().iterator(); iter.hasNext();) {
+
+ for (Iterator iter = ln.rdns.iterator(); iter.hasNext();) {
s2 = s2 + iter.next().toString() + ",";
}
- if (s1.lastIndexOf(',') > 0)
+
+ if (s1.lastIndexOf(',') > 0) {
s1 = s1.substring(0, s1.lastIndexOf(','));
- if (s2.lastIndexOf(',') > 0)
+ }
+
+ if (s2.lastIndexOf(',') > 0) {
s2 = s2.substring(0, s2.lastIndexOf(','));
+ }
+
return s1.toLowerCase().compareTo(s2.toLowerCase());
}
@@ -181,11 +199,12 @@
public boolean endsWith(List rdns) {
try {
Iterator iter = rdns.iterator();
- Iterator iter2 = ((LdapName) getSuffix(getRdns().size()
- - rdns.size())).getRdns().iterator();
+ Iterator iter2 = ((LdapName) getSuffix(rdns.size()
+ - rdns.size())).rdns.iterator();
while (iter.hasNext()) {
- if (!((Rdn) iter.next()).equals((Rdn) iter2.next()))
+ if (!((Rdn) iter.next()).equals(iter2.next())) {
return false;
+ }
}
return true;
} catch (RuntimeException e) {
@@ -198,32 +217,32 @@
*/
public boolean endsWith(Name n) {
try {
- if (n.equals(getSuffix(getRdns().size() - n.size())))
- return true;
- else
- return false;
+ return n.equals(getSuffix(rdns.size() - n.size()));
} catch (RuntimeException e) {
return false;
}
}
-
/**
* @ar.org.fitc.spec_ref
*/
public boolean equals(Object obj) {
LdapName ln = null;
- if (obj == null)
+ if (obj == null) {
return false;
+ }
+
try {
ln = (LdapName) obj;
} catch (ClassCastException e) {
return false;
}
- if (ln.getRdns().size() != getRdns().size())
+
+ if (ln.rdns.size() != rdns.size()) {
return false;
+ }
- Iterator iter = ln.getRdns().iterator();
- Iterator iter2 = getRdns().iterator();
+ Iterator iter = ln.rdns.iterator();
+ Iterator iter2 = rdns.iterator();
while (iter.hasNext()) {
Rdn rdn1 = (Rdn) iter.next();
Rdn rdn2 = (Rdn) iter2.next();
@@ -247,6 +266,7 @@
public Enumeration getAll() {
final Iterator rdns = getRdns().iterator();
return new Enumeration() {
+
public boolean hasMoreElements() {
return rdns.hasNext();
}
@@ -262,16 +282,15 @@
*/
public Name getPrefix(int posn) {
if (posn < 0)
- throw new IndexOutOfBoundsException(
- Messages.getString("ldap.02"));
- return new LdapName(getRdns().subList(0, posn));
+ throw new IndexOutOfBoundsException(Messages.getString("ldap.02"));
+ return new LdapName(rdns.subList(0, posn));
}
/**
* @ar.org.fitc.spec_ref
*/
public Rdn getRdn(int posn) {
- return (Rdn) getRdns().get(posn);
+ return rdns.get(posn);
}
/**
@@ -285,10 +304,11 @@
* @ar.org.fitc.spec_ref
*/
public Name getSuffix(int posn) {
- if (posn > getRdns().size())
- throw new IndexOutOfBoundsException(
- Messages.getString("ldap.02"));
- return new LdapName(getRdns().subList(posn, getRdns().size()));
+ if (posn > rdns.size()) {
+ throw new IndexOutOfBoundsException(Messages.getString("ldap.02"));
+ }
+
+ return new LdapName(rdns.subList(posn, rdns.size()));
}
/**
@@ -296,7 +316,7 @@
*/
public int hashCode() {
int sum = 0;
- for (Iterator iter = getRdns().iterator(); iter.hasNext();) {
+ for (Iterator iter = rdns.iterator(); iter.hasNext();) {
sum += iter.next().hashCode();
}
return sum;
@@ -306,17 +326,14 @@
* @ar.org.fitc.spec_ref
*/
public boolean isEmpty() {
- if (getRdns().size() == 0)
- return true;
- else
- return false;
+ return rdns.size() == 0;
}
/**
* @ar.org.fitc.spec_ref
*/
public Object remove(int posn) throws InvalidNameException {
- return getRdns().remove(posn);
+ return rdns.remove(posn);
}
/**
@@ -332,11 +349,12 @@
public boolean startsWith(List rdns) {
try {
Iterator iter = rdns.iterator();
- Iterator iter2 = ((LdapName) getPrefix(rdns.size())).getRdns()
+ Iterator iter2 = ((LdapName) getPrefix(rdns.size())).rdns
.iterator();
while (iter.hasNext()) {
- if (!((Rdn) iter.next()).equals((Rdn) iter2.next()))
+ if (!((Rdn) iter.next()).equals(iter2.next())) {
return false;
+ }
}
return true;
} catch (RuntimeException e) {
@@ -349,10 +367,7 @@
*/
public boolean startsWith(Name n) {
try {
- if (n.equals(getPrefix(n.size())))
- return true;
- else
- return false;
+ return n.equals(getPrefix(n.size()));
} catch (RuntimeException e) {
return false;
}
@@ -366,10 +381,10 @@
if (rdns.size() == 0)
return "";
StringBuffer sb = new StringBuffer();
- sb.append(rdns.get(getRdns().size() - 1).toString());
- for (int i = getRdns().size() - 2; i >= 0; i--) {
+ sb.append(rdns.get(rdns.size() - 1).toString());
+ for (int i = rdns.size() - 2; i >= 0; i--) {
sb.append("," + rdns.get(i).toString());
}
return sb.toString();
}
-}
\ No newline at end of file
+}
Modified: harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/Rdn.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/Rdn.java?view=diff&rev=511743&r1=511742&r2=511743
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/Rdn.java (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/Rdn.java Sun Feb 25 23:08:56 2007
@@ -41,7 +41,7 @@
* @author Osvaldo C. Demo
*
*/
-public class Rdn implements Serializable, Comparable {
+public class Rdn implements Serializable, Comparable<Object> {
private static final long serialVersionUID = -5994465067210009656L;
@@ -101,8 +101,10 @@
* @ar.org.fitc.spec_ref
*/
public Rdn(String rdnString) throws InvalidNameException {
- if (rdnString == null)
+ if (rdnString == null) {
throw new NullPointerException("rdnString "+Messages.getString("ldap.00"));
+ }
+
if (rdnString.length() != 0) {
parser = new LdapRdnParser(rdnString);
list = parser.getList();
Modified: harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/parser/LdapNameParser.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/parser/LdapNameParser.java?view=diff&rev=511743&r1=511742&r2=511743
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/parser/LdapNameParser.java (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/parser/LdapNameParser.java Sun Feb 25 23:08:56 2007
@@ -65,17 +65,22 @@
int from = 0;
char[] c = s.toCharArray();
- if (s.compareTo("") == 0)
+ if (s.equals("")) {
return list;
- if (s.startsWith(",") || s.startsWith(";"))
+ }
+
+ if (s.startsWith(",") || s.startsWith(";")) {
throw new InvalidNameException("Invalid name: " + s);
+ }
for (int i = 0; i < c.length; i++) {
if ((c[i] == ',' || c[i] == ';') && c[i - 1] != '\\') {
- if (s.substring(from, i).compareTo("") == 0)
+ String sub = s.substring(from, i);
+ if (sub.equals("")) {
throw new InvalidNameException("Invalid name: " + s);
- list.add(new Rdn(s.substring(from, i)));
+ }
+ list.add(new Rdn(sub));
from = i + 1;
}
}
Modified: harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/parser/LdapRdnParser.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/parser/LdapRdnParser.java?view=diff&rev=511743&r1=511742&r2=511743
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/parser/LdapRdnParser.java (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/parser/LdapRdnParser.java Sun Feb 25 23:08:56 2007
@@ -61,9 +61,11 @@
try {
checkTypeRestrictions(name);
parser = new RelaxedDnParser(name);
- listAll = (List) parser.parse();
+ listAll = parser.parse();
} catch (IOException e) {
- throw new InvalidNameException(Messages.getString("ldap.17") + name);
+ throw (InvalidNameException) (new InvalidNameException(Messages
+ .getString("ldap.17")
+ + name).initCause(e));
}
attrList = (List) listAll.get(0);
for (Iterator iter = attrList.iterator(); iter.hasNext();) {