RoboDruid: organize classes into packages

diff --git a/orte/contrib/Robot_Demo/AndroidManifest.xml b/orte/contrib/Robot_Demo/AndroidManifest.xml
index eab91fa2253eb668d1884afcf47462a85a9ece2a..4dcc8b116a9a7f53dddba6216357b9c5d23d9fe5 100644 (file)
--- a/orte/contrib/Robot_Demo/AndroidManifest.xml
+++ b/orte/contrib/Robot_Demo/AndroidManifest.xml
@@ -19,7 +19,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name="org.ocera.orte.demo.MainActivity"
+            android:name="org.ocera.orte.demo.GUI.MainActivity"
             android:label="@string/app_name"
             android:configChanges="orientation|keyboardHidden|screenSize" >
             <intent-filter>

diff --git a/orte/contrib/Robot_Demo/res/layout/hokuyo_view.xml b/orte/contrib/Robot_Demo/res/layout/hokuyo_view.xml
index f5d8b0f9149f1df702b7ba90e13fe543547dbfb4..6d960722bcccf381d26828e92537cb9171e8b57e 100644 (file)
--- a/orte/contrib/Robot_Demo/res/layout/hokuyo_view.xml
+++ b/orte/contrib/Robot_Demo/res/layout/hokuyo_view.xml
@@ -16,7 +16,7 @@
         android:scaleType="fitXY"
         android:src="@drawable/logo_cvut" />
     
-       <org.ocera.orte.demo.HokuyoView 
+       <org.ocera.orte.demo.GUI.HokuyoView 
         android:id="@+id/hokuyo_view"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent" />

diff --git a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/CraneCmdType.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/DataTypes/CraneCmdType.java
similarity index 94%
rename from orte/contrib/Robot_Demo/src/org/ocera/orte/demo/CraneCmdType.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/DataTypes/CraneCmdType.java
index 154755ab3f0553fb9df30337039131210b53a9e4..78673121822e8bc3c0dc931b745f8c802f636d64 100644 (file)
--- a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/CraneCmdType.java
+++ b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/DataTypes/CraneCmdType.java
@@ -1,4 +1,4 @@
-package org.ocera.orte.demo;
+package org.ocera.orte.demo.DataTypes;
 
 import org.ocera.orte.DomainApp;
 import org.ocera.orte.types.MessageData;

diff --git a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanType.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/DataTypes/HokuyoScanType.java
similarity index 95%
rename from orte/contrib/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanType.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/DataTypes/HokuyoScanType.java
index c5e99316da0da3d431d0dddc0e5f8825281e40c0..1d86f2abd055c3e8115cbc5f791534ceda39877d 100644 (file)
--- a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanType.java
+++ b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/DataTypes/HokuyoScanType.java
@@ -1,4 +1,4 @@
-package org.ocera.orte.demo;
+package org.ocera.orte.demo.DataTypes;
 
 import org.ocera.orte.DomainApp;
 import org.ocera.orte.types.MessageData;

diff --git a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MagnetCmdType.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/DataTypes/MagnetCmdType.java
similarity index 94%
rename from orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MagnetCmdType.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/DataTypes/MagnetCmdType.java
index 3f4df5d504de7a707c5f0316ad0118d2f311dab4..bfaa06e8bd9491f220b5743c75b28591a3bf3b35 100644 (file)
--- a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MagnetCmdType.java
+++ b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/DataTypes/MagnetCmdType.java
@@ -1,4 +1,4 @@
-package org.ocera.orte.demo;
+package org.ocera.orte.demo.DataTypes;
 
 import org.ocera.orte.DomainApp;
 import org.ocera.orte.types.MessageData;

diff --git a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/PwrVoltageType.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/DataTypes/PwrVoltageType.java
similarity index 94%
rename from orte/contrib/Robot_Demo/src/org/ocera/orte/demo/PwrVoltageType.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/DataTypes/PwrVoltageType.java
index 575ae4c24e83a55fe75e25e708838a2653114690..05fd15afb771a7c11b96743d7d24118904d38ca5 100644 (file)
--- a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/PwrVoltageType.java
+++ b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/DataTypes/PwrVoltageType.java
@@ -1,4 +1,4 @@
-package org.ocera.orte.demo;
+package org.ocera.orte.demo.DataTypes;
 
 import org.ocera.orte.*;
 import org.ocera.orte.types.*;

