Skip to content

Commit 7a97f28

Browse files
ipa-rwuipa-nhg
authored andcommitted
Update project to use Java SE 21 and Xtext 2.39.0
- Updated the generated files to reflect the new Xtext version (2.39.0). - Changed Java SE version from 19 to 21 in .classpath and .settings/org.eclipse.jdt.core.prefs. - Updated MANIFEST.MF to require Java SE 21. - Adjusted the expected size of the injectors map in XtextActivator. - Modified pom.xml to use the variable for MWE2 version. - Cleaned up whitespace and formatting in various generator files for consistency. - Added a new utility method to remove leading slashes in GeneratorHelpers.
1 parent 3d9e5eb commit 7a97f28

File tree

3 files changed

+6
-126
lines changed

3 files changed

+6
-126
lines changed

plugins/de.fraunhofer.ipa.ros.parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,4 +197,4 @@
197197
</plugin>
198198
</plugins>
199199
</build>
200-
</project>
200+
</project>

plugins/de.fraunhofer.ipa.ros2.xtext/src-gen/de/fraunhofer/ipa/ros2/serializer/Ros2SemanticSequencer.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -431,15 +431,7 @@ protected void sequence_Publisher(ISerializationContext context, Publisher seman
431431
* Reliability='best_effort' |
432432
* Reliability='reliable' |
433433
* Durability='transient_local' |
434-
* Durability='volatile' |
435-
* LeaseDuration=EString |
436-
* LeaseDuration='infinite' |
437-
* Liveliness='automatic' |
438-
* Liveliness='manual' |
439-
* Lifespan=EString |
440-
* Lifespan='infinite' |
441-
* Deadline=EString |
442-
* Deadline='infinite'
434+
* Durability='volatile'
443435
* )*
444436
* </pre>
445437
*/

plugins/de.fraunhofer.ipa.ros2.xtext/src-gen/de/fraunhofer/ipa/ros2/services/Ros2GrammarAccess.java

