Skip to content

Commit c780e7b

Browse files
cboehmecboehme
committed
Switch indentation from tabs to spaces
Four spaces should be used for indentation in java and XML files. Gradle and YAML fiels should be indented with two spaces. (cherry picked from commit 3e7f486)
1 parent 410f2f1 commit c780e7b

File tree

497 files changed

+33935
-33934
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

497 files changed

+33935
-33934
lines changed

‎.editorconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ charset=utf-8
2121
end_of_line=lf
2222
insert_final_newline=true
2323
trim_trailing_whitespace=true
24-
indent_style=tab
24+
indent_style=space
25+
indent_size=4
2526

2627
[{*.yml,*.yaml}]
2728
indent_style=space

‎metafacture-biblio/src/main/java/org/metafacture/biblio/AlephMabXmlHandler.java

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -36,59 +36,59 @@
3636
@FluxCommand("handle-mabxml")
3737
public final class AlephMabXmlHandler extends DefaultXmlPipe<StreamReceiver> {
3838

39-
private static final String SUBFIELD = "subfield";
40-
private static final String DATAFIELD = "datafield";
41-
private static final String CONTROLLFIELD = "controlfield";
42-
private static final String RECORD = "ListRecords";
43-
private static final String LEADER = "leader";
44-
private static final String DATAFIELD_ATTRIBUTE = "tag";
45-
private static final String SUBFIELD_ATTRIBUTE = "code";
46-
private static final String INDICATOR1 = "ind1";
47-
private static final String INDICATOR2 = "ind2";
48-
private String currentTag = "";
49-
private StringBuilder builder = new StringBuilder();
39+
private static final String SUBFIELD = "subfield";
40+
private static final String DATAFIELD = "datafield";
41+
private static final String CONTROLLFIELD = "controlfield";
42+
private static final String RECORD = "ListRecords";
43+
private static final String LEADER = "leader";
44+
private static final String DATAFIELD_ATTRIBUTE = "tag";
45+
private static final String SUBFIELD_ATTRIBUTE = "code";
46+
private static final String INDICATOR1 = "ind1";
47+
private static final String INDICATOR2 = "ind2";
48+
private String currentTag = "";
49+
private StringBuilder builder = new StringBuilder();
5050

51-
@Override
52-
public void characters(final char[] chars, final int start, final int length)
53-
throws SAXException {
54-
this.builder.append(chars, start, length);
55-
}
51+
@Override
52+
public void characters(final char[] chars, final int start, final int length)
53+
throws SAXException {
54+
this.builder.append(chars, start, length);
55+
}
5656

57-
@Override
58-
public void endElement(final String uri, final String localName, final String qName)
59-
throws SAXException {
60-
if (AlephMabXmlHandler.CONTROLLFIELD.equals(localName)) {
61-
getReceiver().literal(this.currentTag, this.builder.toString().trim());
62-
getReceiver().endEntity();
63-
} else if (AlephMabXmlHandler.SUBFIELD.equals(localName)) {
64-
getReceiver().literal(this.currentTag, this.builder.toString().trim());
65-
} else if (AlephMabXmlHandler.DATAFIELD.equals(localName)) {
66-
getReceiver().endEntity();
67-
} else if (AlephMabXmlHandler.RECORD.equals(localName)) {
68-
getReceiver().endRecord();
69-
}
70-
}
57+
@Override
58+
public void endElement(final String uri, final String localName, final String qName)
59+
throws SAXException {
60+
if (AlephMabXmlHandler.CONTROLLFIELD.equals(localName)) {
61+
getReceiver().literal(this.currentTag, this.builder.toString().trim());
62+
getReceiver().endEntity();
63+
} else if (AlephMabXmlHandler.SUBFIELD.equals(localName)) {
64+
getReceiver().literal(this.currentTag, this.builder.toString().trim());
65+
} else if (AlephMabXmlHandler.DATAFIELD.equals(localName)) {
66+
getReceiver().endEntity();
67+
} else if (AlephMabXmlHandler.RECORD.equals(localName)) {
68+
getReceiver().endRecord();
69+
}
70+
}
7171

72-
@Override
73-
public void startElement(final String uri, final String localName, final String qName,
74-
final Attributes attributes) throws SAXException {
75-
if (AlephMabXmlHandler.CONTROLLFIELD.equals(localName)) {
76-
this.builder = new StringBuilder();
77-
this.currentTag = "";
78-
getReceiver().startEntity(attributes.getValue(AlephMabXmlHandler.DATAFIELD_ATTRIBUTE));
79-
} else if (AlephMabXmlHandler.SUBFIELD.equals(localName)) {
80-
this.builder = new StringBuilder();
81-
this.currentTag = attributes.getValue(AlephMabXmlHandler.SUBFIELD_ATTRIBUTE);
82-
} else if (AlephMabXmlHandler.DATAFIELD.equals(localName)) {
83-
getReceiver().startEntity(attributes.getValue(AlephMabXmlHandler.DATAFIELD_ATTRIBUTE)
84-
+ attributes.getValue(AlephMabXmlHandler.INDICATOR1)
85-
+ attributes.getValue(AlephMabXmlHandler.INDICATOR2));
86-
} else if (AlephMabXmlHandler.RECORD.equals(localName)) {
87-
getReceiver().startRecord("");
88-
} else if (AlephMabXmlHandler.LEADER.equals(localName)) {
89-
this.builder = new StringBuilder();
90-
this.currentTag = AlephMabXmlHandler.LEADER;
91-
}
92-
}
72+
@Override
73+
public void startElement(final String uri, final String localName, final String qName,
74+
final Attributes attributes) throws SAXException {
75+
if (AlephMabXmlHandler.CONTROLLFIELD.equals(localName)) {
76+
this.builder = new StringBuilder();
77+
this.currentTag = "";
78+
getReceiver().startEntity(attributes.getValue(AlephMabXmlHandler.DATAFIELD_ATTRIBUTE));
79+
} else if (AlephMabXmlHandler.SUBFIELD.equals(localName)) {
80+
this.builder = new StringBuilder();
81+
this.currentTag = attributes.getValue(AlephMabXmlHandler.SUBFIELD_ATTRIBUTE);
82+
} else if (AlephMabXmlHandler.DATAFIELD.equals(localName)) {
83+
getReceiver().startEntity(attributes.getValue(AlephMabXmlHandler.DATAFIELD_ATTRIBUTE)
84+
+ attributes.getValue(AlephMabXmlHandler.INDICATOR1)
85+
+ attributes.getValue(AlephMabXmlHandler.INDICATOR2));
86+
} else if (AlephMabXmlHandler.RECORD.equals(localName)) {
87+
getReceiver().startRecord("");
88+
} else if (AlephMabXmlHandler.LEADER.equals(localName)) {
89+
this.builder = new StringBuilder();
90+
this.currentTag = AlephMabXmlHandler.LEADER;
91+
}
92+
}
9393

9494
}

