From 636f509299122d02087c6fd62e1e4a46dbd22026 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Wed, 8 Jan 2014 20:06:00 +0100 Subject: Rename many classes to avoid conflicts with KDE --- dcopjava/binding/org/Makefile.am | 2 +- dcopjava/binding/org/kde/DCOP/Client.java | 63 ------- dcopjava/binding/org/kde/DCOP/DCOPRef.java | 30 ---- dcopjava/binding/org/kde/DCOP/Makefile.am | 9 - dcopjava/binding/org/kde/DCOP/Response.java | 9 - dcopjava/binding/org/kde/DCOP/Stub.java | 193 --------------------- dcopjava/binding/org/kde/Makefile.am | 1 - .../binding/org/trinitydesktop/DCOP/Client.java | 63 +++++++ .../binding/org/trinitydesktop/DCOP/DCOPRef.java | 30 ++++ .../binding/org/trinitydesktop/DCOP/Makefile.am | 9 + .../binding/org/trinitydesktop/DCOP/Response.java | 9 + dcopjava/binding/org/trinitydesktop/DCOP/Stub.java | 193 +++++++++++++++++++++ dcopjava/binding/org/trinitydesktop/Makefile.am | 1 + 13 files changed, 306 insertions(+), 306 deletions(-) delete mode 100644 dcopjava/binding/org/kde/DCOP/Client.java delete mode 100644 dcopjava/binding/org/kde/DCOP/DCOPRef.java delete mode 100644 dcopjava/binding/org/kde/DCOP/Makefile.am delete mode 100644 dcopjava/binding/org/kde/DCOP/Response.java delete mode 100644 dcopjava/binding/org/kde/DCOP/Stub.java delete mode 100644 dcopjava/binding/org/kde/Makefile.am create mode 100644 dcopjava/binding/org/trinitydesktop/DCOP/Client.java create mode 100644 dcopjava/binding/org/trinitydesktop/DCOP/DCOPRef.java create mode 100644 dcopjava/binding/org/trinitydesktop/DCOP/Makefile.am create mode 100644 dcopjava/binding/org/trinitydesktop/DCOP/Response.java create mode 100644 dcopjava/binding/org/trinitydesktop/DCOP/Stub.java create mode 100644 dcopjava/binding/org/trinitydesktop/Makefile.am (limited to 'dcopjava/binding/org') 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/kde/DCOP/Client.java deleted file mode 100644 index 55ba943e..00000000 --- a/dcopjava/binding/org/kde/DCOP/Client.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.kde.DCOP; - - -public class Client -{ - // attach to DCOP server as 'anonymous' - public native boolean attach(); - - // 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(); - - // return the registered application id - public native String appId(); - - // suspend DCOP processing - public native void suspend(); - - // resume DCOP processing - public native void resume(); - - // detach from the DCOP server - public native boolean detach(); - - // report if we are attached to DCOP server - public native boolean isAttached(); - - // send a command to the server - public native boolean send(String remApp, String remObj, String remFun, byte[] data); - - // send a command string to the server - public native boolean send(String remApp, String remObj, String remFun, String data); - - // 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) - { - Client client = new Client(); - - System.out.println("Registering as: " + client.registerAs("Java-App")); - if (client.isAttached()) - System.out.println("Attached!"); - - client.send("kdesktop", "KDesktopIface", "selectAll()", ""); - - java.io.ByteArrayOutputStream bs = new java.io.ByteArrayOutputStream(); - Response res = client.call("kdesktop", "KDesktopIface", "selectedURLs()", bs.toByteArray(), false); - System.out.println("Result type: " + res.returnType); - } - - static - { - System.loadLibrary("javadcop"); - } - -} - diff --git a/dcopjava/binding/org/kde/DCOP/DCOPRef.java b/dcopjava/binding/org/kde/DCOP/DCOPRef.java deleted file mode 100644 index 29d37efd..00000000 --- a/dcopjava/binding/org/kde/DCOP/DCOPRef.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.kde.DCOP; - - -public class DCOPRef -{ - private String _app, _obj, _type; - - public DCOPRef(String app, String obj, String type) - { - _app = app; - _obj = obj; - _type = type; - } - - public String app() - { - return _app; - } - - public String object() - { - return _obj; - } - - public String type() - { - return _type; - } - -} diff --git a/dcopjava/binding/org/kde/DCOP/Makefile.am b/dcopjava/binding/org/kde/DCOP/Makefile.am deleted file mode 100644 index 2019d20a..00000000 --- a/dcopjava/binding/org/kde/DCOP/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -class_DATA = DCOPRef.class Response.class Client.class Stub.class -classdir = $(kde_libraries)/java/org/kde/DCOP - -SUFFIXES = .java .class - -.java.class: - CLASSPATH=$(top_srcdir)/dcopjava/binding $(JAVAC) -d ../../../ -cp ../../../ $(top_srcdir)/dcopjava/binding/org/kde/DCOP/$*.java - -CLEANFILES = $(class_DATA) diff --git a/dcopjava/binding/org/kde/DCOP/Response.java b/dcopjava/binding/org/kde/DCOP/Response.java deleted file mode 100644 index 5df99427..00000000 --- a/dcopjava/binding/org/kde/DCOP/Response.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.kde.DCOP; - - -public class Response -{ - public boolean returnValue; - public String returnType; - public byte[] returnData; -} diff --git a/dcopjava/binding/org/kde/DCOP/Stub.java b/dcopjava/binding/org/kde/DCOP/Stub.java deleted file mode 100644 index e9267fa5..00000000 --- a/dcopjava/binding/org/kde/DCOP/Stub.java +++ /dev/null @@ -1,193 +0,0 @@ -package org.kde.DCOP; - - -import java.io.*; - - -public class Stub -{ - private String _app, _obj; - private int _status; - private Client _client; - - public Stub(String app, String obj) - { - _app = app; - _obj = obj; - _status = 0; - - // TODO: The client should be shared between stubs. - _client = new Client(); - _client.attach(); - } - - public String app() - { - return _app; - } - - public String obj() - { - return _obj; - } - - - public Client client() - { - return _client; - } - - - public final static int CallFailed = 0; - public final static int CallSucceeded = 1; - - public int status() - { - return _status; - } - - public void setStatus(int status) - { - _status = status; - } - - public boolean ok() - { - return _status == CallSucceeded; - } - - public void callFailed() - { - _status = CallFailed; - } - - - // accessor methods for the datatypes used --------------------------- - - protected boolean read_bool(DataInputStream is) throws IOException - { - return is.readBoolean(); - } - - protected void write_bool(DataOutputStream os, boolean val) throws IOException - { - os.writeBoolean(val); - } - - protected short read_short_int(DataInputStream is) throws IOException - { - return is.readShort(); - } - - protected void write_short_int(DataOutputStream os, short val) throws IOException - { - os.writeShort(val); - } - - protected int read_int(DataInputStream is) throws IOException - { - return is.readInt(); - } - - protected void write_int(DataOutputStream os, int val) throws IOException - { - os.writeInt(val); - } - - protected int read_long_int(DataInputStream is) throws IOException - { - return is.readInt(); - } - - protected void write_long_int(DataOutputStream os, int val) throws IOException - { - os.writeInt(val); - } - - protected float read_float(DataInputStream is) throws IOException - { - return is.readFloat(); - } - - protected void write_float(DataOutputStream os, float val) throws IOException - { - os.writeFloat(val); - } - - protected double read_double(DataInputStream is) throws IOException - { - return is.readDouble(); - } - - protected void write_double(DataOutputStream os, double val) throws IOException - { - os.writeDouble(val); - } - - protected String read_QString(DataInputStream is) throws IOException - { - int len = is.readInt(); - if (len == 0xffffffff) - return new String(); - else - { - StringBuffer b = new StringBuffer(); - for (int i=0; i