Skip to content

Commit 70f3b72

Browse files
idodeclaretarzanek
idodeclare
authored and
tarzanek
committed
Add brackets. Fix spacing.
1 parent 2c63ff4 commit 70f3b72

File tree

8 files changed

+64
-31
lines changed

8 files changed

+64
-31
lines changed

‎src/org/opensolaris/opengrok/analysis/CtagsReader.java

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,8 @@ public void readLine(String tagLine) {
285285

286286
String[] args;
287287
if (signature != null && !signature.equals("()") &&
288-
!signature.startsWith("() ") && (args =
289-
splitSignature(signature)) != null) {
288+
!signature.startsWith("() ") && (args =
289+
splitSignature(signature)) != null) {
290290
for (String arg : args) {
291291
//TODO this algorithm assumes that data types occur to
292292
// the left of the argument name, so it will not
@@ -312,7 +312,9 @@ public void readLine(String tagLine) {
312312
arg = a[0]; // throws away assigned value
313313
}
314314
arg = arg.trim();
315-
if (arg.length() < 1) continue;
315+
if (arg.length() < 1) {
316+
continue;
317+
}
316318

317319
cidx = bestIndexOfArg(lineno, whole, arg);
318320

@@ -398,7 +400,9 @@ private void addTag(Definitions defs, int lineno, String symbol,
398400
private CpatIndex bestIndexOfTag(int lineno, String whole,
399401
String str) {
400402

401-
if (whole.length() < 1) return new CpatIndex(lineno, 0, 1, true);
403+
if (whole.length() < 1) {
404+
return new CpatIndex(lineno, 0, 1, true);
405+
}
402406
String origWhole = whole;
403407

404408
int t = tabSize;
@@ -456,14 +460,18 @@ private CpatIndex bestIndexOfTag(int lineno, String whole,
456460
* @return a defined instance
457461
*/
458462
private CpatIndex bestIndexOfArg(int lineno, String whole, String arg) {
459-
if (whole.length() < 1) return new CpatIndex(lineno, 0, 1, true);
463+
if (whole.length() < 1) {
464+
return new CpatIndex(lineno, 0, 1, true);
465+
}
460466

461467
int t = tabSize;
462468
int s, e;
463469

464470
// First search arg as-is in the current `whole' -- strict then lax.
465471
int woff = strictIndexOf(whole, arg);
466-
if (woff < 0) woff = whole.indexOf(arg);
472+
if (woff < 0) {
473+
woff = whole.indexOf(arg);
474+
}
467475
if (woff >= 0) {
468476
s = ExpandTabsReader.translate(whole, woff, t);
469477
e = ExpandTabsReader.translate(whole, woff + arg.length(), t);
@@ -532,7 +540,9 @@ private CpatIndex bestIndexOfArg(int lineno, String whole, String arg) {
532540
}
533541
} else {
534542
pr = bestMatch(cut, arg, argpat);
535-
if (pr.start >= 0) return bestLineOfMatch(lineno, pr, cut);
543+
if (pr.start >= 0) {
544+
return bestLineOfMatch(lineno, pr, cut);
545+
}
536546
}
537547

538548
/**
@@ -549,7 +559,9 @@ private CpatIndex bestIndexOfArg(int lineno, String whole, String arg) {
549559
*/
550560
private PatResult bestMatch(String whole, String arg, Pattern argpat) {
551561
PatResult m = strictMatch(whole, arg, argpat);
552-
if (m.start >= 0) return m;
562+
if (m.start >= 0) {
563+
return m;
564+
}
553565
Matcher marg = argpat.matcher(whole);
554566
if (marg.find()) {
555567
return new PatResult(marg.start(), marg.end(), marg.group());
@@ -573,7 +585,9 @@ private int strictIndexOf(String whole, String substr) {
573585
int spos = 0;
574586
do {
575587
int woff = whole.indexOf(substr, spos);
576-
if (woff < 0) return -1;
588+
if (woff < 0) {
589+
return -1;
590+
}
577591

578592
spos = woff + 1;
579593
String onechar;
@@ -718,11 +732,11 @@ private static String[] splitSignature(String signature) {
718732

719733
// Trim outer punctuation if it exists.
720734
while (soff < signature.length() && (signature.charAt(soff) == '(' ||
721-
signature.charAt(soff) == '{')) {
735+
signature.charAt(soff) == '{')) {
722736
++soff;
723737
}
724738
while (eoff - 1 > soff && (signature.charAt(eoff - 1) == ')' ||
725-
signature.charAt(eoff - 1) == '}')) {
739+
signature.charAt(eoff - 1) == '}')) {
726740
--eoff;
727741
}
728742
if (soff > off0 || eoff < offz) {
@@ -738,15 +752,19 @@ private static String[] splitSignature(String signature) {
738752
*/
739753
private String trySplitterCut(int lineOffset, int maxLines) {
740754
if (splitter == null) {
741-
if (splitterSupplier == null || triedSplitterSupplier) return null;
755+
if (splitterSupplier == null || triedSplitterSupplier) {
756+
return null;
757+
}
742758
triedSplitterSupplier = true;
743759
splitter = splitterSupplier.get();
744-
if (splitter == null) return null;
760+
if (splitter == null) {
761+
return null;
762+
}
745763
}
746764

747765
StringBuilder cutbld = new StringBuilder();
748766
for (int i = lineOffset; i < lineOffset + maxLines &&
749-
i < splitter.count(); ++i) {
767+
i < splitter.count(); ++i) {
750768
cutbld.append(splitter.getLine(i));
751769
}
752770
return cutbld.toString();

‎src/org/opensolaris/opengrok/analysis/Definitions.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,8 @@ public static class Tag implements Serializable {
228228
public transient boolean used;
229229

230230
protected Tag(int line, String symbol, String type, String text,
231-
String namespace, String signature, int lineStart, int lineEnd) {
231+
String namespace, String signature, int lineStart,
232+
int lineEnd) {
232233
this.line = line;
233234
this.symbol = symbol;
234235
this.type = type;
@@ -241,12 +242,12 @@ protected Tag(int line, String symbol, String type, String text,
241242
}
242243

243244
public void addTag(int line, String symbol, String type, String text,
244-
int lineStart, int lineEnd) {
245+
int lineStart, int lineEnd) {
245246
addTag(line, symbol, type, text, null, null, lineStart, lineEnd);
246247
}
247248

248249
public void addTag(int line, String symbol, String type, String text,
249-
String namespace, String signature, int lineStart, int lineEnd) {
250+
String namespace, String signature, int lineStart, int lineEnd) {
250251
Tag new_tag = new Tag(line, symbol, type, text, namespace, signature,
251252
lineStart, lineEnd);
252253
tags.add(new_tag);

‎src/org/opensolaris/opengrok/analysis/ExpandTabsReader.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@ public static int translate(String line, int column, int tabSize) {
110110
if (column > line.length()) {
111111
throw new IllegalArgumentException("`column' is out of bounds");
112112
}
113-
if (tabSize < 1) return column;
113+
if (tabSize < 1) {
114+
return column;
115+
}
114116

115117
int newColumn = 0;
116118
for (int i = 0; i < column; ++i) {

‎src/org/opensolaris/opengrok/analysis/plain/DefinitionsTokenStream.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ private void createTokens(Definitions defs, LineBreaker brk) {
116116
int lineno = tag.line - 1;
117117

118118
if (lineno >= 0 && lineno < brk.count() && tag.symbol != null &&
119-
tag.text != null) {
119+
tag.text != null) {
120120
int lineoff = brk.getPosition(lineno);
121121
if (tag.lineStart >= 0) {
122122
PendingToken tok = new PendingToken(tag.symbol, lineoff +

‎src/org/opensolaris/opengrok/util/LineBreaker.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,17 @@ public void reset(StreamSource src, ReaderWrapper wrapper)
7272
Reader rdr = IOUtils.createBOMStrippedReader(in,
7373
StandardCharsets.UTF_8.name())) {
7474
Reader intermediate = null;
75-
if (wrapper != null) intermediate = wrapper.get(rdr);
75+
if (wrapper != null) {
76+
intermediate = wrapper.get(rdr);
77+
}
7678

7779
try (BufferedReader brdr = new BufferedReader(
78-
intermediate != null ? intermediate : rdr)) {
80+
intermediate != null ? intermediate : rdr)) {
7981
reset(brdr);
8082
} finally {
81-
if (intermediate != null) intermediate.close();
83+
if (intermediate != null) {
84+
intermediate.close();
85+
}
8286
}
8387
}
8488
}

‎src/org/opensolaris/opengrok/util/SourceSplitter.java

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@ public int findLineOffset(int position) {
109109
if (lineOffsets == null) {
110110
throw new IllegalStateException("reset() has not succeeded");
111111
}
112-
if (position < 0 || position > length) return -1;
112+
if (position < 0 || position > length) {
113+
return -1;
114+
}
113115

114116
int lo = 0;
115117
int hi = lineOffsets.length - 1;
@@ -195,13 +197,17 @@ public void reset(StreamSource src, ReaderWrapper wrapper)
195197
Reader rdr = IOUtils.createBOMStrippedReader(in,
196198
StandardCharsets.UTF_8.name())) {
197199
Reader intermediate = null;
198-
if (wrapper != null) intermediate = wrapper.get(rdr);
200+
if (wrapper != null) {
201+
intermediate = wrapper.get(rdr);
202+
}
199203

200204
try (BufferedReader brdr = new BufferedReader(
201-
intermediate != null ? intermediate : rdr)) {
205+
intermediate != null ? intermediate : rdr)) {
202206
reset(brdr);
203207
} finally {
204-
if (intermediate != null) intermediate.close();
208+
if (intermediate != null) {
209+
intermediate.close();
210+
}
205211
}
206212
}
207213
}
@@ -277,7 +283,9 @@ private void setLineOffsets() {
277283
int position = 0;
278284
for (int i = 0; i < lineOffsets.length; ++i) {
279285
lineOffsets[i] = position;
280-
if (i < lines.length) position += lines[i].length();
286+
if (i < lines.length) {
287+
position += lines[i].length();
288+
}
281289
}
282290
}
283291
}

‎test/org/opensolaris/opengrok/analysis/plain/DefinitionsTokenStreamTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ private void testDefinitionsVsContent(boolean expandTabs,
115115
StringBuilder bld = new StringBuilder();
116116
String source;
117117
try (Reader rdr = ExpandTabsReader.wrap(
118-
IOUtils.createBOMStrippedReader(src.getStream(),
119-
StandardCharsets.UTF_8.name()), tabSize)) {
118+
IOUtils.createBOMStrippedReader(src.getStream(),
119+
StandardCharsets.UTF_8.name()), tabSize)) {
120120
int c;
121121
while ((c = rdr.read()) != -1) {
122122
bld.append((char)c);

‎test/org/opensolaris/opengrok/util/StreamUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ public static byte[] copyStream(InputStream iss) throws IOException {
6262
}
6363

6464
public static Definitions readTagsFromResource(String tagsResourceName)
65-
throws IOException {
65+
throws IOException {
6666
return readTagsFromResource(tagsResourceName, null);
6767
}
6868

6969
public static Definitions readTagsFromResource(String tagsResourceName,
70-
String rawResourceName) throws IOException {
70+
String rawResourceName) throws IOException {
7171
return readTagsFromResource(tagsResourceName, rawResourceName, 0);
7272
}
7373

0 commit comments

Comments
 (0)