Java: Move interfaces into org.sigrok.core.interfaces, tidy build system.

Makefile.am

@@ -464,28 +464,29 @@ endif
 if BINDINGS_JAVA
 
 JDIR = bindings/java
-JPKG = org/sigrok/core/classes
+JPKG = org/sigrok/core
-JINT = $(JDIR)/$(JPKG)/classes.i
+JCLS = $(JDIR)/$(JPKG)/classes
-JSRC = $(JDIR)/$(JPKG)/classes_wrap.cxx
+JINT = $(JDIR)/$(JPKG)/interfaces
+JSRC = $(JCLS)/*.java $(JINT)/*.java
+JSWG = $(JCLS)/classes.i
+JCXX = $(JCLS)/classes_wrap.cxx
 JLIB = $(JDIR)/libsigrok_java_core_classes.so
 JJAR = $(JDIR)/sigrok-core.jar
 
 java-build: $(JJAR) $(JLIB)
 
-$(JSRC): $(JINT) bindings/swig/classes.i $(library_include_HEADERS)
+$(JCXX): $(JSWG) bindings/swig/classes.i $(library_include_HEADERS)
 	$(AM_V_GEN)swig -c++ -java -package org.sigrok.core.classes \
-		-Iinclude -Ibindings/cxx/include \
+		-Iinclude -Ibindings/cxx/include -outdir $(JCLS) $(JSWG)
-		-outdir $(JDIR)/$(JPKG) $(JINT)
 
-$(JJAR): $(JSRC) $(JDIR)/$(JPKG)/*.java
+$(JJAR): $(JCXX)
-	$(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) $(JDIR)/$(JPKG)/*.java
+	$(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) $(JSRC)
 	$(AM_V_at)jar cf $(JJAR) -C $(JDIR) $(JPKG)
 
-$(JLIB): $(JSRC) bindings/cxx/libsigrokxx.la $(library_include_HEADERS)
+$(JLIB): $(JCXX) bindings/cxx/libsigrokxx.la $(library_include_HEADERS)
 	$(AM_V_GEN)$(CXX) $(CXXFLAGS) -L.libs -Lbindings/cxx/.libs \
-		-fno-strict-aliasing -fPIC -shared \
+		-fno-strict-aliasing -fPIC -shared $(JCLS)/classes_wrap.cxx \
-		$(JDIR)/$(JPKG)/classes_wrap.cxx -lsigrokxx \
+		-lsigrokxx -o $(JLIB)
-		-o $(JLIB)
 
 java-install:
 	$(INSTALL) -d $(libdir)/jni
@@ -494,8 +495,10 @@ java-install:
 	$(INSTALL) $(JJAR) -t $(datadir)/java
 
 java-clean:
-	rm -f $(JSRC)
+	rm -f $(JCXX)
-	rm -f $(JDIR)/$(JPKG)/*.class
+	rm -f $(JCLS)/*.java
+	rm -f $(JCLS)/*.class
+	rm -f $(JINT)/*.class
 	rm -f $(JJAR)
 	rm -f $(JLIB)
 

bindings/java/org/sigrok/core/classes/DatafeedCallback.java

@@ -1,6 +0,0 @@
-package org.sigrok.core.classes;
-
-public interface DatafeedCallback
-{
-    public void run(Device device, Packet packet);
-}

bindings/java/org/sigrok/core/classes/classes.i

@@ -7,6 +7,13 @@
   }
 %}
 
+/* Import interfaces. */
+%pragma(java) jniclassimports=%{
+  import org.sigrok.core.interfaces.LogCallback;
+  import org.sigrok.core.interfaces.DatafeedCallback;
+  import org.sigrok.core.interfaces.SourceCallback;
+%}
+
 /* Map Java FileDescriptor objects to int fds */
 %typemap(jni) int fd "jobject"
 %typemap(jtype) int fd "java.io.FileDescriptor"
@@ -210,6 +217,9 @@ MAP_COMMON(const sigrok::ConfigKey *, Glib::VariantBase, ConfigKey, Variant)
 
 /* Support Java log callbacks. */
 
+%typemap(javaimports) sigrok::Context
+  "import org.sigrok.core.interfaces.LogCallback;"
+
 %inline {
 typedef jobject jlogcallback;
 }
@@ -249,6 +259,9 @@ typedef jobject jlogcallback;
 
 /* Support Java datafeed callbacks. */
 
+%typemap(javaimports) sigrok::Session
+  "import org.sigrok.core.interfaces.DatafeedCallback;"
+
 %inline {
 typedef jobject jdatafeedcallback;
 }
@@ -296,6 +309,9 @@ typedef jobject jdatafeedcallback;
 
 /* Support Java event source callbacks. */
 
+%typemap(javaimports) sigrok::EventSource
+  "import org.sigrok.core.interfaces.SourceCallback;"
+
 %inline {
 typedef jobject jsourcecallback;
 }

bindings/java/org/sigrok/core/interfaces/DatafeedCallback.java

@@ -0,0 +1,9 @@
+package org.sigrok.core.interfaces;
+
+import org.sigrok.core.classes.Device;
+import org.sigrok.core.classes.Packet;
+
+public interface DatafeedCallback
+{
+    public void run(Device device, Packet packet);
+}

bindings/java/org/sigrok/core/interfaces/LogCallback.java

@@ -1,4 +1,6 @@
-package org.sigrok.core.classes;
+package org.sigrok.core.interfaces;
+
+import org.sigrok.core.classes.LogLevel;
 
 public interface LogCallback 
 {

bindings/java/org/sigrok/core/interfaces/SourceCallback.java

@@ -1,4 +1,4 @@
-package org.sigrok.core.classes;
+package org.sigrok.core.interfaces;
 
 public interface SourceCallback 
 {