diff --git a/.gitignore b/.gitignore index 46156a4..1823e7d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ local.properties proguard-project.txt +/build/ +*.iml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ec277e7..c7c74db 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,23 +1,27 @@ - + package="org.ros.android.activity"> + - - + + + + - diff --git a/build.gradle b/build.gradle index b8f8bef..c647ce8 100644 --- a/build.gradle +++ b/build.gradle @@ -14,40 +14,31 @@ * the License. */ -task wrapper(type: Wrapper) { - gradleVersion = '1.0-milestone-9' -} - -allprojects { - group 'ros.android_app_manager' - version = '0.0.0-SNAPSHOT' -} +group 'org.ros' +version = '0.1.0' -repositories { - mavenLocal() - mavenCentral() +dependencies { + compile "org.ros.rosjava_core:rosjava:0.2.0" + compile "org.ros.rosjava_messages:std_msgs:[0.5,0.6)" + compile "org.ros.rosjava_messages:tf:1.11.4" + compile "org.ros.rosjava_messages:diagnostic_msgs:[0,)" + compile "org.ros.rosjava_messages:pr2_msgs:1.11.4" + compile "org.ros.rosjava_messages:pr2_power_board:1.1.2" + compile "org.ros.rosjava_messages:std_srvs:1.10.12" + compile "org.ros.rosjava_messages:app_manager:1.0.2" + compile "org.ros.rosjava_messages:create_node:2.2.1" + compile fileTree(dir: 'external_libs', include: ['*.jar']) } -configurations.add('compile') { - exclude group: 'junit' - exclude group: 'xml-apis' -} +apply plugin: "com.android.library" -task deployLibs(type: Copy) { - from { configurations.compile } - into "${projectDir}/libs" -} - -task clean << { - ant.delete file: "${projectDir}/local.properties" - ant.delete file: "${projectDir}/proguard-project.txt" - ant.delete file: "${projectDir}/build.xml" - ant.delete dir: "${projectDir}/bin" - ant.delete dir: "${projectDir}/gen" - ant.delete dir: "${projectDir}/libs" -} +android { + compileSdkVersion 10 -task debug(type: Exec) { - dependsOn deployLibs - commandLine 'ant', 'debug' + defaultConfig { + minSdkVersion 10 + targetSdkVersion 10 + versionCode 1 + versionName "1.0" + } } diff --git a/build.xml b/build.xml deleted file mode 100644 index ffb5b6a..0000000 --- a/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/create_project.sh b/create_project.sh deleted file mode 100755 index 54b2e30..0000000 --- a/create_project.sh +++ /dev/null @@ -1 +0,0 @@ -android update lib-project --target 11 --path . diff --git a/libs/README-snakeyaml.txt b/external_libs/README-snakeyaml.txt similarity index 100% rename from libs/README-snakeyaml.txt rename to external_libs/README-snakeyaml.txt diff --git a/libs/snakeyaml-android-1.8-SNAPSHOT.jar b/external_libs/snakeyaml-android-1.8-SNAPSHOT.jar similarity index 100% rename from libs/snakeyaml-android-1.8-SNAPSHOT.jar rename to external_libs/snakeyaml-android-1.8-SNAPSHOT.jar diff --git a/libs/vecmath.jar b/external_libs/vecmath.jar similarity index 100% rename from libs/vecmath.jar rename to external_libs/vecmath.jar diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index 1a644c7..0000000 --- a/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -org.gradle.daemon=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 5437731..0000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index a11773b..0000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Thu Mar 29 16:06:14 CEST 2012 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-milestone-9-bin.zip diff --git a/gradlew b/gradlew deleted file mode 100755 index ae91ed9..0000000 --- a/gradlew +++ /dev/null @@ -1,164 +0,0 @@ -#!/bin/bash - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" -APP_HOME="`pwd -P`" -cd "$SAVED" - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - JAVA_OPTS="$JAVA_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index aec9973..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,90 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/manifest.xml b/manifest.xml deleted file mode 100644 index 33c833e..0000000 --- a/manifest.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - Client side code for accessing the app manager from Android, plus some client apps which use it. - - - Dave Hershberger/hersh@willowgarage.com, Ken Conley/kwc@willowgarage.com - BSD - - http://ros.org/wiki/appman_android - - diff --git a/proguard.cfg b/proguard.cfg deleted file mode 100644 index 12dd039..0000000 --- a/proguard.cfg +++ /dev/null @@ -1,36 +0,0 @@ --optimizationpasses 5 --dontusemixedcaseclassnames --dontskipnonpubliclibraryclasses --dontpreverify --verbose --optimizations !code/simplification/arithmetic,!field/*,!class/merging/* - --keep public class * extends android.app.Activity --keep public class * extends android.app.Application --keep public class * extends android.app.Service --keep public class * extends android.content.BroadcastReceiver --keep public class * extends android.content.ContentProvider --keep public class * extends android.app.backup.BackupAgentHelper --keep public class * extends android.preference.Preference --keep public class com.android.vending.licensing.ILicensingService - --keepclasseswithmembernames class * { - native ; -} - --keepclasseswithmembernames class * { - public (android.content.Context, android.util.AttributeSet); -} - --keepclasseswithmembernames class * { - public (android.content.Context, android.util.AttributeSet, int); -} - --keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} - --keep class * implements android.os.Parcelable { - public static final android.os.Parcelable$Creator *; -} diff --git a/project.properties b/project.properties deleted file mode 100644 index c84ac9a..0000000 --- a/project.properties +++ /dev/null @@ -1,16 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-17 -android.library=true -android.library.reference.1=../android_core/android_gingerbread_mr1/ diff --git a/src/ros/android/activity/AppChooserRedirectActivity.java b/src/org/ros/android/activity/AppChooserRedirectActivity.java similarity index 99% rename from src/ros/android/activity/AppChooserRedirectActivity.java rename to src/org/ros/android/activity/AppChooserRedirectActivity.java index 5c1731b..d286499 100644 --- a/src/ros/android/activity/AppChooserRedirectActivity.java +++ b/src/org/ros/android/activity/AppChooserRedirectActivity.java @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.activity; +package org.ros.android.activity; import android.app.Activity; import android.app.AlertDialog; diff --git a/src/ros/android/activity/AppManager.java b/src/org/ros/android/activity/AppManager.java similarity index 98% rename from src/ros/android/activity/AppManager.java rename to src/org/ros/android/activity/AppManager.java index 920c87a..08ea788 100644 --- a/src/ros/android/activity/AppManager.java +++ b/src/org/ros/android/activity/AppManager.java @@ -31,9 +31,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.activity; +package org.ros.android.activity; -import java.util.ArrayList; +import android.util.Log; import org.ros.exception.RemoteException; import org.ros.exception.RosException; @@ -46,7 +46,8 @@ import org.ros.node.service.ServiceResponseListener; import org.ros.node.topic.Subscriber; -import android.util.Log; +import java.util.ArrayList; + import app_manager.App; import app_manager.AppInstallationState; import app_manager.AppList; @@ -71,7 +72,8 @@ * @author kwc@willowgarage.com (Ken Conley) */ public class AppManager { - static public final String PACKAGE = "ros.android.activity"; + + static public final String PACKAGE = "org.ros.android.activity"; private final ConnectedNode node; private AppList appList; diff --git a/src/ros/android/activity/AppManagerNotAvailableException.java b/src/org/ros/android/activity/AppManagerNotAvailableException.java similarity index 98% rename from src/ros/android/activity/AppManagerNotAvailableException.java rename to src/org/ros/android/activity/AppManagerNotAvailableException.java index 73d99e6..2c893bf 100644 --- a/src/ros/android/activity/AppManagerNotAvailableException.java +++ b/src/org/ros/android/activity/AppManagerNotAvailableException.java @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.activity; +package org.ros.android.activity; /** * diff --git a/src/ros/android/activity/AppStartCallback.java b/src/org/ros/android/activity/AppStartCallback.java similarity index 98% rename from src/ros/android/activity/AppStartCallback.java rename to src/org/ros/android/activity/AppStartCallback.java index b7d4ee6..3aef6ad 100644 --- a/src/ros/android/activity/AppStartCallback.java +++ b/src/org/ros/android/activity/AppStartCallback.java @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.activity; +package org.ros.android.activity; /** * @author kwc@willowgarage.com (Ken Conley) diff --git a/src/ros/android/activity/MasterAdapter.java b/src/org/ros/android/activity/MasterAdapter.java similarity index 97% rename from src/ros/android/activity/MasterAdapter.java rename to src/org/ros/android/activity/MasterAdapter.java index 2b07943..c11c223 100644 --- a/src/ros/android/activity/MasterAdapter.java +++ b/src/org/ros/android/activity/MasterAdapter.java @@ -31,13 +31,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.activity; +package org.ros.android.activity; import android.content.Context; import android.view.View; import android.view.ViewGroup; import android.widget.BaseAdapter; -import ros.android.util.RobotDescription; + +import org.ros.android.util.RobotDescription; import java.util.ArrayList; import java.util.List; diff --git a/src/ros/android/activity/MasterChooserActivity.java b/src/org/ros/android/activity/MasterChooserActivity.java similarity index 97% rename from src/ros/android/activity/MasterChooserActivity.java rename to src/org/ros/android/activity/MasterChooserActivity.java index 08f046a..893ef6e 100644 --- a/src/ros/android/activity/MasterChooserActivity.java +++ b/src/org/ros/android/activity/MasterChooserActivity.java @@ -31,25 +31,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.activity; +package org.ros.android.activity; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Timer; -import java.util.TimerTask; - -import org.yaml.snakeyaml.Yaml; - -import ros.android.util.InvalidRobotDescriptionException; -import ros.android.util.MasterChooser; -import ros.android.util.RobotDescription; -import ros.android.util.RobotId; -import ros.android.util.RobotsContentProvider; -import ros.android.util.zxing.IntentIntegrator; -import ros.android.util.zxing.IntentResult; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; @@ -78,6 +61,23 @@ import android.widget.ListView; import android.widget.Toast; +import org.ros.android.util.InvalidRobotDescriptionException; +import org.ros.android.util.MasterChooser; +import org.ros.android.util.RobotDescription; +import org.ros.android.util.RobotId; +import org.ros.android.util.RobotsContentProvider; +import org.ros.android.util.zxing.IntentIntegrator; +import org.ros.android.util.zxing.IntentResult; +import org.yaml.snakeyaml.Yaml; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Timer; +import java.util.TimerTask; + /** * @author hersh@willowgarage.com */ diff --git a/src/ros/android/activity/MasterItem.java b/src/org/ros/android/activity/MasterItem.java similarity index 96% rename from src/ros/android/activity/MasterItem.java rename to src/org/ros/android/activity/MasterItem.java index d623c25..dd03d9f 100644 --- a/src/ros/android/activity/MasterItem.java +++ b/src/org/ros/android/activity/MasterItem.java @@ -31,9 +31,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.activity; +package org.ros.android.activity; import android.content.Context; +import android.net.wifi.WifiManager; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -41,11 +42,11 @@ import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; -import ros.android.util.WiFiChecker; -import ros.android.util.ControlChecker; -import ros.android.util.MasterChecker; -import ros.android.util.RobotDescription; -import android.net.wifi.WifiManager; + +import org.ros.android.util.ControlChecker; +import org.ros.android.util.MasterChecker; +import org.ros.android.util.RobotDescription; +import org.ros.android.util.WiFiChecker; /** * Data class behind view of one item in the list of ROS Masters. Gets created @@ -71,7 +72,7 @@ public MasterItem(RobotDescription robotDescription, MasterChooserActivity paren this.parentMca = parentMca; this.description = robotDescription; this.description.setConnectionStatus(RobotDescription.CONNECTING); - if (ros.android.util.WiFiChecker.wifiValid(this.description.getRobotId(), + if (WiFiChecker.wifiValid(this.description.getRobotId(), (WifiManager)parentMca.getSystemService(parentMca.WIFI_SERVICE))) { checker = new MasterChecker(this, this); if (this.description.getRobotId().getControlUri() != null) { diff --git a/src/ros/android/activity/RosActivity.java b/src/org/ros/android/activity/RosActivity.java similarity index 98% rename from src/ros/android/activity/RosActivity.java rename to src/org/ros/android/activity/RosActivity.java index aa21637..de21d13 100644 --- a/src/ros/android/activity/RosActivity.java +++ b/src/org/ros/android/activity/RosActivity.java @@ -31,44 +31,39 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.activity; +package org.ros.android.activity; -import android.app.AlertDialog; import android.app.Activity; +import android.app.AlertDialog; import android.app.ProgressDialog; -import android.content.Intent; import android.content.DialogInterface; +import android.content.Intent; +import android.net.wifi.WifiManager; +import android.os.Bundle; import android.os.Handler; import android.util.Log; -import android.view.View; -import android.widget.Button; import android.widget.Toast; -import org.ros.node.DefaultNodeMainExecutor; -import org.ros.node.NodeMainExecutor; + +import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.DefaultHttpClient; +import org.ros.android.util.ControlChecker; +import org.ros.android.util.MasterChecker; +import org.ros.android.util.MasterChooser; +import org.ros.android.util.RobotDescription; +import org.ros.android.util.RobotId; +import org.ros.android.util.WiFiChecker; +import org.ros.exception.RosException; import org.ros.node.DefaultNodeFactory; +import org.ros.node.DefaultNodeMainExecutor; import org.ros.node.Node; -import org.ros.exception.RosException; -import ros.android.util.RobotId; -import ros.android.util.MasterChooser; -import ros.android.util.MasterChecker; -import ros.android.util.WiFiChecker; -import ros.android.util.ControlChecker; -import ros.android.util.RobotDescription; import org.ros.node.NodeConfiguration; -import java.lang.Runnable; -import java.lang.System; -import android.net.wifi.WifiManager; -import android.os.Bundle; +import org.ros.node.NodeMainExecutor; import java.io.BufferedReader; import java.io.InputStreamReader; -import java.io.IOException; -import java.net.URISyntaxException; import java.net.URI; -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.DefaultHttpClient; /** * * @author hersh@willowgarage.com diff --git a/src/ros/android/activity/RosAppActivity.java b/src/org/ros/android/activity/RosAppActivity.java similarity index 97% rename from src/ros/android/activity/RosAppActivity.java rename to src/org/ros/android/activity/RosAppActivity.java index 409d0e9..9e5c4e8 100644 --- a/src/ros/android/activity/RosAppActivity.java +++ b/src/org/ros/android/activity/RosAppActivity.java @@ -31,21 +31,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.activity; +package org.ros.android.activity; -import ros.android.activity.RosActivity; -import org.ros.exception.RemoteException; -import org.ros.exception.RosException; -import org.ros.internal.node.xmlrpc.XmlRpcTimeoutException; -import org.ros.namespace.GraphName; -import org.ros.namespace.NameResolver; -import org.ros.node.ConnectedNode; -import org.ros.node.Node; -import org.ros.node.NodeMainExecutor; -import org.ros.node.service.ServiceResponseListener; - -import ros.android.util.Dashboard; -import ros.android.util.RobotDescription; import android.app.AlertDialog; import android.app.ProgressDialog; import android.content.DialogInterface; @@ -55,7 +42,18 @@ import android.view.WindowManager; import android.widget.LinearLayout; import android.widget.Toast; -import app_manager.StartApp; + +import org.ros.android.util.Dashboard; +import org.ros.android.util.RobotDescription; +import org.ros.exception.RemoteException; +import org.ros.exception.RosException; +import org.ros.internal.node.xmlrpc.XmlRpcTimeoutException; +import org.ros.namespace.GraphName; +import org.ros.namespace.NameResolver; +import org.ros.node.ConnectedNode; +import org.ros.node.Node; +import org.ros.node.service.ServiceResponseListener; + import app_manager.StartAppResponse; /** diff --git a/src/ros/android/util/ControlChecker.java b/src/org/ros/android/util/ControlChecker.java similarity index 99% rename from src/ros/android/util/ControlChecker.java rename to src/org/ros/android/util/ControlChecker.java index 30f1874..e55d917 100644 --- a/src/ros/android/util/ControlChecker.java +++ b/src/org/ros/android/util/ControlChecker.java @@ -32,19 +32,19 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.util; +package org.ros.android.util; import android.util.Log; -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.io.IOException; -import java.net.URISyntaxException; -import java.net.URI; + import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.DefaultHttpClient; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.URI; + /** * Threaded control checker. Checks to see if the software is running and in a valid state. diff --git a/src/ros/android/util/CurrentRobotContentProvider.java b/src/org/ros/android/util/CurrentRobotContentProvider.java similarity index 99% rename from src/ros/android/util/CurrentRobotContentProvider.java rename to src/org/ros/android/util/CurrentRobotContentProvider.java index 6d80990..f1565fd 100644 --- a/src/ros/android/util/CurrentRobotContentProvider.java +++ b/src/org/ros/android/util/CurrentRobotContentProvider.java @@ -32,14 +32,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.util; +package org.ros.android.util; import android.content.ContentProvider; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; -import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; import android.net.Uri; import android.util.Log; diff --git a/src/ros/android/util/Dashboard.java b/src/org/ros/android/util/Dashboard.java similarity index 99% rename from src/ros/android/util/Dashboard.java rename to src/org/ros/android/util/Dashboard.java index b98ede9..d41336c 100644 --- a/src/ros/android/util/Dashboard.java +++ b/src/org/ros/android/util/Dashboard.java @@ -31,11 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.util; - -import org.ros.exception.RosException; -import org.ros.node.ConnectedNode; -import org.ros.node.parameter.ParameterTree; +package org.ros.android.util; import android.app.Activity; import android.content.Context; @@ -43,6 +39,10 @@ import android.view.View; import android.view.ViewGroup; +import org.ros.exception.RosException; +import org.ros.node.ConnectedNode; +import org.ros.node.parameter.ParameterTree; + public class Dashboard { public interface DashboardInterface { /** diff --git a/src/ros/android/util/FingerReceiver.java b/src/org/ros/android/util/FingerReceiver.java similarity index 98% rename from src/ros/android/util/FingerReceiver.java rename to src/org/ros/android/util/FingerReceiver.java index 6e88649..9e6fd13 100644 --- a/src/ros/android/util/FingerReceiver.java +++ b/src/org/ros/android/util/FingerReceiver.java @@ -27,7 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.util; +package org.ros.android.util; public interface FingerReceiver { /** diff --git a/src/ros/android/util/FingerTracker.java b/src/org/ros/android/util/FingerTracker.java similarity index 99% rename from src/ros/android/util/FingerTracker.java rename to src/org/ros/android/util/FingerTracker.java index ec1a9a5..94c00ad 100644 --- a/src/ros/android/util/FingerTracker.java +++ b/src/org/ros/android/util/FingerTracker.java @@ -27,7 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.util; +package org.ros.android.util; import android.view.MotionEvent; import android.view.View; diff --git a/src/ros/android/util/InvalidRobotDescriptionException.java b/src/org/ros/android/util/InvalidRobotDescriptionException.java similarity index 98% rename from src/ros/android/util/InvalidRobotDescriptionException.java rename to src/org/ros/android/util/InvalidRobotDescriptionException.java index 22e944f..848658a 100644 --- a/src/ros/android/util/InvalidRobotDescriptionException.java +++ b/src/org/ros/android/util/InvalidRobotDescriptionException.java @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.util; +package org.ros.android.util; public class InvalidRobotDescriptionException extends Exception { diff --git a/src/ros/android/util/MasterChecker.java b/src/org/ros/android/util/MasterChecker.java similarity index 99% rename from src/ros/android/util/MasterChecker.java rename to src/org/ros/android/util/MasterChecker.java index f70f48b..29e5d42 100644 --- a/src/ros/android/util/MasterChecker.java +++ b/src/org/ros/android/util/MasterChecker.java @@ -31,17 +31,17 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.util; +package org.ros.android.util; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Date; +import android.util.Log; import org.ros.internal.node.client.ParameterClient; import org.ros.internal.node.server.NodeIdentifier; import org.ros.namespace.GraphName; -import android.util.Log; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Date; /** * Threaded ROS-master checker. Runs a thread which checks for a valid ROS diff --git a/src/ros/android/util/MasterChooser.java b/src/org/ros/android/util/MasterChooser.java similarity index 99% rename from src/ros/android/util/MasterChooser.java rename to src/org/ros/android/util/MasterChooser.java index dcad5ba..50d213a 100644 --- a/src/ros/android/util/MasterChooser.java +++ b/src/org/ros/android/util/MasterChooser.java @@ -31,23 +31,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.util; +package org.ros.android.util; -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.net.SocketException; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Enumeration; -import java.util.HashMap; - -import org.ros.exception.RosException; -import org.ros.namespace.GraphName; -import org.ros.namespace.NameResolver; -import org.ros.node.NodeConfiguration; -import org.yaml.snakeyaml.Yaml; - -import ros.android.activity.MasterChooserActivity; import android.app.Activity; import android.content.ActivityNotFoundException; import android.content.ContentValues; @@ -56,6 +41,21 @@ import android.net.Uri; import android.util.Log; +import org.ros.android.activity.MasterChooserActivity; +import org.ros.exception.RosException; +import org.ros.namespace.GraphName; +import org.ros.namespace.NameResolver; +import org.ros.node.NodeConfiguration; +import org.yaml.snakeyaml.Yaml; + +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.net.SocketException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Enumeration; +import java.util.HashMap; + /** * Helper class for launching the {@link MasterChooserActivity} for choosing a * ROS master. Keep this object around for the lifetime of an {@link Activity}. diff --git a/src/ros/android/util/PlaneTfChangeListener.java b/src/org/ros/android/util/PlaneTfChangeListener.java similarity index 99% rename from src/ros/android/util/PlaneTfChangeListener.java rename to src/org/ros/android/util/PlaneTfChangeListener.java index a25282b..f222be6 100644 --- a/src/ros/android/util/PlaneTfChangeListener.java +++ b/src/org/ros/android/util/PlaneTfChangeListener.java @@ -27,11 +27,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.util; +package org.ros.android.util; -import geometry_msgs.Quaternion; -import geometry_msgs.TransformStamped; -import geometry_msgs.Vector3; +import android.graphics.Matrix; + +import org.ros.exception.RosException; +import org.ros.message.MessageListener; +import org.ros.node.ConnectedNode; +import org.ros.node.topic.Subscriber; import java.util.ArrayList; import java.util.HashMap; @@ -40,13 +43,10 @@ import javax.vecmath.Quat4d; import javax.vecmath.Vector3d; -import org.ros.exception.RosException; -import org.ros.message.MessageListener; -import org.ros.node.ConnectedNode; -import org.ros.node.topic.Subscriber; - +import geometry_msgs.Quaternion; +import geometry_msgs.TransformStamped; +import geometry_msgs.Vector3; import tf.tfMessage; -import android.graphics.Matrix; /** * Listener for tf messages which does not compose transforms, it just looks for diff --git a/src/ros/android/util/Posable.java b/src/org/ros/android/util/Posable.java similarity index 98% rename from src/ros/android/util/Posable.java rename to src/org/ros/android/util/Posable.java index 96548e5..dd42362 100644 --- a/src/ros/android/util/Posable.java +++ b/src/org/ros/android/util/Posable.java @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.util; +package org.ros.android.util; import android.graphics.Matrix; diff --git a/src/ros/android/util/RobotDescription.java b/src/org/ros/android/util/RobotDescription.java similarity index 97% rename from src/ros/android/util/RobotDescription.java rename to src/org/ros/android/util/RobotDescription.java index f1a38be..2e8e2fa 100644 --- a/src/ros/android/util/RobotDescription.java +++ b/src/org/ros/android/util/RobotDescription.java @@ -31,12 +31,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.util; +package org.ros.android.util; -import org.ros.exception.RosException; -import org.ros.namespace.GraphName; - -import java.net.URI; import java.util.Date; public class RobotDescription implements java.io.Serializable { diff --git a/src/ros/android/util/RobotId.java b/src/org/ros/android/util/RobotId.java similarity index 99% rename from src/ros/android/util/RobotId.java rename to src/org/ros/android/util/RobotId.java index 53398b6..5d8d30e 100644 --- a/src/ros/android/util/RobotId.java +++ b/src/org/ros/android/util/RobotId.java @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.util; +package org.ros.android.util; import java.util.Map; diff --git a/src/ros/android/util/RobotsContentProvider.java b/src/org/ros/android/util/RobotsContentProvider.java similarity index 99% rename from src/ros/android/util/RobotsContentProvider.java rename to src/org/ros/android/util/RobotsContentProvider.java index 74f06d6..4b83054 100644 --- a/src/ros/android/util/RobotsContentProvider.java +++ b/src/org/ros/android/util/RobotsContentProvider.java @@ -32,14 +32,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.util; +package org.ros.android.util; import android.content.ContentProvider; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; -import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; import android.net.Uri; import android.util.Log; diff --git a/src/ros/android/util/SdCardSetup.java b/src/org/ros/android/util/SdCardSetup.java similarity index 99% rename from src/ros/android/util/SdCardSetup.java rename to src/org/ros/android/util/SdCardSetup.java index 8a88ca3..50b8426 100644 --- a/src/ros/android/util/SdCardSetup.java +++ b/src/org/ros/android/util/SdCardSetup.java @@ -32,13 +32,14 @@ */ -package ros.android.util; +package org.ros.android.util; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnCancelListener; import android.os.Environment; + import org.ros.exception.RosException; import java.io.File; diff --git a/src/ros/android/util/WiFiChecker.java b/src/org/ros/android/util/WiFiChecker.java similarity index 99% rename from src/ros/android/util/WiFiChecker.java rename to src/org/ros/android/util/WiFiChecker.java index 5a76d17..e5d4b0d 100644 --- a/src/ros/android/util/WiFiChecker.java +++ b/src/org/ros/android/util/WiFiChecker.java @@ -31,16 +31,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.util; +package org.ros.android.util; -import android.util.Log; - - -import android.net.wifi.WifiManager; -import android.net.wifi.WifiConfiguration; import android.net.wifi.SupplicantState; +import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiInfo; -import android.content.Context; +import android.net.wifi.WifiManager; +import android.util.Log; /** diff --git a/src/ros/android/util/zxing/IntentIntegrator.java b/src/org/ros/android/util/zxing/IntentIntegrator.java similarity index 99% rename from src/ros/android/util/zxing/IntentIntegrator.java rename to src/org/ros/android/util/zxing/IntentIntegrator.java index 1082109..3fe5737 100644 --- a/src/ros/android/util/zxing/IntentIntegrator.java +++ b/src/org/ros/android/util/zxing/IntentIntegrator.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package ros.android.util.zxing; +package org.ros.android.util.zxing; -import android.app.AlertDialog; import android.app.Activity; +import android.app.AlertDialog; import android.content.ActivityNotFoundException; import android.content.DialogInterface; import android.content.Intent; diff --git a/src/ros/android/util/zxing/IntentResult.java b/src/org/ros/android/util/zxing/IntentResult.java similarity index 97% rename from src/ros/android/util/zxing/IntentResult.java rename to src/org/ros/android/util/zxing/IntentResult.java index ed1124d..a5bf5d8 100644 --- a/src/ros/android/util/zxing/IntentResult.java +++ b/src/org/ros/android/util/zxing/IntentResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ros.android.util.zxing; +package org.ros.android.util.zxing; /** *

Encapsulates the result of a barcode scan invoked through {@link IntentIntegrator}.

diff --git a/src/ros/android/views/BatteryLevelView.java b/src/org/ros/android/views/BatteryLevelView.java similarity index 98% rename from src/ros/android/views/BatteryLevelView.java rename to src/org/ros/android/views/BatteryLevelView.java index d7874c9..bb61267 100644 --- a/src/ros/android/views/BatteryLevelView.java +++ b/src/org/ros/android/views/BatteryLevelView.java @@ -27,7 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.views; +package org.ros.android.views; import android.content.Context; import android.graphics.Bitmap; @@ -37,10 +37,10 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.graphics.Rect; -import android.view.View; import android.util.AttributeSet; +import android.view.View; -import ros.android.activity.R; +import org.ros.android.activity.R; public class BatteryLevelView extends View { private Bitmap silhouette; diff --git a/src/ros/android/views/BitmapDisplay.java b/src/org/ros/android/views/BitmapDisplay.java similarity index 97% rename from src/ros/android/views/BitmapDisplay.java rename to src/org/ros/android/views/BitmapDisplay.java index 7933c97..2c1db6c 100644 --- a/src/ros/android/views/BitmapDisplay.java +++ b/src/org/ros/android/views/BitmapDisplay.java @@ -27,11 +27,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.views; +package org.ros.android.views; import android.graphics.Bitmap; import android.graphics.Canvas; -import android.graphics.Color; import android.graphics.Matrix; import android.graphics.Paint; diff --git a/src/ros/android/views/CheckableLinearLayout.java b/src/org/ros/android/views/CheckableLinearLayout.java similarity index 98% rename from src/ros/android/views/CheckableLinearLayout.java rename to src/org/ros/android/views/CheckableLinearLayout.java index e3589b5..d16653e 100644 --- a/src/ros/android/views/CheckableLinearLayout.java +++ b/src/org/ros/android/views/CheckableLinearLayout.java @@ -27,12 +27,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.views; +package org.ros.android.views; -import android.widget.LinearLayout; -import android.widget.Checkable; import android.content.Context; import android.util.AttributeSet; +import android.widget.Checkable; +import android.widget.LinearLayout; /** * Simple extension of LinearLayout which trivially implements diff --git a/src/ros/android/views/JoystickView.java b/src/org/ros/android/views/JoystickView.java similarity index 99% rename from src/ros/android/views/JoystickView.java rename to src/org/ros/android/views/JoystickView.java index 67a8379..6a184d5 100644 --- a/src/ros/android/views/JoystickView.java +++ b/src/org/ros/android/views/JoystickView.java @@ -27,13 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.views; - -import geometry_msgs.Twist; - -import org.ros.exception.RosException; -import org.ros.node.ConnectedNode; -import org.ros.node.topic.Publisher; +package org.ros.android.views; import android.content.Context; import android.util.AttributeSet; @@ -43,6 +37,12 @@ import android.view.View.OnTouchListener; import android.widget.ImageView; +import org.ros.exception.RosException; +import org.ros.node.ConnectedNode; +import org.ros.node.topic.Publisher; + +import geometry_msgs.Twist; + /** * View for screen-based joystick teleop. */ diff --git a/src/ros/android/views/LaserScanDisplay.java b/src/org/ros/android/views/LaserScanDisplay.java similarity index 98% rename from src/ros/android/views/LaserScanDisplay.java rename to src/org/ros/android/views/LaserScanDisplay.java index e2ef6ea..91866b4 100644 --- a/src/ros/android/views/LaserScanDisplay.java +++ b/src/org/ros/android/views/LaserScanDisplay.java @@ -27,19 +27,19 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.views; +package org.ros.android.views; + +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.PointF; +import android.util.FloatMath; import org.ros.exception.RosException; import org.ros.message.MessageListener; import org.ros.node.ConnectedNode; -import org.ros.node.Node; import org.ros.node.topic.Subscriber; import sensor_msgs.LaserScan; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.PointF; -import android.util.FloatMath; /** * PanZoomDisplay which shows a top view of a laser range finder scan. diff --git a/src/ros/android/views/MapDisplay.java b/src/org/ros/android/views/MapDisplay.java similarity index 99% rename from src/ros/android/views/MapDisplay.java rename to src/org/ros/android/views/MapDisplay.java index 8390e76..3ed86e0 100644 --- a/src/ros/android/views/MapDisplay.java +++ b/src/org/ros/android/views/MapDisplay.java @@ -27,14 +27,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.views; +package org.ros.android.views; -import java.util.ArrayList; -import java.util.concurrent.locks.ReentrantLock; - -import nav_msgs.GetMapRequest; -import nav_msgs.GetMapResponse; -import nav_msgs.OccupancyGrid; +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Matrix; +import android.graphics.Paint; +import android.util.Log; import org.ros.exception.RemoteException; import org.ros.exception.RosException; @@ -44,12 +44,12 @@ import org.ros.node.service.ServiceResponseListener; import org.ros.node.topic.Subscriber; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Matrix; -import android.graphics.Paint; -import android.util.Log; +import java.util.ArrayList; +import java.util.concurrent.locks.ReentrantLock; + +import nav_msgs.GetMapRequest; +import nav_msgs.GetMapResponse; +import nav_msgs.OccupancyGrid; /** * PanZoomDisplay which shows an OccupancyGrid map in a PanZoomView. diff --git a/src/ros/android/views/MapView.java b/src/org/ros/android/views/MapView.java similarity index 98% rename from src/ros/android/views/MapView.java rename to src/org/ros/android/views/MapView.java index 33be213..575a220 100644 --- a/src/ros/android/views/MapView.java +++ b/src/org/ros/android/views/MapView.java @@ -27,16 +27,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.views; +package org.ros.android.views; -import java.util.List; - -import org.ros.exception.RosException; -import org.ros.node.ConnectedNode; -import org.ros.node.parameter.ParameterTree; - -import ros.android.activity.R; -import ros.android.util.PlaneTfChangeListener; import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -49,6 +41,14 @@ import android.util.AttributeSet; import android.util.Log; +import org.ros.android.activity.R; +import org.ros.android.util.PlaneTfChangeListener; +import org.ros.exception.RosException; +import org.ros.node.ConnectedNode; +import org.ros.node.parameter.ParameterTree; + +import java.util.List; + /** * View of the latest map with the turtlebot drawn in where TF thinks it is. */ diff --git a/src/ros/android/views/PanZoomDisplay.java b/src/org/ros/android/views/PanZoomDisplay.java similarity index 99% rename from src/ros/android/views/PanZoomDisplay.java rename to src/org/ros/android/views/PanZoomDisplay.java index 8ebbc60..c0ca804 100644 --- a/src/ros/android/views/PanZoomDisplay.java +++ b/src/org/ros/android/views/PanZoomDisplay.java @@ -27,15 +27,15 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.views; - -import org.ros.exception.RosException; -import org.ros.node.ConnectedNode; +package org.ros.android.views; import android.graphics.Canvas; import android.util.Log; import android.view.MotionEvent; +import org.ros.exception.RosException; +import org.ros.node.ConnectedNode; + /** * Abstract base class for displays added to a PanZoomView. */ diff --git a/src/ros/android/views/PanZoomView.java b/src/org/ros/android/views/PanZoomView.java similarity index 99% rename from src/ros/android/views/PanZoomView.java rename to src/org/ros/android/views/PanZoomView.java index 42167e9..6e88882 100644 --- a/src/ros/android/views/PanZoomView.java +++ b/src/org/ros/android/views/PanZoomView.java @@ -27,12 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.views; - -import java.util.ArrayList; - -import org.ros.exception.RosException; -import org.ros.node.ConnectedNode; +package org.ros.android.views; import android.content.Context; import android.graphics.Canvas; @@ -44,6 +39,11 @@ import android.view.MotionEvent; import android.view.View; +import org.ros.exception.RosException; +import org.ros.node.ConnectedNode; + +import java.util.ArrayList; + /** * 2D container view class for showing a map with a robot on it, * sensor data from the robot, etc. diff --git a/src/ros/android/views/PathDisplay.java b/src/org/ros/android/views/PathDisplay.java similarity index 98% rename from src/ros/android/views/PathDisplay.java rename to src/org/ros/android/views/PathDisplay.java index b47e64a..b9e5530 100644 --- a/src/ros/android/views/PathDisplay.java +++ b/src/org/ros/android/views/PathDisplay.java @@ -27,23 +27,21 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.views; +package org.ros.android.views; -import geometry_msgs.PoseStamped; - -import java.util.ArrayList; - -import nav_msgs.Path; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.util.Log; import org.ros.exception.RosException; import org.ros.message.MessageListener; import org.ros.node.ConnectedNode; -import org.ros.node.Node; import org.ros.node.topic.Subscriber; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.util.Log; +import java.util.ArrayList; + +import geometry_msgs.PoseStamped; +import nav_msgs.Path; /** * PanZoomDisplay which shows a path in a PanZoomView. diff --git a/src/ros/android/views/PosablePanZoomDisplay.java b/src/org/ros/android/views/PosablePanZoomDisplay.java similarity index 98% rename from src/ros/android/views/PosablePanZoomDisplay.java rename to src/org/ros/android/views/PosablePanZoomDisplay.java index ab74d9b..41748f7 100644 --- a/src/ros/android/views/PosablePanZoomDisplay.java +++ b/src/org/ros/android/views/PosablePanZoomDisplay.java @@ -27,12 +27,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.views; +package org.ros.android.views; -import android.graphics.Matrix; import android.graphics.Canvas; +import android.graphics.Matrix; -import ros.android.util.Posable; +import org.ros.android.util.Posable; /** * Extension of PanZoomDisplay which implements the Posable interface, diff --git a/src/ros/android/views/PoseInputDisplay.java b/src/org/ros/android/views/PoseInputDisplay.java similarity index 97% rename from src/ros/android/views/PoseInputDisplay.java rename to src/org/ros/android/views/PoseInputDisplay.java index e8bcf6e..5201c58 100644 --- a/src/ros/android/views/PoseInputDisplay.java +++ b/src/org/ros/android/views/PoseInputDisplay.java @@ -27,10 +27,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.views; +package org.ros.android.views; import android.graphics.Canvas; -import android.graphics.Color; import android.graphics.Matrix; import android.graphics.Paint; import android.graphics.PointF; @@ -38,12 +37,9 @@ import android.util.Log; import android.view.MotionEvent; -import javax.vecmath.Quat4f; -import javax.vecmath.Matrix3f; - -import ros.android.util.Posable; -import ros.android.util.FingerReceiver; -import ros.android.util.FingerTracker; +import org.ros.android.util.FingerReceiver; +import org.ros.android.util.FingerTracker; +import org.ros.android.util.Posable; /** * PanZoomDisplay which implements a draggable pose input. @@ -60,7 +56,7 @@ * incoming Poses are ignored and the pose is updated by the user's * drag gestures. */ -abstract public class PoseInputDisplay extends PanZoomDisplay implements Posable { +abstract public class PoseInputDisplay extends org.ros.android.views.PanZoomDisplay implements Posable { private Paint paint = new Paint(); private Paint linePaint = new Paint(); private Matrix estimatedRobotRelMap = new Matrix(); diff --git a/src/ros/android/views/Pr2Dashboard.java b/src/org/ros/android/views/Pr2Dashboard.java similarity index 99% rename from src/ros/android/views/Pr2Dashboard.java rename to src/org/ros/android/views/Pr2Dashboard.java index 1954b79..4825957 100644 --- a/src/ros/android/views/Pr2Dashboard.java +++ b/src/org/ros/android/views/Pr2Dashboard.java @@ -31,8 +31,21 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.views; +package org.ros.android.views; +import android.app.AlertDialog; +import android.content.Context; +import android.content.DialogInterface; +import android.graphics.Color; +import android.util.AttributeSet; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.ImageButton; +import android.widget.ImageView; +import android.widget.ProgressBar; + +import org.ros.android.activity.R; +import org.ros.android.util.Dashboard; import org.ros.exception.RemoteException; import org.ros.exception.RosException; import org.ros.exception.ServiceNotFoundException; @@ -47,20 +60,8 @@ import pr2_msgs.DashboardState; import pr2_power_board.PowerBoardCommandRequest; import pr2_power_board.PowerBoardCommandResponse; -import ros.android.activity.R; -import ros.android.util.Dashboard; import std_srvs.EmptyRequest; import std_srvs.EmptyResponse; -import android.app.AlertDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.graphics.Color; -import android.util.AttributeSet; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.ImageButton; -import android.widget.ImageView; -import android.widget.ProgressBar; public class Pr2Dashboard extends android.widget.LinearLayout implements Dashboard.DashboardInterface { private ImageButton modeButton; diff --git a/src/ros/android/views/SendGoalDisplay.java b/src/org/ros/android/views/SendGoalDisplay.java similarity index 99% rename from src/ros/android/views/SendGoalDisplay.java rename to src/org/ros/android/views/SendGoalDisplay.java index 88efc08..7537890 100644 --- a/src/ros/android/views/SendGoalDisplay.java +++ b/src/org/ros/android/views/SendGoalDisplay.java @@ -27,7 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.views; +package org.ros.android.views; //// diff --git a/src/ros/android/views/SensorImageView.java b/src/org/ros/android/views/SensorImageView.java similarity index 98% rename from src/ros/android/views/SensorImageView.java rename to src/org/ros/android/views/SensorImageView.java index de9c376..9903db8 100644 --- a/src/ros/android/views/SensorImageView.java +++ b/src/org/ros/android/views/SensorImageView.java @@ -27,20 +27,20 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.views; +package org.ros.android.views; -import org.ros.exception.RosException; -import org.ros.message.MessageListener; -import org.ros.node.ConnectedNode; -import org.ros.node.Node; - -import sensor_msgs.CompressedImage; import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.util.AttributeSet; import android.widget.ImageView; +import org.ros.exception.RosException; +import org.ros.message.MessageListener; +import org.ros.node.ConnectedNode; + +import sensor_msgs.CompressedImage; + /** * A camera node that publishes images and camera_info * diff --git a/src/ros/android/views/SetInitialPoseDisplay.java b/src/org/ros/android/views/SetInitialPoseDisplay.java similarity index 99% rename from src/ros/android/views/SetInitialPoseDisplay.java rename to src/org/ros/android/views/SetInitialPoseDisplay.java index 815d795..e28557f 100644 --- a/src/ros/android/views/SetInitialPoseDisplay.java +++ b/src/org/ros/android/views/SetInitialPoseDisplay.java @@ -27,17 +27,17 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.views; +package org.ros.android.views; -import geometry_msgs.Pose; -import geometry_msgs.PoseWithCovarianceStamped; +import android.util.FloatMath; +import android.util.Log; import org.ros.exception.RosException; import org.ros.node.ConnectedNode; import org.ros.node.topic.Publisher; -import android.util.FloatMath; -import android.util.Log; +import geometry_msgs.Pose; +import geometry_msgs.PoseWithCovarianceStamped; /** * PanZoomDisplay which implements a draggable initial-pose setter. diff --git a/src/ros/android/views/TurtlebotDashboard.java b/src/org/ros/android/views/TurtlebotDashboard.java similarity index 98% rename from src/ros/android/views/TurtlebotDashboard.java rename to src/org/ros/android/views/TurtlebotDashboard.java index 0d72397..7cfcfcc 100644 --- a/src/ros/android/views/TurtlebotDashboard.java +++ b/src/org/ros/android/views/TurtlebotDashboard.java @@ -31,11 +31,20 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.android.views; +package org.ros.android.views; -import java.util.HashMap; -import java.util.List; +import android.content.Context; +import android.graphics.Color; +import android.util.AttributeSet; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.ImageButton; +import android.widget.ProgressBar; +import android.widget.Toast; +import org.ros.android.activity.R; +import org.ros.android.util.Dashboard; import org.ros.exception.RemoteException; import org.ros.exception.RosException; import org.ros.message.MessageListener; @@ -46,19 +55,9 @@ import org.ros.node.service.ServiceResponseListener; import org.ros.node.topic.Subscriber; -import ros.android.activity.R; -import ros.android.util.Dashboard; - +import java.util.HashMap; +import java.util.List; -import android.content.Context; -import android.graphics.Color; -import android.util.AttributeSet; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.ImageButton; -import android.widget.ProgressBar; -import android.widget.Toast; import diagnostic_msgs.DiagnosticArray; import diagnostic_msgs.DiagnosticStatus; import diagnostic_msgs.KeyValue; diff --git a/src/ros/tf/Frame.java b/src/org/ros/tf/Frame.java similarity index 99% rename from src/ros/tf/Frame.java rename to src/org/ros/tf/Frame.java index dcccb2a..c6f7f68 100755 --- a/src/ros/tf/Frame.java +++ b/src/org/ros/tf/Frame.java @@ -28,7 +28,7 @@ */ -package ros.tf; +package org.ros.tf; import java.util.HashMap; import java.util.Set; diff --git a/src/ros/tf/Stamped.java b/src/org/ros/tf/Stamped.java similarity index 99% rename from src/ros/tf/Stamped.java rename to src/org/ros/tf/Stamped.java index 25b4bd7..e9da710 100755 --- a/src/ros/tf/Stamped.java +++ b/src/org/ros/tf/Stamped.java @@ -28,7 +28,7 @@ */ -package ros.tf; +package org.ros.tf; import org.ros.message.Time; diff --git a/src/ros/tf/StampedTransform.java b/src/org/ros/tf/StampedTransform.java similarity index 99% rename from src/ros/tf/StampedTransform.java rename to src/org/ros/tf/StampedTransform.java index 6f11f38..35812e6 100755 --- a/src/ros/tf/StampedTransform.java +++ b/src/org/ros/tf/StampedTransform.java @@ -28,7 +28,7 @@ */ -package ros.tf; +package org.ros.tf; import org.ros.message.Time; diff --git a/src/ros/tf/TfBroadcaster.java b/src/org/ros/tf/TfBroadcaster.java similarity index 99% rename from src/ros/tf/TfBroadcaster.java rename to src/org/ros/tf/TfBroadcaster.java index 44ebccb..4543d47 100755 --- a/src/ros/tf/TfBroadcaster.java +++ b/src/org/ros/tf/TfBroadcaster.java @@ -27,21 +27,21 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package ros.tf; - -import javax.vecmath.Vector3d; -import javax.vecmath.Quat4d; +package org.ros.tf; +import org.ros.message.Time; import org.ros.node.ConnectedNode; import org.ros.node.topic.Publisher; -import org.ros.message.Time; -import tf.tfMessage; +import java.util.ArrayList; + +import javax.vecmath.Quat4d; +import javax.vecmath.Vector3d; + +import geometry_msgs.Quaternion; import geometry_msgs.TransformStamped; import geometry_msgs.Vector3; -import geometry_msgs.Quaternion; - -import java.util.ArrayList; +import tf.tfMessage; /** * diff --git a/src/ros/tf/TfListener.java b/src/org/ros/tf/TfListener.java similarity index 99% rename from src/ros/tf/TfListener.java rename to src/org/ros/tf/TfListener.java index 72daf85..aed0d3d 100755 --- a/src/ros/tf/TfListener.java +++ b/src/org/ros/tf/TfListener.java @@ -28,26 +28,27 @@ */ -package ros.tf; +package org.ros.tf; -import org.ros.node.ConnectedNode; -import org.ros.message.MessageListener; -import org.ros.node.topic.Subscriber; import org.ros.message.Duration; +import org.ros.message.MessageListener; import org.ros.message.Time; -import tf.tfMessage; -import geometry_msgs.Quaternion; -import geometry_msgs.TransformStamped; -import geometry_msgs.Vector3; +import org.ros.node.ConnectedNode; +import org.ros.node.topic.Subscriber; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.PriorityQueue; + +import javax.vecmath.Matrix4d; +import javax.vecmath.Point3d; import javax.vecmath.Quat4d; import javax.vecmath.Vector3d; -import javax.vecmath.Point3d; -import javax.vecmath.Matrix4d; -import java.util.HashMap; -import java.util.PriorityQueue; -import java.util.LinkedList; +import geometry_msgs.Quaternion; +import geometry_msgs.TransformStamped; +import geometry_msgs.Vector3; +import tf.tfMessage; /** * A client that listens to the /tf topic, stores transforms in a buffer and allows transformation diff --git a/src/ros/tf/TimeCache.java b/src/org/ros/tf/TimeCache.java similarity index 99% rename from src/ros/tf/TimeCache.java rename to src/org/ros/tf/TimeCache.java index 93b0da8..d6f1a26 100755 --- a/src/ros/tf/TimeCache.java +++ b/src/org/ros/tf/TimeCache.java @@ -28,7 +28,7 @@ */ -package ros.tf; +package org.ros.tf; import java.util.TreeMap; diff --git a/src/ros/tf/TransformChangeDetector.java b/src/org/ros/tf/TransformChangeDetector.java similarity index 99% rename from src/ros/tf/TransformChangeDetector.java rename to src/org/ros/tf/TransformChangeDetector.java index 94d8be6..7eca975 100644 --- a/src/ros/tf/TransformChangeDetector.java +++ b/src/org/ros/tf/TransformChangeDetector.java @@ -29,7 +29,7 @@ * @author hersh@willowgarage.com (Dave Hershberger) */ -package ros.tf; +package org.ros.tf; import org.ros.message.Time; diff --git a/src/ros/tf/TransformStorage.java b/src/org/ros/tf/TransformStorage.java similarity index 99% rename from src/ros/tf/TransformStorage.java rename to src/org/ros/tf/TransformStorage.java index 0c90635..d8b1275 100755 --- a/src/ros/tf/TransformStorage.java +++ b/src/org/ros/tf/TransformStorage.java @@ -28,7 +28,7 @@ */ -package ros.tf; +package org.ros.tf; import javax.vecmath.Quat4d; import javax.vecmath.Vector3d;