adjusted autogenerated code to match actionlib defaults

message_generation/src/main/java/org/ros/internal/message/GenerateInterfaces.java

@@ -24,9 +24,12 @@ import org.ros.exception.RosMessageRuntimeException;
 import org.ros.internal.message.definition.MessageDefinitionProviderChain;
 import org.ros.internal.message.definition.MessageDefinitionTupleParser;
 import org.ros.internal.message.action.ActionDefinitionFileProvider;
-import org.ros.internal.message.action.ActionGoalGenerationTemplate;
-import org.ros.internal.message.action.ActionFeedbackGenerationTemplate;
-import org.ros.internal.message.action.ActionResultGenerationTemplate;
+import org.ros.internal.message.action.ActionGenerationTemplateActionGoal;
+import org.ros.internal.message.action.ActionGenerationTemplateActionResult;
+import org.ros.internal.message.action.ActionGenerationTemplateActionFeedback;
+import org.ros.internal.message.action.ActionGenerationTemplateGoal;
+import org.ros.internal.message.action.ActionGenerationTemplateResult;
+import org.ros.internal.message.action.ActionGenerationTemplateFeedback;
 import org.ros.internal.message.service.ServiceDefinitionFileProvider;
 import org.ros.internal.message.topic.TopicDefinitionFileProvider;
 import org.ros.message.MessageDeclaration;
@@ -49,9 +52,14 @@ public class GenerateInterfaces {
   private final ActionDefinitionFileProvider actionDefinitionFileProvider;
   private final MessageDefinitionProviderChain messageDefinitionProviderChain;
   private final MessageFactory messageFactory;
-  private final ActionGoalGenerationTemplate actionGoalGenerationTemplate = new ActionGoalGenerationTemplate();
-  private final ActionFeedbackGenerationTemplate actionFeedbackGenerationTemplate = new ActionFeedbackGenerationTemplate();
-  private final ActionResultGenerationTemplate actionResultGenerationTemplate = new ActionResultGenerationTemplate();
+
+  private final MessageGenerationTemplate actionGenerationTemplateGoal     = new ActionGenerationTemplateGoal();
+  private final MessageGenerationTemplate actionGenerationTemplateResult   = new ActionGenerationTemplateResult();
+  private final MessageGenerationTemplate actionGenerationTemplateFeedback = new ActionGenerationTemplateFeedback();
+
+  private final MessageGenerationTemplate actionGenerationTemplateActionGoal     = new ActionGenerationTemplateActionGoal();
+  private final MessageGenerationTemplate actionGenerationTemplateActionResult   = new ActionGenerationTemplateActionResult();
+  private final MessageGenerationTemplate actionGenerationTemplateActionFeedback = new ActionGenerationTemplateActionFeedback();
 
   static private final String ROS_PACKAGE_PATH = "ROS_PACKAGE_PATH";
 
@@ -162,20 +170,37 @@ public class GenerateInterfaces {
 
       MessageDeclaration goalDeclaration = MessageDeclaration.of(
               actionType.getType() + "Goal",
-              actionGoalGenerationTemplate.applyTemplate(goalResultAndFeedback.get(0))
+              actionGenerationTemplateGoal.applyTemplate(goalResultAndFeedback.get(0))
       );
       MessageDeclaration resultDeclaration = MessageDeclaration.of(
               actionType.getType() + "Result",
-              actionResultGenerationTemplate.applyTemplate(goalResultAndFeedback.get(1))
+              actionGenerationTemplateResult.applyTemplate(goalResultAndFeedback.get(1))
       );
       MessageDeclaration feedbackDeclaration = MessageDeclaration.of(
               actionType.getType() + "Feedback",
-              actionFeedbackGenerationTemplate.applyTemplate(goalResultAndFeedback.get(2))
+              actionGenerationTemplateFeedback.applyTemplate(goalResultAndFeedback.get(2))
+      );
+
+      MessageDeclaration actionGoalDeclaration = MessageDeclaration.of(
+              actionType.getType() + "ActionGoal",
+              actionGenerationTemplateActionGoal.applyTemplate(actionType.getType())
+      );
+      MessageDeclaration actionResultDeclaration = MessageDeclaration.of(
+              actionType.getType() + "ActionResult",
+              actionGenerationTemplateActionResult.applyTemplate(actionType.getType())
+      );
+      MessageDeclaration actionFeedbackDeclaration = MessageDeclaration.of(
+              actionType.getType() + "ActionFeedback",
+              actionGenerationTemplateActionFeedback.applyTemplate(actionType.getType())
       );
 
       writeInterface(goalDeclaration, outputDirectory, true);
       writeInterface(resultDeclaration, outputDirectory, true);
       writeInterface(feedbackDeclaration, outputDirectory, true);
+
+      writeInterface(actionGoalDeclaration, outputDirectory, true);
+      writeInterface(actionResultDeclaration, outputDirectory, true);
+      writeInterface(actionFeedbackDeclaration, outputDirectory, true);
     }
   }
 

message_generation/src/main/java/org/ros/internal/message/action/ActionGenerationTemplateActionFeedback.java

