Skip to content

Commit abf357d

Browse files
author
Roger Lee Whitcomb
committed
PIVOT-1032: Fix a number of the "easy" style errors in various files.
git-svn-id: https://svn.apache.org/repos/asf/pivot/trunk@1828370 13f79535-47bb-0310-9956-ffa450edef68
1 parent 1272a77 commit abf357d

File tree

32 files changed

+150
-112
lines changed

32 files changed

+150
-112
lines changed

‎core/src/org/apache/pivot/collections/Dictionary.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.awt.Font;
2121
import java.io.Serializable;
2222

23-
import org.apache.pivot.collections.Map;
2423
import org.apache.pivot.util.Utils;
2524

2625
/**

‎core/src/org/apache/pivot/functional/functions/FunctionN.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
*/
2323
public interface FunctionN<R, T> {
2424
@SuppressWarnings("unchecked")
25-
public R apply(T ... a);
25+
public R apply(T... a);
2626
}

‎core/src/org/apache/pivot/functional/functions/ProcedureN.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
*/
2323
public interface ProcedureN<T> {
2424
@SuppressWarnings("unchecked")
25-
public void apply(T ... a);
25+
public void apply(T... a);
2626
}

‎core/src/org/apache/pivot/serialization/MacroReader.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ private void queue(String str) {
7777
private String getNextWord() throws IOException {
7878
StringBuilder buf = new StringBuilder();
7979
int ch;
80-
while ((ch = getNextChar(true)) != -1 && Character.isWhitespace(ch)) {
81-
;
82-
}
80+
do {
81+
ch = getNextChar(true);
82+
} while (ch != -1 && Character.isWhitespace(ch));
8383
if (ch != -1) {
8484
buf.append((char)ch);
8585
while ((ch = getNextChar(true)) != -1 &&
@@ -95,9 +95,9 @@ private String getNextWord() throws IOException {
9595

9696
private void skipToEol() throws IOException {
9797
int ch;
98-
while ((ch = getNextChar(true)) != -1 && ch != '\n') {
99-
;
100-
}
98+
do {
99+
ch = getNextChar(true);
100+
} while (ch != -1 && ch != '\n');
101101
}
102102

103103
/**
@@ -144,9 +144,9 @@ else if (!keyword.equalsIgnoreCase("define")) {
144144
String name = getNextWord();
145145
StringBuilder buf = new StringBuilder();
146146
int ch;
147-
while ((ch = getNextChar(true)) != -1 && Character.isWhitespace(ch) && ch != '\\' && ch != '\n') {
148-
;
149-
}
147+
do {
148+
ch = getNextChar(true);
149+
} while (ch != -1 && Character.isWhitespace(ch) && ch != '\\' && ch != '\n');
150150
queue(ch);
151151
do {
152152
while ((ch = getNextChar(true)) != -1 && ch != '\\' && ch != '\n') {

‎core/src/org/apache/pivot/text/CompositeIterator.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,34 +55,34 @@ public CompositeIterator(AttributedCharacterIterator... iterators) {
5555
fullLength += range;
5656
}
5757
this.endIndex = fullLength;
58-
__setIndex(0);
58+
setIndex0(0);
5959
}
6060

6161
// CharacterIterator implementations
6262

6363
public char first() {
64-
return __setIndex(0);
64+
return setIndex0(0);
6565
}
6666

6767
public char last() {
6868
if (endIndex == 0) {
69-
return __setIndex(endIndex);
69+
return setIndex0(endIndex);
7070
} else {
71-
return __setIndex(endIndex - 1);
71+
return setIndex0(endIndex - 1);
7272
}
7373
}
7474

7575
public char next() {
7676
if (currentIndex < endIndex) {
77-
return __setIndex(currentIndex + 1);
77+
return setIndex0(currentIndex + 1);
7878
} else {
7979
return DONE;
8080
}
8181
}
8282

8383
public char previous() {
8484
if (currentIndex > 0) {
85-
return __setIndex(currentIndex - 1);
85+
return setIndex0(currentIndex - 1);
8686
} else {
8787
return DONE;
8888
}
@@ -96,10 +96,10 @@ public char setIndex(int position) {
9696
// Note: this is a (0 < position <= endIndex) check, since "endIndex" is a valid value here
9797
Utils.checkIndexBounds(position, 0, endIndex);
9898

99-
return __setIndex(position);
99+
return setIndex0(position);
100100
}
101101

102-
private char __setIndex(int position) {
102+
private char setIndex0(int position) {
103103
currentIndex = position;
104104
int cumLength = 0;
105105
for (AttributedCharacterIterator iter : iterators) {

‎core/src/org/apache/pivot/text/FileSizeFormat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* Converts a file size into a human-readable representation using binary
2626
* prefixes (1KB = 1024 bytes).
2727
*/
28-
public class FileSizeFormat extends Format {
28+
public final class FileSizeFormat extends Format {
2929
private static final long serialVersionUID = 9126510513247641698L;
3030

3131
public static final int KILOBYTE = 1024;

‎core/src/org/apache/pivot/util/CalendarDate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ public int subtract(CalendarDate calendarDate) {
392392
long t1 = c1.getTimeInMillis();
393393
long t2 = c2.getTimeInMillis();
394394

395-
return (int) ((t1 - t2) / (1000l * 60 * 60 * 24));
395+
return (int) ((t1 - t2) / (1000L * 60 * 60 * 24));
396396
}
397397

398398
/**

‎core/src/org/apache/pivot/util/Console.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/**
2020
* Utility class for a simple log to the console, for example from scripts.
2121
*/
22-
public class Console {
22+
public final class Console {
2323

2424
private Console() {
2525
}

‎core/src/org/apache/pivot/util/Time.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.apache.pivot.collections.Sequence;
3030
import org.apache.pivot.json.JSONSerializer;
3131
import org.apache.pivot.serialization.SerializationException;
32-
import org.apache.pivot.util.Utils;
3332

3433
/**
3534
* Class representing a time of day, independent of any particular time zone.

‎core/src/org/apache/pivot/xml/Element.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public String toString() {
173173
/**
174174
* Sequence representing the attributes declared by this element.
175175
*/
176-
public class AttributeSequence implements Sequence<Attribute>, Iterable<Attribute> {
176+
public final class AttributeSequence implements Sequence<Attribute>, Iterable<Attribute> {
177177
private AttributeSequence() {
178178
}
179179

@@ -312,7 +312,7 @@ public Iterator<Attribute> iterator() {
312312
/**
313313
* Dictionary representing the namespaces declared by this element.
314314
*/
315-
public class NamespaceDictionary implements Dictionary<String, String>, Iterable<String> {
315+
public final class NamespaceDictionary implements Dictionary<String, String>, Iterable<String> {
316316
private NamespaceDictionary() {
317317
}
318318

@@ -393,7 +393,7 @@ public Iterator<String> iterator() {
393393
/**
394394
* Dictionary representing the attributes declared by this element.
395395
*/
396-
public class ElementDictionary implements Dictionary<String, String> {
396+
public final class ElementDictionary implements Dictionary<String, String> {
397397
private ElementDictionary() {
398398
}
399399

‎core/test/org/apache/pivot/beans/test/BeanAdapterTest.java

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ public class BeanAdapterTest {
3838

3939
private static Random rnd;
4040

41-
BeanAdapterSampleObject src_test;
41+
BeanAdapterSampleObject srcTest;
4242
JSONSerializer jsonSerializer;
4343
StringWriter writer;
4444
StringReader reader;
45-
BeanAdapterSampleObject target_test;
45+
BeanAdapterSampleObject targetTest;
4646

4747
@BeforeClass
4848
public static void setUpClass() {
@@ -58,87 +58,87 @@ public static void tearDownClass() {
5858

5959
@Before
6060
public void setUp() {
61-
src_test = new BeanAdapterSampleObject();
61+
srcTest = new BeanAdapterSampleObject();
6262
jsonSerializer = new JSONSerializer(BeanAdapterSampleObject.class);
6363
writer = new StringWriter();
6464
}
6565

6666
@After
6767
public void tearDown() {
68-
src_test = null;
68+
srcTest = null;
6969
jsonSerializer = null;
7070
writer = null;
7171
reader = null;
72-
target_test = null;
72+
targetTest = null;
7373
}
7474

7575
@Test
7676
public void testSerializeBigDecimal() {
7777
System.out.println("testSerializeBigDecimal");
7878

79-
double random_double = rnd.nextDouble();
80-
System.out.println("random_double = " + random_double
79+
double randomDouble = rnd.nextDouble();
80+
System.out.println("randomDouble = " + randomDouble
8181
+ " (value will be truncated to 4 digits in this test)");
8282

83-
src_test.setBd(new BigDecimal(random_double, new MathContext(4)));
83+
srcTest.setBd(new BigDecimal(randomDouble, new MathContext(4)));
8484

8585
try {
86-
jsonSerializer.writeObject(src_test, writer);
86+
jsonSerializer.writeObject(srcTest, writer);
8787
} catch (Exception e) {
8888
e.printStackTrace();
8989
fail();
9090
return;
9191
}
9292

93-
System.out.println("json string from src_test = " + writer.toString());
94-
System.out.println("src_test.getBd() = " + src_test.getBd());
93+
System.out.println("json string from srcTest = " + writer.toString());
94+
System.out.println("srcTest.getBd() = " + srcTest.getBd());
9595

9696
reader = new StringReader(writer.toString());
9797

9898
try {
99-
target_test = (BeanAdapterSampleObject) jsonSerializer.readObject(reader);
99+
targetTest = (BeanAdapterSampleObject) jsonSerializer.readObject(reader);
100100
} catch (Exception e) {
101101
e.printStackTrace();
102102
fail();
103103
return;
104104
}
105105

106-
System.out.println("target_test.getBd() = " + target_test.getBd());
107-
assertEquals(src_test.getBd().doubleValue(), target_test.getBd().doubleValue(), 0.0001);
106+
System.out.println("targetTest.getBd() = " + targetTest.getBd());
107+
assertEquals(srcTest.getBd().doubleValue(), targetTest.getBd().doubleValue(), 0.0001);
108108
}
109109

110110
@Test
111111
public void testSerializeBigInteger() {
112112
System.out.println("testSerializeBigInteger");
113113

114-
int random_int = rnd.nextInt();
115-
System.out.println("random_int = " + random_int);
114+
int randomInt = rnd.nextInt();
115+
System.out.println("randomInt = " + randomInt);
116116

117-
src_test.setBi(new BigInteger(String.valueOf(random_int)));
117+
srcTest.setBi(new BigInteger(String.valueOf(randomInt)));
118118

119119
try {
120-
jsonSerializer.writeObject(src_test, writer);
120+
jsonSerializer.writeObject(srcTest, writer);
121121
} catch (Exception e) {
122122
e.printStackTrace();
123123
fail();
124124
return;
125125
}
126126

127-
System.out.println("json string from src_test = " + writer.toString());
128-
System.out.println("src_test.getBi() = " + src_test.getBi());
127+
System.out.println("json string from srcTest = " + writer.toString());
128+
System.out.println("srcTest.getBi() = " + srcTest.getBi());
129129

130130
reader = new StringReader(writer.toString());
131131

132132
try {
133-
target_test = (BeanAdapterSampleObject) jsonSerializer.readObject(reader);
133+
targetTest = (BeanAdapterSampleObject) jsonSerializer.readObject(reader);
134134
} catch (Exception e) {
135135
e.printStackTrace();
136136
fail();
137137
return;
138138
}
139139

140-
System.out.println("target_test.getBi() = " + target_test.getBi());
141-
assertEquals(src_test.getBi(), target_test.getBi());
140+
System.out.println("targetTest.getBi() = " + targetTest.getBi());
141+
assertEquals(srcTest.getBi(), targetTest.getBi());
142142
}
143143

144144
@Test
@@ -148,31 +148,31 @@ public void testSerializeString() {
148148
String value = "A test String";
149149
System.out.println("String value = \"" + value + "\"");
150150

151-
src_test.setString(value);
151+
srcTest.setString(value);
152152

153153
try {
154-
jsonSerializer.writeObject(src_test, writer);
154+
jsonSerializer.writeObject(srcTest, writer);
155155
} catch (Exception e) {
156156
e.printStackTrace();
157157
fail();
158158
return;
159159
}
160160

161-
System.out.println("json string from src_test = " + writer.toString());
162-
System.out.println("src_test.getString() = \"" + src_test.getString() + "\"");
161+
System.out.println("json string from srcTest = " + writer.toString());
162+
System.out.println("srcTest.getString() = \"" + srcTest.getString() + "\"");
163163

164164
reader = new StringReader(writer.toString());
165165

166166
try {
167-
target_test = (BeanAdapterSampleObject) jsonSerializer.readObject(reader);
167+
targetTest = (BeanAdapterSampleObject) jsonSerializer.readObject(reader);
168168
} catch (Exception e) {
169169
e.printStackTrace();
170170
fail();
171171
return;
172172
}
173173

174-
System.out.println("target_test.getString() = \"" + target_test.getString() + "\"");
175-
assertEquals(src_test.getString(), target_test.getString());
174+
System.out.println("targetTest.getString() = \"" + targetTest.getString() + "\"");
175+
assertEquals(srcTest.getString(), targetTest.getString());
176176
}
177177

178178
}

0 commit comments

Comments
 (0)