diff --git a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/SpeedMotionType.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/DataTypes/SpeedMotionType.java
similarity index 95%
rename from orte/contrib/Robot_Demo/src/org/ocera/orte/demo/SpeedMotionType.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/DataTypes/SpeedMotionType.java
index b524f9aecf610e384566da51efdda7b55c2b7fcc..a19a29ef206e887386196d619d61a195189d3167 100644 (file)
--- a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/SpeedMotionType.java
+++ b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/DataTypes/SpeedMotionType.java
@@ -1,4 +1,4 @@
-package org.ocera.orte.demo;
+package org.ocera.orte.demo.DataTypes;
 
 import org.ocera.orte.*;
 import org.ocera.orte.types.*;

diff --git a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/HokuyoView.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/GUI/HokuyoView.java
similarity index 99%
rename from orte/contrib/Robot_Demo/src/org/ocera/orte/demo/HokuyoView.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/GUI/HokuyoView.java
index 9ad8a1417a90d212a4bc11904f6444d1bcc3c74e..b20dd2e013fc793214cec6d35955ac6f40ee06d0 100644 (file)
--- a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/HokuyoView.java
+++ b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/GUI/HokuyoView.java
@@ -1,4 +1,4 @@
-package org.ocera.orte.demo;
+package org.ocera.orte.demo.GUI;
 
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;

diff --git a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/GUI/MainActivity.java
similarity index 97%
rename from orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/GUI/MainActivity.java
index 8c80301c45169bc7399f6fc91137356b253dbaef..facca30b487848b0ea8508fd9d1b9aaeec0b3e72 100644 (file)
--- a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java
+++ b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/GUI/MainActivity.java
@@ -1,7 +1,14 @@
-package org.ocera.orte.demo;
+package org.ocera.orte.demo.GUI;
 
 import org.ocera.orte.DomainApp;
 import org.ocera.orte.Manager;
+import org.ocera.orte.demo.R;
+import org.ocera.orte.demo.Publishers.CraneCmdPublish;
+import org.ocera.orte.demo.Publishers.MagnetCmdPublish;
+import org.ocera.orte.demo.Publishers.MotionSpeedPublish;
+import org.ocera.orte.demo.Subscribers.HokuyoScanSubscribe;
+import org.ocera.orte.demo.Subscribers.MotionSpeedSubscribe;
+import org.ocera.orte.demo.Subscribers.PwrVoltageSubscribe;
 
 import android.app.Activity;
 import android.app.AlertDialog;

diff --git a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/CraneCmdPublish.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/Publishers/CraneCmdPublish.java
similarity index 94%
rename from orte/contrib/Robot_Demo/src/org/ocera/orte/demo/CraneCmdPublish.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/Publishers/CraneCmdPublish.java
index 92df568e90e2884f2cc45af225258f2835781a3c..e5357b3513966fcdd923d4cce5f2c20a57ee98b6 100644 (file)
--- a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/CraneCmdPublish.java
+++ b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/Publishers/CraneCmdPublish.java
@@ -1,4 +1,4 @@
-package org.ocera.orte.demo;
+package org.ocera.orte.demo.Publishers;
 
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
@@ -6,6 +6,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
 import org.ocera.orte.DomainApp;
 import org.ocera.orte.Publication;
+import org.ocera.orte.demo.DataTypes.CraneCmdType;
 import org.ocera.orte.types.NtpTime;
 import org.ocera.orte.types.PublProp;
 

diff --git a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MagnetCmdPublish.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/Publishers/MagnetCmdPublish.java
similarity index 94%
rename from orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MagnetCmdPublish.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/Publishers/MagnetCmdPublish.java
index e0a3b3896a2e0b15b550aff0bce34d37cd24260b..101c5da5c1c200688099934c8c7afbf9bc801dfe 100644 (file)
--- a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MagnetCmdPublish.java
+++ b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/Publishers/MagnetCmdPublish.java
@@ -1,4 +1,4 @@
-package org.ocera.orte.demo;
+package org.ocera.orte.demo.Publishers;
 
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
@@ -6,6 +6,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
 import org.ocera.orte.DomainApp;
 import org.ocera.orte.Publication;