+/*
+ * Copyright (C) 2012 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.ros.internal.message.action;
+
+import org.ros.internal.message.MessageGenerationTemplate;
+
+/**
+ * @author arne.peters@tum.de (Arne Peters)
+ */
+public class ActionGenerationTemplateActionFeedback implements MessageGenerationTemplate {
+
+  /**
+   * @return returns this {@link Message} as a {@link RawMessage}
+   */
+  public String applyTemplate(String messageSource) {
+    return "# ====== DO NOT MODIFY! AUTOGENERATED FROM AN ACTION DEFINITION ======\n" +
+           "\n" +
+           "Header header\n" +
+           "actionlib_msgs/GoalStatus status\n" +
+           messageSource + "Feedback feedback";
+  }
+}

message_generation/src/main/java/org/ros/internal/message/action/ActionGoalGenerationTemplate.java → message_generation/src/main/java/org/ros/internal/message/action/ActionGenerationTemplateActionGoal.java

@@ -16,10 +16,12 @@
 
 package org.ros.internal.message.action;
 
+import org.ros.internal.message.MessageGenerationTemplate;
+
 /**
  * @author arne.peters@tum.de (Arne Peters)
  */
-public class ActionGoalGenerationTemplate {
+public class ActionGenerationTemplateActionGoal implements MessageGenerationTemplate {
 
   /**
    * @return returns this {@link Message} as a {@link RawMessage}
@@ -29,6 +31,6 @@ public class ActionGoalGenerationTemplate {
            "\n" +
            "Header header\n" +
             "actionlib_msgs/GoalID goal_id\n" +
-           messageSource;
+           messageSource + "Goal goal";
   }
 }

message_generation/src/main/java/org/ros/internal/message/action/ActionGenerationTemplateActionResult.java

+/*
+ * Copyright (C) 2012 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.ros.internal.message.action;
+
+import org.ros.internal.message.MessageGenerationTemplate;
+
+/**
+ * @author arne.peters@tum.de (Arne Peters)
+ */
+public class ActionGenerationTemplateActionResult implements MessageGenerationTemplate {
+
+  /**
+   * @return returns this {@link Message} as a {@link RawMessage}
+   */
+  public String applyTemplate(String messageSource) {
+    return "# ====== DO NOT MODIFY! AUTOGENERATED FROM AN ACTION DEFINITION ======\n" +
+           "\n" +
+           "Header header\n" +
+           "actionlib_msgs/GoalStatus status\n" +
+           messageSource + "Result result";
+  }
+}

message_generation/src/main/java/org/ros/internal/message/action/ActionGenerationTemplateFeedback.java

+/*
+ * Copyright (C) 2012 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.ros.internal.message.action;
+
+import org.ros.internal.message.MessageGenerationTemplate;
+
+/**
+ * @author arne.peters@tum.de (Arne Peters)
+ */
+public class ActionGenerationTemplateFeedback implements MessageGenerationTemplate {
+
+  /**
+   * @return returns this {@link Message} as a {@link RawMessage}
+   */
+  public String applyTemplate(String messageSource) {
+    return "# ====== DO NOT MODIFY! AUTOGENERATED FROM AN ACTION DEFINITION ======\n" +
+           "#feedback definition\n" +
+           messageSource;
+  }
+}

message_generation/src/main/java/org/ros/internal/message/action/ActionFeedbackGenerationTemplate.java → message_generation/src/main/java/org/ros/internal/message/action/ActionGenerationTemplateGoal.java

@@ -16,19 +16,19 @@
 
 package org.ros.internal.message.action;
 
+import org.ros.internal.message.MessageGenerationTemplate;
+
 /**
  * @author arne.peters@tum.de (Arne Peters)
  */
-public class ActionFeedbackGenerationTemplate {
+public class ActionGenerationTemplateGoal implements MessageGenerationTemplate {
 
   /**
    * @return returns this {@link Message} as a {@link RawMessage}
    */
   public String applyTemplate(String messageSource) {
     return "# ====== DO NOT MODIFY! AUTOGENERATED FROM AN ACTION DEFINITION ======\n" +
-           "\n" +
-           "Header header\n" +
-           "actionlib_msgs/GoalStatus status\n" +
+           "#goal definition" +
            messageSource;
   }
 }

message_generation/src/main/java/org/ros/internal/message/action/ActionResultGenerationTemplate.java → message_generation/src/main/java/org/ros/internal/message/action/ActionGenerationTemplateResult.java

@@ -16,19 +16,19 @@
 
 package org.ros.internal.message.action;
 
+import org.ros.internal.message.MessageGenerationTemplate;
+
 /**
  * @author arne.peters@tum.de (Arne Peters)
  */
-public class ActionResultGenerationTemplate {
+public class ActionGenerationTemplateResult implements MessageGenerationTemplate {
 
   /**
    * @return returns this {@link Message} as a {@link RawMessage}
    */
   public String applyTemplate(String messageSource) {
     return "# ====== DO NOT MODIFY! AUTOGENERATED FROM AN ACTION DEFINITION ======\n" +
-           "\n" +
-           "Header header\n" +
-           "actionlib_msgs/GoalStatus status\n" +
+           "#result definition" +
            messageSource;
   }
 }