diff options
Diffstat (limited to 'dcopjava/binding')
-rw-r--r-- | dcopjava/binding/Makefile.am | 10 | ||||
-rw-r--r-- | dcopjava/binding/client.cpp | 28 | ||||
-rw-r--r-- | dcopjava/binding/org/Makefile.am | 2 | ||||
-rw-r--r-- | dcopjava/binding/org/trinitydesktop/DCOP/Client.java (renamed from dcopjava/binding/org/kde/DCOP/Client.java) | 18 | ||||
-rw-r--r-- | dcopjava/binding/org/trinitydesktop/DCOP/DCOPRef.java (renamed from dcopjava/binding/org/kde/DCOP/DCOPRef.java) | 2 | ||||
-rw-r--r-- | dcopjava/binding/org/trinitydesktop/DCOP/Makefile.am (renamed from dcopjava/binding/org/kde/DCOP/Makefile.am) | 4 | ||||
-rw-r--r-- | dcopjava/binding/org/trinitydesktop/DCOP/Response.java (renamed from dcopjava/binding/org/kde/DCOP/Response.java) | 2 | ||||
-rw-r--r-- | dcopjava/binding/org/trinitydesktop/DCOP/Stub.java (renamed from dcopjava/binding/org/kde/DCOP/Stub.java) | 24 | ||||
-rw-r--r-- | dcopjava/binding/org/trinitydesktop/Makefile.am (renamed from dcopjava/binding/org/kde/Makefile.am) | 0 |
9 files changed, 45 insertions, 45 deletions
diff --git a/dcopjava/binding/Makefile.am b/dcopjava/binding/Makefile.am index 8baebffb..d5ad26ac 100644 --- a/dcopjava/binding/Makefile.am +++ b/dcopjava/binding/Makefile.am @@ -6,14 +6,14 @@ libjavadcop_la_LIBADD = $(LIB_TDECORE) INCLUDES = $(jni_includes) $(all_includes) -client.$(OBJEXT): org_kde_DCOP_Client.h +client.$(OBJEXT): org_trinitydesktop_DCOP_Client.h -client.lo: org_kde_DCOP_Client.h +client.lo: org_trinitydesktop_DCOP_Client.h -org_kde_DCOP_Client.h: +org_trinitydesktop_DCOP_Client.h: $(MAKE) -C org - $(JAVAH) -classpath .:$(srcdir) -jni org.kde.DCOP.Client + $(JAVAH) -classpath .:$(srcdir) -jni org.trinitydesktop.DCOP.Client SUBDIRS = org -CLEANFILES = org_kde_DCOP_Client.h +CLEANFILES = org_trinitydesktop_DCOP_Client.h diff --git a/dcopjava/binding/client.cpp b/dcopjava/binding/client.cpp index e60fe2ac..f19af5e1 100644 --- a/dcopjava/binding/client.cpp +++ b/dcopjava/binding/client.cpp @@ -6,7 +6,7 @@ #include <kdebug.h> -#include "org_kde_DCOP_Client.h" +#include "org_trinitydesktop_DCOP_Client.h" class client @@ -34,7 +34,7 @@ DCOPClient *client::instance() } -JNIEXPORT jboolean JNICALL Java_org_kde_DCOP_Client_attach(JNIEnv *, jobject) +JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_DCOP_Client_attach(JNIEnv *, jobject) { kdDebug() << "javadcop::attach() called" << endl; @@ -42,7 +42,7 @@ JNIEXPORT jboolean JNICALL Java_org_kde_DCOP_Client_attach(JNIEnv *, jobject) } -JNIEXPORT jstring JNICALL Java_org_kde_DCOP_Client_registerAs(JNIEnv *env, jobject, jstring appName) +JNIEXPORT jstring JNICALL Java_org_trinitydesktop_DCOP_Client_registerAs(JNIEnv *env, jobject, jstring appName) { TQString name(env->GetStringUTFChars(appName, 0)); @@ -54,7 +54,7 @@ JNIEXPORT jstring JNICALL Java_org_kde_DCOP_Client_registerAs(JNIEnv *env, jobje } -JNIEXPORT jboolean JNICALL Java_org_kde_DCOP_Client_isAttached(JNIEnv *, jobject) +JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_DCOP_Client_isAttached(JNIEnv *, jobject) { kdDebug() << "javadcop::isAttached() called" << endl; @@ -62,7 +62,7 @@ JNIEXPORT jboolean JNICALL Java_org_kde_DCOP_Client_isAttached(JNIEnv *, jobject } -JNIEXPORT jboolean JNICALL Java_org_kde_DCOP_Client_detach(JNIEnv *, jobject) +JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_DCOP_Client_detach(JNIEnv *, jobject) { kdDebug() << "javadcop::detach() called" << endl; @@ -70,7 +70,7 @@ JNIEXPORT jboolean JNICALL Java_org_kde_DCOP_Client_detach(JNIEnv *, jobject) } -JNIEXPORT jboolean JNICALL Java_org_kde_DCOP_Client_send__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv *env, jobject, jstring remApp, jstring remObj, jstring remFun, jstring data) +JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_DCOP_Client_send__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv *env, jobject, jstring remApp, jstring remObj, jstring remFun, jstring data) { TQString _remApp(env->GetStringUTFChars(remApp, 0)); TQString _remObj(env->GetStringUTFChars(remObj, 0)); @@ -94,7 +94,7 @@ TQByteArray byteArray(JNIEnv *env, jbyteArray a) } -JNIEXPORT jboolean JNICALL Java_org_kde_DCOP_Client_send__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2_3B(JNIEnv *env, jobject, jstring remApp, jstring remObj, jstring remFun, jbyteArray data) +JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_DCOP_Client_send__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2_3B(JNIEnv *env, jobject, jstring remApp, jstring remObj, jstring remFun, jbyteArray data) { TQString _remApp(env->GetStringUTFChars(remApp, 0)); TQString _remObj(env->GetStringUTFChars(remObj, 0)); @@ -109,7 +109,7 @@ JNIEXPORT jboolean JNICALL Java_org_kde_DCOP_Client_send__Ljava_lang_String_2Lja } -JNIEXPORT jboolean JNICALL Java_org_kde_DCOP_Client_isRegistered(JNIEnv *, jobject) +JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_DCOP_Client_isRegistered(JNIEnv *, jobject) { kdDebug() << "javadcop::isRegistered() called" << endl; @@ -117,7 +117,7 @@ JNIEXPORT jboolean JNICALL Java_org_kde_DCOP_Client_isRegistered(JNIEnv *, jobje } -JNIEXPORT jstring JNICALL Java_org_kde_DCOP_Client_appId(JNIEnv *env, jobject) +JNIEXPORT jstring JNICALL Java_org_trinitydesktop_DCOP_Client_appId(JNIEnv *env, jobject) { kdDebug() << "javadcop::appId called" << endl; @@ -125,7 +125,7 @@ JNIEXPORT jstring JNICALL Java_org_kde_DCOP_Client_appId(JNIEnv *env, jobject) } -JNIEXPORT void JNICALL Java_org_kde_DCOP_Client_suspend(JNIEnv *, jobject) +JNIEXPORT void JNICALL Java_org_trinitydesktop_DCOP_Client_suspend(JNIEnv *, jobject) { kdDebug() << "javadcop::suspend() called" << endl; @@ -133,7 +133,7 @@ JNIEXPORT void JNICALL Java_org_kde_DCOP_Client_suspend(JNIEnv *, jobject) } -JNIEXPORT void JNICALL Java_org_kde_DCOP_Client_resume(JNIEnv *, jobject) +JNIEXPORT void JNICALL Java_org_trinitydesktop_DCOP_Client_resume(JNIEnv *, jobject) { kdDebug() << "javadcop::resume() called" << endl; @@ -141,7 +141,7 @@ JNIEXPORT void JNICALL Java_org_kde_DCOP_Client_resume(JNIEnv *, jobject) } -JNIEXPORT jobject JNICALL Java_org_kde_DCOP_Client_call(JNIEnv *env, jobject, jstring remApp, jstring remObj, jstring remFun, jbyteArray data, jboolean eventLoop) +JNIEXPORT jobject JNICALL Java_org_trinitydesktop_DCOP_Client_call(JNIEnv *env, jobject, jstring remApp, jstring remObj, jstring remFun, jbyteArray data, jboolean eventLoop) { TQString _remApp(env->GetStringUTFChars(remApp, 0)); TQString _remObj(env->GetStringUTFChars(remObj, 0)); @@ -167,7 +167,7 @@ JNIEXPORT jobject JNICALL Java_org_kde_DCOP_Client_call(JNIEnv *env, jobject, js jobject response; jfieldID jfid; - jcls = env->FindClass("Lorg/kde/DCOP/Response;"); + jcls = env->FindClass("Lorg/trinitydesktop/DCOP/Response;"); if (!jcls) return NULL; @@ -201,7 +201,7 @@ JNIEXPORT jobject JNICALL Java_org_kde_DCOP_Client_call(JNIEnv *env, jobject, js return response; } -JNIEXPORT jboolean JNICALL Java_org_kde_DCOP_Client_isApplicationRegistered(JNIEnv *env, jobject, jstring remApp) +JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_DCOP_Client_isApplicationRegistered(JNIEnv *env, jobject, jstring remApp) { const TQCString _remApp(env->GetStringUTFChars(remApp, 0)); diff --git a/dcopjava/binding/org/Makefile.am b/dcopjava/binding/org/Makefile.am index 800b92ea..8279b890 100644 --- a/dcopjava/binding/org/Makefile.am +++ b/dcopjava/binding/org/Makefile.am @@ -1 +1 @@ -SUBDIRS = kde +SUBDIRS = trinitydesktop diff --git a/dcopjava/binding/org/kde/DCOP/Client.java b/dcopjava/binding/org/trinitydesktop/DCOP/Client.java index 55ba943e..f8e87f72 100644 --- a/dcopjava/binding/org/kde/DCOP/Client.java +++ b/dcopjava/binding/org/trinitydesktop/DCOP/Client.java @@ -1,4 +1,4 @@ -package org.kde.DCOP; +package org.trinitydesktop.DCOP; public class Client @@ -6,9 +6,9 @@ public class Client // attach to DCOP server as 'anonymous' public native boolean attach(); - // attach to DCOP server using appName as key + // attach to DCOP server using appName as key public native String registerAs(String appName); - + // report if we are registered at the server public native boolean isRegistered(); @@ -35,11 +35,11 @@ public class Client // call a function and get the result public native Response call(String remApp, String remObj, String remFun, byte[] data, boolean eventLoop); - + // Checks whether remApp is registered with the DCOP server. public native boolean isApplicationRegistered ( String remApp); - - public static void main(String[] args) + + public static void main(String[] args) { Client client = new Client(); @@ -53,10 +53,10 @@ public class Client Response res = client.call("kdesktop", "KDesktopIface", "selectedURLs()", bs.toByteArray(), false); System.out.println("Result type: " + res.returnType); } - - static + + static { - System.loadLibrary("javadcop"); + System.loadLibrary("javadcop"); } } diff --git a/dcopjava/binding/org/kde/DCOP/DCOPRef.java b/dcopjava/binding/org/trinitydesktop/DCOP/DCOPRef.java index 29d37efd..65e5e039 100644 --- a/dcopjava/binding/org/kde/DCOP/DCOPRef.java +++ b/dcopjava/binding/org/trinitydesktop/DCOP/DCOPRef.java @@ -1,4 +1,4 @@ -package org.kde.DCOP; +package org.trinitydesktop.DCOP; public class DCOPRef diff --git a/dcopjava/binding/org/kde/DCOP/Makefile.am b/dcopjava/binding/org/trinitydesktop/DCOP/Makefile.am index 2019d20a..975d2826 100644 --- a/dcopjava/binding/org/kde/DCOP/Makefile.am +++ b/dcopjava/binding/org/trinitydesktop/DCOP/Makefile.am @@ -1,9 +1,9 @@ class_DATA = DCOPRef.class Response.class Client.class Stub.class -classdir = $(kde_libraries)/java/org/kde/DCOP +classdir = $(kde_libraries)/java/org/trinitydesktop/DCOP SUFFIXES = .java .class .java.class: - CLASSPATH=$(top_srcdir)/dcopjava/binding $(JAVAC) -d ../../../ -cp ../../../ $(top_srcdir)/dcopjava/binding/org/kde/DCOP/$*.java + CLASSPATH=$(top_srcdir)/dcopjava/binding $(JAVAC) -d ../../../ -cp ../../../ $(top_srcdir)/dcopjava/binding/org/trinitydesktop/DCOP/$*.java CLEANFILES = $(class_DATA) diff --git a/dcopjava/binding/org/kde/DCOP/Response.java b/dcopjava/binding/org/trinitydesktop/DCOP/Response.java index 5df99427..aca9fc61 100644 --- a/dcopjava/binding/org/kde/DCOP/Response.java +++ b/dcopjava/binding/org/trinitydesktop/DCOP/Response.java @@ -1,4 +1,4 @@ -package org.kde.DCOP; +package org.trinitydesktop.DCOP; public class Response diff --git a/dcopjava/binding/org/kde/DCOP/Stub.java b/dcopjava/binding/org/trinitydesktop/DCOP/Stub.java index e9267fa5..0a23543a 100644 --- a/dcopjava/binding/org/kde/DCOP/Stub.java +++ b/dcopjava/binding/org/trinitydesktop/DCOP/Stub.java @@ -1,4 +1,4 @@ -package org.kde.DCOP; +package org.trinitydesktop.DCOP; import java.io.*; @@ -20,7 +20,7 @@ public class Stub _client = new Client(); _client.attach(); } - + public String app() { return _app; @@ -31,7 +31,7 @@ public class Stub return _obj; } - + public Client client() { return _client; @@ -68,7 +68,7 @@ public class Stub { return is.readBoolean(); } - + protected void write_bool(DataOutputStream os, boolean val) throws IOException { os.writeBoolean(val); @@ -78,7 +78,7 @@ public class Stub { return is.readShort(); } - + protected void write_short_int(DataOutputStream os, short val) throws IOException { os.writeShort(val); @@ -88,7 +88,7 @@ public class Stub { return is.readInt(); } - + protected void write_int(DataOutputStream os, int val) throws IOException { os.writeInt(val); @@ -98,7 +98,7 @@ public class Stub { return is.readInt(); } - + protected void write_long_int(DataOutputStream os, int val) throws IOException { os.writeInt(val); @@ -108,7 +108,7 @@ public class Stub { return is.readFloat(); } - + protected void write_float(DataOutputStream os, float val) throws IOException { os.writeFloat(val); @@ -118,7 +118,7 @@ public class Stub { return is.readDouble(); } - + protected void write_double(DataOutputStream os, double val) throws IOException { os.writeDouble(val); @@ -137,7 +137,7 @@ public class Stub return b.toString(); } } - + protected void write_QString(DataOutputStream os, String val) throws IOException { os.writeInt(val.length()*2); @@ -153,7 +153,7 @@ public class Stub b.append((char)is.readByte()); return b.toString(); } - + protected void write_QCString(DataOutputStream os, String val) throws IOException { os.writeInt(val.length()+1); @@ -170,7 +170,7 @@ public class Stub result[i] = read_QString(is); return result; } - + protected void write_QStringList(DataOutputStream os, String[] val) throws IOException { os.writeInt(val.length); diff --git a/dcopjava/binding/org/kde/Makefile.am b/dcopjava/binding/org/trinitydesktop/Makefile.am index 4e9d266d..4e9d266d 100644 --- a/dcopjava/binding/org/kde/Makefile.am +++ b/dcopjava/binding/org/trinitydesktop/Makefile.am |