Skip to content

Commit 407a477

Browse files
mjpt777mjpt777
committed
[Java] Rename contextualTypeName to applicableTypeName.
1 parent c14e205 commit 407a477

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

‎sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public List<String> generateTypeStubs() throws IOException
7575
break;
7676
}
7777

78-
typesToInclude.add(tokens.get(0).contextualTypeName());
78+
typesToInclude.add(tokens.get(0).applicableTypeName());
7979
}
8080

8181
return typesToInclude;
@@ -92,7 +92,7 @@ public List<String> generateTypesToIncludes(final List<Token> tokens)
9292
case BEGIN_ENUM:
9393
case BEGIN_SET:
9494
case BEGIN_COMPOSITE:
95-
typesToInclude.add(token.contextualTypeName());
95+
typesToInclude.add(token.applicableTypeName());
9696
break;
9797
}
9898
}
@@ -557,7 +557,7 @@ private void generateVarDataDescriptors(
557557

558558
private void generateChoiceSet(final List<Token> tokens) throws IOException
559559
{
560-
final String bitSetName = formatClassName(tokens.get(0).contextualTypeName());
560+
final String bitSetName = formatClassName(tokens.get(0).applicableTypeName());
561561

562562
try (Writer out = outputManager.createOutput(bitSetName))
563563
{
@@ -584,7 +584,7 @@ private void generateChoiceSet(final List<Token> tokens) throws IOException
584584
private void generateEnum(final List<Token> tokens) throws IOException
585585
{
586586
final Token enumToken = tokens.get(0);
587-
final String enumName = formatClassName(tokens.get(0).contextualTypeName());
587+
final String enumName = formatClassName(tokens.get(0).applicableTypeName());
588588

589589
try (Writer out = outputManager.createOutput(enumName))
590590
{
@@ -602,7 +602,7 @@ private void generateEnum(final List<Token> tokens) throws IOException
602602

603603
private void generateComposite(final List<Token> tokens) throws IOException
604604
{
605-
final String compositeName = formatClassName(tokens.get(0).contextualTypeName());
605+
final String compositeName = formatClassName(tokens.get(0).applicableTypeName());
606606

607607
try (Writer out = outputManager.createOutput(compositeName))
608608
{
@@ -708,7 +708,7 @@ private CharSequence generateEnumValues(final List<Token> tokens, final Token en
708708

709709
private static CharSequence generateEnumLookupMethod(final List<Token> tokens, final Token encodingToken)
710710
{
711-
final String enumName = formatClassName(encodingToken.contextualTypeName());
711+
final String enumName = formatClassName(encodingToken.applicableTypeName());
712712
final StringBuilder sb = new StringBuilder();
713713

714714
sb.append(String.format(
@@ -1508,7 +1508,7 @@ private CharSequence generateEnumProperty(
15081508
final Token token,
15091509
final String indent)
15101510
{
1511-
final String enumName = formatClassName(token.contextualTypeName());
1511+
final String enumName = formatClassName(token.applicableTypeName());
15121512
final String typeName = cppTypeName(token.encoding().primitiveType());
15131513
final int offset = token.offset();
15141514

@@ -1575,7 +1575,7 @@ private static Object generateBitsetProperty(final String propertyName, final To
15751575
{
15761576
final StringBuilder sb = new StringBuilder();
15771577

1578-
final String bitsetName = formatClassName(token.contextualTypeName());
1578+
final String bitsetName = formatClassName(token.applicableTypeName());
15791579
final int offset = token.offset();
15801580

15811581
sb.append(String.format(
@@ -1611,7 +1611,7 @@ private static Object generateBitsetProperty(final String propertyName, final To
16111611

16121612
private static Object generateCompositeProperty(final String propertyName, final Token token, final String indent)
16131613
{
1614-
final String compositeName = formatClassName(token.contextualTypeName());
1614+
final String compositeName = formatClassName(token.applicableTypeName());
16151615
final int offset = token.offset();
16161616

16171617
final StringBuilder sb = new StringBuilder();

‎sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,7 @@ private void generateDataTypedEncoder(
932932
private void generateBitSet(final List<Token> tokens) throws IOException
933933
{
934934
final Token token = tokens.get(0);
935-
final String bitSetName = formatClassName(token.contextualTypeName());
935+
final String bitSetName = formatClassName(token.applicableTypeName());
936936
final String decoderName = decoderName(bitSetName);
937937
final String encoderName = encoderName(bitSetName);
938938
final List<Token> messageBody = getMessageBody(tokens);
@@ -981,7 +981,7 @@ private void generateCompositeFlyweightHeader(
981981

982982
private void generateEnum(final List<Token> tokens) throws IOException
983983
{
984-
final String enumName = formatClassName(tokens.get(0).contextualTypeName());
984+
final String enumName = formatClassName(tokens.get(0).applicableTypeName());
985985

986986
try (Writer out = outputManager.createOutput(enumName))
987987
{
@@ -1000,7 +1000,7 @@ private void generateEnum(final List<Token> tokens) throws IOException
10001000
private void generateComposite(final List<Token> tokens) throws IOException
10011001
{
10021002
final Token token = tokens.get(0);
1003-
final String compositeName = formatClassName(token.contextualTypeName());
1003+
final String compositeName = formatClassName(token.applicableTypeName());
10041004
final String decoderName = decoderName(compositeName);
10051005
final String encoderName = encoderName(compositeName);
10061006

@@ -1014,7 +1014,7 @@ private void generateComposite(final List<Token> tokens) throws IOException
10141014
{
10151015
final Token encodingToken = tokens.get(i);
10161016
final String propertyName = formatPropertyName(encodingToken.name());
1017-
final String typeName = formatClassName(decoderName(encodingToken.contextualTypeName()));
1017+
final String typeName = formatClassName(decoderName(encodingToken.applicableTypeName()));
10181018

10191019
final StringBuilder sb = new StringBuilder();
10201020
generateEncodingOffsetMethod(sb, propertyName, encodingToken.offset(), BASE_INDENT);
@@ -1064,7 +1064,7 @@ private void generateComposite(final List<Token> tokens) throws IOException
10641064
{
10651065
final Token encodingToken = tokens.get(i);
10661066
final String propertyName = formatPropertyName(encodingToken.name());
1067-
final String typeName = formatClassName(encoderName(encodingToken.contextualTypeName()));
1067+
final String typeName = formatClassName(encoderName(encodingToken.applicableTypeName()));
10681068

10691069
final StringBuilder sb = new StringBuilder();
10701070
generateEncodingOffsetMethod(sb, propertyName, encodingToken.offset(), BASE_INDENT);
@@ -2237,7 +2237,7 @@ private CharSequence generateEnumDecoder(
22372237
final Token token,
22382238
final String indent)
22392239
{
2240-
final String enumName = formatClassName(token.contextualTypeName());
2240+
final String enumName = formatClassName(token.applicableTypeName());
22412241
final Encoding encoding = token.encoding();
22422242

22432243
if (token.isConstantEncoding())
@@ -2277,7 +2277,7 @@ private CharSequence generateEnumEncoder(
22772277
return "";
22782278
}
22792279

2280-
final String enumName = formatClassName(token.contextualTypeName());
2280+
final String enumName = formatClassName(token.applicableTypeName());
22812281
final Encoding encoding = token.encoding();
22822282
final int offset = token.offset();
22832283

‎sbe-tool/src/main/java/uk/co/real_logic/sbe/ir/Token.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,11 @@ public int deprecated()
225225
}
226226

227227
/**
228-
* Get the name of the type that should be used in context.
228+
* Get the name of the type that should be applied in context.
229229
*
230-
* @return the name of the type that should be used in context.
230+
* @return the name of the type that should be applied in context.
231231
*/
232-
public String contextualTypeName()
232+
public String applicableTypeName()
233233
{
234234
return null == referencedName ? name : referencedName;
235235
}

0 commit comments

Comments
 (0)