Author: mrglavas
Date: Sun Jul 6 17:53:05 2008
New Revision: 674379
URL: http://svn.apache.org/viewvc?rev=674379&view=rev
Log:
Miscellaneous code clean-up.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/XML11Char.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/XMLChar.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/XML11Char.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/XML11Char.java?rev=674379&r1=674378&r2=674379&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/XML11Char.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/XML11Char.java
Sun Jul 6 17:53:05 2008
@@ -288,16 +288,17 @@
* @return true if name is a valid Name
*/
public static boolean isXML11ValidName(String name) {
- int length = name.length();
- if (length == 0)
+ final int length = name.length();
+ if (length == 0) {
return false;
+ }
int i = 1;
char ch = name.charAt(0);
- if( !isXML11NameStart(ch) ) {
- if ( length > 1 && isXML11NameHighSurrogate(ch) ) {
+ if (!isXML11NameStart(ch)) {
+ if (length > 1 && isXML11NameHighSurrogate(ch)) {
char ch2 = name.charAt(1);
- if ( !XMLChar.isLowSurrogate(ch2) ||
- !isXML11NameStart(XMLChar.supplemental(ch, ch2)) ) {
+ if (!XMLChar.isLowSurrogate(ch2) ||
+ !isXML11NameStart(XMLChar.supplemental(ch, ch2))) {
return false;
}
i = 2;
@@ -308,11 +309,11 @@
}
while (i < length) {
ch = name.charAt(i);
- if ( !isXML11Name(ch) ) {
- if ( ++i < length && isXML11NameHighSurrogate(ch) ) {
+ if (!isXML11Name(ch)) {
+ if (++i < length && isXML11NameHighSurrogate(ch)) {
char ch2 = name.charAt(i);
- if ( !XMLChar.isLowSurrogate(ch2) ||
- !isXML11Name(XMLChar.supplemental(ch, ch2)) ) {
+ if (!XMLChar.isLowSurrogate(ch2) ||
+ !isXML11Name(XMLChar.supplemental(ch, ch2))) {
return false;
}
}
@@ -325,7 +326,6 @@
return true;
} // isXML11ValidName(String):boolean
-
/*
* from the namespace 1.1 rec
* [4] NCName ::= NCNameStartChar NCNameChar*
@@ -338,16 +338,17 @@
* @return true if name is a valid NCName
*/
public static boolean isXML11ValidNCName(String ncName) {
- int length = ncName.length();
- if (length == 0)
+ final int length = ncName.length();
+ if (length == 0) {
return false;
+ }
int i = 1;
char ch = ncName.charAt(0);
- if( !isXML11NCNameStart(ch) ) {
- if ( length > 1 && isXML11NameHighSurrogate(ch) ) {
+ if (!isXML11NCNameStart(ch)) {
+ if (length > 1 && isXML11NameHighSurrogate(ch)) {
char ch2 = ncName.charAt(1);
- if ( !XMLChar.isLowSurrogate(ch2) ||
- !isXML11NCNameStart(XMLChar.supplemental(ch, ch2)) ) {
+ if (!XMLChar.isLowSurrogate(ch2) ||
+ !isXML11NCNameStart(XMLChar.supplemental(ch, ch2))) {
return false;
}
i = 2;
@@ -358,11 +359,11 @@
}
while (i < length) {
ch = ncName.charAt(i);
- if ( !isXML11NCName(ch) ) {
- if ( ++i < length && isXML11NameHighSurrogate(ch) ) {
+ if (!isXML11NCName(ch)) {
+ if (++i < length && isXML11NameHighSurrogate(ch)) {
char ch2 = ncName.charAt(i);
- if ( !XMLChar.isLowSurrogate(ch2) ||
- !isXML11NCName(XMLChar.supplemental(ch, ch2)) ) {
+ if (!XMLChar.isLowSurrogate(ch2) ||
+ !isXML11NCName(XMLChar.supplemental(ch, ch2))) {
return false;
}
}
@@ -386,16 +387,17 @@
* @return true if nmtoken is a valid Nmtoken
*/
public static boolean isXML11ValidNmtoken(String nmtoken) {
- int length = nmtoken.length();
- if (length == 0)
+ final int length = nmtoken.length();
+ if (length == 0) {
return false;
- for (int i = 0; i < length; ++i ) {
+ }
+ for (int i = 0; i < length; ++i) {
char ch = nmtoken.charAt(i);
- if( !isXML11Name(ch) ) {
- if ( ++i < length && isXML11NameHighSurrogate(ch) ) {
+ if (!isXML11Name(ch)) {
+ if (++i < length && isXML11NameHighSurrogate(ch)) {
char ch2 = nmtoken.charAt(i);
- if ( !XMLChar.isLowSurrogate(ch2) ||
- !isXML11Name(XMLChar.supplemental(ch, ch2)) ) {
+ if (!XMLChar.isLowSurrogate(ch2) ||
+ !isXML11Name(XMLChar.supplemental(ch, ch2))) {
return false;
}
}
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/XMLChar.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/XMLChar.java?rev=674379&r1=674378&r2=674379&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/XMLChar.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/XMLChar.java
Sun Jul 6 17:53:05 2008
@@ -895,21 +895,23 @@
* @return true if name is a valid Name
*/
public static boolean isValidName(String name) {
- if (name.length() == 0)
+ final int length = name.length();
+ if (length == 0) {
return false;
+ }
char ch = name.charAt(0);
- if( isNameStart(ch) == false)
- return false;
- for (int i = 1; i < name.length(); i++ ) {
- ch = name.charAt(i);
- if( isName( ch ) == false ){
- return false;
- }
+ if (!isNameStart(ch)) {
+ return false;
+ }
+ for (int i = 1; i < length; ++i) {
+ ch = name.charAt(i);
+ if (!isName(ch)) {
+ return false;
+ }
}
return true;
} // isValidName(String):boolean
-
/*
* from the namespace rec
* [4] NCName ::= (Letter | '_') (NCNameChar)*
@@ -922,16 +924,19 @@
* @return true if name is a valid NCName
*/
public static boolean isValidNCName(String ncName) {
- if (ncName.length() == 0)
+ final int length = ncName.length();
+ if (length == 0) {
return false;
+ }
char ch = ncName.charAt(0);
- if( isNCNameStart(ch) == false)
- return false;
- for (int i = 1; i < ncName.length(); i++ ) {
- ch = ncName.charAt(i);
- if( isNCName( ch ) == false ){
- return false;
- }
+ if (!isNCNameStart(ch)) {
+ return false;
+ }
+ for (int i = 1; i < length; ++i) {
+ ch = ncName.charAt(i);
+ if (!isNCName(ch)) {
+ return false;
+ }
}
return true;
} // isValidNCName(String):boolean
@@ -947,13 +952,15 @@
* @return true if nmtoken is a valid Nmtoken
*/
public static boolean isValidNmtoken(String nmtoken) {
- if (nmtoken.length() == 0)
+ final int length = nmtoken.length();
+ if (length == 0) {
return false;
- for (int i = 0; i < nmtoken.length(); i++ ) {
- char ch = nmtoken.charAt(i);
- if( ! isName( ch ) ){
- return false;
- }
+ }
+ for (int i = 0; i < length; ++i) {
+ char ch = nmtoken.charAt(i);
+ if (!isName(ch)) {
+ return false;
+ }
}
return true;
} // isValidName(String):boolean
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
