src/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java
Print this page
rev 10430 : imported patch typos
*** 82,92 ****
private static final String PRIVATE_ID = "X-";
// Object Class specific IDs
private static final String ABSTRACT_ID = "ABSTRACT";
private static final String STRUCTURAL_ID = "STRUCTURAL";
! private static final String AUXILARY_ID = "AUXILIARY";
private static final String MUST_ID = "MUST";
private static final String MAY_ID = "MAY";
// Attribute Type specific IDs
private static final String EQUALITY_ID = "EQUALITY";
--- 82,92 ----
private static final String PRIVATE_ID = "X-";
// Object Class specific IDs
private static final String ABSTRACT_ID = "ABSTRACT";
private static final String STRUCTURAL_ID = "STRUCTURAL";
! private static final String AUXILIARY_ID = "AUXILIARY";
private static final String MUST_ID = "MUST";
private static final String MAY_ID = "MAY";
// Attribute Type specific IDs
private static final String EQUALITY_ID = "EQUALITY";
*** 298,309 ****
}
return new Object[] {currentName, attrs};
}
! // returns the index of the first whitespace char of a linear whitspace
! // sequince ending at the given position.
final private static int findTrailingWhitespace(String string, int pos) {
for(int i = pos; i > 0; i--) {
if(string.charAt(i) != WHSP) {
return i + 1;
}
--- 298,309 ----
}
return new Object[] {currentName, attrs};
}
! // returns the index of the first whitespace char of a linear whitespace
! // sequence ending at the given position.
final private static int findTrailingWhitespace(String string, int pos) {
for(int i = pos; i > 0; i--) {
if(string.charAt(i) != WHSP) {
return i + 1;
}
*** 421,431 ****
}
if (tag.equals(OBSOLETE_ID) ||
tag.equals(ABSTRACT_ID) ||
tag.equals(STRUCTURAL_ID) ||
! tag.equals(AUXILARY_ID) ||
tag.equals(SINGLE_VAL_ID) ||
tag.equals(COLLECTIVE_ID) ||
tag.equals(NO_USER_MOD_ID)) {
return new String[] {SCHEMA_TRUE_VALUE};
}
--- 421,431 ----
}
if (tag.equals(OBSOLETE_ID) ||
tag.equals(ABSTRACT_ID) ||
tag.equals(STRUCTURAL_ID) ||
! tag.equals(AUXILIARY_ID) ||
tag.equals(SINGLE_VAL_ID) ||
tag.equals(COLLECTIVE_ID) ||
tag.equals(NO_USER_MOD_ID)) {
return new String[] {SCHEMA_TRUE_VALUE};
}
*** 817,827 ****
if (attr != null) {
objectDesc.append(writeBoolean(attr));
count++;
}
! attr = attrs.get(AUXILARY_ID);
if (attr != null) {
objectDesc.append(writeBoolean(attr));
count++;
}
--- 817,827 ----
if (attr != null) {
objectDesc.append(writeBoolean(attr));
count++;
}
! attr = attrs.get(AUXILIARY_ID);
if (attr != null) {
objectDesc.append(writeBoolean(attr));
count++;
}
*** 854,864 ****
attrId.equals(SUP_ID) ||
attrId.equals(MAY_ID) ||
attrId.equals(MUST_ID) ||
attrId.equals(STRUCTURAL_ID) ||
attrId.equals(DESC_ID) ||
! attrId.equals(AUXILARY_ID) ||
attrId.equals(ABSTRACT_ID) ||
attrId.equals(OBSOLETE_ID)) {
continue;
} else {
--- 854,864 ----
attrId.equals(SUP_ID) ||
attrId.equals(MAY_ID) ||
attrId.equals(MUST_ID) ||
attrId.equals(STRUCTURAL_ID) ||
attrId.equals(DESC_ID) ||
! attrId.equals(AUXILIARY_ID) ||
attrId.equals(ABSTRACT_ID) ||
attrId.equals(OBSOLETE_ID)) {
continue;
} else {