File dbus-java-gettext-java-9.patch of Package dbus-java
diff -ru dbus-java-2.7.orig/Makefile dbus-java-2.7/Makefile
--- dbus-java-2.7.orig/Makefile 2011-11-11 02:22:47.000000000 +0100
+++ dbus-java-2.7/Makefile 2018-06-18 11:18:55.856865672 +0200
@@ -79,17 +79,15 @@
.classes: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java $(SRCDIR)/dbus/exceptions/*.java $(SRCDIR)/dbus/types/*.java translations/*.po
mkdir -p classes
$(JAVAC) -d classes -cp classes:${JAVAUNIXJARDIR}/unix.jar:${JAVAUNIXJARDIR}/debug-$(DEBUG).jar:${JAVAUNIXJARDIR}/hexdump.jar:$(CLASSPATH) $(JCFLAGS) $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java $(SRCDIR)/dbus/exceptions/*.java $(SRCDIR)/dbus/types/*.java
- (cd translations; for i in *.po; do $(MSGFMT) --java2 -r dbusjava_localized -d ../classes -l $${i%.po} $$i; done)
- $(MSGFMT) --java2 -r dbusjava_localized -d classes translations/en_GB.po
touch .classes
translations/en_GB.po: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java $(SRCDIR)/dbus/exceptions/*.java $(SRCDIR)/dbus/types/*.java $(SRCDIR)/dbus/bin/*.java $(SRCDIR)/dbus/viewer/*.java
echo "#java-format" > $@
- sed -n '/_(/s/.*_("\([^"]*\)").*/\1/p' $^ | sort -u | sed 's/\(.*\)/msgid "\1"\nmsgstr "\1"/' >> $@
+ sed -n '/gettext(/s/.*gettext("\([^"]*\)").*/\1/p' $^ | sort -u | sed 's/\(.*\)/msgid "\1"\nmsgstr "\1"/' >> $@
libdbus-java-$(VERSION).jar: .classes
echo "Class-Path: ${JAVAUNIXJARDIR}/unix.jar ${JAVAUNIXJARDIR}/hexdump.jar ${JAVAUNIXJARDIR}/debug-$(DEBUG).jar" > Manifest
- (cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/*.class org/freedesktop/*.class org/freedesktop/dbus/types/*.class org/freedesktop/dbus/exceptions/*.class *localized*class)
+ (cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/*.class org/freedesktop/*.class org/freedesktop/dbus/types/*.class org/freedesktop/dbus/exceptions/*.class)
dbus-java-test-$(VERSION).jar: .testclasses
echo "Class-Path: ${JARPREFIX}/libdbus-java-$(VERSION).jar" > Manifest
(cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/test/*.class)
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/AbstractConnection.java dbus-java-2.7/org/freedesktop/dbus/AbstractConnection.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/AbstractConnection.java 2009-12-06 12:21:07.000000000 +0100
+++ dbus-java-2.7/org/freedesktop/dbus/AbstractConnection.java 2018-06-18 10:36:56.837865922 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -394,12 +394,12 @@
public void exportObject(String objectpath, DBusInterface object) throws DBusException
{
if (null == objectpath || "".equals(objectpath))
- throw new DBusException(_("Must Specify an Object Path"));
+ throw new DBusException(gettext("Must Specify an Object Path"));
if (!objectpath.matches(OBJECT_REGEX)||objectpath.length() > MAX_NAME_LENGTH)
- throw new DBusException(_("Invalid object path: ")+objectpath);
+ throw new DBusException(gettext("Invalid object path: ")+objectpath);
synchronized (exportedObjects) {
if (null != exportedObjects.get(objectpath))
- throw new DBusException(_("Object already exported"));
+ throw new DBusException(gettext("Object already exported"));
ExportedObject eo = new ExportedObject(object, weakreferences);
exportedObjects.put(objectpath, eo);
objectTree.add(objectpath, eo, eo.introspectiondata);
@@ -417,9 +417,9 @@
public void addFallback(String objectprefix, DBusInterface object) throws DBusException
{
if (null == objectprefix || "".equals(objectprefix))
- throw new DBusException(_("Must Specify an Object Path"));
+ throw new DBusException(gettext("Must Specify an Object Path"));
if (!objectprefix.matches(OBJECT_REGEX)||objectprefix.length() > MAX_NAME_LENGTH)
- throw new DBusException(_("Invalid object path: ")+objectprefix);
+ throw new DBusException(gettext("Invalid object path: ")+objectprefix);
ExportedObject eo = new ExportedObject(object, weakreferences);
fallbackcontainer.add(objectprefix, eo);
}
@@ -482,7 +482,7 @@
*/
public <T extends DBusSignal> void removeSigHandler(Class<T> type, DBusSigHandler<T> handler) throws DBusException
{
- if (!DBusSignal.class.isAssignableFrom(type)) throw new ClassCastException(_("Not A DBus Signal"));
+ if (!DBusSignal.class.isAssignableFrom(type)) throw new ClassCastException(gettext("Not A DBus Signal"));
removeSigHandler(new DBusMatchRule(type), handler);
}
/**
@@ -495,10 +495,10 @@
*/
public <T extends DBusSignal> void removeSigHandler(Class<T> type, DBusInterface object, DBusSigHandler<T> handler) throws DBusException
{
- if (!DBusSignal.class.isAssignableFrom(type)) throw new ClassCastException(_("Not A DBus Signal"));
+ if (!DBusSignal.class.isAssignableFrom(type)) throw new ClassCastException(gettext("Not A DBus Signal"));
String objectpath = importedObjects.get(object).objectpath;
if (!objectpath.matches(OBJECT_REGEX)||objectpath.length() > MAX_NAME_LENGTH)
- throw new DBusException(_("Invalid object path: ")+objectpath);
+ throw new DBusException(gettext("Invalid object path: ")+objectpath);
removeSigHandler(new DBusMatchRule(type, null, objectpath), handler);
}
@@ -514,7 +514,7 @@
@SuppressWarnings("unchecked")
public <T extends DBusSignal> void addSigHandler(Class<T> type, DBusSigHandler<T> handler) throws DBusException
{
- if (!DBusSignal.class.isAssignableFrom(type)) throw new ClassCastException(_("Not A DBus Signal"));
+ if (!DBusSignal.class.isAssignableFrom(type)) throw new ClassCastException(gettext("Not A DBus Signal"));
addSigHandler(new DBusMatchRule(type), (DBusSigHandler<? extends DBusSignal>) handler);
}
/**
@@ -529,10 +529,10 @@
@SuppressWarnings("unchecked")
public <T extends DBusSignal> void addSigHandler(Class<T> type, DBusInterface object, DBusSigHandler<T> handler) throws DBusException
{
- if (!DBusSignal.class.isAssignableFrom(type)) throw new ClassCastException(_("Not A DBus Signal"));
+ if (!DBusSignal.class.isAssignableFrom(type)) throw new ClassCastException(gettext("Not A DBus Signal"));
String objectpath = importedObjects.get(object).objectpath;
if (!objectpath.matches(OBJECT_REGEX)||objectpath.length() > MAX_NAME_LENGTH)
- throw new DBusException(_("Invalid object path: ")+objectpath);
+ throw new DBusException(gettext("Invalid object path: ")+objectpath);
addSigHandler(new DBusMatchRule(type, null, objectpath), (DBusSigHandler<? extends DBusSignal>) handler);
}
@@ -728,7 +728,7 @@
if (null == eo) {
try {
- queueOutgoing(new Error(m, new DBus.Error.UnknownObject(m.getPath()+_(" is not an object provided by this process."))));
+ queueOutgoing(new Error(m, new DBus.Error.UnknownObject(m.getPath()+gettext(" is not an object provided by this process."))));
} catch (DBusException DBe) {}
return;
}
@@ -741,7 +741,7 @@
meth = eo.methods.get(new MethodTuple(m.getName(), m.getSig()));
if (null == meth) {
try {
- queueOutgoing(new Error(m, new DBus.Error.UnknownMethod(MessageFormat.format(_("The method `{0}.{1}' does not exist on this object."), new Object[] { m.getInterface(), m.getName() }))));
+ queueOutgoing(new Error(m, new DBus.Error.UnknownMethod(MessageFormat.format(gettext("The method `{0}.{1}' does not exist on this object."), new Object[] { m.getInterface(), m.getName() }))));
} catch (DBusException DBe) {}
return;
}
@@ -770,7 +770,7 @@
} catch (Exception e) {
if (EXCEPTION_DEBUG && Debug.debug) Debug.print(Debug.ERR, e);
try {
- conn.queueOutgoing(new Error(m, new DBus.Error.UnknownMethod(_("Failure in de-serializing message: ")+e)));
+ conn.queueOutgoing(new Error(m, new DBus.Error.UnknownMethod(gettext("Failure in de-serializing message: ")+e)));
} catch (DBusException DBe) {}
return;
}
@@ -812,7 +812,7 @@
} catch (Throwable e) {
if (EXCEPTION_DEBUG && Debug.debug) Debug.print(Debug.ERR, e);
try {
- conn.queueOutgoing(new Error(m, new DBusExecutionException(MessageFormat.format(_("Error Executing Method {0}.{1}: {2}"), new Object[] { m.getInterface(), m.getName(), e.getMessage() }))));
+ conn.queueOutgoing(new Error(m, new DBusExecutionException(MessageFormat.format(gettext("Error Executing Method {0}.{1}: {2}"), new Object[] { m.getInterface(), m.getName(), e.getMessage() }))));
} catch (DBusException DBe) {}
}
}
@@ -965,20 +965,20 @@
} else
try {
- queueOutgoing(new Error(mr, new DBusExecutionException(_("Spurious reply. No message with the given serial id was awaiting a reply."))));
+ queueOutgoing(new Error(mr, new DBusExecutionException(gettext("Spurious reply. No message with the given serial id was awaiting a reply."))));
} catch (DBusException DBe) {}
}
protected void sendMessage(Message m)
{
try {
- if (!connected) throw new NotConnected(_("Disconnected"));
+ if (!connected) throw new NotConnected(gettext("Disconnected"));
if (m instanceof DBusSignal)
((DBusSignal) m).appendbody(this);
if (m instanceof MethodCall) {
if (0 == (m.getFlags() & Message.Flags.NO_REPLY_EXPECTED))
if (null == pendingCalls)
- ((MethodCall) m).setReply(new Error("org.freedesktop.DBus.Local", "org.freedesktop.DBus.Local.Disconnected", 0, "s", new Object[] { _("Disconnected") }));
+ ((MethodCall) m).setReply(new Error("org.freedesktop.DBus.Local", "org.freedesktop.DBus.Local.Disconnected", 0, "s", new Object[] { gettext("Disconnected") }));
else synchronized (pendingCalls) {
pendingCalls.put(m.getSerial(),(MethodCall) m);
}
@@ -990,7 +990,7 @@
if (EXCEPTION_DEBUG && Debug.debug) Debug.print(Debug.ERR, e);
if (m instanceof MethodCall && e instanceof NotConnected)
try {
- ((MethodCall) m).setReply(new Error("org.freedesktop.DBus.Local", "org.freedesktop.DBus.Local.Disconnected", 0, "s", new Object[] { _("Disconnected") }));
+ ((MethodCall) m).setReply(new Error("org.freedesktop.DBus.Local", "org.freedesktop.DBus.Local.Disconnected", 0, "s", new Object[] { gettext("Disconnected") }));
} catch (DBusException DBe) {}
if (m instanceof MethodCall && e instanceof DBusExecutionException)
try {
@@ -999,7 +999,7 @@
else if (m instanceof MethodCall)
try {
if (Debug.debug) Debug.print(Debug.INFO, "Setting reply to "+m+" as an error");
- ((MethodCall)m).setReply(new Error(m, new DBusExecutionException(_("Message Failed to Send: ")+e.getMessage())));
+ ((MethodCall)m).setReply(new Error(m, new DBusExecutionException(gettext("Message Failed to Send: ")+e.getMessage())));
} catch (DBusException DBe) {}
else if (m instanceof MethodReturn)
try {
@@ -1014,7 +1014,7 @@
}
private Message readIncoming() throws DBusException
{
- if (!connected) throw new NotConnected(_("No transport present"));
+ if (!connected) throw new NotConnected(gettext("No transport present"));
Message m = null;
try {
m = transport.min.readMessage();
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/ArrayFrob.java dbus-java-2.7/org/freedesktop/dbus/ArrayFrob.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/ArrayFrob.java 2008-06-07 12:19:11.000000000 +0200
+++ dbus-java-2.7/org/freedesktop/dbus/ArrayFrob.java 2018-06-18 10:36:56.837865922 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.lang.reflect.Array;
import java.text.MessageFormat;
@@ -48,10 +48,10 @@
public static <T> T[] wrap(Object o) throws IllegalArgumentException
{
Class<? extends Object> ac = o.getClass();
- if (!ac.isArray()) throw new IllegalArgumentException(_("Not an array"));
+ if (!ac.isArray()) throw new IllegalArgumentException(gettext("Not an array"));
Class<? extends Object> cc = ac.getComponentType();
Class<? extends Object> ncc = primitiveToWrapper.get(cc);
- if (null == ncc) throw new IllegalArgumentException(_("Not a primitive type"));
+ if (null == ncc) throw new IllegalArgumentException(gettext("Not a primitive type"));
T[] ns = (T[]) Array.newInstance(ncc, Array.getLength(o));
for (int i = 0; i < ns.length; i++)
ns[i] = (T) Array.get(o, i);
@@ -63,7 +63,7 @@
Class<? extends T[]> ac = (Class<? extends T[]>) ns.getClass();
Class<T> cc = (Class<T>) ac.getComponentType();
Class<? extends Object> ncc = wrapperToPrimitive.get(cc);
- if (null == ncc) throw new IllegalArgumentException(_("Not a wrapper type"));
+ if (null == ncc) throw new IllegalArgumentException(gettext("Not a wrapper type"));
Object o = Array.newInstance(ncc, ns.length);
for (int i = 0; i < ns.length; i++)
Array.set(o, i, ns[i]);
@@ -77,7 +77,7 @@
public static <T> List<T> listify(Object o) throws IllegalArgumentException
{
if (o instanceof Object[]) return listify((T[]) o);
- if (!o.getClass().isArray()) throw new IllegalArgumentException(_("Not an array"));
+ if (!o.getClass().isArray()) throw new IllegalArgumentException(gettext("Not an array"));
List<T> l = new ArrayList<T>(Array.getLength(o));
for (int i = 0; i < Array.getLength(o); i++)
l.add((T)Array.get(o, i));
@@ -161,7 +161,7 @@
throw new IllegalArgumentException(e);
}
- throw new IllegalArgumentException(MessageFormat.format(_("Not An Expected Convertion type from {0} to {1}"), new Object[] { o.getClass(), c}));
+ throw new IllegalArgumentException(MessageFormat.format(gettext("Not An Expected Convertion type from {0} to {1}"), new Object[] { o.getClass(), c}));
}
public static Object[] type(Object[] old, Class<Object> c)
{
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/bin/CreateInterface.java dbus-java-2.7/org/freedesktop/dbus/bin/CreateInterface.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/bin/CreateInterface.java 2008-06-07 12:19:11.000000000 +0200
+++ dbus-java-2.7/org/freedesktop/dbus/bin/CreateInterface.java 2018-06-18 10:36:56.837865922 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus.bin;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import static org.freedesktop.dbus.bin.IdentifierMangler.mangle;
import java.io.File;
@@ -156,7 +156,7 @@
Vector<Element> out = new Vector<Element>();
if (null == meth.getAttribute("name") ||
"".equals(meth.getAttribute("name"))) {
- System.err.println(_("ERROR: Method name was blank, failed"));
+ System.err.println(gettext("ERROR: Method name was blank, failed"));
System.exit(1);
}
String annotations = "";
@@ -271,7 +271,7 @@
{
if (null == iface.getAttribute("name") ||
"".equals(iface.getAttribute("name"))) {
- System.err.println(_("ERROR: Interface name was blank, failed"));
+ System.err.println(gettext("ERROR: Interface name was blank, failed"));
System.exit(1);
}
@@ -440,7 +440,7 @@
else if ("node".equals(iface.getNodeName()))
parseRoot((Element) iface);
else {
- System.err.println(_("ERROR: Unknown node: ")+iface.getNodeName());
+ System.err.println(gettext("ERROR: Unknown node: ")+iface.getNodeName());
System.exit(1);
}
}
@@ -573,7 +573,7 @@
if (name.equals(n.getNodeName())) return;
expected += name + " or ";
}
- System.err.println(MessageFormat.format(_("ERROR: Expected {0}, got {1}, failed."), new Object[] { expected.replaceAll("....$", ""), n.getNodeName() }));
+ System.err.println(MessageFormat.format(gettext("ERROR: Expected {0}, got {1}, failed."), new Object[] { expected.replaceAll("....$", ""), n.getNodeName() }));
System.exit(1);
}
@@ -626,7 +626,7 @@
version();
System.exit(0);
} else if (p.startsWith("-")) {
- System.err.println(_("ERROR: Unknown option: ")+p);
+ System.err.println(gettext("ERROR: Unknown option: ")+p);
printSyntax();
System.exit(1);
}
@@ -661,22 +661,22 @@
Introspectable in = conn.getRemoteObject(config.busname, config.object, Introspectable.class);
String id = in.Introspect();
if (null == id) {
- System.err.println(_("ERROR: Failed to get introspection data"));
+ System.err.println(gettext("ERROR: Failed to get introspection data"));
System.exit(1);
}
introspectdata = new StringReader(id);
conn.disconnect();
} catch (DBusException DBe) {
- System.err.println(_("ERROR: Failure in DBus Communications: ")+DBe.getMessage());
+ System.err.println(gettext("ERROR: Failure in DBus Communications: ")+DBe.getMessage());
System.exit(1);
} catch (DBusExecutionException DEe) {
- System.err.println(_("ERROR: Failure in DBus Communications: ")+DEe.getMessage());
+ System.err.println(gettext("ERROR: Failure in DBus Communications: ")+DEe.getMessage());
System.exit(1);
} else if (null != config.datafile) try {
introspectdata = new InputStreamReader(new FileInputStream(config.datafile));
} catch (FileNotFoundException FNFe) {
- System.err.println(_("ERROR: Could not find introspection file: ")+FNFe.getMessage());
+ System.err.println(gettext("ERROR: Could not find introspection file: ")+FNFe.getMessage());
System.exit(1);
}
try {
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/bin/DBusDaemon.java dbus-java-2.7/org/freedesktop/dbus/bin/DBusDaemon.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/bin/DBusDaemon.java 2009-11-01 14:53:27.000000000 +0100
+++ dbus-java-2.7/org/freedesktop/dbus/bin/DBusDaemon.java 2018-06-18 10:36:56.841865938 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus.bin;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import org.freedesktop.DBus;
import org.freedesktop.dbus.AbstractConnection;
@@ -145,7 +145,7 @@
if (Debug.debug) Debug.print(Debug.DEBUG, "enter");
synchronized (c) {
if (null != c.unique)
- throw new org.freedesktop.DBus.Error.AccessDenied(_("Connection has already sent a Hello message"));
+ throw new org.freedesktop.DBus.Error.AccessDenied(gettext("Connection has already sent a Hello message"));
synchronized (unique_lock) {
c.unique = ":1."+(++next_unique);
}
@@ -347,10 +347,10 @@
send(c, new org.freedesktop.dbus.Error("org.freedesktop.DBus", m, DBEe));
} catch (Exception e) {
if (Debug.debug && AbstractConnection.EXCEPTION_DEBUG) Debug.print(Debug.ERR, e);
- send(c,new org.freedesktop.dbus.Error("org.freedesktop.DBus", c.unique, "org.freedesktop.DBus.Error.GeneralError", m.getSerial(), "s", _("An error occurred while calling ")+m.getName()));
+ send(c,new org.freedesktop.dbus.Error("org.freedesktop.DBus", c.unique, "org.freedesktop.DBus.Error.GeneralError", m.getSerial(), "s", gettext("An error occurred while calling ")+m.getName()));
}
} catch (NoSuchMethodException NSMe) {
- send(c,new org.freedesktop.dbus.Error("org.freedesktop.DBus", c.unique, "org.freedesktop.DBus.Error.UnknownMethod", m.getSerial(), "s", _("This service does not support ")+m.getName()));
+ send(c,new org.freedesktop.dbus.Error("org.freedesktop.DBus", c.unique, "org.freedesktop.DBus.Error.UnknownMethod", m.getSerial(), "s", gettext("This service does not support ")+m.getName()));
}
if (Debug.debug) Debug.print(Debug.DEBUG, "exit");
@@ -649,13 +649,13 @@
&& (!(m instanceof MethodCall)
|| !"org.freedesktop.DBus".equals(m.getDestination())
|| !"Hello".equals(m.getName()))) {
- send(c,new Error("org.freedesktop.DBus", null, "org.freedesktop.DBus.Error.AccessDenied", m.getSerial(), "s", _("You must send a Hello message")));
+ send(c,new Error("org.freedesktop.DBus", null, "org.freedesktop.DBus.Error.AccessDenied", m.getSerial(), "s", gettext("You must send a Hello message")));
} else {
try {
if (null != c.unique) m.setSource(c.unique);
} catch (DBusException DBe) {
if (Debug.debug && AbstractConnection.EXCEPTION_DEBUG) Debug.print(Debug.ERR, DBe);
- send(c,new Error("org.freedesktop.DBus", null, "org.freedesktop.DBus.Error.GeneralError", m.getSerial(), "s", _("Sending message failed")));
+ send(c,new Error("org.freedesktop.DBus", null, "org.freedesktop.DBus.Error.GeneralError", m.getSerial(), "s", gettext("Sending message failed")));
}
if ("org.freedesktop.DBus".equals(m.getDestination())) {
@@ -672,7 +672,7 @@
Connstruct dest = names.get(m.getDestination());
if (null == dest) {
- send(c, new Error("org.freedesktop.DBus", null, "org.freedesktop.DBus.Error.ServiceUnknown", m.getSerial(), "s", MessageFormat.format(_("The name `{0}' does not exist"), new Object[] { m.getDestination() })));
+ send(c, new Error("org.freedesktop.DBus", null, "org.freedesktop.DBus.Error.ServiceUnknown", m.getSerial(), "s", MessageFormat.format(gettext("The name `{0}' does not exist"), new Object[] { m.getDestination() })));
} else
send(dest, m);
}
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/BusAddress.java dbus-java-2.7/org/freedesktop/dbus/BusAddress.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/BusAddress.java 2008-06-07 12:19:11.000000000 +0200
+++ dbus-java-2.7/org/freedesktop/dbus/BusAddress.java 2018-06-18 10:36:56.841865938 +0200
@@ -9,7 +9,7 @@
Full licence texts are included in the COPYING file with this program.
*/
package org.freedesktop.dbus;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.text.ParseException;
import java.util.Map;
import java.util.HashMap;
@@ -21,10 +21,10 @@
private Map<String,String> parameters;
public BusAddress(String address) throws ParseException
{
- if (null == address || "".equals(address)) throw new ParseException(_("Bus address is blank"), 0);
+ if (null == address || "".equals(address)) throw new ParseException(gettext("Bus address is blank"), 0);
if (Debug.debug) Debug.print(Debug.VERBOSE, "Parsing bus address: "+address);
String[] ss = address.split(":", 2);
- if (ss.length < 2) throw new ParseException(_("Bus address is invalid: ")+address, 0);
+ if (ss.length < 2) throw new ParseException(gettext("Bus address is invalid: ")+address, 0);
type = ss[0];
if (Debug.debug) Debug.print(Debug.VERBOSE, "Transport type: "+type);
String[] ps = ss[1].split(",");
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/DBusAsyncReply.java dbus-java-2.7/org/freedesktop/dbus/DBusAsyncReply.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/DBusAsyncReply.java 2008-06-07 12:19:11.000000000 +0200
+++ dbus-java-2.7/org/freedesktop/dbus/DBusAsyncReply.java 2018-06-18 10:36:56.841865938 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -97,12 +97,12 @@
checkReply();
if (null != rval) return rval;
else if (null != error) throw error;
- else throw new NoReply(_("Async call has not had a reply"));
+ else throw new NoReply(gettext("Async call has not had a reply"));
}
public String toString()
{
- return _("Waiting for: ")+mc;
+ return gettext("Waiting for: ")+mc;
}
Method getMethod() { return me; }
AbstractConnection getConnection() { return conn; }
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/DBusConnection.java dbus-java-2.7/org/freedesktop/dbus/DBusConnection.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/DBusConnection.java 2009-11-01 14:53:27.000000000 +0100
+++ dbus-java-2.7/org/freedesktop/dbus/DBusConnection.java 2018-06-18 10:36:56.845865954 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.lang.reflect.Proxy;
@@ -163,7 +163,7 @@
if (Debug.debug) Debug.print(Debug.WARN, "Handling Disconnected signal from bus");
try {
Error err = new Error(
- "org.freedesktop.DBus.Local" , "org.freedesktop.DBus.Local.Disconnected", 0, "s", new Object[] { _("Disconnected") });
+ "org.freedesktop.DBus.Local" , "org.freedesktop.DBus.Local.Disconnected", 0, "s", new Object[] { gettext("Disconnected") });
if (null != pendingCalls) synchronized (pendingCalls) {
long[] set = pendingCalls.getKeys();
for (long l: set) if (-1 != l) {
@@ -241,16 +241,16 @@
if (null == s) {
// address gets stashed in $HOME/.dbus/session-bus/`dbus-uuidgen --get`-`sed 's/:\(.\)\..*/\1/' <<< $DISPLAY`
String display = System.getenv("DISPLAY");
- if (null == display) throw new DBusException(_("Cannot Resolve Session Bus Address"));
+ if (null == display) throw new DBusException(gettext("Cannot Resolve Session Bus Address"));
File uuidfile = new File("/var/lib/dbus/machine-id");
- if (!uuidfile.exists()) throw new DBusException(_("Cannot Resolve Session Bus Address"));
+ if (!uuidfile.exists()) throw new DBusException(gettext("Cannot Resolve Session Bus Address"));
try {
BufferedReader r = new BufferedReader(new FileReader(uuidfile));
String uuid = r.readLine();
String homedir = System.getProperty("user.home");
File addressfile = new File(homedir + "/.dbus/session-bus",
uuid + "-" + display.replaceAll(":([0-9]*)\\..*", "$1"));
- if (!addressfile.exists()) throw new DBusException(_("Cannot Resolve Session Bus Address"));
+ if (!addressfile.exists()) throw new DBusException(gettext("Cannot Resolve Session Bus Address"));
r = new BufferedReader(new FileReader(addressfile));
String l;
while (null != (l = r.readLine())) {
@@ -260,16 +260,16 @@
if (Debug.debug) Debug.print(Debug.VERBOSE, "Parsing "+l+" to "+s);
}
}
- if (null == s || "".equals(s)) throw new DBusException(_("Cannot Resolve Session Bus Address"));
+ if (null == s || "".equals(s)) throw new DBusException(gettext("Cannot Resolve Session Bus Address"));
if (Debug.debug) Debug.print(Debug.INFO, "Read bus address "+s+" from file "+addressfile.toString());
} catch (Exception e) {
if (EXCEPTION_DEBUG && Debug.debug) Debug.print(Debug.ERR, e);
- throw new DBusException(_("Cannot Resolve Session Bus Address"));
+ throw new DBusException(gettext("Cannot Resolve Session Bus Address"));
}
}
break;
default:
- throw new DBusException(_("Invalid Bus Type: ")+bustype);
+ throw new DBusException(gettext("Invalid Bus Type: ")+bustype);
}
DBusConnection c = conn.get(s);
if (Debug.debug) Debug.print(Debug.VERBOSE, "Getting bus connection for "+s+": "+c);
@@ -301,11 +301,11 @@
} catch (IOException IOe) {
if (EXCEPTION_DEBUG && Debug.debug) Debug.print(Debug.ERR, IOe);
disconnect();
- throw new DBusException(_("Failed to connect to bus ")+IOe.getMessage());
+ throw new DBusException(gettext("Failed to connect to bus ")+IOe.getMessage());
} catch (ParseException Pe) {
if (EXCEPTION_DEBUG && Debug.debug) Debug.print(Debug.ERR, Pe);
disconnect();
- throw new DBusException(_("Failed to connect to bus ")+Pe.getMessage());
+ throw new DBusException(gettext("Failed to connect to bus ")+Pe.getMessage());
}
// start listening for calls
@@ -361,7 +361,7 @@
}
}
- if (ifcs.size() == 0) throw new DBusException(_("Could not find an interface to cast to"));
+ if (ifcs.size() == 0) throw new DBusException(gettext("Could not find an interface to cast to"));
RemoteObject ro = new RemoteObject(source, path, null, false);
DBusInterface newi = (DBusInterface)
@@ -372,7 +372,7 @@
return newi;
} catch (Exception e) {
if (EXCEPTION_DEBUG && Debug.debug) Debug.print(Debug.ERR, e);
- throw new DBusException(MessageFormat.format(_("Failed to create proxy object for {0} exported by {1}. Reason: {2}"), new Object[] { path, source, e.getMessage() }));
+ throw new DBusException(MessageFormat.format(gettext("Failed to create proxy object for {0} exported by {1}. Reason: {2}"), new Object[] { path, source, e.getMessage() }));
}
}
@@ -387,7 +387,7 @@
o = null;
}
if (null != o) return o.object.get();
- if (null == source) throw new DBusException(_("Not an object exported by this connection and no remote specified"));
+ if (null == source) throw new DBusException(gettext("Not an object exported by this connection and no remote specified"));
return dynamicProxy(source, path);
}
@@ -400,7 +400,7 @@
public void releaseBusName(String busname) throws DBusException
{
if (!busname.matches(BUSNAME_REGEX)||busname.length() > MAX_NAME_LENGTH)
- throw new DBusException(_("Invalid bus name"));
+ throw new DBusException(gettext("Invalid bus name"));
synchronized (this.busnames) {
UInt32 rv;
try {
@@ -422,7 +422,7 @@
public void requestBusName(String busname) throws DBusException
{
if (!busname.matches(BUSNAME_REGEX)||busname.length() > MAX_NAME_LENGTH)
- throw new DBusException(_("Invalid bus name"));
+ throw new DBusException(gettext("Invalid bus name"));
synchronized (this.busnames) {
UInt32 rv;
try {
@@ -435,8 +435,8 @@
}
switch (rv.intValue()) {
case DBus.DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER: break;
- case DBus.DBUS_REQUEST_NAME_REPLY_IN_QUEUE: throw new DBusException(_("Failed to register bus name"));
- case DBus.DBUS_REQUEST_NAME_REPLY_EXISTS: throw new DBusException(_("Failed to register bus name"));
+ case DBus.DBUS_REQUEST_NAME_REPLY_IN_QUEUE: throw new DBusException(gettext("Failed to register bus name"));
+ case DBus.DBUS_REQUEST_NAME_REPLY_EXISTS: throw new DBusException(gettext("Failed to register bus name"));
case DBus.DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER: break;
default: break;
}
@@ -486,11 +486,11 @@
*/
public DBusInterface getPeerRemoteObject(String busname, String objectpath) throws DBusException
{
- if (null == busname) throw new DBusException(_("Invalid bus name: null"));
+ if (null == busname) throw new DBusException(gettext("Invalid bus name: null"));
if ((!busname.matches(BUSNAME_REGEX) && !busname.matches(CONNID_REGEX))
|| busname.length() > MAX_NAME_LENGTH)
- throw new DBusException(_("Invalid bus name: ")+busname);
+ throw new DBusException(gettext("Invalid bus name: ")+busname);
String unique = _dbus.GetNameOwner(busname);
@@ -519,15 +519,15 @@
*/
public DBusInterface getRemoteObject(String busname, String objectpath) throws DBusException
{
- if (null == busname) throw new DBusException(_("Invalid bus name: null"));
- if (null == objectpath) throw new DBusException(_("Invalid object path: null"));
+ if (null == busname) throw new DBusException(gettext("Invalid bus name: null"));
+ if (null == objectpath) throw new DBusException(gettext("Invalid object path: null"));
if ((!busname.matches(BUSNAME_REGEX) && !busname.matches(CONNID_REGEX))
|| busname.length() > MAX_NAME_LENGTH)
- throw new DBusException(_("Invalid bus name: ")+busname);
+ throw new DBusException(gettext("Invalid bus name: ")+busname);
if (!objectpath.matches(OBJECT_REGEX) || objectpath.length() > MAX_NAME_LENGTH)
- throw new DBusException(_("Invalid object path: ")+objectpath);
+ throw new DBusException(gettext("Invalid object path: ")+objectpath);
return dynamicProxy(busname, objectpath);
}
@@ -552,11 +552,11 @@
*/
public <I extends DBusInterface> I getPeerRemoteObject(String busname, String objectpath, Class<I> type, boolean autostart) throws DBusException
{
- if (null == busname) throw new DBusException(_("Invalid bus name: null"));
+ if (null == busname) throw new DBusException(gettext("Invalid bus name: null"));
if ((!busname.matches(BUSNAME_REGEX) && !busname.matches(CONNID_REGEX))
|| busname.length() > MAX_NAME_LENGTH)
- throw new DBusException(_("Invalid bus name: ")+busname);
+ throw new DBusException(gettext("Invalid bus name: ")+busname);
String unique = _dbus.GetNameOwner(busname);
@@ -601,23 +601,23 @@
@SuppressWarnings("unchecked")
public <I extends DBusInterface> I getRemoteObject(String busname, String objectpath, Class<I> type, boolean autostart) throws DBusException
{
- if (null == busname) throw new DBusException(_("Invalid bus name: null"));
- if (null == objectpath) throw new DBusException(_("Invalid object path: null"));
- if (null == type) throw new ClassCastException(_("Not A DBus Interface"));
+ if (null == busname) throw new DBusException(gettext("Invalid bus name: null"));
+ if (null == objectpath) throw new DBusException(gettext("Invalid object path: null"));
+ if (null == type) throw new ClassCastException(gettext("Not A DBus Interface"));
if ((!busname.matches(BUSNAME_REGEX) && !busname.matches(CONNID_REGEX))
|| busname.length() > MAX_NAME_LENGTH)
- throw new DBusException(_("Invalid bus name: ")+busname);
+ throw new DBusException(gettext("Invalid bus name: ")+busname);
if (!objectpath.matches(OBJECT_REGEX) || objectpath.length() > MAX_NAME_LENGTH)
- throw new DBusException(_("Invalid object path: ")+objectpath);
+ throw new DBusException(gettext("Invalid object path: ")+objectpath);
- if (!DBusInterface.class.isAssignableFrom(type)) throw new ClassCastException(_("Not A DBus Interface"));
+ if (!DBusInterface.class.isAssignableFrom(type)) throw new ClassCastException(gettext("Not A DBus Interface"));
// don't let people import things which don't have a
// valid D-Bus interface name
if (type.getName().equals(type.getSimpleName()))
- throw new DBusException(_("DBusInterfaces cannot be declared outside a package"));
+ throw new DBusException(gettext("DBusInterfaces cannot be declared outside a package"));
RemoteObject ro = new RemoteObject(busname, objectpath, type, autostart);
I i = (I) Proxy.newProxyInstance(type.getClassLoader(),
@@ -635,10 +635,10 @@
*/
public <T extends DBusSignal> void removeSigHandler(Class<T> type, String source, DBusSigHandler<T> handler) throws DBusException
{
- if (!DBusSignal.class.isAssignableFrom(type)) throw new ClassCastException(_("Not A DBus Signal"));
- if (source.matches(BUSNAME_REGEX)) throw new DBusException(_("Cannot watch for signals based on well known bus name as source, only unique names."));
+ if (!DBusSignal.class.isAssignableFrom(type)) throw new ClassCastException(gettext("Not A DBus Signal"));
+ if (source.matches(BUSNAME_REGEX)) throw new DBusException(gettext("Cannot watch for signals based on well known bus name as source, only unique names."));
if (!source.matches(CONNID_REGEX)||source.length() > MAX_NAME_LENGTH)
- throw new DBusException(_("Invalid bus name: ")+source);
+ throw new DBusException(gettext("Invalid bus name: ")+source);
removeSigHandler(new DBusMatchRule(type, source, null), handler);
}
/**
@@ -652,13 +652,13 @@
*/
public <T extends DBusSignal> void removeSigHandler(Class<T> type, String source, DBusInterface object, DBusSigHandler<T> handler) throws DBusException
{
- if (!DBusSignal.class.isAssignableFrom(type)) throw new ClassCastException(_("Not A DBus Signal"));
- if (source.matches(BUSNAME_REGEX)) throw new DBusException(_("Cannot watch for signals based on well known bus name as source, only unique names."));
+ if (!DBusSignal.class.isAssignableFrom(type)) throw new ClassCastException(gettext("Not A DBus Signal"));
+ if (source.matches(BUSNAME_REGEX)) throw new DBusException(gettext("Cannot watch for signals based on well known bus name as source, only unique names."));
if (!source.matches(CONNID_REGEX)||source.length() > MAX_NAME_LENGTH)
- throw new DBusException(_("Invalid bus name: ")+source);
+ throw new DBusException(gettext("Invalid bus name: ")+source);
String objectpath = importedObjects.get(object).objectpath;
if (!objectpath.matches(OBJECT_REGEX)||objectpath.length() > MAX_NAME_LENGTH)
- throw new DBusException(_("Invalid object path: ")+objectpath);
+ throw new DBusException(gettext("Invalid object path: ")+objectpath);
removeSigHandler(new DBusMatchRule(type, source, objectpath), handler);
}
protected <T extends DBusSignal> void removeSigHandler(DBusMatchRule rule, DBusSigHandler<T> handler) throws DBusException
@@ -695,10 +695,10 @@
@SuppressWarnings("unchecked")
public <T extends DBusSignal> void addSigHandler(Class<T> type, String source, DBusSigHandler<T> handler) throws DBusException
{
- if (!DBusSignal.class.isAssignableFrom(type)) throw new ClassCastException(_("Not A DBus Signal"));
- if (source.matches(BUSNAME_REGEX)) throw new DBusException(_("Cannot watch for signals based on well known bus name as source, only unique names."));
+ if (!DBusSignal.class.isAssignableFrom(type)) throw new ClassCastException(gettext("Not A DBus Signal"));
+ if (source.matches(BUSNAME_REGEX)) throw new DBusException(gettext("Cannot watch for signals based on well known bus name as source, only unique names."));
if (!source.matches(CONNID_REGEX)||source.length() > MAX_NAME_LENGTH)
- throw new DBusException(_("Invalid bus name: ")+source);
+ throw new DBusException(gettext("Invalid bus name: ")+source);
addSigHandler(new DBusMatchRule(type, source, null), (DBusSigHandler<? extends DBusSignal>) handler);
}
/**
@@ -714,13 +714,13 @@
@SuppressWarnings("unchecked")
public <T extends DBusSignal> void addSigHandler(Class<T> type, String source, DBusInterface object, DBusSigHandler<T> handler) throws DBusException
{
- if (!DBusSignal.class.isAssignableFrom(type)) throw new ClassCastException(_("Not A DBus Signal"));
- if (source.matches(BUSNAME_REGEX)) throw new DBusException(_("Cannot watch for signals based on well known bus name as source, only unique names."));
+ if (!DBusSignal.class.isAssignableFrom(type)) throw new ClassCastException(gettext("Not A DBus Signal"));
+ if (source.matches(BUSNAME_REGEX)) throw new DBusException(gettext("Cannot watch for signals based on well known bus name as source, only unique names."));
if (!source.matches(CONNID_REGEX)||source.length() > MAX_NAME_LENGTH)
- throw new DBusException(_("Invalid bus name: ")+source);
+ throw new DBusException(gettext("Invalid bus name: ")+source);
String objectpath = importedObjects.get(object).objectpath;
if (!objectpath.matches(OBJECT_REGEX)||objectpath.length() > MAX_NAME_LENGTH)
- throw new DBusException(_("Invalid object path: ")+objectpath);
+ throw new DBusException(gettext("Invalid object path: ")+objectpath);
addSigHandler(new DBusMatchRule(type, source, objectpath), (DBusSigHandler<? extends DBusSignal>) handler);
}
protected <T extends DBusSignal> void addSigHandler(DBusMatchRule rule, DBusSigHandler<T> handler) throws DBusException
@@ -756,7 +756,7 @@
// Set all pending messages to have an error.
try {
Error err = new Error(
- "org.freedesktop.DBus.Local" , "org.freedesktop.DBus.Local.Disconnected", 0, "s", new Object[] { _("Disconnected") });
+ "org.freedesktop.DBus.Local" , "org.freedesktop.DBus.Local.Disconnected", 0, "s", new Object[] { gettext("Disconnected") });
synchronized (pendingCalls) {
long[] set = pendingCalls.getKeys();
for (long l: set) if (-1 != l) {
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/DBusMatchRule.java dbus-java-2.7/org/freedesktop/dbus/DBusMatchRule.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/DBusMatchRule.java 2008-11-15 01:28:58.000000000 +0100
+++ dbus-java-2.7/org/freedesktop/dbus/DBusMatchRule.java 2018-06-18 10:36:56.845865954 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import org.freedesktop.dbus.exceptions.DBusException;
import org.freedesktop.dbus.exceptions.DBusExecutionException;
@@ -79,13 +79,13 @@
else
iface = AbstractConnection.dollar_pattern.matcher(c.getName()).replaceAll(".");
if (!iface.matches(".*\\..*"))
- throw new DBusException(_("DBusInterfaces must be defined in a package."));
+ throw new DBusException(gettext("DBusInterfaces must be defined in a package."));
member = null;
type = null;
}
else if (DBusSignal.class.isAssignableFrom(c)) {
if (null == c.getEnclosingClass())
- throw new DBusException(_("Signals must be declared as a member of a class implementing DBusInterface which is the member of a package."));
+ throw new DBusException(gettext("Signals must be declared as a member of a class implementing DBusInterface which is the member of a package."));
else
if (null != c.getEnclosingClass().getAnnotation(DBusInterfaceName.class))
iface = c.getEnclosingClass().getAnnotation(DBusInterfaceName.class).value();
@@ -93,7 +93,7 @@
iface = AbstractConnection.dollar_pattern.matcher(c.getEnclosingClass().getName()).replaceAll(".");
// Don't export things which are invalid D-Bus interfaces
if (!iface.matches(".*\\..*"))
- throw new DBusException(_("DBusInterfaces must be defined in a package."));
+ throw new DBusException(gettext("DBusInterfaces must be defined in a package."));
if (c.isAnnotationPresent(DBusMemberName.class))
member = c.getAnnotation(DBusMemberName.class).value();
else
@@ -107,7 +107,7 @@
else
iface = AbstractConnection.dollar_pattern.matcher(c.getName()).replaceAll(".");
if (!iface.matches(".*\\..*"))
- throw new DBusException(_("DBusInterfaces must be defined in a package."));
+ throw new DBusException(gettext("DBusInterfaces must be defined in a package."));
member = null;
type = "error";
}
@@ -117,12 +117,12 @@
else
iface = AbstractConnection.dollar_pattern.matcher(c.getClass().getName()).replaceAll(".");
if (!iface.matches(".*\\..*"))
- throw new DBusException(_("DBusInterfaces must be defined in a package."));
+ throw new DBusException(gettext("DBusInterfaces must be defined in a package."));
member = null;
type = "error";
}
else
- throw new DBusException(_("Invalid type for match rule: ")+c);
+ throw new DBusException(gettext("Invalid type for match rule: ")+c);
}
public String toString()
{
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/DBusSignal.java dbus-java-2.7/org/freedesktop/dbus/DBusSignal.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/DBusSignal.java 2009-05-21 18:20:32.000000000 +0200
+++ dbus-java-2.7/org/freedesktop/dbus/DBusSignal.java 2018-06-18 10:36:56.845865954 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.lang.reflect.Constructor;
import java.lang.reflect.GenericDeclaration;
@@ -34,7 +34,7 @@
super(Message.Endian.BIG, Message.MessageType.SIGNAL, (byte) 0);
if (null == path || null == member || null == iface)
- throw new MessageFormatException(_("Must specify object path, interface and signal name to Signals."));
+ throw new MessageFormatException(gettext("Must specify object path, interface and signal name to Signals."));
headers.put(Message.HeaderField.PATH,path);
headers.put(Message.HeaderField.MEMBER,member);
headers.put(Message.HeaderField.INTERFACE,iface);
@@ -100,7 +100,7 @@
type = AbstractConnection.dollar_pattern.matcher(c.getEnclosingClass().getName()).replaceAll(".");
} else
- throw new DBusException(_("Signals must be declared as a member of a class implementing DBusInterface which is the member of a package."));
+ throw new DBusException(gettext("Signals must be declared as a member of a class implementing DBusInterface which is the member of a package."));
DBusSignal s = new internalsig(source, objectpath, type, c.getSimpleName(), sig, parameters, serial);
s.c = c;
return s;
@@ -119,7 +119,7 @@
name = name.replaceAll("\\.([^\\.]*)$", "\\$$1");
} while (null == c && name.matches(".*\\..*"));
if (null == c)
- throw new DBusException(_("Could not create class from signal ")+intname+'.'+signame);
+ throw new DBusException(gettext("Could not create class from signal ")+intname+'.'+signame);
classCache.put(name, c);
return c;
}
@@ -182,7 +182,7 @@
{
super(Message.Endian.BIG, Message.MessageType.SIGNAL, (byte) 0);
- if (!objectpath.matches(AbstractConnection.OBJECT_REGEX)) throw new DBusException(_("Invalid object path: ")+objectpath);
+ if (!objectpath.matches(AbstractConnection.OBJECT_REGEX)) throw new DBusException(gettext("Invalid object path: ")+objectpath);
Class<? extends DBusSignal> tc = getClass();
String member;
@@ -195,7 +195,7 @@
if (null == enc ||
!DBusInterface.class.isAssignableFrom(enc) ||
enc.getName().equals(enc.getSimpleName()))
- throw new DBusException(_("Signals must be declared as a member of a class implementing DBusInterface which is the member of a package."));
+ throw new DBusException(gettext("Signals must be declared as a member of a class implementing DBusInterface which is the member of a package."));
else
if (null != enc.getAnnotation(DBusInterfaceName.class))
iface = enc.getAnnotation(DBusInterfaceName.class).value();
@@ -233,7 +233,7 @@
setArgs(args);
} catch (Exception e) {
if (AbstractConnection.EXCEPTION_DEBUG && Debug.debug) Debug.print(Debug.ERR, e);
- throw new DBusException(_("Failed to add signal parameters: ")+e.getMessage());
+ throw new DBusException(gettext("Failed to add signal parameters: ")+e.getMessage());
}
}
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/DirectConnection.java dbus-java-2.7/org/freedesktop/dbus/DirectConnection.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/DirectConnection.java 2009-03-29 21:17:57.000000000 +0200
+++ dbus-java-2.7/org/freedesktop/dbus/DirectConnection.java 2018-06-18 10:36:56.845865954 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.lang.reflect.Proxy;
import java.io.File;
@@ -46,10 +46,10 @@
connected = true;
} catch (IOException IOe) {
if (EXCEPTION_DEBUG && Debug.debug) Debug.print(Debug.ERR, IOe);
- throw new DBusException(_("Failed to connect to bus ")+IOe.getMessage());
+ throw new DBusException(gettext("Failed to connect to bus ")+IOe.getMessage());
} catch (ParseException Pe) {
if (EXCEPTION_DEBUG && Debug.debug) Debug.print(Debug.ERR, Pe);
- throw new DBusException(_("Failed to connect to bus ")+Pe.getMessage());
+ throw new DBusException(gettext("Failed to connect to bus ")+Pe.getMessage());
}
listen();
@@ -128,7 +128,7 @@
}
}
- if (ifcs.size() == 0) throw new DBusException(_("Could not find an interface to cast to"));
+ if (ifcs.size() == 0) throw new DBusException(gettext("Could not find an interface to cast to"));
RemoteObject ro = new RemoteObject(null, path, null, false);
DBusInterface newi = (DBusInterface)
@@ -139,7 +139,7 @@
return newi;
} catch (Exception e) {
if (EXCEPTION_DEBUG && Debug.debug) Debug.print(Debug.ERR, e);
- throw new DBusException(MessageFormat.format(_("Failed to create proxy object for {0}; reason: {1}."), new Object[] { path, e.getMessage()}));
+ throw new DBusException(MessageFormat.format(gettext("Failed to create proxy object for {0}; reason: {1}."), new Object[] { path, e.getMessage()}));
}
}
@@ -177,10 +177,10 @@
*/
public DBusInterface getRemoteObject(String objectpath) throws DBusException
{
- if (null == objectpath) throw new DBusException(_("Invalid object path: null"));
+ if (null == objectpath) throw new DBusException(gettext("Invalid object path: null"));
if (!objectpath.matches(OBJECT_REGEX) || objectpath.length() > MAX_NAME_LENGTH)
- throw new DBusException(_("Invalid object path: ")+objectpath);
+ throw new DBusException(gettext("Invalid object path: ")+objectpath);
return dynamicProxy(objectpath);
}
@@ -199,18 +199,18 @@
*/
public DBusInterface getRemoteObject(String objectpath, Class<? extends DBusInterface> type) throws DBusException
{
- if (null == objectpath) throw new DBusException(_("Invalid object path: null"));
- if (null == type) throw new ClassCastException(_("Not A DBus Interface"));
+ if (null == objectpath) throw new DBusException(gettext("Invalid object path: null"));
+ if (null == type) throw new ClassCastException(gettext("Not A DBus Interface"));
if (!objectpath.matches(OBJECT_REGEX) || objectpath.length() > MAX_NAME_LENGTH)
- throw new DBusException(_("Invalid object path: ")+objectpath);
+ throw new DBusException(gettext("Invalid object path: ")+objectpath);
- if (!DBusInterface.class.isAssignableFrom(type)) throw new ClassCastException(_("Not A DBus Interface"));
+ if (!DBusInterface.class.isAssignableFrom(type)) throw new ClassCastException(gettext("Not A DBus Interface"));
// don't let people import things which don't have a
// valid D-Bus interface name
if (type.getName().equals(type.getSimpleName()))
- throw new DBusException(_("DBusInterfaces cannot be declared outside a package"));
+ throw new DBusException(gettext("DBusInterfaces cannot be declared outside a package"));
RemoteObject ro = new RemoteObject(null, objectpath, type, false);
DBusInterface i = (DBusInterface) Proxy.newProxyInstance(type.getClassLoader(),
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/Error.java dbus-java-2.7/org/freedesktop/dbus/Error.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/Error.java 2009-04-29 19:19:17.000000000 +0200
+++ dbus-java-2.7/org/freedesktop/dbus/Error.java 2018-06-18 10:36:56.845865954 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.lang.reflect.Constructor;
import java.util.Vector;
@@ -36,7 +36,7 @@
super(Message.Endian.BIG, Message.MessageType.ERROR, (byte) 0);
if (null == errorName)
- throw new MessageFormatException(_("Must specify error name to Errors."));
+ throw new MessageFormatException(gettext("Must specify error name to Errors."));
headers.put(Message.HeaderField.REPLY_SERIAL,replyserial);
headers.put(Message.HeaderField.ERROR_NAME,errorName);
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/exceptions/UnknownTypeCodeException.java dbus-java-2.7/org/freedesktop/dbus/exceptions/UnknownTypeCodeException.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/exceptions/UnknownTypeCodeException.java 2009-03-29 21:17:57.000000000 +0200
+++ dbus-java-2.7/org/freedesktop/dbus/exceptions/UnknownTypeCodeException.java 2018-06-18 10:36:56.845865954 +0200
@@ -9,13 +9,13 @@
Full licence texts are included in the COPYING file with this program.
*/
package org.freedesktop.dbus.exceptions;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
@SuppressWarnings("serial")
public class UnknownTypeCodeException extends DBusException implements NonFatalException
{
public UnknownTypeCodeException(byte code)
{
- super(_("Not a valid D-Bus type code: ") + code);
+ super(gettext("Not a valid D-Bus type code: ") + code);
}
}
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/ExportedObject.java dbus-java-2.7/org/freedesktop/dbus/ExportedObject.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/ExportedObject.java 2008-06-07 12:19:11.000000000 +0200
+++ dbus-java-2.7/org/freedesktop/dbus/ExportedObject.java 2018-06-18 10:36:56.849865970 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.lang.ref.Reference;
import java.lang.ref.WeakReference;
@@ -65,9 +65,9 @@
// don't let people export things which don't have a
// valid D-Bus interface name
if (c.getName().equals(c.getSimpleName()))
- throw new DBusException(_("DBusInterfaces cannot be declared outside a package"));
+ throw new DBusException(gettext("DBusInterfaces cannot be declared outside a package"));
if (c.getName().length() > DBusConnection.MAX_NAME_LENGTH)
- throw new DBusException(_("Introspected interface name exceeds 255 characters. Cannot export objects of type ")+c.getName());
+ throw new DBusException(gettext("Introspected interface name exceeds 255 characters. Cannot export objects of type ")+c.getName());
else
introspectiondata += " <interface name=\""+AbstractConnection.dollar_pattern.matcher(c.getName()).replaceAll(".")+"\">\n";
}
@@ -81,7 +81,7 @@
else
name = meth.getName();
if (name.length() > DBusConnection.MAX_NAME_LENGTH)
- throw new DBusException(_("Introspected method name exceeds 255 characters. Cannot export objects with method ")+name);
+ throw new DBusException(gettext("Introspected method name exceeds 255 characters. Cannot export objects with method ")+name);
introspectiondata += " <method name=\""+name+"\" >\n";
introspectiondata += getAnnotations(meth);
for (Class ex: meth.getExceptionTypes())
@@ -103,7 +103,7 @@
for (String s: Marshalling.getDBusType(t))
introspectiondata += " <arg type=\""+s+"\" direction=\"out\"/>\n";
} else if (Object[].class.equals(meth.getGenericReturnType())) {
- throw new DBusException(_("Return type of Object[] cannot be introspected properly"));
+ throw new DBusException(gettext("Return type of Object[] cannot be introspected properly"));
} else
for (String s: Marshalling.getDBusType(meth.getGenericReturnType()))
introspectiondata += " <arg type=\""+s+"\" direction=\"out\"/>\n";
@@ -120,7 +120,7 @@
} else
name = sig.getSimpleName();
if (name.length() > DBusConnection.MAX_NAME_LENGTH)
- throw new DBusException(_("Introspected signal name exceeds 255 characters. Cannot export objects with signals of type ")+name);
+ throw new DBusException(gettext("Introspected signal name exceeds 255 characters. Cannot export objects with signals of type ")+name);
introspectiondata += " <signal name=\""+name+"\">\n";
Constructor con = sig.getConstructors()[0];
Type[] ts = con.getGenericParameterTypes();
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/Gettext.java dbus-java-2.7/org/freedesktop/dbus/Gettext.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/Gettext.java 2008-06-07 12:19:11.000000000 +0200
+++ dbus-java-2.7/org/freedesktop/dbus/Gettext.java 2018-06-18 11:18:05.928670696 +0200
@@ -18,13 +18,9 @@
*/
package org.freedesktop.dbus;
-import java.util.ResourceBundle;
-
public class Gettext
{
- private static ResourceBundle myResources =
- ResourceBundle.getBundle("dbusjava_localized");
- public static String _(String s) {
- return myResources.getString(s);
+ public static String gettext(String s) {
+ return s;
}
}
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/Marshalling.java dbus-java-2.7/org/freedesktop/dbus/Marshalling.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/Marshalling.java 2009-11-01 14:53:27.000000000 +0100
+++ dbus-java-2.7/org/freedesktop/dbus/Marshalling.java 2018-06-18 10:36:56.849865970 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
@@ -98,13 +98,13 @@
else out[level].delete(0, out[level].length());
if (basic && !(c instanceof Class))
- throw new DBusException(c+_(" is not a basic type"));
+ throw new DBusException(c+gettext(" is not a basic type"));
if (c instanceof TypeVariable) out[level].append((char) Message.ArgumentType.VARIANT);
else if (c instanceof GenericArrayType) {
out[level].append((char) Message.ArgumentType.ARRAY);
String[] s = recursiveGetDBusType(((GenericArrayType) c).getGenericComponentType(), false, level+1);
- if (s.length != 1) throw new DBusException(_("Multi-valued array types not permitted"));
+ if (s.length != 1) throw new DBusException(gettext("Multi-valued array types not permitted"));
out[level].append(s[0]);
} else if ((c instanceof Class &&
DBusSerializable.class.isAssignableFrom((Class<? extends Object>) c)) ||
@@ -122,12 +122,12 @@
if (m.getName().equals("deserialize"))
newtypes = m.getGenericParameterTypes();
- if (null == newtypes) throw new DBusException(_("Serializable classes must implement a deserialize method"));
+ if (null == newtypes) throw new DBusException(gettext("Serializable classes must implement a deserialize method"));
String[] sigs = new String[newtypes.length];
for (int j = 0; j < sigs.length; j++) {
String[] ss = recursiveGetDBusType(newtypes[j], false, level+1);
- if (1 != ss.length) throw new DBusException(_("Serializable classes must serialize to native DBus types"));
+ if (1 != ss.length) throw new DBusException(gettext("Serializable classes must serialize to native DBus types"));
sigs[j] = ss[0];
}
return sigs;
@@ -139,14 +139,14 @@
Type[] t = p.getActualTypeArguments();
try {
String[] s = recursiveGetDBusType(t[0], true, level+1);
- if (s.length != 1) throw new DBusException(_("Multi-valued array types not permitted"));
+ if (s.length != 1) throw new DBusException(gettext("Multi-valued array types not permitted"));
out[level].append(s[0]);
s = recursiveGetDBusType(t[1], false, level+1);
- if (s.length != 1) throw new DBusException(_("Multi-valued array types not permitted"));
+ if (s.length != 1) throw new DBusException(gettext("Multi-valued array types not permitted"));
out[level].append(s[0]);
} catch (ArrayIndexOutOfBoundsException AIOOBe) {
if (AbstractConnection.EXCEPTION_DEBUG && Debug.debug) Debug.print(Debug.ERR, AIOOBe);
- throw new DBusException(_("Map must have 2 parameters"));
+ throw new DBusException(gettext("Map must have 2 parameters"));
}
out[level].append('}');
}
@@ -156,7 +156,7 @@
out[level].append((char) Message.ArgumentType.SIGNATURE);
else {
String[] s = recursiveGetDBusType(t, false, level+1);
- if (s.length != 1) throw new DBusException(_("Multi-valued array types not permitted"));
+ if (s.length != 1) throw new DBusException(gettext("Multi-valued array types not permitted"));
out[level].append((char) Message.ArgumentType.ARRAY);
out[level].append(s[0]);
}
@@ -177,7 +177,7 @@
return vs.toArray(new String[0]);
}
else
- throw new DBusException(_("Exporting non-exportable parameterized type ")+c);
+ throw new DBusException(gettext("Exporting non-exportable parameterized type ")+c);
}
else if (c.equals(Byte.class)) out[level].append((char) Message.ArgumentType.BYTE);
@@ -214,7 +214,7 @@
else {
out[level].append((char) Message.ArgumentType.ARRAY);
String[] s = recursiveGetDBusType(((Class<? extends Object>) c).getComponentType(), false, level+1);
- if (s.length != 1) throw new DBusException(_("Multi-valued array types not permitted"));
+ if (s.length != 1) throw new DBusException(gettext("Multi-valued array types not permitted"));
out[level].append(s[0]);
}
} else if (c instanceof Class &&
@@ -238,7 +238,7 @@
out[level].append(s);
out[level].append(')');
} else {
- throw new DBusException(_("Exporting non-exportable type ")+c);
+ throw new DBusException(gettext("Exporting non-exportable type ")+c);
}
if (Debug.debug) Debug.print(Debug.VERBOSE, "Converted Java type: "+c+" to D-Bus Type: "+out[level]);
@@ -335,12 +335,12 @@
i+=c+1;
break;
default:
- throw new DBusException(MessageFormat.format(_("Failed to parse DBus type signature: {0} ({1})."), new Object[] { dbus, dbus.charAt(i) }));
+ throw new DBusException(MessageFormat.format(gettext("Failed to parse DBus type signature: {0} ({1})."), new Object[] { dbus, dbus.charAt(i) }));
}
return i;
} catch (IndexOutOfBoundsException IOOBe) {
if (AbstractConnection.EXCEPTION_DEBUG && Debug.debug) Debug.print(Debug.ERR, IOOBe);
- throw new DBusException(_("Failed to parse DBus type signature: ")+dbus);
+ throw new DBusException(gettext("Failed to parse DBus type signature: ")+dbus);
}
}
/**
@@ -583,7 +583,7 @@
Debug.print(Debug.ERR, String.format("Error, Parameters difference (%1d, '%2s')", j, parameters[j].toString()));
}
}
- throw new DBusException(_("Error deserializing message: number of parameters didn't match receiving signature"));
+ throw new DBusException(gettext("Error deserializing message: number of parameters didn't match receiving signature"));
}
if (null == parameters[i]) continue;
@@ -612,7 +612,7 @@
parameters = compress;
} catch (ArrayIndexOutOfBoundsException AIOOBe) {
if (AbstractConnection.EXCEPTION_DEBUG && Debug.debug) Debug.print(Debug.ERR, AIOOBe);
- throw new DBusException(MessageFormat.format(_("Not enough elements to create custom object from serialized data ({0} < {1})."),
+ throw new DBusException(MessageFormat.format(gettext("Not enough elements to create custom object from serialized data ({0} < {1})."),
new Object[] { parameters.length-i, newtypes.length }));
}
}
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/Message.java dbus-java-2.7/org/freedesktop/dbus/Message.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/Message.java 2008-11-16 12:51:27.000000000 +0100
+++ dbus-java-2.7/org/freedesktop/dbus/Message.java 2018-06-18 10:36:56.853865986 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.lang.reflect.Array;
import java.lang.reflect.Type;
@@ -258,7 +258,7 @@
if (null == buf) return;
if (preallocated > 0) {
if (paofs+buf.length > pabuf.length)
- throw new ArrayIndexOutOfBoundsException(MessageFormat.format(_("Array index out of bounds, paofs={0}, pabuf.length={1}, buf.length={2}."), new Object[] { paofs, pabuf.length, buf.length }));
+ throw new ArrayIndexOutOfBoundsException(MessageFormat.format(gettext("Array index out of bounds, paofs={0}, pabuf.length={1}, buf.length={2}."), new Object[] { paofs, pabuf.length, buf.length }));
System.arraycopy(buf, 0, pabuf, paofs, buf.length);
paofs += buf.length;
preallocated -= buf.length;
@@ -539,7 +539,7 @@
payloadbytes = payload.getBytes("UTF-8");
} catch (UnsupportedEncodingException UEe) {
if (AbstractConnection.EXCEPTION_DEBUG && Debug.debug) Debug.print(UEe);
- throw new DBusException(_("System does not support UTF-8 encoding"));
+ throw new DBusException(gettext("System does not support UTF-8 encoding"));
}
if (Debug.debug) Debug.print(Debug.VERBOSE, "Appending String of length "+payloadbytes.length);
appendint(payloadbytes.length, 4);
@@ -618,7 +618,7 @@
primbuf, k, algn);
break;
default:
- throw new MarshallingException(_("Primative array being sent as non-primative array."));
+ throw new MarshallingException(gettext("Primative array being sent as non-primative array."));
}
appendBytes(primbuf);
} else if (data instanceof List) {
@@ -703,7 +703,7 @@
return i;
} catch (ClassCastException CCe) {
if (AbstractConnection.EXCEPTION_DEBUG && Debug.debug) Debug.print(Debug.ERR, CCe);
- throw new MarshallingException(MessageFormat.format(_("Trying to marshall to unconvertable type (from {0} to {1})."), new Object[] { data.getClass().getName(), sigb[sigofs] }));
+ throw new MarshallingException(MessageFormat.format(gettext("Trying to marshall to unconvertable type (from {0} to {1})."), new Object[] { data.getClass().getName(), sigb[sigofs] }));
}
}
/**
@@ -867,7 +867,7 @@
ofs[1] = align(ofs[1], sigb[ofs[0]]);
int length = (int) (size / algn);
if (length > DBusConnection.MAX_ARRAY_LENGTH)
- throw new MarshallingException(_("Arrays must not exceed ")+DBusConnection.MAX_ARRAY_LENGTH);
+ throw new MarshallingException(gettext("Arrays must not exceed ")+DBusConnection.MAX_ARRAY_LENGTH);
// optimise primatives
switch (sigb[ofs[0]]) {
case ArgumentType.BYTE:
@@ -982,7 +982,7 @@
rv = new String(buf, ofs[1], length, "UTF-8");
} catch (UnsupportedEncodingException UEe) {
if (AbstractConnection.EXCEPTION_DEBUG && Debug.debug) Debug.print(UEe);
- throw new DBusException(_("System does not support UTF-8 encoding"));
+ throw new DBusException(gettext("System does not support UTF-8 encoding"));
}
ofs[1] += length + 1;
break;
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/MessageReader.java dbus-java-2.7/org/freedesktop/dbus/MessageReader.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/MessageReader.java 2009-11-01 14:53:27.000000000 +0100
+++ dbus-java-2.7/org/freedesktop/dbus/MessageReader.java 2018-06-18 10:36:56.853865986 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.io.BufferedInputStream;
import java.io.EOFException;
@@ -46,7 +46,7 @@
if (len[0] < 12) {
try { rv = in.read(buf, len[0], 12-len[0]); }
catch (SocketTimeoutException STe) { return null; }
- if (-1 == rv) throw new EOFException(_("Underlying transport returned EOF"));
+ if (-1 == rv) throw new EOFException(gettext("Underlying transport returned EOF"));
len[0] += rv;
}
if (len[0] == 0) return null;
@@ -61,7 +61,7 @@
byte protover = buf[3];
if (protover > Message.PROTOCOL) {
buf = null;
- throw new MessageProtocolVersionException(MessageFormat.format(_("Protocol version {0} is unsupported"), new Object[] { protover }));
+ throw new MessageProtocolVersionException(MessageFormat.format(gettext("Protocol version {0} is unsupported"), new Object[] { protover }));
}
/* Read the length of the variable header */
@@ -69,7 +69,7 @@
if (len[1] < 4) {
try { rv = in.read(tbuf, len[1], 4-len[1]); }
catch (SocketTimeoutException STe) { return null; }
- if (-1 == rv) throw new EOFException(_("Underlying transport returned EOF"));
+ if (-1 == rv) throw new EOFException(gettext("Underlying transport returned EOF"));
len[1] += rv;
}
if (len[1] < 4) {
@@ -95,7 +95,7 @@
if (len[2] < headerlen) {
try { rv = in.read(header, 8+len[2], headerlen-len[2]); }
catch (SocketTimeoutException STe) { return null; }
- if (-1 == rv) throw new EOFException(_("Underlying transport returned EOF"));
+ if (-1 == rv) throw new EOFException(gettext("Underlying transport returned EOF"));
len[2] += rv;
}
if (len[2] < headerlen) {
@@ -110,7 +110,7 @@
if (len[3] < body.length) {
try { rv = in.read(body, len[3], body.length-len[3]); }
catch (SocketTimeoutException STe) { return null; }
- if (-1 == rv) throw new EOFException(_("Underlying transport returned EOF"));
+ if (-1 == rv) throw new EOFException(gettext("Underlying transport returned EOF"));
len[3] += rv;
}
if (len[3] < body.length) {
@@ -133,7 +133,7 @@
m = new Error();
break;
default:
- throw new MessageTypeException(MessageFormat.format(_("Message type {0} unsupported"), new Object[] {type}));
+ throw new MessageTypeException(MessageFormat.format(gettext("Message type {0} unsupported"), new Object[] {type}));
}
if (Debug.debug) {
Debug.print(Debug.VERBOSE, Hexdump.format(buf));
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/MethodCall.java dbus-java-2.7/org/freedesktop/dbus/MethodCall.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/MethodCall.java 2008-06-07 12:19:11.000000000 +0200
+++ dbus-java-2.7/org/freedesktop/dbus/MethodCall.java 2018-06-18 10:36:56.853865986 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.util.Vector;
import org.freedesktop.dbus.exceptions.DBusException;
@@ -30,7 +30,7 @@
super(Message.Endian.BIG, Message.MessageType.METHOD_CALL, flags);
if (null == member || null == path)
- throw new MessageFormatException(_("Must specify destination, path and function name to MethodCalls."));
+ throw new MessageFormatException(gettext("Must specify destination, path and function name to MethodCalls."));
headers.put(Message.HeaderField.PATH,path);
headers.put(Message.HeaderField.MEMBER,member);
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/RemoteInvocationHandler.java dbus-java-2.7/org/freedesktop/dbus/RemoteInvocationHandler.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/RemoteInvocationHandler.java 2008-11-15 01:28:58.000000000 +0100
+++ dbus-java-2.7/org/freedesktop/dbus/RemoteInvocationHandler.java 2018-06-18 10:36:56.853865986 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
@@ -38,7 +38,7 @@
if (null == rp) {
if(null == c || Void.TYPE.equals(c)) return null;
- else throw new DBusExecutionException(_("Wrong return type (got void, expected a value)"));
+ else throw new DBusExecutionException(gettext("Wrong return type (got void, expected a value)"));
} else {
try {
if (Debug.debug) Debug.print(Debug.VERBOSE, "Converting return parameters from "+Arrays.deepToString(rp)+" to type "+m.getGenericReturnType());
@@ -47,7 +47,7 @@
}
catch (Exception e) {
if (AbstractConnection.EXCEPTION_DEBUG && Debug.debug) Debug.print(Debug.ERR, e);
- throw new DBusExecutionException(MessageFormat.format(_("Wrong return type (failed to de-serialize correct types: {0} )"), new Object[] { e.getMessage() }));
+ throw new DBusExecutionException(MessageFormat.format(gettext("Wrong return type (failed to de-serialize correct types: {0} )"), new Object[] { e.getMessage() }));
}
}
@@ -55,14 +55,14 @@
case 0:
if (null == c || Void.TYPE.equals(c))
return null;
- else throw new DBusExecutionException(_("Wrong return type (got void, expected a value)"));
+ else throw new DBusExecutionException(gettext("Wrong return type (got void, expected a value)"));
case 1:
return rp[0];
default:
// check we are meant to return multiple values
if (!Tuple.class.isAssignableFrom(c))
- throw new DBusExecutionException(_("Wrong return type (not expecting Tuple)"));
+ throw new DBusExecutionException(gettext("Wrong return type (not expecting Tuple)"));
Constructor<? extends Object> cons = c.getConstructors()[0];
try {
@@ -82,7 +82,7 @@
sig = Marshalling.getDBusType(ts);
args = Marshalling.convertParameters(args, ts, conn);
} catch (DBusException DBe) {
- throw new DBusExecutionException(_("Failed to construct D-Bus type: ")+DBe.getMessage());
+ throw new DBusExecutionException(gettext("Failed to construct D-Bus type: ")+DBe.getMessage());
}
MethodCall call;
byte flags = 0;
@@ -105,9 +105,9 @@
}
} catch (DBusException DBe) {
if (AbstractConnection.EXCEPTION_DEBUG && Debug.debug) Debug.print(Debug.ERR, DBe);
- throw new DBusExecutionException(_("Failed to construct outgoing method call: ")+DBe.getMessage());
+ throw new DBusExecutionException(gettext("Failed to construct outgoing method call: ")+DBe.getMessage());
}
- if (null == conn.outgoing) throw new NotConnected(_("Not Connected"));
+ if (null == conn.outgoing) throw new NotConnected(gettext("Not Connected"));
switch (syncmethod) {
case CALL_TYPE_ASYNC:
@@ -130,7 +130,7 @@
if (m.isAnnotationPresent(DBus.Method.NoReply.class)) return null;
Message reply = call.getReply();
- if (null == reply) throw new DBus.Error.NoReply(_("No reply within specified time"));
+ if (null == reply) throw new DBus.Error.NoReply(gettext("No reply within specified time"));
if (reply instanceof Error)
((Error) reply).throwException();
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/Transport.java dbus-java-2.7/org/freedesktop/dbus/Transport.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/Transport.java 2009-11-01 14:53:27.000000000 +0100
+++ dbus-java-2.7/org/freedesktop/dbus/Transport.java 2018-06-18 10:36:56.857866002 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.io.BufferedReader;
import java.io.File;
@@ -90,7 +90,7 @@
command = COMMAND_ERROR;
data = ss[1];
} else {
- throw new IOException(_("Invalid Command ")+ss[0]);
+ throw new IOException(gettext("Invalid Command ")+ss[0]);
}
if (Debug.debug) Debug.print(Debug.VERBOSE, "Created command: "+this);
}
@@ -793,12 +793,12 @@
in = s.getInputStream();
out = s.getOutputStream();
} else {
- throw new IOException(_("unknown address type ")+address.getType());
+ throw new IOException(gettext("unknown address type ")+address.getType());
}
if (!(new SASL()).auth(mode, types, address.getParameter("guid"), out, in, us)) {
out.close();
- throw new IOException(_("Failed to auth"));
+ throw new IOException(gettext("Failed to auth"));
}
if (null != us) {
if (Debug.debug) Debug.print(Debug.VERBOSE, "Setting timeout to "+timeout+" on Socket");
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/UInt16.java dbus-java-2.7/org/freedesktop/dbus/UInt16.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/UInt16.java 2008-06-07 12:19:11.000000000 +0200
+++ dbus-java-2.7/org/freedesktop/dbus/UInt16.java 2018-06-18 10:36:56.857866002 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.text.MessageFormat;
@@ -32,7 +32,7 @@
public UInt16(int value)
{
if (value < MIN_VALUE || value > MAX_VALUE)
- throw new NumberFormatException(MessageFormat.format(_("{0} is not between {1} and {2}."), new Object[] { value, MIN_VALUE, MAX_VALUE}));
+ throw new NumberFormatException(MessageFormat.format(gettext("{0} is not between {1} and {2}."), new Object[] { value, MIN_VALUE, MAX_VALUE}));
this.value = value;
}
/** Create a UInt16 from a String.
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/UInt32.java dbus-java-2.7/org/freedesktop/dbus/UInt32.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/UInt32.java 2008-06-07 12:19:11.000000000 +0200
+++ dbus-java-2.7/org/freedesktop/dbus/UInt32.java 2018-06-18 10:36:56.857866002 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.text.MessageFormat;
@@ -32,7 +32,7 @@
public UInt32(long value)
{
if (value < MIN_VALUE || value > MAX_VALUE)
- throw new NumberFormatException(MessageFormat.format(_("{0} is not between {1} and {2}."), new Object[] { value, MIN_VALUE, MAX_VALUE}));
+ throw new NumberFormatException(MessageFormat.format(gettext("{0} is not between {1} and {2}."), new Object[] { value, MIN_VALUE, MAX_VALUE}));
this.value = value;
}
/** Create a UInt32 from a String.
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/UInt64.java dbus-java-2.7/org/freedesktop/dbus/UInt64.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/UInt64.java 2008-06-07 12:19:11.000000000 +0200
+++ dbus-java-2.7/org/freedesktop/dbus/UInt64.java 2018-06-18 10:36:56.857866002 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.math.BigInteger;
@@ -42,7 +42,7 @@
public UInt64(long value)
{
if (value < MIN_VALUE || value > MAX_LONG_VALUE)
- throw new NumberFormatException(MessageFormat.format(_("{0} is not between {1} and {2}."), new Object[] { value, MIN_VALUE, MAX_LONG_VALUE}));
+ throw new NumberFormatException(MessageFormat.format(gettext("{0} is not between {1} and {2}."), new Object[] { value, MIN_VALUE, MAX_LONG_VALUE}));
this.value = new BigInteger(""+value);
this.top = this.value.shiftRight(32).and(new BigInteger("4294967295")).longValue();
this.bottom = this.value.and(new BigInteger("4294967295")).longValue();
@@ -58,9 +58,9 @@
a = a.shiftLeft(32);
a = a.add(new BigInteger(""+bottom));
if (0 > a.compareTo(BigInteger.ZERO))
- throw new NumberFormatException(MessageFormat.format(_("{0} is not between {1} and {2}."), new Object[] { a, MIN_VALUE, MAX_BIG_VALUE}));
+ throw new NumberFormatException(MessageFormat.format(gettext("{0} is not between {1} and {2}."), new Object[] { a, MIN_VALUE, MAX_BIG_VALUE}));
if (0 < a.compareTo(MAX_BIG_VALUE))
- throw new NumberFormatException(MessageFormat.format(_("{0} is not between {1} and {2}."), new Object[] { a, MIN_VALUE, MAX_BIG_VALUE}));
+ throw new NumberFormatException(MessageFormat.format(gettext("{0} is not between {1} and {2}."), new Object[] { a, MIN_VALUE, MAX_BIG_VALUE}));
this.value = a;
this.top = top;
this.bottom = bottom;
@@ -72,11 +72,11 @@
public UInt64(BigInteger value)
{
if (null == value)
- throw new NumberFormatException(MessageFormat.format(_("{0} is not between {1} and {2}."), new Object[] { value, MIN_VALUE, MAX_BIG_VALUE}));
+ throw new NumberFormatException(MessageFormat.format(gettext("{0} is not between {1} and {2}."), new Object[] { value, MIN_VALUE, MAX_BIG_VALUE}));
if (0 > value.compareTo(BigInteger.ZERO))
- throw new NumberFormatException(MessageFormat.format(_("{0} is not between {1} and {2}."), new Object[] { value, MIN_VALUE, MAX_BIG_VALUE}));
+ throw new NumberFormatException(MessageFormat.format(gettext("{0} is not between {1} and {2}."), new Object[] { value, MIN_VALUE, MAX_BIG_VALUE}));
if (0 < value.compareTo(MAX_BIG_VALUE))
- throw new NumberFormatException(MessageFormat.format(_("{0} is not between {1} and {2}."), new Object[] { value, MIN_VALUE, MAX_BIG_VALUE}));
+ throw new NumberFormatException(MessageFormat.format(gettext("{0} is not between {1} and {2}."), new Object[] { value, MIN_VALUE, MAX_BIG_VALUE}));
this.value = value;
this.top = this.value.shiftRight(32).and(new BigInteger("4294967295")).longValue();
this.bottom = this.value.and(new BigInteger("4294967295")).longValue();
@@ -88,12 +88,12 @@
public UInt64(String value)
{
if (null == value)
- throw new NumberFormatException(MessageFormat.format(_("{0} is not between {1} and {2}."), new Object[] { value, MIN_VALUE, MAX_BIG_VALUE}));
+ throw new NumberFormatException(MessageFormat.format(gettext("{0} is not between {1} and {2}."), new Object[] { value, MIN_VALUE, MAX_BIG_VALUE}));
BigInteger a = new BigInteger(value);
if (0 > a.compareTo(BigInteger.ZERO))
- throw new NumberFormatException(MessageFormat.format(_("{0} is not between {1} and {2}."), new Object[] { value, MIN_VALUE, MAX_BIG_VALUE}));
+ throw new NumberFormatException(MessageFormat.format(gettext("{0} is not between {1} and {2}."), new Object[] { value, MIN_VALUE, MAX_BIG_VALUE}));
if (0 < a.compareTo(MAX_BIG_VALUE))
- throw new NumberFormatException(MessageFormat.format(_("{0} is not between {1} and {2}."), new Object[] { value, MIN_VALUE, MAX_BIG_VALUE}));
+ throw new NumberFormatException(MessageFormat.format(gettext("{0} is not between {1} and {2}."), new Object[] { value, MIN_VALUE, MAX_BIG_VALUE}));
this.value = a;
this.top = this.value.shiftRight(32).and(new BigInteger("4294967295")).longValue();
this.bottom = this.value.and(new BigInteger("4294967295")).longValue();
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/Variant.java dbus-java-2.7/org/freedesktop/dbus/Variant.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/Variant.java 2008-06-07 12:19:11.000000000 +0200
+++ dbus-java-2.7/org/freedesktop/dbus/Variant.java 2018-06-18 10:36:56.857866002 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.lang.reflect.Type;
import java.text.MessageFormat;
@@ -37,16 +37,16 @@
*/
public Variant(T o) throws IllegalArgumentException
{
- if (null == o) throw new IllegalArgumentException(_("Can't wrap Null in a Variant"));
+ if (null == o) throw new IllegalArgumentException(gettext("Can't wrap Null in a Variant"));
type = o.getClass();
try {
String[] ss = Marshalling.getDBusType(o.getClass(), true);
if (ss.length != 1)
- throw new IllegalArgumentException(_("Can't wrap a multi-valued type in a Variant: ")+type);
+ throw new IllegalArgumentException(gettext("Can't wrap a multi-valued type in a Variant: ")+type);
this.sig = ss[0];
} catch (DBusException DBe) {
if (AbstractConnection.EXCEPTION_DEBUG && Debug.debug) Debug.print(Debug.ERR, DBe);
- throw new IllegalArgumentException(MessageFormat.format(_("Can't wrap {0} in an unqualified Variant ({1})."), new Object[] { o.getClass(), DBe.getMessage() }));
+ throw new IllegalArgumentException(MessageFormat.format(gettext("Can't wrap {0} in an unqualified Variant ({1})."), new Object[] { o.getClass(), DBe.getMessage() }));
}
this.o = o;
}
@@ -58,16 +58,16 @@
*/
public Variant(T o, Type type) throws IllegalArgumentException
{
- if (null == o) throw new IllegalArgumentException(_("Can't wrap Null in a Variant"));
+ if (null == o) throw new IllegalArgumentException(gettext("Can't wrap Null in a Variant"));
this.type = type;
try {
String[] ss = Marshalling.getDBusType(type);
if (ss.length != 1)
- throw new IllegalArgumentException(_("Can't wrap a multi-valued type in a Variant: ")+type);
+ throw new IllegalArgumentException(gettext("Can't wrap a multi-valued type in a Variant: ")+type);
this.sig = ss[0];
} catch (DBusException DBe) {
if (AbstractConnection.EXCEPTION_DEBUG && Debug.debug) Debug.print(Debug.ERR, DBe);
- throw new IllegalArgumentException(MessageFormat.format(_("Can't wrap {0} in an unqualified Variant ({1})."), new Object[] { type, DBe.getMessage() }));
+ throw new IllegalArgumentException(MessageFormat.format(gettext("Can't wrap {0} in an unqualified Variant ({1})."), new Object[] { type, DBe.getMessage() }));
}
this.o = o;
}
@@ -79,17 +79,17 @@
*/
public Variant(T o, String sig) throws IllegalArgumentException
{
- if (null == o) throw new IllegalArgumentException(_("Can't wrap Null in a Variant"));
+ if (null == o) throw new IllegalArgumentException(gettext("Can't wrap Null in a Variant"));
this.sig = sig;
try {
Vector<Type> ts = new Vector<Type>();
Marshalling.getJavaType(sig, ts,1);
if (ts.size() != 1)
- throw new IllegalArgumentException(_("Can't wrap multiple or no types in a Variant: ")+sig);
+ throw new IllegalArgumentException(gettext("Can't wrap multiple or no types in a Variant: ")+sig);
this.type = ts.get(0);
} catch (DBusException DBe) {
if (AbstractConnection.EXCEPTION_DEBUG && Debug.debug) Debug.print(Debug.ERR, DBe);
- throw new IllegalArgumentException(MessageFormat.format(_("Can't wrap {0} in an unqualified Variant ({1})."), new Object[] { sig, DBe.getMessage() }));
+ throw new IllegalArgumentException(MessageFormat.format(gettext("Can't wrap {0} in an unqualified Variant ({1})."), new Object[] { sig, DBe.getMessage() }));
}
this.o = o;
}
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/viewer/DBusViewer.java dbus-java-2.7/org/freedesktop/dbus/viewer/DBusViewer.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/viewer/DBusViewer.java 2008-06-07 12:19:12.000000000 +0200
+++ dbus-java-2.7/org/freedesktop/dbus/viewer/DBusViewer.java 2018-06-18 10:36:56.861866018 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus.viewer;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.awt.BorderLayout;
import java.awt.event.WindowAdapter;
@@ -122,7 +122,7 @@
{
for (final String key : connectionTypes.keySet())
{
- final JLabel label = new JLabel(_("Processing DBus for ") + key);
+ final JLabel label = new JLabel(gettext("Processing DBus for ") + key);
tabbedPane.addTab(key, label);
}
Runnable loader = new Runnable()
@@ -179,7 +179,7 @@
JLabel label = (JLabel) tabbedPane
.getComponentAt(index);
label
- .setText(_("Could not load Dbus information for ")
+ .setText(gettext("Could not load Dbus information for ")
+ key + ":" + e.getMessage());
}
});
@@ -195,7 +195,7 @@
JLabel label = (JLabel) tabbedPane
.getComponentAt(index);
label
- .setText(_("Could not load Dbus information for ")
+ .setText(gettext("Could not load Dbus information for ")
+ key + ":" + e.getMessage());
}
});
@@ -292,7 +292,7 @@
builder = factory.newDocumentBuilder();
} catch (ParserConfigurationException e1) {
// TODO Auto-generated catch block
- throw new RuntimeException(_("Error during parser init: ")+e1.getMessage(),e1);
+ throw new RuntimeException(gettext("Error during parser init: ")+e1.getMessage(),e1);
}
reset();
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/viewer/FileSaver.java dbus-java-2.7/org/freedesktop/dbus/viewer/FileSaver.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/viewer/FileSaver.java 2008-06-07 12:19:12.000000000 +0200
+++ dbus-java-2.7/org/freedesktop/dbus/viewer/FileSaver.java 2018-06-18 10:36:56.861866018 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus.viewer;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.awt.Component;
import java.io.BufferedWriter;
@@ -114,8 +114,8 @@
int confirm = JOptionPane.showConfirmDialog(
parentComponent, errorMessage
- + ".\n"+_("Try saving other files?"),
- _("Save Failed"),
+ + ".\n"+gettext("Try saving other files?"),
+ gettext("Save Failed"),
JOptionPane.OK_CANCEL_OPTION,
JOptionPane.ERROR_MESSAGE);
if (confirm != JOptionPane.OK_OPTION)
@@ -126,7 +126,7 @@
else
{
JOptionPane.showMessageDialog(parentComponent,
- errorMessage + ".", _("Save Failed"),
+ errorMessage + ".", gettext("Save Failed"),
JOptionPane.ERROR_MESSAGE);
}
}
@@ -135,15 +135,15 @@
else
{
- final String errorMessage = _("Could not access parent directory for ")
+ final String errorMessage = gettext("Could not access parent directory for ")
+ fileName;
if (iterator.hasNext())
{
int confirm = JOptionPane.showConfirmDialog(
parentComponent, errorMessage
- + ".\n"+_("Try saving other files?"),
- _("Save Failed"), JOptionPane.OK_CANCEL_OPTION,
+ + ".\n"+gettext("Try saving other files?"),
+ gettext("Save Failed"), JOptionPane.OK_CANCEL_OPTION,
JOptionPane.ERROR_MESSAGE);
if (confirm != JOptionPane.OK_OPTION)
{
@@ -153,7 +153,7 @@
else
{
JOptionPane.showMessageDialog(parentComponent, errorMessage
- + ".", _("Save Failed"), JOptionPane.ERROR_MESSAGE);
+ + ".", gettext("Save Failed"), JOptionPane.ERROR_MESSAGE);
}
}
}
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/viewer/SaveFileAction.java dbus-java-2.7/org/freedesktop/dbus/viewer/SaveFileAction.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/viewer/SaveFileAction.java 2008-06-07 12:19:12.000000000 +0200
+++ dbus-java-2.7/org/freedesktop/dbus/viewer/SaveFileAction.java 2018-06-18 10:36:56.861866018 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus.viewer;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.util.Iterator;
import java.util.NoSuchElementException;
@@ -37,7 +37,7 @@
{
if (iterated)
{
- throw new NoSuchElementException(_("Already iterated"));
+ throw new NoSuchElementException(gettext("Already iterated"));
}
iterated = true;
return getTextFile(tabbedPane.getSelectedIndex());
@@ -73,7 +73,7 @@
{
int selectedIndex = tabbedPane.getSelectedIndex();
boolean enabled = selectedIndex > -1;
- putValue(Action.NAME, _("Save ") + getFileName(selectedIndex) + "...");
+ putValue(Action.NAME, gettext("Save ") + getFileName(selectedIndex) + "...");
setEnabled(enabled);
}
diff -ru dbus-java-2.7.orig/org/freedesktop/dbus/viewer/TabbedSaveAction.java dbus-java-2.7/org/freedesktop/dbus/viewer/TabbedSaveAction.java
--- dbus-java-2.7.orig/org/freedesktop/dbus/viewer/TabbedSaveAction.java 2008-06-07 12:19:12.000000000 +0200
+++ dbus-java-2.7/org/freedesktop/dbus/viewer/TabbedSaveAction.java 2018-06-18 10:36:56.861866018 +0200
@@ -10,7 +10,7 @@
*/
package org.freedesktop.dbus.viewer;
-import static org.freedesktop.dbus.Gettext._;
+import static org.freedesktop.dbus.Gettext.gettext;
import java.awt.event.ActionEvent;
import java.io.File;
@@ -79,7 +79,7 @@
chooser = new JFileChooser();
}
chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
- chooser.setDialogTitle(_("Select parent directory for saving"));
+ chooser.setDialogTitle(gettext("Select parent directory for saving"));
int result = chooser.showDialog(tabbedPane, "Select");
@@ -96,12 +96,12 @@
}
else
{
- JOptionPane.showMessageDialog(tabbedPane, _("Could not write to parent directory"), _("Invalid Parent Directory"), JOptionPane.ERROR_MESSAGE);
+ JOptionPane.showMessageDialog(tabbedPane, gettext("Could not write to parent directory"), gettext("Invalid Parent Directory"), JOptionPane.ERROR_MESSAGE);
}
}
else
{
- JOptionPane.showMessageDialog(tabbedPane, _("Could not access parent directory"), _("Invalid Parent Directory"), JOptionPane.ERROR_MESSAGE);
+ JOptionPane.showMessageDialog(tabbedPane, gettext("Could not access parent directory"), gettext("Invalid Parent Directory"), JOptionPane.ERROR_MESSAGE);
}
}
}
