summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-02-13 18:06:16 +0100
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-02-13 18:06:16 +0100
commit56ccc618a686ee5cb0128bdf32538a1f29e06b3d (patch)
treeca1ce7e24598f79db6b922c0e0dfbf5b8847cfa2
parent947390013409e297cab8ec991212473ae4b76802 (diff)
Move SameService.
com.orbekk{.discovery =>}.SameService
-rw-r--r--same-android/AndroidManifest.xml2
-rw-r--r--same-android/src/main/java/com/orbekk/SameControllerActivity.java3
-rw-r--r--same-android/src/main/java/com/orbekk/SameService.java (renamed from same-android/src/main/java/com/orbekk/discovery/SameService.java)3
3 files changed, 4 insertions, 4 deletions
diff --git a/same-android/AndroidManifest.xml b/same-android/AndroidManifest.xml
index 88b2208..9d87f5e 100644
--- a/same-android/AndroidManifest.xml
+++ b/same-android/AndroidManifest.xml
@@ -20,7 +20,7 @@
<activity android:name=".SameControllerActivity"/>
- <service android:name=".discovery.SameService" />
+ <service android:name=".SameService" />
</application>
</manifest> \ No newline at end of file
diff --git a/same-android/src/main/java/com/orbekk/SameControllerActivity.java b/same-android/src/main/java/com/orbekk/SameControllerActivity.java
index 0a9d387..9768cdc 100644
--- a/same-android/src/main/java/com/orbekk/SameControllerActivity.java
+++ b/same-android/src/main/java/com/orbekk/SameControllerActivity.java
@@ -6,8 +6,7 @@ import java.util.ArrayList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.orbekk.discovery.Broadcaster;
-import com.orbekk.discovery.SameService;
+import com.orbekk.same.android.net.Broadcaster;
import android.app.Activity;
import android.content.BroadcastReceiver;
diff --git a/same-android/src/main/java/com/orbekk/discovery/SameService.java b/same-android/src/main/java/com/orbekk/SameService.java
index c43d4ff..0738a00 100644
--- a/same-android/src/main/java/com/orbekk/discovery/SameService.java
+++ b/same-android/src/main/java/com/orbekk/SameService.java
@@ -1,4 +1,4 @@
-package com.orbekk.discovery;
+package com.orbekk;
import java.util.List;
import java.net.DatagramPacket;
@@ -21,6 +21,7 @@ import org.slf4j.LoggerFactory;
import com.orbekk.same.DiscoveryListener;
import com.orbekk.same.NetworkNotificationListener;
import com.orbekk.same.SameController;
+import com.orbekk.same.android.net.Broadcaster;
import com.orbekk.same.config.Configuration;
public class SameService extends Service {