Lines changed: 4 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -215,30 +215,6 @@ public class QualityOfServiceElements extends AbstractParserRuleElementFinder {
215215
private final Alternatives cDurabilityAlternatives_2_4_1_0 = (Alternatives)cDurabilityAssignment_2_4_1.eContents().get(0);
216216
private final Keyword cDurabilityTransient_localKeyword_2_4_1_0_0 = (Keyword)cDurabilityAlternatives_2_4_1_0.eContents().get(0);
217217
private final Keyword cDurabilityVolatileKeyword_2_4_1_0_1 = (Keyword)cDurabilityAlternatives_2_4_1_0.eContents().get(1);
218-
private final Group cGroup_2_5 = (Group)cUnorderedGroup_2.eContents().get(5);
219-
private final Keyword cLease_durationKeyword_2_5_0 = (Keyword)cGroup_2_5.eContents().get(0);
220-
private final Assignment cLeaseDurationAssignment_2_5_1 = (Assignment)cGroup_2_5.eContents().get(1);
221-
private final Alternatives cLeaseDurationAlternatives_2_5_1_0 = (Alternatives)cLeaseDurationAssignment_2_5_1.eContents().get(0);
222-
private final RuleCall cLeaseDurationEStringParserRuleCall_2_5_1_0_0 = (RuleCall)cLeaseDurationAlternatives_2_5_1_0.eContents().get(0);
223-
private final Keyword cLeaseDurationInfiniteKeyword_2_5_1_0_1 = (Keyword)cLeaseDurationAlternatives_2_5_1_0.eContents().get(1);
224-
private final Group cGroup_2_6 = (Group)cUnorderedGroup_2.eContents().get(6);
225-
private final Keyword cLivelinessKeyword_2_6_0 = (Keyword)cGroup_2_6.eContents().get(0);
226-
private final Assignment cLivelinessAssignment_2_6_1 = (Assignment)cGroup_2_6.eContents().get(1);
227-
private final Alternatives cLivelinessAlternatives_2_6_1_0 = (Alternatives)cLivelinessAssignment_2_6_1.eContents().get(0);
228-
private final Keyword cLivelinessAutomaticKeyword_2_6_1_0_0 = (Keyword)cLivelinessAlternatives_2_6_1_0.eContents().get(0);
229-
private final Keyword cLivelinessManualKeyword_2_6_1_0_1 = (Keyword)cLivelinessAlternatives_2_6_1_0.eContents().get(1);
230-
private final Group cGroup_2_7 = (Group)cUnorderedGroup_2.eContents().get(7);
231-
private final Keyword cLifespanKeyword_2_7_0 = (Keyword)cGroup_2_7.eContents().get(0);
232-
private final Assignment cLifespanAssignment_2_7_1 = (Assignment)cGroup_2_7.eContents().get(1);
233-
private final Alternatives cLifespanAlternatives_2_7_1_0 = (Alternatives)cLifespanAssignment_2_7_1.eContents().get(0);
234-
private final RuleCall cLifespanEStringParserRuleCall_2_7_1_0_0 = (RuleCall)cLifespanAlternatives_2_7_1_0.eContents().get(0);
235-
private final Keyword cLifespanInfiniteKeyword_2_7_1_0_1 = (Keyword)cLifespanAlternatives_2_7_1_0.eContents().get(1);
236-
private final Group cGroup_2_8 = (Group)cUnorderedGroup_2.eContents().get(8);
237-
private final Keyword cDeadlineKeyword_2_8_0 = (Keyword)cGroup_2_8.eContents().get(0);
238-
private final Assignment cDeadlineAssignment_2_8_1 = (Assignment)cGroup_2_8.eContents().get(1);
239-
private final Alternatives cDeadlineAlternatives_2_8_1_0 = (Alternatives)cDeadlineAssignment_2_8_1.eContents().get(0);
240-
private final RuleCall cDeadlineEStringParserRuleCall_2_8_1_0_0 = (RuleCall)cDeadlineAlternatives_2_8_1_0.eContents().get(0);
241-
private final Keyword cDeadlineInfiniteKeyword_2_8_1_0_1 = (Keyword)cDeadlineAlternatives_2_8_1_0.eContents().get(1);
242218
private final RuleCall cENDTerminalRuleCall_3 = (RuleCall)cGroup.eContents().get(3);
243219

244220
/////////////////////
@@ -251,11 +227,7 @@ public class QualityOfServiceElements extends AbstractParserRuleElementFinder {
251227
// ('history:' History=('keep_last'|'keep_all'))? &
252228
// ('depth:' Depth=Integer0)? &
253229
// ('reliability:' Reliability=('best_effort'|'reliable'))? &
254-
// ('durability:' Durability=('transient_local'|'volatile'))? &
255-
// ('lease_duration:' LeaseDuration=(EString | 'infinite'))? &
256-
// ('liveliness:' Liveliness=('automatic'|'manual'))? &
257-
// ('lifespan:' Lifespan=(EString | 'infinite'))? &
258-
// ('deadline:' Deadline=(EString | 'infinite'))?)
230+
// ('durability:' Durability=('transient_local'|'volatile'))?)
259231
// END
260232
// ;
261233
@Override public ParserRule getRule() { return rule; }
@@ -266,11 +238,7 @@ public class QualityOfServiceElements extends AbstractParserRuleElementFinder {
266238
// ('history:' History=('keep_last'|'keep_all'))? &
267239
// ('depth:' Depth=Integer0)? &
268240
// ('reliability:' Reliability=('best_effort'|'reliable'))? &
269-
// ('durability:' Durability=('transient_local'|'volatile'))? &
270-
// ('lease_duration:' LeaseDuration=(EString | 'infinite'))? &
271-
// ('liveliness:' Liveliness=('automatic'|'manual'))? &
272-
// ('lifespan:' Lifespan=(EString | 'infinite'))? &
273-
// ('deadline:' Deadline=(EString | 'infinite'))?)
241+
// ('durability:' Durability=('transient_local'|'volatile'))?)
274242
// END
275243
public Group getGroup() { return cGroup; }
276244

@@ -284,11 +252,7 @@ public class QualityOfServiceElements extends AbstractParserRuleElementFinder {
284252
//('history:' History=('keep_last'|'keep_all'))? &
285253
//('depth:' Depth=Integer0)? &
286254
//('reliability:' Reliability=('best_effort'|'reliable'))? &
287-
//('durability:' Durability=('transient_local'|'volatile'))? &
288-
//('lease_duration:' LeaseDuration=(EString | 'infinite'))? &
289-
//('liveliness:' Liveliness=('automatic'|'manual'))? &
290-
//('lifespan:' Lifespan=(EString | 'infinite'))? &
291-
//('deadline:' Deadline=(EString | 'infinite'))?)
255+
//('durability:' Durability=('transient_local'|'volatile'))?)
292256
public UnorderedGroup getUnorderedGroup_2() { return cUnorderedGroup_2; }
293257

294258
//('profile:' QoSProfile=('default_qos'|'services_qos'|'sensor_qos'|'parameter_qos'))?
@@ -381,78 +345,6 @@ public class QualityOfServiceElements extends AbstractParserRuleElementFinder {
381345
//'volatile'
382346
public Keyword getDurabilityVolatileKeyword_2_4_1_0_1() { return cDurabilityVolatileKeyword_2_4_1_0_1; }
383347

384-
//('lease_duration:' LeaseDuration=(EString | 'infinite'))?
385-
public Group getGroup_2_5() { return cGroup_2_5; }
386-
387-
//'lease_duration:'
388-
public Keyword getLease_durationKeyword_2_5_0() { return cLease_durationKeyword_2_5_0; }
389-
390-
//LeaseDuration=(EString | 'infinite')
391-
public Assignment getLeaseDurationAssignment_2_5_1() { return cLeaseDurationAssignment_2_5_1; }
392-
393-
//(EString | 'infinite')
394-
public Alternatives getLeaseDurationAlternatives_2_5_1_0() { return cLeaseDurationAlternatives_2_5_1_0; }
395-
396-
//EString
397-
public RuleCall getLeaseDurationEStringParserRuleCall_2_5_1_0_0() { return cLeaseDurationEStringParserRuleCall_2_5_1_0_0; }
398-
399-
//'infinite'
400-
public Keyword getLeaseDurationInfiniteKeyword_2_5_1_0_1() { return cLeaseDurationInfiniteKeyword_2_5_1_0_1; }
401-
402-
//('liveliness:' Liveliness=('automatic'|'manual'))?
403-
public Group getGroup_2_6() { return cGroup_2_6; }
404-
405-
//'liveliness:'
406-
public Keyword getLivelinessKeyword_2_6_0() { return cLivelinessKeyword_2_6_0; }
407-
408-
//Liveliness=('automatic'|'manual')
409-
public Assignment getLivelinessAssignment_2_6_1() { return cLivelinessAssignment_2_6_1; }
410-
411-
//('automatic'|'manual')
412-
public Alternatives getLivelinessAlternatives_2_6_1_0() { return cLivelinessAlternatives_2_6_1_0; }
413-
414-
//'automatic'
415-
public Keyword getLivelinessAutomaticKeyword_2_6_1_0_0() { return cLivelinessAutomaticKeyword_2_6_1_0_0; }
416-
417-
//'manual'
418-
public Keyword getLivelinessManualKeyword_2_6_1_0_1() { return cLivelinessManualKeyword_2_6_1_0_1; }
419-
420-
//('lifespan:' Lifespan=(EString | 'infinite'))?
421-
public Group getGroup_2_7() { return cGroup_2_7; }
422-
423-
//'lifespan:'
424-
public Keyword getLifespanKeyword_2_7_0() { return cLifespanKeyword_2_7_0; }
425-
426-
//Lifespan=(EString | 'infinite')
427-
public Assignment getLifespanAssignment_2_7_1() { return cLifespanAssignment_2_7_1; }
428-
429-
//(EString | 'infinite')
430-
public Alternatives getLifespanAlternatives_2_7_1_0() { return cLifespanAlternatives_2_7_1_0; }
431-
432-
//EString
433-
public RuleCall getLifespanEStringParserRuleCall_2_7_1_0_0() { return cLifespanEStringParserRuleCall_2_7_1_0_0; }
434-
435-
//'infinite'
436-
public Keyword getLifespanInfiniteKeyword_2_7_1_0_1() { return cLifespanInfiniteKeyword_2_7_1_0_1; }
437-
438-
//('deadline:' Deadline=(EString | 'infinite'))?
439-
public Group getGroup_2_8() { return cGroup_2_8; }
440-
441-
//'deadline:'
442-
public Keyword getDeadlineKeyword_2_8_0() { return cDeadlineKeyword_2_8_0; }
443-
444-
//Deadline=(EString | 'infinite')
445-
public Assignment getDeadlineAssignment_2_8_1() { return cDeadlineAssignment_2_8_1; }
446-
447-
//(EString | 'infinite')
448-
public Alternatives getDeadlineAlternatives_2_8_1_0() { return cDeadlineAlternatives_2_8_1_0; }
449-
450-
//EString
451-
public RuleCall getDeadlineEStringParserRuleCall_2_8_1_0_0() { return cDeadlineEStringParserRuleCall_2_8_1_0_0; }
452-
453-
//'infinite'
454-
public Keyword getDeadlineInfiniteKeyword_2_8_1_0_1() { return cDeadlineInfiniteKeyword_2_8_1_0_1; }
455-
456348
//END
457349
public RuleCall getENDTerminalRuleCall_3() { return cENDTerminalRuleCall_3; }
458350
}
@@ -1271,11 +1163,7 @@ public ParserRule getAmentPackageRule() {
12711163
// ('history:' History=('keep_last'|'keep_all'))? &
12721164
// ('depth:' Depth=Integer0)? &
12731165
// ('reliability:' Reliability=('best_effort'|'reliable'))? &
1274-
// ('durability:' Durability=('transient_local'|'volatile'))? &
1275-
// ('lease_duration:' LeaseDuration=(EString | 'infinite'))? &
1276-
// ('liveliness:' Liveliness=('automatic'|'manual'))? &
1277-
// ('lifespan:' Lifespan=(EString | 'infinite'))? &
1278-
// ('deadline:' Deadline=(EString | 'infinite'))?)
1166+
// ('durability:' Durability=('transient_local'|'volatile'))?)
12791167
// END
12801168
// ;
12811169
public QualityOfServiceElements getQualityOfServiceAccess() {

0 commit comments

Comments
 (0)