From 5f784d30ef59d4bc324ef99d88610e5951768331 Mon Sep 17 00:00:00 2001
From: Martin Vajnar <martin.vajnar@gmail.com>
Date: Fri, 26 Jul 2013 10:59:36 +0200
Subject: [PATCH] ROBOT_DEMO: MessageData clean up

---
 .../org/ocera/orte/demo/HokuyoScanType.java   | 17 ++++++-----------
 .../org/ocera/orte/demo/SpeedMotionType.java  | 19 +++++++------------
 2 files changed, 13 insertions(+), 23 deletions(-)

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 4a9cebb..da0362e 100644
--- a/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanType.java
+++ b/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanType.java
@@ -6,21 +6,16 @@ import org.ocera.orte.types.ORTEConstant;
 
 public class HokuyoScanType extends MessageData {
 	
-	private int counter = 0;
-	
 	public  int[]	hokuyo = new int[681];
 
 	public HokuyoScanType(DomainApp domainApp, String newTopic) {
 	    super();
-		if(counter == 0) {
-	 	     boolean b;
-	 	     counter++;
-	         this.setTopic(newTopic); 
-	     	 b = domainApp.regNewDataType("hokuyo_scan",getMaxDataLength()); 
-		     if (b == false) {
-		       System.out.println(":j!: cannot register data type!");    
-		     }
-		}
+            boolean b;
+            this.setTopic(newTopic); 
+            b = domainApp.regNewDataType("hokuyo_scan",getMaxDataLength()); 
+            if (b == false) {
+	      System.out.println(":j!: cannot register data type!");    
+	    }
 	}
 
 	@Override
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 e953f19..6ed08b0 100644
--- a/orte/Robot_Demo/src/org/ocera/orte/demo/SpeedMotionType.java
+++ b/orte/Robot_Demo/src/org/ocera/orte/demo/SpeedMotionType.java
@@ -6,21 +6,16 @@ import org.ocera.orte.types.*;
 
 public class SpeedMotionType extends MessageData
 {
-   private int counter = 0;
-
    public  short[]	speed = new short[2];
    
   public SpeedMotionType(DomainApp domainApp, String newTopic) {
     super();
-	if(counter == 0) {
- 	     boolean b;
- 	     counter++;
-         this.setTopic(newTopic);
-     	 b = domainApp.regNewDataType("motion_speed",getMaxDataLength()); 
-	     if (b == false) {
-	       System.out.println(":j!: cannot register data type!");    
-	     }
-	}
+    boolean b;
+    this.setTopic(newTopic);
+    b = domainApp.regNewDataType("motion_speed",getMaxDataLength()); 
+    if (b == false) {
+      System.out.println(":j!: cannot register data type!");    
+    }
   }
       
   @Override
@@ -52,4 +47,4 @@ public class SpeedMotionType extends MessageData
    	return data;	  
   }
   
-}  
\ No newline at end of file
+}  
-- 
2.39.2