Skip to content

Commit 694ae4c

Browse files
mjpt777mjpt777
committed
[Java]: Change line wrapping style to better suit rename refactorings.
1 parent aa395a9 commit 694ae4c

Some content is hidden

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

55 files changed

+829
-930
lines changed

‎examples/java/uk/co/real_logic/sbe/examples/ExampleTokenListener.java‎

Lines changed: 32 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,12 @@ public void onEndMessage(final Token token)
5050
namedScope.pop();
5151
}
5252

53-
public void onEncoding(final Token fieldToken,
54-
final DirectBuffer buffer,
55-
final int index,
56-
final Token typeToken,
57-
final int actingVersion)
53+
public void onEncoding(
54+
final Token fieldToken,
55+
final DirectBuffer buffer,
56+
final int index,
57+
final Token typeToken,
58+
final int actingVersion)
5859
{
5960
final CharSequence value = readEncodingAsString(buffer, index, typeToken, actingVersion);
6061

@@ -65,10 +66,14 @@ public void onEncoding(final Token fieldToken,
6566
.println();
6667
}
6768

68-
public void onEnum(final Token fieldToken,
69-
final DirectBuffer buffer, final int bufferIndex,
70-
final List<Token> tokens, final int beginIndex, final int endIndex,
71-
final int actingVersion)
69+
public void onEnum(
70+
final Token fieldToken,
71+
final DirectBuffer buffer,
72+
final int bufferIndex,
73+
final List<Token> tokens,
74+
final int beginIndex,
75+
final int endIndex,
76+
final int actingVersion)
7277
{
7378
final Token typeToken = tokens.get(beginIndex + 1);
7479
final long encodedValue = readEncodingAsLong(buffer, bufferIndex, typeToken, actingVersion);
@@ -90,10 +95,14 @@ public void onEnum(final Token fieldToken,
9095
.println();
9196
}
9297

93-
public void onBitSet(final Token fieldToken,
94-
final DirectBuffer buffer, final int bufferIndex,
95-
final List<Token> tokens, final int beginIndex, final int endIndex,
96-
final int actingVersion)
98+
public void onBitSet(
99+
final Token fieldToken,
100+
final DirectBuffer buffer,
101+
final int bufferIndex,
102+
final List<Token> tokens,
103+
final int beginIndex,
104+
final int endIndex,
105+
final int actingVersion)
97106
{
98107
final Token typeToken = tokens.get(beginIndex + 1);
99108
final long encodedValue = readEncodingAsLong(buffer, bufferIndex, typeToken, actingVersion);
@@ -143,12 +152,14 @@ public void onEndGroup(final Token token, final int groupIndex, final int numInG
143152
namedScope.pop();
144153
}
145154

146-
public void onVarData(final Token fieldToken, final DirectBuffer buffer, final int bufferIndex, final int length, final Token typeToken)
155+
public void onVarData(
156+
final Token fieldToken, final DirectBuffer buffer, final int bufferIndex, final int length, final Token typeToken)
147157
{
148158
final String value;
149159
try
150160
{
151-
value = new String(tempBuffer, 0, buffer.getBytes(bufferIndex, tempBuffer, 0, length), typeToken.encoding().characterEncoding());
161+
value = new String(
162+
tempBuffer, 0, buffer.getBytes(bufferIndex, tempBuffer, 0, length), typeToken.encoding().characterEncoding());
152163
}
153164
catch (final UnsupportedEncodingException ex)
154165
{
@@ -163,10 +174,8 @@ public void onVarData(final Token fieldToken, final DirectBuffer buffer, final i
163174
.println();
164175
}
165176

166-
private static CharSequence readEncodingAsString(final DirectBuffer buffer,
167-
final int index,
168-
final Token typeToken,
169-
final int actingVersion)
177+
private static CharSequence readEncodingAsString(
178+
final DirectBuffer buffer, final int index, final Token typeToken, final int actingVersion)
170179
{
171180
final PrimitiveValue constOrNotPresentValue = constOrNotPresentValue(typeToken, actingVersion);
172181
if (null != constOrNotPresentValue)
@@ -189,7 +198,8 @@ private static CharSequence readEncodingAsString(final DirectBuffer buffer,
189198
return sb;
190199
}
191200

192-
private long readEncodingAsLong(final DirectBuffer buffer, final int bufferIndex, final Token typeToken, final int actingVersion)
201+
private long readEncodingAsLong(
202+
final DirectBuffer buffer, final int bufferIndex, final Token typeToken, final int actingVersion)
193203
{
194204
final PrimitiveValue constOrNotPresentValue = constOrNotPresentValue(typeToken, actingVersion);
195205
if (null != constOrNotPresentValue)
@@ -218,7 +228,8 @@ else if (Encoding.Presence.OPTIONAL == encoding.presence())
218228
return null;
219229
}
220230

221-
private static void mapEncodingToString(final StringBuilder sb, final DirectBuffer buffer, final int index, final Encoding encoding)
231+
private static void mapEncodingToString(
232+
final StringBuilder sb, final DirectBuffer buffer, final int index, final Encoding encoding)
222233
{
223234
switch (encoding.primitiveType())
224235
{

‎examples/java/uk/co/real_logic/sbe/examples/ExampleUsingGeneratedStub.java‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class ExampleUsingGeneratedStub
4949
}
5050
}
5151

52-
public static void main(final String[] args)throws Exception
52+
public static void main(final String[] args) throws Exception
5353
{
5454
System.out.println("\n*** Basic Stub Example ***");
5555

@@ -120,40 +120,41 @@ public static int encode(final Car car, final DirectBuffer directBuffer, final i
120120
}
121121

122122
car.extras().clear()
123-
.cruiseControl(true)
124-
.sportsPack(true)
125-
.sunRoof(false);
123+
.cruiseControl(true)
124+
.sportsPack(true)
125+
.sunRoof(false);
126126

127127
car.engine().capacity(2000)
128-
.numCylinders((short)4)
129-
.putManufacturerCode(MANUFACTURER_CODE, srcOffset);
128+
.numCylinders((short)4)
129+
.putManufacturerCode(MANUFACTURER_CODE, srcOffset);
130130

131131
car.fuelFiguresCount(3).next().speed(30).mpg(35.9f)
132-
.next().speed(55).mpg(49.0f)
133-
.next().speed(75).mpg(40.0f);
132+
.next().speed(55).mpg(49.0f)
133+
.next().speed(75).mpg(40.0f);
134134

135135
final Car.PerformanceFigures perfFigures = car.performanceFiguresCount(2);
136136
perfFigures.next().octaneRating((short)95)
137-
.accelerationCount(3).next().mph(30).seconds(4.0f)
138-
.next().mph(60).seconds(7.5f)
139-
.next().mph(100).seconds(12.2f);
137+
.accelerationCount(3).next().mph(30).seconds(4.0f)
138+
.next().mph(60).seconds(7.5f)
139+
.next().mph(100).seconds(12.2f);
140140
perfFigures.next().octaneRating((short)99)
141-
.accelerationCount(3).next().mph(30).seconds(3.8f)
142-
.next().mph(60).seconds(7.1f)
143-
.next().mph(100).seconds(11.8f);
141+
.accelerationCount(3).next().mph(30).seconds(3.8f)
142+
.next().mph(60).seconds(7.1f)
143+
.next().mph(100).seconds(11.8f);
144144

145145
car.putMake(MAKE, srcOffset, MAKE.length);
146146
car.putModel(MODEL, srcOffset, MODEL.length);
147147

148148
return car.size();
149149
}
150150

151-
public static void decode(final Car car,
152-
final DirectBuffer directBuffer,
153-
final int bufferOffset,
154-
final int actingBlockLength,
155-
final int schemaId,
156-
final int actingVersion)
151+
public static void decode(
152+
final Car car,
153+
final DirectBuffer directBuffer,
154+
final int bufferOffset,
155+
final int actingBlockLength,
156+
final int schemaId,
157+
final int actingVersion)
157158
throws Exception
158159
{
159160
final byte[] buffer = new byte[128];
@@ -216,9 +217,11 @@ public static void decode(final Car car,
216217
}
217218

218219
sb.append("\ncar.make.semanticType=").append(Car.makeMetaAttribute(MetaAttribute.SEMANTIC_TYPE));
219-
sb.append("\ncar.make=").append(new String(buffer, 0, car.getMake(buffer, 0, buffer.length), Car.makeCharacterEncoding()));
220+
sb.append("\ncar.make=").append(
221+
new String(buffer, 0, car.getMake(buffer, 0, buffer.length), Car.makeCharacterEncoding()));
220222

221-
sb.append("\ncar.model=").append(new String(buffer, 0, car.getModel(buffer, 0, buffer.length), Car.modelCharacterEncoding()));
223+
sb.append("\ncar.model=").append(
224+
new String(buffer, 0, car.getModel(buffer, 0, buffer.length), Car.modelCharacterEncoding()));
222225

223226
sb.append("\ncar.size=").append(car.size());
224227

‎examples/java/uk/co/real_logic/sbe/examples/ExampleUsingGeneratedStubExtension.java‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class ExampleUsingGeneratedStubExtension
5050
}
5151
}
5252

53-
public static void main(final String[] args)throws Exception
53+
public static void main(final String[] args) throws Exception
5454
{
5555
System.out.println("\n*** Extension Stub Example ***");
5656

@@ -104,9 +104,7 @@ public static void main(final String[] args)throws Exception
104104
decode(CAR_1, directBuffer, bufferOffset, schemaId, actingBlockLength, actingVersion);
105105
}
106106

107-
public static int encode(final baseline.Car car,
108-
final DirectBuffer directBuffer,
109-
final int bufferOffset)
107+
public static int encode(final baseline.Car car, final DirectBuffer directBuffer, final int bufferOffset)
110108
{
111109
final int srcOffset = 0;
112110

@@ -123,40 +121,41 @@ public static int encode(final baseline.Car car,
123121
}
124122

125123
car.extras().clear()
126-
.cruiseControl(true)
127-
.sportsPack(true)
128-
.sunRoof(false);
124+
.cruiseControl(true)
125+
.sportsPack(true)
126+
.sunRoof(false);
129127

130128
car.engine().capacity(2000)
131-
.numCylinders((short)4)
132-
.putManufacturerCode(MANUFACTURER_CODE, srcOffset);
129+
.numCylinders((short)4)
130+
.putManufacturerCode(MANUFACTURER_CODE, srcOffset);
133131

134132
car.fuelFiguresCount(3).next().speed(30).mpg(35.9f)
135-
.next().speed(55).mpg(49.0f)
136-
.next().speed(75).mpg(40.0f);
133+
.next().speed(55).mpg(49.0f)
134+
.next().speed(75).mpg(40.0f);
137135

138136
final baseline.Car.PerformanceFigures perfFigures = car.performanceFiguresCount(2);
139137
perfFigures.next().octaneRating((short)95)
140-
.accelerationCount(3).next().mph(30).seconds(4.0f)
141-
.next().mph(60).seconds(7.5f)
142-
.next().mph(100).seconds(12.2f);
138+
.accelerationCount(3).next().mph(30).seconds(4.0f)
139+
.next().mph(60).seconds(7.5f)
140+
.next().mph(100).seconds(12.2f);
143141
perfFigures.next().octaneRating((short)99)
144-
.accelerationCount(3).next().mph(30).seconds(3.8f)
145-
.next().mph(60).seconds(7.1f)
146-
.next().mph(100).seconds(11.8f);
142+
.accelerationCount(3).next().mph(30).seconds(3.8f)
143+
.next().mph(60).seconds(7.1f)
144+
.next().mph(100).seconds(11.8f);
147145

148146
car.putMake(MAKE, srcOffset, MAKE.length);
149147
car.putModel(MODEL, srcOffset, MODEL.length);
150148

151149
return car.size();
152150
}
153151

154-
public static void decode(final extension.Car car,
155-
final DirectBuffer directBuffer,
156-
final int bufferOffset,
157-
final int schemaId,
158-
final int actingBlockLength,
159-
final int actingVersion)
152+
public static void decode(
153+
final extension.Car car,
154+
final DirectBuffer directBuffer,
155+
final int bufferOffset,
156+
final int schemaId,
157+
final int actingBlockLength,
158+
final int actingVersion)
160159
throws Exception
161160
{
162161
final byte[] buffer = new byte[128];
@@ -222,9 +221,11 @@ public static void decode(final extension.Car car,
222221
}
223222

224223
sb.append("\ncar.make.semanticType=").append(extension.Car.makeMetaAttribute(extension.MetaAttribute.SEMANTIC_TYPE));
225-
sb.append("\ncar.make=").append(new String(buffer, 0, car.getMake(buffer, 0, buffer.length), extension.Car.makeCharacterEncoding()));
224+
sb.append("\ncar.make=").append(
225+
new String(buffer, 0, car.getMake(buffer, 0, buffer.length), extension.Car.makeCharacterEncoding()));
226226

227-
sb.append("\ncar.model=").append(new String(buffer, 0, car.getModel(buffer, 0, buffer.length), extension.Car.modelCharacterEncoding()));
227+
sb.append("\ncar.model=").append(
228+
new String(buffer, 0, car.getModel(buffer, 0, buffer.length), extension.Car.modelCharacterEncoding()));
228229

229230
sb.append("\ncar.size=").append(car.size());
230231

‎examples/java/uk/co/real_logic/sbe/examples/OtfExample.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,13 @@ public static void main(final String[] args) throws Exception
7373

7474
final List<Token> msgTokens = ir.getMessage(templateId);
7575

76-
bufferOffset = OtfMessageDecoder.decode(buffer,
77-
bufferOffset,
78-
actingVersion,
79-
blockLength,
80-
msgTokens,
81-
new ExampleTokenListener(new PrintWriter(System.out, true)));
76+
bufferOffset = OtfMessageDecoder.decode(
77+
buffer,
78+
bufferOffset,
79+
actingVersion,
80+
blockLength,
81+
msgTokens,
82+
new ExampleTokenListener(new PrintWriter(System.out, true)));
8283

8384
if (bufferOffset != encodedMsgBuffer.position())
8485
{
@@ -93,7 +94,7 @@ private static void encodeSchema(final ByteBuffer buffer)
9394
{
9495
final MessageSchema schema = XmlSchemaParser.parse(in, ParserOptions.DEFAULT);
9596
final Ir ir = new IrGenerator().generate(schema);
96-
try (IrEncoder irEncoder = new IrEncoder(buffer, ir))
97+
try (final IrEncoder irEncoder = new IrEncoder(buffer, ir))
9798
{
9899
irEncoder.encode();
99100
}

‎main/android/uk/co/real_logic/sbe/codec/java/BitUtil.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,19 @@ final class BitUtil
2929
{
3030

3131
//
32-
//"effectiveDirectAddress" type changed from int to long in changeset: 0121106d9dc1ba713b53822886355e4d9339e852 (Android 4.3 - api 18)
32+
//"effectiveDirectAddress" type changed from int to long in changeset:
33+
// 0121106d9dc1ba713b53822886355e4d9339e852 (Android 4.3 - api 18)
3334
//at the same time, methods inside libcore.io.Memory where changed to use long addresses instead of ints
34-
//https://android.googlesource.com/platform/libcore/+/0121106d9dc1ba713b53822886355e4d9339e852%5E%21/luni/src/main/java/java/nio/Buffer.java
35+
//https://android.googlesource.com/platform/libcore/+/0121106d9dc1ba713b53822886355e4d9339e852%5E%21/
36+
// luni/src/main/java/java/nio/Buffer.java
3537
//
3638
//In api 14 org/apache/harmony/luni/platform/OSMemory.java was renamed to libcore/io/Memory.java
3739
//https://android.googlesource.com/platform/libcore/+/f934c3d2c8dd9e6bc5299cef41adace2a671637d
3840
//DirectBuffer class supports api 14 or later.
3941
//
4042
//Added to Buffer in changeset: bd8ecd863aa83df50d7ce8f5950d8645ab6356af (Android 2.3 - api 9)
41-
//https://android.googlesource.com/platform/libcore/+/bd8ecd863aa83df50d7ce8f5950d8645ab6356af%5E%21/nio/src/main/java/java/nio/Buffer.java
43+
//https://android.googlesource.com/platform/libcore/+/bd8ecd863aa83df50d7ce8f5950d8645ab6356af%5E%21/
44+
// nio/src/main/java/java/nio/Buffer.java
4245

4346
private static final Field EFFECTIVE_DIRECT_ADDRESS_FIELD;
4447
private static final MemoryAccess MEMORY_ACCESS;
@@ -70,11 +73,11 @@ static long getEffectiveDirectAddress(final ByteBuffer buffer)
7073
return USE_LONG_ADDRESS ? EFFECTIVE_DIRECT_ADDRESS_FIELD.getLong(buffer)
7174
: EFFECTIVE_DIRECT_ADDRESS_FIELD.getInt(buffer);
7275
}
73-
catch (IllegalArgumentException e)
76+
catch (final IllegalArgumentException e)
7477
{
7578
return 0;
7679
}
77-
catch (IllegalAccessException e)
80+
catch (final IllegalAccessException e)
7881
{
7982
return 0;
8083
}
@@ -110,6 +113,7 @@ public T run() throws Exception
110113
return (T) field.get(null);
111114
}
112115
};
116+
113117
return AccessController.doPrivileged(action);
114118
}
115119

@@ -132,6 +136,7 @@ public Field run() throws Exception
132136
return field;
133137
}
134138
};
139+
135140
return AccessController.doPrivileged(action);
136141
}
137142
}

0 commit comments

Comments
 (0)