From dde4c094b6c143a7026dbff2a1bc815a2075e0b5 Mon Sep 17 00:00:00 2001
From: Martin Vajnar <martin@martin-HP-ProBook-4330s.(none)>
Date: Sat, 1 Feb 2014 18:19:11 +0100
Subject: [PATCH] RoboDruid: organize classes into packages

---
 orte/contrib/Robot_Demo/AndroidManifest.xml              | 2 +-
 orte/contrib/Robot_Demo/res/layout/hokuyo_view.xml       | 2 +-
 .../ocera/orte/demo/{ => DataTypes}/CraneCmdType.java    | 2 +-
 .../ocera/orte/demo/{ => DataTypes}/HokuyoScanType.java  | 2 +-
 .../ocera/orte/demo/{ => DataTypes}/MagnetCmdType.java   | 2 +-
 .../ocera/orte/demo/{ => DataTypes}/PwrVoltageType.java  | 2 +-
 .../ocera/orte/demo/{ => DataTypes}/SpeedMotionType.java | 2 +-
 .../src/org/ocera/orte/demo/{ => GUI}/HokuyoView.java    | 2 +-
 .../src/org/ocera/orte/demo/{ => GUI}/MainActivity.java  | 9 ++++++++-
 .../orte/demo/{ => Publishers}/CraneCmdPublish.java      | 3 ++-
 .../orte/demo/{ => Publishers}/MagnetCmdPublish.java     | 3 ++-
 .../orte/demo/{ => Publishers}/MotionSpeedPublish.java   | 3 ++-
 .../orte/demo/{ => Subscribers}/HokuyoScanSubscribe.java | 4 +++-
 .../demo/{ => Subscribers}/MotionSpeedSubscribe.java     | 4 +++-
 .../orte/demo/{ => Subscribers}/PwrVoltageSubscribe.java | 3 ++-
 15 files changed, 30 insertions(+), 15 deletions(-)
 rename orte/contrib/Robot_Demo/src/org/ocera/orte/demo/{ => DataTypes}/CraneCmdType.java (94%)
 rename orte/contrib/Robot_Demo/src/org/ocera/orte/demo/{ => DataTypes}/HokuyoScanType.java (95%)
 rename orte/contrib/Robot_Demo/src/org/ocera/orte/demo/{ => DataTypes}/MagnetCmdType.java (94%)
 rename orte/contrib/Robot_Demo/src/org/ocera/orte/demo/{ => DataTypes}/PwrVoltageType.java (94%)
 rename orte/contrib/Robot_Demo/src/org/ocera/orte/demo/{ => DataTypes}/SpeedMotionType.java (95%)
 rename orte/contrib/Robot_Demo/src/org/ocera/orte/demo/{ => GUI}/HokuyoView.java (99%)
 rename orte/contrib/Robot_Demo/src/org/ocera/orte/demo/{ => GUI}/MainActivity.java (97%)
 rename orte/contrib/Robot_Demo/src/org/ocera/orte/demo/{ => Publishers}/CraneCmdPublish.java (94%)
 rename orte/contrib/Robot_Demo/src/org/ocera/orte/demo/{ => Publishers}/MagnetCmdPublish.java (94%)
 rename orte/contrib/Robot_Demo/src/org/ocera/orte/demo/{ => Publishers}/MotionSpeedPublish.java (97%)
 rename orte/contrib/Robot_Demo/src/org/ocera/orte/demo/{ => Subscribers}/HokuyoScanSubscribe.java (93%)
 rename orte/contrib/Robot_Demo/src/org/ocera/orte/demo/{ => Subscribers}/MotionSpeedSubscribe.java (93%)
 rename orte/contrib/Robot_Demo/src/org/ocera/orte/demo/{ => Subscribers}/PwrVoltageSubscribe.java (96%)

diff --git a/orte/contrib/Robot_Demo/AndroidManifest.xml b/orte/contrib/Robot_Demo/AndroidManifest.xml
index eab91fa..4dcc8b1 100644
--- 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 f5d8b0f..6d96072 100644
--- 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 154755a..7867312 100644
--- 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 c5e9931..1d86f2a 100644
--- 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 3f4df5d..bfaa06e 100644
--- 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 575ae4c..05fd15a 100644
--- 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 b524f9a..a19a29e 100644
--- 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 9ad8a14..b20dd2e 100644
--- 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 8c80301..facca30 100644
--- 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 92df568..e5357b3 100644
--- 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 e0a3b38..101c5da 100644
--- 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 b6e475f..489f5e0 100644
--- 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 900d9f2..e28452a 100644
--- 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 f9dc652..e4c5d80 100644
--- 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 70cf025..b441614 100644
--- 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;
-- 
2.39.2