You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by sa...@apache.org on 2010/09/02 17:49:38 UTC
svn commit: r991992 -
/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSDFACM.java
Author: sandygao
Date: Thu Sep 2 15:49:38 2010
New Revision: 991992
URL: http://svn.apache.org/viewvc?rev=991992&view=rev
Log:
Fixing syntax not supported by Java 1.4.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSDFACM.java
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSDFACM.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSDFACM.java?rev=991992&r1=991991&r2=991992&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSDFACM.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSDFACM.java Thu Sep 2 15:49:38 2010
@@ -1191,8 +1191,8 @@ public class XSDFACM
fTransTable[i][k] != -1) {
if (conflictTable[j][k] == 0) {
if (xsConstraints.overlapUPA
- (j < fNumElements ? fElements[j] : fWildcards[j],
- k < fNumElements ? fElements[k] : fWildcards[k],
+ (j < fNumElements ? (Object)fElements[j] : (Object)fWildcards[j],
+ k < fNumElements ? (Object)fElements[k] : (Object)fWildcards[k],
subGroupHandler)) {
if (fCountingStates != null) {
Occurence o = fCountingStates[i];
@@ -1225,8 +1225,8 @@ public class XSDFACM
// fElemMap[j].toString()});
// REVISIT: do we want to report all errors? or just one?
throw new XMLSchemaException("cos-nonambig", new Object[]{
- i < fNumElements ? fElements[i] : fWildcards[i],
- j < fNumElements ? fElements[j] : fWildcards[j]});
+ i < fNumElements ? (Object)fElements[i] : (Object)fWildcards[i],
+ j < fNumElements ? (Object)fElements[j] : (Object)fWildcards[j]});
}
}
}
@@ -1295,7 +1295,7 @@ public class XSDFACM
continue;
}
}
- ret.addElement(elemIndex < fNumElements ? fElements[elemIndex] : fWildcards[elemIndex]);
+ ret.addElement(elemIndex < fNumElements ? (Object)fElements[elemIndex] : (Object)fWildcards[elemIndex]);
}
}
return ret;
@@ -1321,7 +1321,7 @@ public class XSDFACM
}
public String getTermName(int termId) {
- Object term = termId < fNumElements ? fElements[termId] : fWildcards[termId];
+ Object term = termId < fNumElements ? (Object)fElements[termId] : (Object)fWildcards[termId];
return (term != null) ? term.toString() : null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org