Author: fanningpj
Date: Mon Jun 24 10:23:56 2024
New Revision: 1918535
URL: http://svn.apache.org/viewvc?rev=1918535&view=rev
Log:
use isEmpty() in more places
Added:
xmlbeans/trunk/src/test/resources/xbean/compile/scomp/ScéimreSonraí/
xmlbeans/trunk/src/test/resources/xbean/compile/scomp/ScéimreSonraí/scéimresonraí.xsd
- copied, changed from r1918417,
xmlbeans/trunk/src/test/resources/xbean/compile/scomp/pricequote/PriceQuote.xsd
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSetBuilder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaType.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlValidationError.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/NameUtil.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/SniffedXmlInputStream.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLChar.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLNameHelper.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlNameImpl.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlReaderToWriter.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/RussianDollStrategy.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/REUtil.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/repackage/Repackager.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypePool.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscJavaizer.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscState.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscTranslator.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Cursor.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/DomImpl.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Jsr173.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Saver.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Xobj.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/BaseSchemaResourceManager.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/CodeGenUtil.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/MavenPluginHelp.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/Validator.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaQNameHolder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/XmlListImpl.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpath/XPathStep.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpathgen/XPathGenerator.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xsd2inst/SampleXmlUtil.java
xmlbeans/trunk/src/test/java/ValidatingXSRTests/detailed/ValidatingXmlStreamReaderTests.java
xmlbeans/trunk/src/test/java/compile/scomp/checkin/CompilationTests.java
xmlbeans/trunk/src/test/java/misc/detailed/SampleRunner.java
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSetBuilder.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSetBuilder.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSetBuilder.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSetBuilder.java Mon
Jun 24 10:23:56 2024
@@ -178,7 +178,7 @@ public class QNameSetBuilder implements
private static String[] splitList(String s)
{
- if (s.length() == 0)
+ if (s.isEmpty())
return EMPTY_STRINGARRAY;
List<String> result = new ArrayList<>();
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaType.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaType.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaType.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaType.java Mon Jun 24
10:23:56 2024
@@ -198,7 +198,7 @@ public interface SchemaType extends Sche
String getFullJavaName();
/**
- * The short unqualfiied Java name for the class.
+ * The short unqualified Java name for the class.
*/
String getShortJavaName();
@@ -208,7 +208,7 @@ public interface SchemaType extends Sche
String getFullJavaImplName();
/**
- * The short unqualfiied Java name for the implementation class.
+ * The short unqualified Java name for the implementation class.
*/
String getShortJavaImplName();
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlValidationError.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlValidationError.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlValidationError.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlValidationError.java
Mon Jun 24 10:23:56 2024
@@ -240,7 +240,7 @@ public class XmlValidationError extends
sb.append(" in element ");
sb.append(_fieldQName.getLocalPart());
- if (_fieldQName.getNamespaceURI() != null &&
_fieldQName.getNamespaceURI().length() != 0)
+ if (_fieldQName.getNamespaceURI() != null &&
!_fieldQName.getNamespaceURI().isEmpty())
sb.append('@').append(_fieldQName.getNamespaceURI());
return sb.toString();
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/NameUtil.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/NameUtil.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/NameUtil.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/NameUtil.java
Mon Jun 24 10:23:56 2024
@@ -463,7 +463,7 @@ public class NameUtil {
public static String getPackageFromNamespace(String uri, boolean
useJaxRpcRules) {
// special case: no namespace -> package "noNamespace"
- if (uri == null || uri.length() == 0) {
+ if (uri == null || uri.isEmpty()) {
return "noNamespace";
}
@@ -510,7 +510,7 @@ public class NameUtil {
StringBuilder buf = new StringBuilder();
for (String s : result) {
String part = nonJavaKeyword(lowerCamelCase(s, useJaxRpcRules,
true));
- if (part.length() > 0) {
+ if (!part.isEmpty()) {
buf.append(part);
buf.append('.');
}
@@ -643,7 +643,7 @@ public class NameUtil {
* ncname is xml ncname (i.e. no colons).
*/
private static void addCapped(List<String> list, String str) {
- if (str.length() > 0) {
+ if (!str.isEmpty()) {
list.add(upperCaseFirstLetter(str));
}
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java
Mon Jun 24 10:23:56 2024
@@ -65,7 +65,7 @@ public class QNameHelper
if (name == null)
return "null";
- if (name.getNamespaceURI() == null || name.getNamespaceURI().length()
== 0)
+ if (name.getNamespaceURI() == null || name.getNamespaceURI().isEmpty())
return name.getLocalPart();
return name.getLocalPart() + "@" + name.getNamespaceURI();
@@ -173,7 +173,7 @@ public class QNameHelper
public static String hexsafedir(QName name)
{
- if (name.getNamespaceURI() == null || name.getNamespaceURI().length()
== 0)
+ if (name.getNamespaceURI() == null || name.getNamespaceURI().isEmpty())
return "_nons/" + hexsafe(name.getLocalPart());
return hexsafe(name.getNamespaceURI()) + "/" +
hexsafe(name.getLocalPart());
}
@@ -258,7 +258,7 @@ public class QNameHelper
public static String readable(QName name, Map<String, String> prefixes)
{
- if (name.getNamespaceURI().length() == 0)
+ if (name.getNamespaceURI().isEmpty())
return name.getLocalPart();
String prefix = prefixes.get(name.getNamespaceURI());
if (prefix != null)
@@ -366,7 +366,7 @@ public class QNameHelper
{
if (sType.getName() != null)
return sType.getName().getNamespaceURI();
- if (sType.getContainerField() != null &&
sType.getContainerField().getName().getNamespaceURI().length() > 0)
+ if (sType.getContainerField() != null &&
!sType.getContainerField().getName().getNamespaceURI().isEmpty())
return sType.getContainerField().getName().getNamespaceURI();
sType = sType.getOuterType();
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/SniffedXmlInputStream.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/SniffedXmlInputStream.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/SniffedXmlInputStream.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/SniffedXmlInputStream.java
Mon Jun 24 10:23:56 2024
@@ -188,7 +188,7 @@ public class SniffedXmlInputStream exten
}
private static int firstIndexOf(String s, char[] buf, int startAt, int
limit) {
- assert (s.length() > 0);
+ assert (!s.isEmpty());
char[] lookFor = s.toCharArray();
char firstchar = lookFor[0];
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLChar.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLChar.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLChar.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLChar.java
Mon Jun 24 10:23:56 2024
@@ -515,7 +515,7 @@ public class XMLChar {
* @return true if name is a valid Name
*/
public static boolean isValidName(String name) {
- if (name.length() == 0)
+ if (name.isEmpty())
return false;
char ch = name.charAt(0);
if( isNameStart(ch) == false)
@@ -542,7 +542,7 @@ public class XMLChar {
* @return true if name is a valid NCName
*/
public static boolean isValidNCName(String ncName) {
- if (ncName.length() == 0)
+ if (ncName.isEmpty())
return false;
char ch = ncName.charAt(0);
if( isNCNameStart(ch) == false)
@@ -567,7 +567,7 @@ public class XMLChar {
* @return true if nmtoken is a valid Nmtoken
*/
public static boolean isValidNmtoken(String nmtoken) {
- if (nmtoken.length() == 0)
+ if (nmtoken.isEmpty())
return false;
for (int i = 0; i < nmtoken.length(); i++ ) {
char ch = nmtoken.charAt(i);
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLNameHelper.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLNameHelper.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLNameHelper.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLNameHelper.java
Mon Jun 24 10:23:56 2024
@@ -54,7 +54,7 @@ public class XMLNameHelper
if (name == null)
return "null";
- if (name.getNamespaceUri() == null || name.getNamespaceUri().length()
== 0)
+ if (name.getNamespaceUri() == null || name.getNamespaceUri().isEmpty())
return name.getLocalName();
return name.getLocalName() + "@" + name.getNamespaceUri();
@@ -109,7 +109,7 @@ public class XMLNameHelper
public static String hexsafedir(XMLName name)
{
- if (name.getNamespaceUri() == null || name.getNamespaceUri().length()
== 0)
+ if (name.getNamespaceUri() == null || name.getNamespaceUri().isEmpty())
return "_nons/" + hexsafe(name.getLocalName());
return hexsafe(name.getNamespaceUri()) + "/" +
hexsafe(name.getLocalName());
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlNameImpl.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlNameImpl.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlNameImpl.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlNameImpl.java
Mon Jun 24 10:23:56 2024
@@ -56,7 +56,7 @@ public class XmlNameImpl implements XMLN
public void setPrefix(String prefix) { this.prefix = prefix; }
public String getQualifiedName() {
- if (prefix != null && prefix.length() > 0)
+ if (prefix != null && !prefix.isEmpty())
return prefix + ":" + localName;
else
return localName;
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlReaderToWriter.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlReaderToWriter.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlReaderToWriter.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlReaderToWriter.java
Mon Jun 24 10:23:56 2024
@@ -45,7 +45,7 @@ public final class XmlReaderToWriter
case XMLEvent.START_ELEMENT:
final String localName = xmlr.getLocalName();
final String namespaceURI = xmlr.getNamespaceURI();
- if (namespaceURI != null && namespaceURI.length() > 0) {
+ if (namespaceURI != null && !namespaceURI.isEmpty()) {
final String prefix = xmlr.getPrefix();
if (prefix != null)
writer.writeStartElement(prefix, localName,
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
Mon Jun 24 10:23:56 2024
@@ -316,7 +316,7 @@ public class InterfaceExtensionImpl impl
_name = method.getName().asString();
String typeParams =
method.getTypeParameters().stream().map(TypeParameter::toString).collect(Collectors.joining(",
"));
- _return = ( typeParams.length() == 0 ? "" : ( " <" + typeParams +
"> ") ) +
+ _return = (typeParams.isEmpty() ? "" : ( " <" + typeParams + "> ")
) +
replaceInner(method.getType().resolve().describe());
_params = method.getParameters().stream().map(p ->
p.getType().resolve().describe())
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/RussianDollStrategy.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/RussianDollStrategy.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/RussianDollStrategy.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/RussianDollStrategy.java
Mon Jun 24 10:23:56 2024
@@ -156,7 +156,7 @@ public class RussianDollStrategy
if (!children.isEmpty()) {
// complex content
- if (collapsedText.length() > 0) {
+ if (!collapsedText.isEmpty()) {
elemType.setContentType(Type.COMPLEX_TYPE_MIXED_CONTENT);
} else {
elemType.setContentType(Type.COMPLEX_TYPE_COMPLEX_CONTENT);
@@ -743,7 +743,7 @@ public class RussianDollStrategy
}
protected void combineElementComments(Element into, Element with) {
- if (with.getComment() != null && with.getComment().length() > 0) {
+ if (with.getComment() != null && !with.getComment().isEmpty()) {
if (into.getComment() == null) {
into.setComment(with.getComment());
} else {
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java
Mon Jun 24 10:23:56 2024
@@ -177,7 +177,7 @@ public class TypeSystemHolder
if (!element.isRef())
{
assert element.getName().getNamespaceURI().equals(tns) ||
- element.getName().getNamespaceURI().length() == 0;
+ element.getName().getNamespaceUri().isEmpty();
fillUpTypeOnElement(element.getType(), localSElement, tns);
localSElement.setName(element.getName().getLocalPart());
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/REUtil.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/REUtil.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/REUtil.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/REUtil.java Mon
Jun 24 10:23:56 2024
@@ -180,7 +180,7 @@ public final class REUtil {
System.exit( 0 );
}
for (int i = 0; i < argv.length; i ++) {
- if (argv[i].length() == 0 || argv[i].charAt(0) != '-') {
+ if (argv[i].isEmpty() || argv[i].charAt(0) != '-') {
if (pattern == null)
pattern = argv[i];
else if (target == null)
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/repackage/Repackager.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/repackage/Repackager.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/repackage/Repackager.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/repackage/Repackager.java
Mon Jun 24 10:23:56 2024
@@ -156,7 +156,7 @@ public class Repackager {
path = path.substring(i + 1);
}
- if (path.length() > 0) {
+ if (!path.isEmpty()) {
components.add(path);
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypePool.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypePool.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypePool.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypePool.java
Mon Jun 24 10:23:56 2024
@@ -233,7 +233,7 @@ class SchemaTypePool {
}
void readHandlePool(XsbReader reader) {
- if (_handlesToRefs.size() != 0 || _started) {
+ if (!_handlesToRefs.isEmpty() || _started) {
throw new IllegalStateException("Nonempty handle set before read");
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
Mon Jun 24 10:23:56 2024
@@ -697,7 +697,7 @@ public class SchemaTypeSystemImpl extend
}
void readFrom(LongUTFDataInputStream input) {
- if (intsToStrings.size() != 1 || stringsToInts.size() != 0) {
+ if (intsToStrings.size() != 1 || !stringsToInts.isEmpty()) {
throw new IllegalStateException();
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscJavaizer.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscJavaizer.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscJavaizer.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscJavaizer.java
Mon Jun 24 10:23:56 2024
@@ -157,7 +157,7 @@ public class StscJavaizer {
static String pickConstantName(Set<String> usedNames, String words) {
String base = NameUtil.upperCaseUnderbar(words);
- if (base.length() == 0) {
+ if (base.isEmpty()) {
base = "X";
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscState.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscState.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscState.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscState.java
Mon Jun 24 10:23:56 2024
@@ -539,7 +539,7 @@ public class StscState {
*/
private QName compatName(QName name, String chameleonNamespace) {
// first check for a chameleonNamespace namespace
- if (name.getNamespaceURI().length() == 0 && chameleonNamespace != null
&& chameleonNamespace.length() > 0) {
+ if (name.getNamespaceUri().isEmpty() && chameleonNamespace != null &&
chameleonNamespace.length() > 0) {
name = new QName(chameleonNamespace, name.getLocalPart());
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscTranslator.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscTranslator.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscTranslator.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscTranslator.java
Mon Jun 24 10:23:56 2024
@@ -1387,7 +1387,7 @@ public class StscTranslator {
state.error(XmlErrorCodes.NO_XSI, new
Object[]{"http://www.w3.org/2001/XMLSchema-instance"}, xsdAttr.xgetName());
}
- if (qname.getNamespaceURI().length() == 0 &&
qname.getLocalPart().equals("xmlns")) {
+ if (qname.getNamespaceUri().isEmpty() &&
qname.getLocalPart().equals("xmlns")) {
state.error(XmlErrorCodes.NO_XMLNS, null, xsdAttr.xgetName());
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Cursor.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Cursor.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Cursor.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Cursor.java Mon
Jun 24 10:23:56 2024
@@ -109,7 +109,7 @@ public final class Cursor implements Xml
throw new IllegalArgumentException("Name is null");
}
- if (name.length() == 0) {
+ if (name.isEmpty()) {
throw new IllegalArgumentException("Name is empty");
}
@@ -123,7 +123,7 @@ public final class Cursor implements Xml
throw new IllegalArgumentException("Prefix is null");
}
- if (name.length() == 0) {
+ if (name.isEmpty()) {
throw new IllegalArgumentException("Prefix is empty");
}
@@ -790,7 +790,7 @@ public final class Cursor implements Xml
}
public String _prefixForNamespace(String ns) {
- if (ns == null || ns.length() == 0) {
+ if (ns == null || ns.isEmpty()) {
throw new IllegalArgumentException("Must specify a namespace");
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/DomImpl.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/DomImpl.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/DomImpl.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/DomImpl.java
Mon Jun 24 10:23:56 2024
@@ -334,7 +334,7 @@ public final class DomImpl {
uri = "";
}
- if (prefix.length() > 0 && uri.length() == 0) {
+ if (!prefix.isEmpty() && uri.isEmpty()) {
throw new NamespaceErr("Attempt to give a prefix for no
namespace");
}
@@ -372,7 +372,7 @@ public final class DomImpl {
throw new IllegalArgumentException("Name is null");
}
- if (name.length() == 0) {
+ if (name.isEmpty()) {
throw new IllegalArgumentException("Name is empty");
}
@@ -415,7 +415,7 @@ public final class DomImpl {
validateNcName(prefix);
- if (uri.length() == 0) {
+ if (uri.isEmpty()) {
throw new NamespaceErr("Attempt to give a prefix for no
namespace");
}
@@ -432,7 +432,7 @@ public final class DomImpl {
}
}
- if (local.length() == 0) {
+ if (local.isEmpty()) {
throw new NamespaceErr("Invalid qualified name, no local part
specified");
}
}
@@ -752,7 +752,7 @@ public final class DomImpl {
throw new IllegalArgumentException("Target is null");
}
- if (target.length() == 0) {
+ if (target.isEmpty()) {
throw new IllegalArgumentException("Target is empty");
}
@@ -894,14 +894,14 @@ public final class DomImpl {
case ELEMENT: {
String local = n.getLocalName();
- if (local == null || local.length() == 0) {
+ if (local == null || local.isEmpty()) {
i = document_createElement(d, n.getNodeName());
} else {
String prefix = n.getPrefix();
- String name = prefix == null || prefix.length() == 0 ?
local : prefix + ":" + local;
+ String name = prefix == null || prefix.isEmpty() ? local :
prefix + ":" + local;
String uri = n.getNamespaceURI();
- if (uri == null || uri.length() == 0) {
+ if (uri == null || uri.isEmpty()) {
i = document_createElement(d, name);
} else {
i = document_createElementNS(d, uri, name);
@@ -922,14 +922,14 @@ public final class DomImpl {
case ATTR: {
String local = n.getLocalName();
- if (local == null || local.length() == 0) {
+ if (local == null || local.isEmpty()) {
i = document_createAttribute(d, n.getNodeName());
} else {
String prefix = n.getPrefix();
- String name = prefix == null || prefix.length() == 0 ?
local : prefix + ":" + local;
+ String name = prefix == null || prefix.isEmpty() ? local :
prefix + ":" + local;
String uri = n.getNamespaceURI();
- if (uri == null || uri.length() == 0) {
+ if (uri == null || uri.isEmpty()) {
i = document_createAttribute(d, name);
} else {
i = document_createAttributeNS(d, uri, name);
@@ -1965,7 +1965,7 @@ public final class DomImpl {
case ELEMENT: {
QName name = n.getQName();
String prefix = name.getPrefix();
- return prefix.length() == 0 ? name.getLocalPart() : prefix +
":" + name.getLocalPart();
+ return prefix.isEmpty() ? name.getLocalPart() : prefix + ":" +
name.getLocalPart();
}
case DOCTYPE:
@@ -2938,7 +2938,7 @@ public final class DomImpl {
// TODO - fix this *really* cheesy/bad/lousy perf impl
// also fix all the funcitons which follow
- if (arg != null && arg.length() != 0) {
+ if (arg != null && !arg.isEmpty()) {
_node_setNodeValue(cd, _node_getNodeValue(cd) + arg);
}
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Jsr173.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Jsr173.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Jsr173.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Jsr173.java Mon
Jun 24 10:23:56 2024
@@ -327,7 +327,7 @@ public class Jsr173 {
}
private static Cur toAttr(Cur c, String uri, String local) {
- if (uri == null || local == null || local.length() == 0) {
+ if (uri == null || local == null || local.isEmpty()) {
throw new IllegalArgumentException();
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java Mon
Jun 24 10:23:56 2024
@@ -562,7 +562,7 @@ public final class Locale
for (int a = 0; a < n; a++) {
String prefix = xsr.getNamespacePrefix(a);
- if (prefix == null || prefix.length() == 0) {
+ if (prefix == null || prefix.isEmpty()) {
context.attr("xmlns", _xmlnsUri, null,
xsr.getNamespaceURI(a));
} else {
@@ -2109,7 +2109,7 @@ public final class Locale
return true;
}
- return prefix.length() == 0 && name.getLocalPart().equals("xmlns");
+ return prefix.isEmpty() && name.getLocalPart().equals("xmlns");
}
QName createXmlns(String prefix) {
@@ -2118,7 +2118,7 @@ public final class Locale
}
return
- prefix.length() == 0
+ prefix.isEmpty()
? makeQName(_xmlnsUri, "xmlns", "")
: makeQName(_xmlnsUri, prefix, "xmlns");
}
@@ -2309,7 +2309,7 @@ public final class Locale
// Out current parser does not error when a
// namespace is used and not defined. Check for these here
- if (qName.indexOf(':') >= 0 && uri.length() == 0) {
+ if (qName.indexOf(':') >= 0 && uri.isEmpty()) {
XmlError err =
XmlError.forMessage("Use of undefined namespace prefix: " +
qName.substring(0,
qName.indexOf(':')));
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Saver.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Saver.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Saver.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Saver.java Mon
Jun 24 10:23:56 2024
@@ -394,7 +394,7 @@ abstract class Saver {
// which has no namespace, then we must make sure that pushing
// the mappings causes the default namespace to be empty
- boolean ensureDefaultEmpty = name.getNamespaceURI().length() == 0;
+ boolean ensureDefaultEmpty = name.getNamespaceUri().isEmpty();
pushMappings(_cur, ensureDefaultEmpty);
@@ -451,7 +451,7 @@ abstract class Saver {
for (Map.Entry<String, String> entry :
_preComputedNamespaces.entrySet()) {
String uri = entry.getKey();
String prefix = entry.getValue();
- boolean considerDefault = prefix.length() == 0 &&
!ensureDefaultEmpty;
+ boolean considerDefault = prefix.isEmpty() &&
!ensureDefaultEmpty;
ensureMapping(uri, prefix, considerDefault, false);
}
@@ -533,7 +533,7 @@ abstract class Saver {
// I map the default to "" at the very beginning
assert defaultUri != null;
- if (defaultUri.length() > 0) {
+ if (!defaultUri.isEmpty()) {
addMapping("", "");
}
}
@@ -544,8 +544,8 @@ abstract class Saver {
// Also, if we want to make sure that the default namespace is always
"", then check that
// here as well.
- if ((prefix.length() == 0 || uri.length() > 0) &&
- (!ensureDefaultEmpty || prefix.length() > 0 || uri.length() == 0))
{
+ if ((prefix.isEmpty() || !uri.isEmpty()) &&
+ (!ensureDefaultEmpty || !prefix.isEmpty() || uri.isEmpty())) {
// Make sure the prefix is not already mapped in this frame
for (iterateMappings(); hasMapping(); nextMapping()) {
@@ -688,13 +688,13 @@ abstract class Saver {
// Can be called for no-namespaced things
- if (uri.length() == 0) {
+ if (uri.isEmpty()) {
return;
}
String prefix = _uriMap.get(uri);
- if (prefix != null && (prefix.length() > 0 || !mustHavePrefix)) {
+ if (prefix != null && (!prefix.isEmpty() || !mustHavePrefix)) {
return;
}
@@ -707,7 +707,7 @@ abstract class Saver {
// 4) ns#++
//
- if (candidatePrefix != null && candidatePrefix.length() == 0) {
+ if (candidatePrefix != null && candidatePrefix.isEmpty()) {
candidatePrefix = null;
}
@@ -747,14 +747,14 @@ abstract class Saver {
String getNonDefaultUriMapping(String uri) {
String prefix = _uriMap.get(uri);
- if (prefix != null && prefix.length() > 0) {
+ if (prefix != null && !prefix.isEmpty()) {
return prefix;
}
for (String s : _prefixMap.keySet()) {
prefix = s;
- if (prefix.length() > 0 && _prefixMap.get(prefix).equals(uri)) {
+ if (!prefix.isEmpty() && _prefixMap.get(prefix).equals(uri)) {
return prefix;
}
}
@@ -928,7 +928,7 @@ abstract class Saver {
emit("xmlns");
- if (prefix.length() > 0) {
+ if (!prefix.isEmpty()) {
emit(':');
emit(prefix);
}
@@ -950,7 +950,7 @@ abstract class Saver {
String uri = mappingUri();
if (nsMap.containsKey(prefix)) {
//only overwrite the nsMap entry for the prefix if the
stored entry has prefix="" and uri=""
- if (prefix.length() == 0 && nsMap.get(prefix).length() ==
0) {
+ if (prefix.isEmpty() && nsMap.get(prefix).isEmpty()) {
nsMap.put(prefix, uri);
}
} else {
@@ -1077,7 +1077,7 @@ abstract class Saver {
assert uri != null;
- if (uri.length() != 0) {
+ if (!uri.isEmpty()) {
String prefix = name.getPrefix();
String mappedUri = getNamespaceForPrefix(prefix);
@@ -1092,11 +1092,11 @@ abstract class Saver {
// _urpMap and _prefixMap. This way, I would not have to look
it up manually
// here
- if (needsPrefix && prefix.length() == 0) {
+ if (needsPrefix && prefix.isEmpty()) {
prefix = getNonDefaultUriMapping(uri);
}
- if (prefix.length() > 0) {
+ if (!prefix.isEmpty()) {
emit(prefix);
emit(':');
}
@@ -1470,7 +1470,7 @@ abstract class Saver {
}
private int replace(int i, String replacement) {
- assert replacement.length() > 0;
+ assert !replacement.isEmpty();
int dCch = replacement.length() - 1;
@@ -1882,7 +1882,7 @@ abstract class Saver {
emit("xmlns");
- if (prefix.length() > 0) {
+ if (!prefix.isEmpty()) {
emit(':');
emit(prefix);
}
@@ -1985,7 +1985,7 @@ abstract class Saver {
assert uri != null;
- if (uri.length() != 0) {
+ if (!uri.isEmpty()) {
String prefix = name.getPrefix();
String mappedUri = getNamespaceForPrefix(prefix);
@@ -2000,17 +2000,17 @@ abstract class Saver {
// _urpMap and _prefixMap. This way, I would not have to look
it up manually
// here
- if (needsPrefix && prefix.length() == 0) {
+ if (needsPrefix && prefix.isEmpty()) {
prefix = getNonDefaultUriMapping(uri);
}
- if (prefix.length() > 0) {
+ if (!prefix.isEmpty()) {
emit(prefix);
emit(':');
}
}
- assert name.getLocalPart().length() > 0;
+ assert !name.getLocalPart().isEmpty();
emit(name.getLocalPart());
}
@@ -2565,13 +2565,13 @@ abstract class Saver {
String uri = name.getNamespaceURI();
String local = name.getLocalPart();
- if (uri.length() == 0) {
+ if (uri.isEmpty()) {
return local;
}
String prefix = getUriMapping(uri);
- if (prefix.length() == 0) {
+ if (prefix.isEmpty()) {
return local;
}
@@ -2590,7 +2590,7 @@ abstract class Saver {
}
if (_nsAsAttrs) {
- if (prefix == null || prefix.length() == 0) {
+ if (prefix == null || prefix.isEmpty()) {
_attributes.addAttribute("http://www.w3.org/2000/xmlns/";, "xmlns", "xmlns",
"CDATA", uri);
} else {
_attributes.addAttribute("http://www.w3.org/2000/xmlns/";, prefix, "xmlns:" +
prefix, "CDATA", uri);
@@ -3090,7 +3090,7 @@ abstract class Saver {
// Don't let xmlns:foo="" get used
- if (uri.length() > 0 || prefix.length() == 0) {
+ if (!uri.isEmpty() || prefix.isEmpty()) {
_ancestorNamespaces.add(c.getXmlnsPrefix());
_ancestorNamespaces.add(c.getXmlnsUri());
}
@@ -3449,7 +3449,7 @@ abstract class Saver {
int k;
if (_txt != null) {
- assert _txt.length() > 0;
+ assert !_txt.isEmpty();
assert !_cur.isText();
_txt = null;
_isTextCData = false;
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Xobj.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Xobj.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Xobj.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Xobj.java Mon
Jun 24 10:23:56 2024
@@ -1419,7 +1419,7 @@ abstract class Xobj implements TypeStore
}
}
- return defaultAlwaysMapped && prefix.length() == 0 ? "" : null;
+ return defaultAlwaysMapped && prefix.isEmpty() ? "" : null;
}
final String prefixForNamespace(String ns, String suggestion, boolean
createIfMissing) {
@@ -1447,7 +1447,7 @@ abstract class Xobj implements TypeStore
// Special handling for the no-namespace case
- if (ns.length() == 0) {
+ if (ns.isEmpty()) {
// Search for a namespace decl which defines the default namespace
Xobj a = base.findXmlnsForPrefix("");
@@ -1455,7 +1455,7 @@ abstract class Xobj implements TypeStore
// If I did not find a default decl or the decl maps to the no
namespace, then
// the default namespace is mapped to ""
- if (a == null || a.getXmlnsUri().length() == 0) {
+ if (a == null || a.getXmlnsUri().isEmpty()) {
return "";
}
@@ -1494,7 +1494,7 @@ abstract class Xobj implements TypeStore
// Sanitize the suggestion.
if (suggestion != null &&
- (suggestion.length() == 0 ||
suggestion.toLowerCase(java.util.Locale.ROOT).startsWith("xml") ||
+ (suggestion.isEmpty() ||
suggestion.toLowerCase(java.util.Locale.ROOT).startsWith("xml") ||
base.findXmlnsForPrefix(suggestion) != null)) {
suggestion = null;
}
@@ -1832,7 +1832,7 @@ abstract class Xobj implements TypeStore
c.moveNodeContents(null, false);
- if (text != null && text.length() > 0) {
+ if (text != null && !text.isEmpty()) {
c.next();
c.insertString(text);
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/BaseSchemaResourceManager.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/BaseSchemaResourceManager.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/BaseSchemaResourceManager.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/BaseSchemaResourceManager.java
Mon Jun 24 10:23:56 2024
@@ -462,7 +462,7 @@ public abstract class BaseSchemaResource
if (localFilename.endsWith(".xsd")) {
localFilename = localFilename.substring(0, localFilename.length()
- 4);
}
- if (localFilename.length() == 0) {
+ if (localFilename.isEmpty()) {
localFilename = "schema";
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/CodeGenUtil.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/CodeGenUtil.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/CodeGenUtil.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/CodeGenUtil.java
Mon Jun 24 10:23:56 2024
@@ -171,10 +171,10 @@ public class CodeGenUtil {
List<String> newargs = new ArrayList<>();
newargs.add(args.get(0));
- if (memStart != null && memStart.length() != 0) {
+ if (memStart != null && !memStart.isEmpty()) {
newargs.add("-J-Xms" + memStart);
}
- if (memMax != null && memMax.length() != 0) {
+ if (memMax != null && !memMax.isEmpty()) {
newargs.add("-J-Xmx" + memMax);
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/MavenPluginHelp.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/MavenPluginHelp.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/MavenPluginHelp.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/MavenPluginHelp.java
Mon Jun 24 10:23:56 2024
@@ -139,7 +139,7 @@ public class MavenPluginHelp extends Abs
private static boolean isNotEmpty(String string) {
- return string != null && string.length() > 0;
+ return string != null && !string.isEmpty();
}
private String getValue(Node node, String elementName)
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/Validator.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/Validator.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/Validator.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/Validator.java
Mon Jun 24 10:23:56 2024
@@ -976,7 +976,7 @@ public final class Validator
// See if I can apply a default/fixed value
- if (value.length() == 0 && canApplyDefault && field != null &&
+ if (value.isEmpty() && canApplyDefault && field != null &&
(field.isDefault() || field.isFixed())) {
if (XmlQName.type.isAssignableFrom(type)) {
// TODO: will be fixed in XmlSchema 1.1
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaQNameHolder.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaQNameHolder.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaQNameHolder.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaQNameHolder.java
Mon Jun 24 10:23:56 2024
@@ -70,7 +70,7 @@ public class JavaQNameHolder extends Xml
String namespace = _value.getNamespaceURI();
String localPart = _value.getLocalPart();
- if (namespace == null || namespace.length() == 0) {
+ if (namespace == null || namespace.isEmpty()) {
return localPart;
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/XmlListImpl.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/XmlListImpl.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/XmlListImpl.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/XmlListImpl.java
Mon Jun 24 10:23:56 2024
@@ -97,7 +97,7 @@ public class XmlListImpl extends XmlObje
private static final String[] EMPTY_STRINGARRAY = new String[0];
public static String[] split_list(String s) {
- if (s.length() == 0) {
+ if (s.isEmpty()) {
return EMPTY_STRINGARRAY;
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpath/XPathStep.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpath/XPathStep.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpath/XPathStep.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpath/XPathStep.java
Mon Jun 24 10:23:56 2024
@@ -51,7 +51,7 @@ class XPathStep {
}
boolean isWild() {
- return _name.getLocalPart().length() == 0;
+ return _name.getLocalPart().isEmpty();
}
boolean match(QName name) {
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpathgen/XPathGenerator.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpathgen/XPathGenerator.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpathgen/XPathGenerator.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpathgen/XPathGenerator.java
Mon Jun 24 10:23:56 2024
@@ -63,7 +63,7 @@ public class XPathGenerator
node.toParent();
pathToParent = generateInternal(node, context, nsctx);
String prefix = name.getLocalPart();
- if (prefix.length() == 0)
+ if (prefix.isEmpty())
return pathToParent + "/@xmlns";
else
return pathToParent + "/@xmlns:" + prefix;
@@ -119,7 +119,7 @@ public class XPathGenerator
{
String localName = qname.getLocalPart();
String uri = qname.getNamespaceURI();
- if (uri.length() == 0)
+ if (uri.isEmpty())
return localName;
String prefix = qname.getPrefix();
if (prefix != null && prefix.length() > 0)
@@ -133,7 +133,7 @@ public class XPathGenerator
prefix = ctx.getPrefix(uri);
if (prefix == null)
throw new XPathGenerationException("Could not obtain a prefix for
URI: " + uri);
- if (prefix.length() == 0)
+ if (prefix.isEmpty())
throw new XPathGenerationException("Can not use default prefix in
XPath for URI: " + uri);
return prefix + ':' + localName;
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xsd2inst/SampleXmlUtil.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xsd2inst/SampleXmlUtil.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xsd2inst/SampleXmlUtil.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xsd2inst/SampleXmlUtil.java
Mon Jun 24 10:23:56 2024
@@ -998,7 +998,7 @@ public class SampleXmlUtil {
prefix = parent.prefixForNamespace(qName.getNamespaceURI());
}
String name;
- if (prefix == null || prefix.length() == 0) {
+ if (prefix == null || prefix.isEmpty()) {
name = qName.getLocalPart();
} else {
name = prefix + ":" + qName.getLocalPart();
Modified:
xmlbeans/trunk/src/test/java/ValidatingXSRTests/detailed/ValidatingXmlStreamReaderTests.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/ValidatingXSRTests/detailed/ValidatingXmlStreamReaderTests.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/test/java/ValidatingXSRTests/detailed/ValidatingXmlStreamReaderTests.java
(original)
+++
xmlbeans/trunk/src/test/java/ValidatingXSRTests/detailed/ValidatingXmlStreamReaderTests.java
Mon Jun 24 10:23:56 2024
@@ -299,7 +299,7 @@ public class ValidatingXmlStreamReaderTe
private static File getCasesFile(String path)
throws java.io.IOException {
- if (path.length() == 0) {
+ if (path.isEmpty()) {
throw new IOException("getCasesFile was called with path of len
0");
}
return JarUtil.getResourceFromJarasFile(path);
Modified:
xmlbeans/trunk/src/test/java/compile/scomp/checkin/CompilationTests.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/compile/scomp/checkin/CompilationTests.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
--- xmlbeans/trunk/src/test/java/compile/scomp/checkin/CompilationTests.java
(original)
+++ xmlbeans/trunk/src/test/java/compile/scomp/checkin/CompilationTests.java
Mon Jun 24 10:23:56 2024
@@ -22,7 +22,6 @@ import org.apache.xmlbeans.impl.tool.*;
import org.apache.xmlbeans.impl.util.FilerImpl;
import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
import org.apache.xmlbeans.impl.xb.xsdschema.TopLevelComplexType;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.platform.launcher.Launcher;
import org.junit.platform.launcher.LauncherDiscoveryRequest;
@@ -34,7 +33,6 @@ import org.junit.platform.launcher.liste
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
-import java.io.StringWriter;
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
@@ -314,6 +312,23 @@ public class CompilationTests {
assertTrue(SchemaCompiler.compile(params), "Build failed " + fwroot);
assertTrue(outputjar.exists(), "Cannot find " + outputjar);
}
+
+ @Test
+ void testScéimreSonraÃ() {
+ deltree(xbeanOutput("compile/scomp/scéimresonraÃ"));
+ // First, compile schema
+ File srcdir = xbeanOutput("compile/scomp/scéimresonraÃ/src");
+ File classesdir = xbeanOutput("compile/scomp/scéimresonraÃ/classes");
+ File outputjar =
xbeanOutput("compile/scomp/scéimresonraÃ/scéimresonraÃ.jar");
+ Parameters params = new Parameters();
+ params.setXsdFiles(xbeanCase("ScéimreSonraÃ/scéimresonraÃ.xsd"));
+ params.setSrcDir(srcdir);
+ params.setClassesDir(classesdir);
+ params.setOutputJar(outputjar);
+ params.setVerbose(true);
+ assertTrue(SchemaCompiler.compile(params), "Build failed " + fwroot);
+ assertTrue(outputjar.exists(), "Cannot find " + outputjar);
+ }
@Test
void testBase64Binary() {
Modified: xmlbeans/trunk/src/test/java/misc/detailed/SampleRunner.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/misc/detailed/SampleRunner.java?rev=1918535&r1=1918534&r2=1918535&view=diff
==============================================================================
--- xmlbeans/trunk/src/test/java/misc/detailed/SampleRunner.java (original)
+++ xmlbeans/trunk/src/test/java/misc/detailed/SampleRunner.java Mon Jun 24
10:23:56 2024
@@ -58,7 +58,7 @@ public class SampleRunner {
exceptions.add(e.getCause());
}
}
- if (exceptions.size() != 0) {
+ if (!exceptions.isEmpty()) {
throw new RuntimeException(getMessageFromExceptions(exceptions));
}
Copied:
xmlbeans/trunk/src/test/resources/xbean/compile/scomp/ScéimreSonraí/scéimresonraí.xsd
(from r1918417,
xmlbeans/trunk/src/test/resources/xbean/compile/scomp/pricequote/PriceQuote.xsd)
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/resources/xbean/compile/scomp/Sc%C3%A9imreSonra%C3%AD/sc%C3%A9imresonra%C3%AD.xsd?p2=xmlbeans/trunk/src/test/resources/xbean/compile/scomp/Sc%C3%A9imreSonra%C3%AD/sc%C3%A9imresonra%C3%AD.xsd&p1=xmlbeans/trunk/src/test/resources/xbean/compile/scomp/pricequote/PriceQuote.xsd&r1=1918417&r2=1918535&rev=1918535&view=diff
==============================================================================
---
xmlbeans/trunk/src/test/resources/xbean/compile/scomp/pricequote/PriceQuote.xsd
(original)
+++
xmlbeans/trunk/src/test/resources/xbean/compile/scomp/ScéimreSonraí/scéimresonraí.xsd
Mon Jun 24 10:23:56 2024
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2004 The Apache Software Foundation
-
+<!--
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -14,16 +13,15 @@
limitations under the License. -->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified">
- <xsd:element name="price-quote">
+ <xsd:element name="scéimre-sonraÃ">
<xsd:complexType>
<xsd:sequence>
- <xsd:element ref="stock-symbol" minOccurs="1" maxOccurs="1"/>
- <xsd:element ref="stock-price" minOccurs="1" maxOccurs="1"/>
+ <xsd:element ref="ainm" minOccurs="1" maxOccurs="1"/>
+ <xsd:element ref="luach" minOccurs="1" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
- <!-- XXXSJM change following to use refined datatypes -->
- <xsd:element name="stock-symbol" type="xsd:string"/>
- <xsd:element name="stock-price" type="xsd:string"/>
+ <xsd:element name="ainm" type="xsd:string"/>
+ <xsd:element name="luach" type="xsd:string"/>
</xsd:schema>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