+import org.ocera.orte.demo.DataTypes.MagnetCmdType;
 import org.ocera.orte.types.NtpTime;
 import org.ocera.orte.types.PublProp;
 

diff --git a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MotionSpeedPublish.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/Publishers/MotionSpeedPublish.java
similarity index 97%
rename from orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MotionSpeedPublish.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/Publishers/MotionSpeedPublish.java
index b6e475f9c4a135ccf5029751c4261689152fc960..489f5e08a71899c9c93f49a9f494bdd410ead34d 100644 (file)
--- a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MotionSpeedPublish.java
+++ b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/Publishers/MotionSpeedPublish.java
@@ -1,4 +1,4 @@
-package org.ocera.orte.demo;
+package org.ocera.orte.demo.Publishers;
 
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -7,6 +7,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
 import org.ocera.orte.DomainApp;
 import org.ocera.orte.Publication;
+import org.ocera.orte.demo.DataTypes.SpeedMotionType;
 import org.ocera.orte.types.NtpTime;
 import org.ocera.orte.types.PublProp;
 

diff --git a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanSubscribe.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/Subscribers/HokuyoScanSubscribe.java
similarity index 93%
rename from orte/contrib/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanSubscribe.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/Subscribers/HokuyoScanSubscribe.java
index 900d9f21d0b5f3ecd97971ac12ebdd04b5460e40..e28452a81e16d171992a28b4f09a22c01703b860 100644 (file)
--- a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanSubscribe.java
+++ b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/Subscribers/HokuyoScanSubscribe.java
@@ -1,4 +1,4 @@
-package org.ocera.orte.demo;
+package org.ocera.orte.demo.Subscribers;
 
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
@@ -7,6 +7,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 import org.ocera.orte.DomainApp;
 import org.ocera.orte.Subscription;
 import org.ocera.orte.SubscriptionCallback;
+import org.ocera.orte.demo.DataTypes.HokuyoScanType;
+import org.ocera.orte.demo.GUI.HokuyoView;
 import org.ocera.orte.types.MessageData;
 import org.ocera.orte.types.NtpTime;
 import org.ocera.orte.types.RecvInfo;

diff --git a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MotionSpeedSubscribe.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/Subscribers/MotionSpeedSubscribe.java
similarity index 93%
rename from orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MotionSpeedSubscribe.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/Subscribers/MotionSpeedSubscribe.java
index f9dc652e9199129f69ab3c2cb9d8a1ec18f3078b..e4c5d80684c19c7d6c0377bb9574672df8e0f74d 100644 (file)
--- a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MotionSpeedSubscribe.java
+++ b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/Subscribers/MotionSpeedSubscribe.java
@@ -1,4 +1,4 @@
-package org.ocera.orte.demo;
+package org.ocera.orte.demo.Subscribers;
 
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
@@ -7,6 +7,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 import org.ocera.orte.DomainApp;
 import org.ocera.orte.Subscription;
 import org.ocera.orte.SubscriptionCallback;
+import org.ocera.orte.demo.DataTypes.SpeedMotionType;
+import org.ocera.orte.demo.GUI.HokuyoView;
 import org.ocera.orte.types.MessageData;
 import org.ocera.orte.types.NtpTime;
 import org.ocera.orte.types.RecvInfo;

diff --git a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/PwrVoltageSubscribe.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/Subscribers/PwrVoltageSubscribe.java
similarity index 96%
rename from orte/contrib/Robot_Demo/src/org/ocera/orte/demo/PwrVoltageSubscribe.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/Subscribers/PwrVoltageSubscribe.java
index 70cf02558e3fca219655748ef698e967cbdd6d04..b441614edab636125d9996f5d9e4253262ff3a25 100644 (file)
--- a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/PwrVoltageSubscribe.java
+++ b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/Subscribers/PwrVoltageSubscribe.java
@@ -1,4 +1,4 @@
-package org.ocera.orte.demo;
+package org.ocera.orte.demo.Subscribers;
 
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
@@ -7,6 +7,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 import org.ocera.orte.DomainApp;
 import org.ocera.orte.Subscription;
 import org.ocera.orte.SubscriptionCallback;
+import org.ocera.orte.demo.DataTypes.PwrVoltageType;
 import org.ocera.orte.types.MessageData;
 import org.ocera.orte.types.NtpTime;
 import org.ocera.orte.types.RecvInfo;