Repository: incubator-edgent
Updated Branches:
refs/heads/master 3118af669 -> 57c28824b
fix android/{hardware,topology} ant build
- fix bug in android/topology/build.xml -- missing oplet jar presumably
from earlier refactoring
- fix bugs in android/{hardware,topology} classes -- import names from
quarks->edgent rename.
Need to "ant release" with ANDROID_SDK_PLATFORM ev set to see thebuild
problems in the absence of these changes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/57c28824
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/57c28824
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/57c28824
Branch: refs/heads/master
Commit: 57c28824b299814492a5bf53dcc7af047c736942
Parents: 3118af6
Author: Dale LaBossiere <dlab...@us.ibm.com>
Authored: Tue Sep 6 15:46:00 2016 -0400
Committer: Dale LaBossiere <dlab...@us.ibm.com>
Committed: Tue Sep 6 15:46:00 2016 -0400
----------------------------------------------------------------------
.../apache/edgent/android/hardware/SensorStreams.java | 6 +++---
.../android/hardware/runtime/SensorChangeEvents.java | 2 +-
.../android/hardware/runtime/SensorSourceSetup.java | 2 +-
android/topology/build.xml | 1 +
.../org/apache/edgent/android/oplet/RunOnUIThread.java | 2 +-
.../apache/edgent/android/topology/ActivityStreams.java | 12 ++++++------
6 files changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/57c28824/android/hardware/src/main/java/org/apache/edgent/android/hardware/SensorStreams.java
----------------------------------------------------------------------
diff --git
a/android/hardware/src/main/java/org/apache/edgent/android/hardware/SensorStreams.java
b/android/hardware/src/main/java/org/apache/edgent/android/hardware/SensorStreams.java
index e7cc85a..687bac1 100644
---
a/android/hardware/src/main/java/org/apache/edgent/android/hardware/SensorStreams.java
+++
b/android/hardware/src/main/java/org/apache/edgent/android/hardware/SensorStreams.java
@@ -21,9 +21,9 @@ package org.apache.edgent.android.hardware;
import android.hardware.Sensor;
import android.hardware.SensorEvent;
import android.hardware.SensorManager;
-import edgent.android.hardware.runtime.SensorSourceSetup;
-import edgent.topology.TStream;
-import edgent.topology.TopologyElement;
+import org.apache.edgent.android.hardware.runtime.SensorSourceSetup;
+import org.apache.edgent.topology.TStream;
+import org.apache.edgent.topology.TopologyElement;
/**
* Create streams from sensors.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/57c28824/android/hardware/src/main/java/org/apache/edgent/android/hardware/runtime/SensorChangeEvents.java
----------------------------------------------------------------------
diff --git
a/android/hardware/src/main/java/org/apache/edgent/android/hardware/runtime/SensorChangeEvents.java
b/android/hardware/src/main/java/org/apache/edgent/android/hardware/runtime/SensorChangeEvents.java
index e563180..d85b74f 100644
---
a/android/hardware/src/main/java/org/apache/edgent/android/hardware/runtime/SensorChangeEvents.java
+++
b/android/hardware/src/main/java/org/apache/edgent/android/hardware/runtime/SensorChangeEvents.java
@@ -22,7 +22,7 @@ import android.hardware.Sensor;
import android.hardware.SensorEvent;
import android.hardware.SensorEventListener;
-import edgent.function.Consumer;
+import org.apache.edgent.function.Consumer;
/**
* Sensor event listener that submits sensor
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/57c28824/android/hardware/src/main/java/org/apache/edgent/android/hardware/runtime/SensorSourceSetup.java
----------------------------------------------------------------------
diff --git
a/android/hardware/src/main/java/org/apache/edgent/android/hardware/runtime/SensorSourceSetup.java
b/android/hardware/src/main/java/org/apache/edgent/android/hardware/runtime/SensorSourceSetup.java
index 3d92dca..afa3d2d 100644
---
a/android/hardware/src/main/java/org/apache/edgent/android/hardware/runtime/SensorSourceSetup.java
+++
b/android/hardware/src/main/java/org/apache/edgent/android/hardware/runtime/SensorSourceSetup.java
@@ -18,7 +18,7 @@ under the License.
*/
package org.apache.edgent.android.hardware.runtime;
-import edgent.function.Consumer;
+import org.apache.edgent.function.Consumer;
import android.hardware.Sensor;
import android.hardware.SensorEvent;
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/57c28824/android/topology/build.xml
----------------------------------------------------------------------
diff --git a/android/topology/build.xml b/android/topology/build.xml
index 9157033..91dc0e5 100644
--- a/android/topology/build.xml
+++ b/android/topology/build.xml
@@ -29,6 +29,7 @@
<path id="compile.classpath">
<pathelement location="${edgent.lib}/edgent.api.topology.jar" />
+ <pathelement location="${edgent.lib}/edgent.api.oplet.jar" />
</path>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/57c28824/android/topology/src/main/java/org/apache/edgent/android/oplet/RunOnUIThread.java
----------------------------------------------------------------------
diff --git
a/android/topology/src/main/java/org/apache/edgent/android/oplet/RunOnUIThread.java
b/android/topology/src/main/java/org/apache/edgent/android/oplet/RunOnUIThread.java
index a17610e..a68834d 100644
---
a/android/topology/src/main/java/org/apache/edgent/android/oplet/RunOnUIThread.java
+++
b/android/topology/src/main/java/org/apache/edgent/android/oplet/RunOnUIThread.java
@@ -19,7 +19,7 @@ under the License.
package org.apache.edgent.android.oplet;
import android.app.Activity;
-import edgent.oplet.core.Pipe;
+import org.apache.edgent.oplet.core.Pipe;
public class RunOnUIThread<T> extends Pipe<T,T> {
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/57c28824/android/topology/src/main/java/org/apache/edgent/android/topology/ActivityStreams.java
----------------------------------------------------------------------
diff --git
a/android/topology/src/main/java/org/apache/edgent/android/topology/ActivityStreams.java
b/android/topology/src/main/java/org/apache/edgent/android/topology/ActivityStreams.java
index 060b72d..86bf743 100644
---
a/android/topology/src/main/java/org/apache/edgent/android/topology/ActivityStreams.java
+++
b/android/topology/src/main/java/org/apache/edgent/android/topology/ActivityStreams.java
@@ -19,12 +19,12 @@ under the License.
package org.apache.edgent.android.topology;
import android.app.Activity;
-import edgent.android.oplet.RunOnUIThread;
-import edgent.function.Consumer;
-import edgent.function.Function;
-import edgent.topology.TSink;
-import edgent.topology.TStream;
-import edgent.topology.plumbing.PlumbingStreams;
+import org.apache.edgent.android.oplet.RunOnUIThread;
+import org.apache.edgent.function.Consumer;
+import org.apache.edgent.function.Function;
+import org.apache.edgent.topology.TSink;
+import org.apache.edgent.topology.TStream;
+import org.apache.edgent.topology.plumbing.PlumbingStreams;
/**
* Stream utilities for an Android {@code Activity}.
