From 07283b264f440735ed00e6d4563050dfaeb4bc81 Mon Sep 17 00:00:00 2001 From: Alexander Tiderko Date: Wed, 7 Feb 2024 17:44:22 +0100 Subject: [PATCH] fixed build jaustoolset --- .../src/org/jts/codegenerator/RecordGenerator.java | 6 +++--- .../src/org/jts/codegenerator/SequenceGenerator.java | 12 ++++++------ .../src/org/jts/codegenerator/VariantGenerator.java | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jaustoolset/src/org/jts/codegenerator/RecordGenerator.java b/jaustoolset/src/org/jts/codegenerator/RecordGenerator.java index 6137335..b368bd5 100644 --- a/jaustoolset/src/org/jts/codegenerator/RecordGenerator.java +++ b/jaustoolset/src/org/jts/codegenerator/RecordGenerator.java @@ -66,7 +66,7 @@ public class RecordGenerator final private boolean fixedLengthStringHasClass = false; // FixedLengthString // Currently always false final private boolean variableLengthStringHasClass = false; // VariableLengthString // Currently always false private CodeLines.CodeType codeType; - private Record record; + private org.jts.jsidl.binding.Record record; private boolean isList; private String countFieldType; private boolean countFieldSigned; @@ -77,7 +77,7 @@ public class RecordGenerator private String shortClassName; private String varName; - public RecordGenerator(CodeLines.CodeType codeType, Record record) + public RecordGenerator(CodeLines.CodeType codeType, org.jts.jsidl.binding.Record record) { this.codeType = codeType; this.record = record; @@ -101,7 +101,7 @@ else if (codeType == CodeLines.CodeType.C_SHARP) } - public RecordGenerator(CodeLines.CodeType codeType, Record record, boolean isList, String countFieldType) + public RecordGenerator(CodeLines.CodeType codeType, org.jts.jsidl.binding.Record record, boolean isList, String countFieldType) { this.codeType = codeType; this.record = record; diff --git a/jaustoolset/src/org/jts/codegenerator/SequenceGenerator.java b/jaustoolset/src/org/jts/codegenerator/SequenceGenerator.java index 2ba02fd..e473ae7 100644 --- a/jaustoolset/src/org/jts/codegenerator/SequenceGenerator.java +++ b/jaustoolset/src/org/jts/codegenerator/SequenceGenerator.java @@ -248,9 +248,9 @@ private void cppGenerateClass(CodeLines code, CodeLines varCode, int pvIndex1, S new VariantGenerator(codeType, variant).run(fullClassName, pvIndex1, varCode); } - else if (field instanceof Record) + else if (field instanceof org.jts.jsidl.binding.Record) { - Record record = (Record)field; + org.jts.jsidl.binding.Record record = (org.jts.jsidl.binding.Record)field; fieldName = Util.upperCaseFirstLetter(record.getName()); fieldIsNested = recordIsNested; @@ -364,9 +364,9 @@ private void javaGenerateClass(CodeLines code, CodeLines varCode, int pvIndex1, new VariantGenerator(codeType, variant).run(fullClassName, pvIndex1, varCode); } - else if (field instanceof Record) + else if (field instanceof org.jts.jsidl.binding.Record) { - Record record = (Record)field; + org.jts.jsidl.binding.Record record = (org.jts.jsidl.binding.Record)field; fieldName = Util.upperCaseFirstLetter(record.getName()); fieldIsNested = recordIsNested; @@ -479,9 +479,9 @@ private void csharpGenerateClass(CodeLines code, CodeLines varCode, int pvIndex1 new VariantGenerator(codeType, variant).run(fullClassName, pvIndex1, varCode); } - else if (field instanceof Record) + else if (field instanceof org.jts.jsidl.binding.Record) { - Record record = (Record)field; + org.jts.jsidl.binding.Record record = (org.jts.jsidl.binding.Record)field; fieldName = Util.upperCaseFirstLetter(record.getName()); fieldIsNested = recordIsNested; diff --git a/jaustoolset/src/org/jts/codegenerator/VariantGenerator.java b/jaustoolset/src/org/jts/codegenerator/VariantGenerator.java index f9e10e8..3bd3b06 100644 --- a/jaustoolset/src/org/jts/codegenerator/VariantGenerator.java +++ b/jaustoolset/src/org/jts/codegenerator/VariantGenerator.java @@ -346,9 +346,9 @@ else if (codeType == CodeLines.CodeType.C_SHARP) varCode.clear(); - if (field instanceof Record) + if (field instanceof org.jts.jsidl.binding.Record) { - Record record = (Record) field; + org.jts.jsidl.binding.Record record = (org.jts.jsidl.binding.Record) field; fieldName = record.getName(); if (record.isOptional())