Author: ks156
Date: 2008-12-19 13:09:48 +0100 (Fri, 19 Dec 2008)
New Revision: 3260
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/branches/ip_field/tuxdroid-gadget-framework/.classpath
software_suite_v2/software/tuxdroid-gadget-framework/branches/ip_field/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/Gadget.java
software_suite_v2/software/tuxdroid-gadget-framework/branches/ip_field/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetsContainer.java
software_suite_v2/software/tuxdroid-gadget-framework/branches/ip_field/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/interpreters/GadgetJavaInterpreter.java
Log:
* Applied changes made on revs 3219 and 3232
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/branches/ip_field/tuxdroid-gadget-framework/.classpath
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/branches/ip_field/tuxdroid-gadget-framework/.classpath
2008-12-19 11:58:12 UTC (rev 3259)
+++
software_suite_v2/software/tuxdroid-gadget-framework/branches/ip_field/tuxdroid-gadget-framework/.classpath
2008-12-19 12:09:48 UTC (rev 3260)
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="sources"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/karmalab-commons"/>
- <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/javassist-3.7.ga.jar"/>
- <classpathentry kind="output" path="targets/eclipse"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="sources"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/karmalab-commons"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/javassist-3.7.ga.jar"/>
+ <classpathentry kind="output" path="targets/eclipse"/>
+</classpath>
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/branches/ip_field/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/Gadget.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/branches/ip_field/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/Gadget.java
2008-12-19 11:58:12 UTC (rev 3259)
+++
software_suite_v2/software/tuxdroid-gadget-framework/branches/ip_field/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/Gadget.java
2008-12-19 12:09:48 UTC (rev 3260)
@@ -184,7 +184,6 @@
/** called by the container when the gadget is fully loaded. */
void loaded() {
- parameters.add(new GadgetParameter("ip", "string",
GadgetsContainer.getConnectionIP(), "Server address"));
parameters.add(new GadgetParameter("traces", "boolean",
"false", "Verbose mode"));
parameters.add(new GadgetParameter("language", "string",
GadgetsContainer.getLanguage(), "Language"));
parameters.add(new GadgetParameter("locutor", "string",
GadgetsContainer.getLocutor(), "Locutor"));
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/branches/ip_field/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetsContainer.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/branches/ip_field/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetsContainer.java
2008-12-19 11:58:12 UTC (rev 3259)
+++
software_suite_v2/software/tuxdroid-gadget-framework/branches/ip_field/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetsContainer.java
2008-12-19 12:09:48 UTC (rev 3260)
@@ -51,7 +51,7 @@
private static String locutor;
private static String country;
private static int pitch;
- private static String ip;
+ public static String ip;
public static void setLocale(String language, String locutor, String
country, int pitch, String ip) {
GadgetsContainer.language = language;
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/branches/ip_field/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/interpreters/GadgetJavaInterpreter.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/branches/ip_field/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/interpreters/GadgetJavaInterpreter.java
2008-12-19 11:58:12 UTC (rev 3259)
+++
software_suite_v2/software/tuxdroid-gadget-framework/branches/ip_field/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/interpreters/GadgetJavaInterpreter.java
2008-12-19 12:09:48 UTC (rev 3260)
@@ -27,6 +27,8 @@
import java.util.Vector;
import java.util.logging.Logger;
+import com.kysoh.tuxdroid.gadget.framework.container.GadgetsContainer;
+
import net.karmaLab.beans.mapping.annotation.BeanAliases;
import net.karmaLab.tools.Files;
import net.karmaLab.tools.SystemInformation;
@@ -82,6 +84,10 @@
tmp = classpath.toString();
// }
arguments.add("java");
+ if(SystemInformation.isUnix())
+ {
+ arguments.add(String.format("-Dtgp_ip=%s",
GadgetsContainer.ip));
+ }
arguments.add("-cp");
arguments.add(tmp.toString());
arguments.add(getExecutable());
------------------------------------------------------------------------------
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
