arch-jedi/nx01
1
0
Fork 0
Code Issues Pull requests Actions Packages Releases Activity

Added more white space and tab space in the code

Browse source
This commit is contained in:
Willem Cazander 2025-01-29 18:43:31 +01:00
parent 275c4aa161
commit 5ba12c3a3e
15 changed files with 349 additions and 357 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nx01-x4o-sax3/src/main/java/org/x4o/sax3/SAX3WriterEnum.java
View file

@ -127,8 +127,7 @@ public class SAX3WriterEnum<TAG extends Enum<?>,TAG_WRITER extends ContentWriter
private String toTagString(TAG tag) { private String toTagString(TAG tag) {
String result = tag.name(); String result = tag.name();
if (result.startsWith("_")) if (result.startsWith("_")) {
{
result = result.substring(1); // remove _ result = result.substring(1); // remove _
} }
return result; return result;

18
nx01-x4o-sax3/src/main/java/org/x4o/sax3/io/AbstractContentWriterHandler.java
View file

@ -180,18 +180,18 @@ public class AbstractContentWriterHandler implements ContentHandler, Closeable {
BufferedReader br = new BufferedReader(new InputStreamReader(inputStream, Charset.forName(encoding))); BufferedReader br = new BufferedReader(new InputStreamReader(inputStream, Charset.forName(encoding)));
try { try {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append('\n'); // like plugin sb.append('\n');
sb.append('\n'); // like plugin sb.append('\n');
String line = br.readLine(); String line = br.readLine();
while (line != null) { while (line != null) {
if (line.length() > 0) { if (line.length() > 0) {
sb.append(" "); // like plugin sb.append(" ");
} }
sb.append(line); sb.append(line);
sb.append('\n'); sb.append('\n');
line = br.readLine(); line = br.readLine();
} }
sb.append('\n'); // like plugin sb.append('\n');
String out = sb.toString(); String out = sb.toString();
return out; return out;
} finally { } finally {
@ -279,7 +279,7 @@ public class AbstractContentWriterHandler implements ContentHandler, Closeable {
} }
public void startElementTag(String uri, String localName) throws SAXException { public void startElementTag(String uri, String localName) throws SAXException {
if (SAX3XMLConstants.NULL_NS_URI.equals(uri) | uri==null) { if (SAX3XMLConstants.NULL_NS_URI.equals(uri) || uri == null) {
startElement.append(localName); startElement.append(localName);
} else { } else {
String prefix = prefixMapping.get(uri); String prefix = prefixMapping.get(uri);
@ -339,12 +339,10 @@ public class AbstractContentWriterHandler implements ContentHandler, Closeable {
if (SAX3XMLConstants.NULL_NS_URI.equals(uri2)) { if (SAX3XMLConstants.NULL_NS_URI.equals(uri2)) {
continue; // don't print empty namespace uri location continue; // don't print empty namespace uri location
} }
if (first) { if (first) {
startElement.append(getPropertyConfig().getPropertyString(OUTPUT_CHAR_NEWLINE)); startElement.append(getPropertyConfig().getPropertyString(OUTPUT_CHAR_NEWLINE));
first = false; first = false;
} }
startElement.append(' '); startElement.append(' ');
startElement.append(SAX3XMLConstants.XMLNS_ATTRIBUTE); startElement.append(SAX3XMLConstants.XMLNS_ATTRIBUTE);
if ("".equals(prefix) == false) { if ("".equals(prefix) == false) {
@ -383,8 +381,7 @@ public class AbstractContentWriterHandler implements ContentHandler, Closeable {
} else { } else {
startElement.append(' '); startElement.append(' ');
} }
if (SAX3XMLConstants.NULL_NS_URI.equals(attributeUri) || attributeUri == null) {
if (SAX3XMLConstants.NULL_NS_URI.equals(attributeUri) | attributeUri ==null) {
startElement.append(attributeName); startElement.append(attributeName);
} else { } else {
startElement.append(attributeUri); startElement.append(attributeUri);
@ -420,7 +417,6 @@ public class AbstractContentWriterHandler implements ContentHandler, Closeable {
* @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String) * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
*/ */
public void endElement(String uri, String localName, String name) throws SAXException { public void endElement(String uri, String localName, String name) throws SAXException {
if (elements.size() > 0 && elements.peek().equals((localName)) == false) { if (elements.size() > 0 && elements.peek().equals((localName)) == false) {
throw new SAXException("Unexpected end tag: " + localName + " should be: " + elements.peek()); throw new SAXException("Unexpected end tag: " + localName + " should be: " + elements.peek());
} }
@ -447,7 +443,7 @@ public class AbstractContentWriterHandler implements ContentHandler, Closeable {
} }
write(SAX3XMLConstants.TAG_OPEN_END); write(SAX3XMLConstants.TAG_OPEN_END);
if (SAX3XMLConstants.NULL_NS_URI.equals(uri) | uri==null) { if (SAX3XMLConstants.NULL_NS_URI.equals(uri) || uri == null) {
write(localName); write(localName);
} else { } else {
String prefix = prefixMapping.get(uri); String prefix = prefixMapping.get(uri);

2
nx01-x4o-sax3/src/main/java/org/x4o/sax3/io/AttributeMap.java
View file

@ -358,7 +358,7 @@ public class AttributeMap<K,V> implements Map<K,V> {
public boolean equals(Object o) { public boolean equals(Object o) {
if (o instanceof Map.Entry) { if (o instanceof Map.Entry) {
Map.Entry mapEntry = (Map.Entry) o; Map.Entry mapEntry = (Map.Entry) o;
if (mapEntry.getKey().equals(key) & mapEntry.getValue().equals(value)) { if (mapEntry.getKey().equals(key) && mapEntry.getValue().equals(value)) {
return true; return true;
} }
} }

1
nx01-x4o-sax3/src/main/java/org/x4o/sax3/io/SAX3PropertyConfig.java
View file

@ -403,7 +403,6 @@ public final class SAX3PropertyConfig implements Cloneable {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public final void setPropertyParsedValue(String key,String value) { public final void setPropertyParsedValue(String key,String value) {
Class<?> valueType = getPropertyType(key); Class<?> valueType = getPropertyType(key);
//System.out.println("key: "+key+" value: "+value+" type: "+valueType);
if (String.class.equals(valueType)) { if (String.class.equals(valueType)) {
setProperty(key, value); setProperty(key, value);
return; return;

1
nx01-x4o-sax3/src/main/java/org/x4o/sax3/io/SAX3XMLConstants.java
View file

@ -407,7 +407,6 @@ public final class SAX3XMLConstants {
for (int ii = 0; ii < indent; ii++) { for (int ii = 0; ii < indent; ii++) {
result.append(charTab); result.append(charTab);
} }
continue; continue;
} }
result.appendCodePoint(c); result.appendCodePoint(c);

19
nx01-x4o-sax3/src/main/java/org/x4o/sax3/io/xdbx/AbstractXDBXWriterHandler.java
View file

@ -198,18 +198,18 @@ public class AbstractXDBXWriterHandler implements ContentHandler, Closeable {
BufferedReader br = new BufferedReader(new InputStreamReader(inputStream, Charset.forName(encoding))); BufferedReader br = new BufferedReader(new InputStreamReader(inputStream, Charset.forName(encoding)));
try { try {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append('\n'); // like plugin sb.append('\n');
sb.append('\n'); // like plugin sb.append('\n');
String line = br.readLine(); String line = br.readLine();
while (line != null) { while (line != null) {
if (line.length()>0) { if (line.length()>0) {
sb.append(" "); // like plugin sb.append(" ");
} }
sb.append(line); sb.append(line);
sb.append('\n'); sb.append('\n');
line = br.readLine(); line = br.readLine();
} }
sb.append('\n'); // like plugin sb.append('\n');
String out = sb.toString(); String out = sb.toString();
return out; return out;
} finally { } finally {
@ -282,7 +282,7 @@ public class AbstractXDBXWriterHandler implements ContentHandler, Closeable {
startElementTag(uri,localName,name); startElementTag(uri,localName,name);
startElementNamespace(uri); startElementNamespace(uri);
startElementAttributes(atts); startElementAttributes(atts);
if (SAX3XMLConstants.NULL_NS_URI.equals(uri) | uri==null) { if (SAX3XMLConstants.NULL_NS_URI.equals(uri) || uri == null) {
elements.push(localName); elements.push(localName);
} else { } else {
elements.push(uri + ":" + name); elements.push(uri + ":" + name);
@ -291,7 +291,7 @@ public class AbstractXDBXWriterHandler implements ContentHandler, Closeable {
public void startElementTag(String uri, String localName, String name) throws SAXException { public void startElementTag(String uri, String localName, String name) throws SAXException {
boolean localNameIdx = xdbxStringId(localName); boolean localNameIdx = xdbxStringId(localName);
if (SAX3XMLConstants.NULL_NS_URI.equals(uri) | uri==null) { if (SAX3XMLConstants.NULL_NS_URI.equals(uri) || uri==null) {
if (localNameIdx) { if (localNameIdx) {
writeTag(XDBXContentTag.ELEMENT_I); writeTag(XDBXContentTag.ELEMENT_I);
writeVariableInteger(xdbxStringStore(localName)); writeVariableInteger(xdbxStringStore(localName));
@ -320,7 +320,7 @@ public class AbstractXDBXWriterHandler implements ContentHandler, Closeable {
} }
public void startElementNamespace(String uri) throws SAXException { public void startElementNamespace(String uri) throws SAXException {
if ((uri!=null & SAX3XMLConstants.NULL_NS_URI.equals(uri)==false) && printedMappings.contains(uri)==false) { if ((uri != null && SAX3XMLConstants.NULL_NS_URI.equals(uri) == false) && printedMappings.contains(uri) == false) {
String prefix = prefixMapping.get(uri); String prefix = prefixMapping.get(uri);
if (prefix == null) { if (prefix == null) {
throw new SAXException("preFixUri: "+uri+" is not started."); throw new SAXException("preFixUri: "+uri+" is not started.");
@ -366,7 +366,7 @@ public class AbstractXDBXWriterHandler implements ContentHandler, Closeable {
boolean attributeValueSimple = attributeValue.equals(attributeValueSafe); boolean attributeValueSimple = attributeValue.equals(attributeValueSafe);
boolean attributeNameIdx = xdbxStringId(attributeName); boolean attributeNameIdx = xdbxStringId(attributeName);
if (SAX3XMLConstants.NULL_NS_URI.equals(attributeUri) | attributeUri ==null) { if (SAX3XMLConstants.NULL_NS_URI.equals(attributeUri) || attributeUri ==null) {
if (attributeNameIdx) { if (attributeNameIdx) {
writeTag(XDBXContentTag.ATTRIBUTE_I); writeTag(XDBXContentTag.ATTRIBUTE_I);
writeVariableInteger(xdbxStringStore(attributeName)); writeVariableInteger(xdbxStringStore(attributeName));
@ -407,7 +407,7 @@ public class AbstractXDBXWriterHandler implements ContentHandler, Closeable {
* @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String) * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
*/ */
public void endElement(String uri, String localName, String name) throws SAXException { public void endElement(String uri, String localName, String name) throws SAXException {
if (SAX3XMLConstants.NULL_NS_URI.equals(uri) | uri==null) { if (SAX3XMLConstants.NULL_NS_URI.equals(uri) || uri==null) {
if (elements.size() > 0 && elements.peek().equals(localName) == false) { if (elements.size() > 0 && elements.peek().equals(localName) == false) {
throw new SAXException("Unexpected end tag: " + localName + " should be: " + elements.peek()); throw new SAXException("Unexpected end tag: " + localName + " should be: " + elements.peek());
} }
@ -436,7 +436,6 @@ public class AbstractXDBXWriterHandler implements ContentHandler, Closeable {
writeTagLengthValue(XDBXContentTag.STRING_ID, prefix); writeTagLengthValue(XDBXContentTag.STRING_ID, prefix);
writeVariableInteger(prefixIdxNum); writeVariableInteger(prefixIdxNum);
} }
boolean uriIdx = xdbxStringId(uri); boolean uriIdx = xdbxStringId(uri);
if (!uriIdx) { if (!uriIdx) {
int uriIdxNum = xdbxStringStore(uri); int uriIdxNum = xdbxStringStore(uri);