Skip to content

Commit b725144

Browse files
committed
Partially revert "Add interfaces for action goal, result, and feedback"
Partially revert commit dd04614. I don't think we need to aliases for the message types, but I'll add them back if they turn out to be useful.
1 parent 1b65d7f commit b725144

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

rcljava_common/src/main/java/org/ros2/rcljava/interfaces/ActionDefinition.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
package org.ros2.rcljava.interfaces;
1717

1818
public interface ActionDefinition {
19-
interface ActionGoal<T extends ActionDefinition> {}
20-
interface ActionResult<T extends ActionDefinition> {}
21-
interface ActionFeedback<T extends ActionDefinition> {}
22-
2319
Class<? extends GoalRequestDefinition> getSendGoalRequestType();
2420
Class<? extends GoalResponseDefinition> getSendGoalResponseType();
2521
Class<? extends MessageDefinition> getGetResultRequestType();

rosidl_generator_java/resource/action.java.em

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,6 @@ import @(action_import);
8080

8181
public class @(type_name) implements ActionDefinition {
8282

83-
public static class Goal extends @(type_name)_Goal implements ActionGoal<@(type_name)> {}
84-
85-
public static class Result extends @(type_name)_Result implements ActionResult<@(type_name)> {}
86-
87-
public static class Feedback extends @(type_name)_Feedback implements ActionFeedback<@(type_name)> {}
88-
8983
public static class SendGoalRequest extends @(type_name)_SendGoal_Request implements GoalRequestDefinition {
9084
public List<Byte> getGoalUuid() {
9185
return super.getGoalId().getUuid();
@@ -133,4 +127,10 @@ public class @(type_name) implements ActionDefinition {
133127
}
134128

135129
public static native long getActionTypeSupport();
130+
131+
public static final Class<@(type_name)_Goal> GoalType = @(type_name)_Goal.class;
132+
133+
public static final Class<@(type_name)_Result> ResultType = @(type_name)_Result.class;
134+
135+
public static final Class<@(type_name)_Feedback> FeedbackType = @(type_name)_Feedback.class;
136136
}

0 commit comments

Comments
 (0)