‎metafacture-biblio/src/main/java/org/metafacture/biblio/AseqDecoder.java

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -32,39 +32,39 @@
3232
@Out(StreamReceiver.class)
3333
@FluxCommand("decode-aseq")
3434
public final class AseqDecoder
35-
extends DefaultObjectPipe<String, StreamReceiver> {
35+
extends DefaultObjectPipe<String, StreamReceiver> {
3636

37-
private static final String FIELD_DELIMITER = "\n";
37+
private static final String FIELD_DELIMITER = "\n";
3838

39-
@Override
40-
public void process(final String record) {
41-
assert !isClosed();
42-
final String trimedRecord = record.trim();
43-
if (trimedRecord.isEmpty()) {
44-
return;
45-
}
46-
final String[] lines = trimedRecord.split(FIELD_DELIMITER);
47-
for (int i = 0; i < lines.length; i++) {
48-
final String field = lines[i];
49-
if (i == 0) {
50-
getReceiver().startRecord(field.substring(0, 9));
51-
}
52-
final String category = field.substring(10, 15).trim();
53-
final String fieldContent = field.substring(18).trim();
54-
if (!fieldContent.startsWith("$$")) {
55-
getReceiver().literal(category, fieldContent);
56-
} else {
57-
getReceiver().startEntity(category);
58-
final String[] subfields = fieldContent.split("\\$\\$");
59-
for (final String subfield : subfields) {
60-
if (!subfield.isEmpty()) {
61-
getReceiver().literal(subfield.substring(0, 1), subfield.substring(1));
62-
}
63-
}
64-
getReceiver().endEntity();
65-
}
66-
}
67-
getReceiver().endRecord();
68-
}
39+
@Override
40+
public void process(final String record) {
41+
assert !isClosed();
42+
final String trimedRecord = record.trim();
43+
if (trimedRecord.isEmpty()) {
44+
return;
45+
}
46+
final String[] lines = trimedRecord.split(FIELD_DELIMITER);
47+
for (int i = 0; i < lines.length; i++) {
48+
final String field = lines[i];
49+
if (i == 0) {
50+
getReceiver().startRecord(field.substring(0, 9));
51+
}
52+
final String category = field.substring(10, 15).trim();
53+
final String fieldContent = field.substring(18).trim();
54+
if (!fieldContent.startsWith("$$")) {
55+
getReceiver().literal(category, fieldContent);
56+
} else {
57+
getReceiver().startEntity(category);
58+
final String[] subfields = fieldContent.split("\\$\\$");
59+
for (final String subfield : subfields) {
60+
if (!subfield.isEmpty()) {
61+
getReceiver().literal(subfield.substring(0, 1), subfield.substring(1));
62+
}
63+
}
64+
getReceiver().endEntity();
65+
}
66+
}
67+
getReceiver().endRecord();
68+
}
6969

7070
}

‎metafacture-biblio/src/main/java/org/metafacture/biblio/ComarcXmlHandler.java

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -48,91 +48,91 @@
4848
@FluxCommand("handle-comarcxml")
4949
public class ComarcXmlHandler extends DefaultXmlPipe<StreamReceiver> {
5050

51-
private static final String SUBFIELD = "subfield";
52-
private static final String DATAFIELD = "datafield";
53-
private static final String RECORD = "record";
54-
private static final String NAMESPACE = "http://www.loc.gov/MARC21/slim";
55-
private static final int RECORD_NOT_INITIALISED = 0;
56-
private static final int RECORD_INITIALISED = 1;
51+
private static final String SUBFIELD = "subfield";
52+
private static final String DATAFIELD = "datafield";
53+
private static final String RECORD = "record";
54+
private static final String NAMESPACE = "http://www.loc.gov/MARC21/slim";
55+
private static final int RECORD_NOT_INITIALISED = 0;
56+
private static final int RECORD_INITIALISED = 1;
5757

58-
private final List<Entry> subfieldValues = new ArrayList<Entry>();
58+
private final List<Entry> subfieldValues = new ArrayList<Entry>();
5959

60-
private int state = RECORD_NOT_INITIALISED;
61-
private String currentTag = "";
62-
private StringBuilder builder = new StringBuilder();
60+
private int state = RECORD_NOT_INITIALISED;
61+
private String currentTag = "";
62+
private StringBuilder builder = new StringBuilder();
6363

64-
private class Entry {
65-
String key;
66-
String value;
64+
private class Entry {
65+
String key;
66+
String value;
6767

68-
Entry(final String key, final String value) {
69-
this.key = key;
70-
this.value = value;
71-
}
72-
}
68+
Entry(final String key, final String value) {
69+
this.key = key;
70+
this.value = value;
71+
}
72+
}
7373

74-
@Override
75-
public void startElement(final String uri, final String localName,
76-
final String qName, final Attributes attributes)
77-
throws SAXException {
78-
if (SUBFIELD.equals(localName)) {
79-
this.builder = new StringBuilder();
80-
this.currentTag = attributes.getValue("code");
81-
} else if (DATAFIELD.equals(localName)
82-
&& this.state == RECORD_INITIALISED) {
83-
getReceiver().startEntity(
84-
attributes.getValue("tag") + attributes.getValue("ind1")
85-
+ attributes.getValue("ind2"));
86-
} else if (RECORD.equals(localName) && NAMESPACE.equals(uri)) {
87-
this.state = RECORD_NOT_INITIALISED;
88-
}
89-
}
74+
@Override
75+
public void startElement(final String uri, final String localName,
76+
final String qName, final Attributes attributes)
77+
throws SAXException {
78+
if (SUBFIELD.equals(localName)) {
79+
this.builder = new StringBuilder();
80+
this.currentTag = attributes.getValue("code");
81+
} else if (DATAFIELD.equals(localName)
82+
&& this.state == RECORD_INITIALISED) {
83+
getReceiver().startEntity(
84+
attributes.getValue("tag") + attributes.getValue("ind1")
85+
+ attributes.getValue("ind2"));
86+
} else if (RECORD.equals(localName) && NAMESPACE.equals(uri)) {
87+
this.state = RECORD_NOT_INITIALISED;
88+
}
89+
}
9090

91-
@Override
92-
public void endElement(final String uri, final String localName,
93-
final String qName) throws SAXException {
94-
if (SUBFIELD.equals(localName)) {
95-
this.subfieldValues.add(new Entry(this.currentTag, this.builder
96-
.toString().trim()));
97-
} else if (DATAFIELD.equals(localName)) {
98-
switch (this.state) {
99-
case RECORD_NOT_INITIALISED:
100-
super.getReceiver().startRecord(getFirstSubfield("x"));
101-
super.getReceiver().startEntity("000 ");
102-
this.state = RECORD_INITIALISED;
103-
// this should fall through so that the entity 000 is properly
104-
// ended
105-
case RECORD_INITIALISED:
106-
for (final Entry entry : this.subfieldValues) {
107-
super.getReceiver().literal(entry.key, entry.value);
108-
}
109-
super.getReceiver().endEntity();
110-
this.subfieldValues.clear();
111-
break;
112-
default:
113-
throw new SAXException(
114-
"State was not one of initialised or not initialised");
115-
}
116-
} else if (RECORD.equals(localName) && NAMESPACE.equals(uri)) {
117-
getReceiver().endRecord();
118-
}
119-
}
91+
@Override
92+
public void endElement(final String uri, final String localName,
93+
final String qName) throws SAXException {
94+
if (SUBFIELD.equals(localName)) {
95+
this.subfieldValues.add(new Entry(this.currentTag, this.builder
96+
.toString().trim()));
97+
} else if (DATAFIELD.equals(localName)) {
98+
switch (this.state) {
99+
case RECORD_NOT_INITIALISED:
100+
super.getReceiver().startRecord(getFirstSubfield("x"));
101+
super.getReceiver().startEntity("000 ");
102+
this.state = RECORD_INITIALISED;
103+
// this should fall through so that the entity 000 is properly
104+
// ended
105+
case RECORD_INITIALISED:
106+
for (final Entry entry : this.subfieldValues) {
107+
super.getReceiver().literal(entry.key, entry.value);
108+
}
109+
super.getReceiver().endEntity();
110+
this.subfieldValues.clear();
111+
break;
112+
default:
113+
throw new SAXException(
114+
"State was not one of initialised or not initialised");
115+
}
116+
} else if (RECORD.equals(localName) && NAMESPACE.equals(uri)) {
117+
getReceiver().endRecord();
118+
}
119+
}
120120

121-
@Override
122-
public void characters(final char[] chars, final int start, final int length)
123-
throws SAXException {
124-
this.builder.append(chars, start, length);
125-
}
121+
@Override
122+
public void characters(final char[] chars, final int start, final int length)
123+
throws SAXException {
124+
this.builder.append(chars, start, length);
125+
}
126126

127-
private String getFirstSubfield(final String subfieldCode) {
128-
String ret = null;
129-
for (final Entry entry : this.subfieldValues) {
130-
if (subfieldCode.equals(entry.key)) {
131-
ret = entry.value;
132-
break;
133-
}
134-
}
135-
return ret;
136-
}
127+
private String getFirstSubfield(final String subfieldCode) {
128+
String ret = null;
129+
for (final Entry entry : this.subfieldValues) {
130+
if (subfieldCode.equals(entry.key)) {
131+
ret = entry.value;
132+
break;
133+
}
134+
}
135+
return ret;
136+
}
137137

138138
}

0 commit comments

Comments
 (0)