ROBOT_DEMO: simplify MessageData types

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanType.java b/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanType.java
index da0362e0f1461774a1627f4441e50e1d4d903110..5be174ae794ce8b746334172e20c3bb344484062 100644 (file)
--- a/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanType.java
+++ b/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanType.java
@@ -10,11 +10,9 @@ public class HokuyoScanType extends MessageData {
 
        public HokuyoScanType(DomainApp domainApp, String newTopic) {
            super();
-            boolean b;
-            this.setTopic(newTopic); 
-            b = domainApp.regNewDataType("hokuyo_scan",getMaxDataLength()); 
-            if (b == false) {
-             System.out.println(":j!: cannot register data type!");    
+           this.setTopic(newTopic); 
+           if (domainApp.regNewDataType("hokuyo_scan",getMaxDataLength())) {
+               System.out.println(":j!: cannot register data type \"hokuyo_scan\"!");    
            }
        }
 

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/SpeedMotionType.java b/orte/Robot_Demo/src/org/ocera/orte/demo/SpeedMotionType.java
index 6ed08b0fafb54ece28206929b51e12f60af42e56..de9f8e6ff5e05e1c0bc3630b71ebc87964a4fd63 100644 (file)
--- a/orte/Robot_Demo/src/org/ocera/orte/demo/SpeedMotionType.java
+++ b/orte/Robot_Demo/src/org/ocera/orte/demo/SpeedMotionType.java
@@ -10,11 +10,9 @@ public class SpeedMotionType extends MessageData
    
   public SpeedMotionType(DomainApp domainApp, String newTopic) {
     super();
-    boolean b;
     this.setTopic(newTopic);
-    b = domainApp.regNewDataType("motion_speed",getMaxDataLength()); 
-    if (b == false) {
-      System.out.println(":j!: cannot register data type!");    
+    if (!domainApp.regNewDataType("motion_speed",getMaxDataLength())) {
+      System.out.println(":j!: cannot register data type \"motion_speed\"!");    
     }
   }
       
@@ -32,15 +30,12 @@ public class SpeedMotionType extends MessageData
   @Override
   public int getMaxDataLength()
   {
-       int len=0;
-       len += ORTEConstant.SHORT_FIELD_SIZE;
-       len += ORTEConstant.SHORT_FIELD_SIZE;
-    return len;
+    return 2 * ORTEConstant.SHORT_FIELD_SIZE;
   }
 
   public String toString()
   {
-    String data = new String();
+    String data = "";
     
     data += (" left = " + speed[0]); 
     data += (" right = " + speed[1]);