Author: ulhume
Date: 2008-08-31 04:34:13 +0200 (Sun, 31 Aug 2008)
New Revision: 1663
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/Gadget.java
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetDescription.java
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetParameter.java
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetToken.java
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetsContainer.java
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/interpreters/GadgetInterpreter.java
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/interpreters/GadgetJavaInterpreter.java
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/propertyEditor/GadgetParameterEditorLabelRenderer.java
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/propertyEditor/GadgetParametersEditorValueRenderer.java
Log:
- Pour ?\195?\169viter les confusions, une nouvelle librairie a
?\195?\169t?\195?\169 cr?\195?\169?\195?\169e : Tuxdroid-Gadget-JavaKit. Elle
permet de construire plus rapidement des gadgets en java et ne d?\195?\169pend
d'AUCUNE AUTRE librairie. Ainsi les gadgets en java ne d?\195?\169pendent plus
de Gadget Framework.
- gadgets.xml est maintenant localis?\195?\169 dans le dossier ./ressources
d'un gadget
- Les param?\195?\168tres d'un gadgets ont maintenant une
propri?\195?\169t?\195?\169 "visible" permettant de masquer certains
param?\195?\168tres comme "traces". Par d?\195?\169faut cette
propri?\195?\169t?\195?\169 est ?\195?\160 "true". C'est ?\195?\160 usage
interne mais il est possible de sp?\195?\169cifier un <visible>false</visible>
dans un gadgets.xml.
- Tant que l'impl?\195?\169mentation de throwMessage n'a pas
?\195?\169t?\195?\169 finalis?\195?\169e dans le Control Center (pile de
textes), on garde locuteur, contry & co dans le conteneur. Cependant, dans la
mesure o?\195?\185 tous les gadgets ont le m?\195?\170me param?\195?\169trage,
les donn?\195?\169es ont ?\195?\169t?\195?\169 d?\195?\169plac?\195?\169es de
l'interpr?\195?\169teur au GadgetsContainer (m?\195?\169thode setLocale). Cet
appel ne change pas dynamiquement la langue des gadgets d?\195?\169j?\195?\160
charg?\195?\169s mais celle de ceux qui suivent l'appel.
- Les propri?\195?\169t?\195?\169s languages, locutor, country et pitch ont
?\195?\169t?\195?\169 normalis?\195?\169s en tant que param?\195?\169tre
invisible du gadget.
- Encore pour ?\195?\169viter les confusions, le mode "standalone" qui
consistait ?\195?\160 instancier un Gadget Tester de mani?\195?\168re directe
pour tester un gadget a ?\195?\169t?\195?\169 supprim?\195?\169. Pour tester un
gadget, il faut lancer le tester en mode "gadget" en sp?\195?\169cifiant le
dossier de travail eclipse.
ex: java -jar Gadget-Tester.jar --mode=gadget --path=../tuxdroid-gadget-clock
--classpath=../targets/eclipse:../tuxdroid-gadget-java-kit/targets/eclipse
Ainsi le dossier ./targets/eclipse et
../tuxdroid-gadget-java-kit/targets/eclipse, relatifs ?\195?\160
../tuxdroid-gadget-clock sont ins?\195?\169r?\195?\169s en t?\195?\170te du
classpath, surchargeant ainsi d'?\195?\169ventuelles librairies.
- Concernant la configuration des gadgets, plus besoin d'avoir un getter et un
setter comme avant. Un simple champ, m?\195?\170me priv?\195?\169, suffit
pourvu qu'il ait le m?\195?\170me nom que le param?\195?\168tre du gadget
d?\195?\169clar?\195?\169 dans gadgets.xml
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/Gadget.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/Gadget.java
2008-08-31 02:32:44 UTC (rev 1662)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/Gadget.java
2008-08-31 02:34:13 UTC (rev 1663)
@@ -54,7 +54,6 @@
}
private final Vector<GadgetParameter> parameters = new
Vector<GadgetParameter>();
- private I18n i18n;
/**
* @return the configuration
@@ -97,33 +96,15 @@
* the interpreter to set
*/
public void setInterpreter(GadgetInterpreter interpreter) {
- this.interpreter = interpreter; //FIXME
+ this.interpreter = interpreter; // FIXME
}
static final Logger logger = Traces.LOGGER(Gadget.class);
public GadgetParameter traces;
-
- public void setLocale(String lang, String locutor, String country, int
pitch){
- this.i18n = I18nFactory.getI18n(new Locale(lang), new
File(interpreter.getWorkingPath(), "resources"));
- GadgetDescription.i18n = i18n;
- GadgetToken.i18n = i18n;
- GadgetParameter.i18n = i18n;
- interpreter.setLanguage(lang);
- interpreter.setLocutor(locutor);
- interpreter.setContry(country);
- interpreter.setPitch(String.valueOf(pitch));
- GadgetParameter traces = new GadgetParameter();
- traces.setName("traces");
- traces.setDefaultValue("false");
- traces.setDescription("Verbose mode");
- traces.setType("boolean");
- parameters.add(traces);
- }
public Gadget() {
}
-
@Override
public String toString() {
@@ -164,7 +145,6 @@
return new File(interpreter.getWorkingPath(),
description.getIconFile());
}
-
public File getHelpFile() {
File helpFile = new File(interpreter.getWorkingPath(),
"resources/help_" + Locale.getDefault().getLanguage() + ".html");
if (!helpFile.exists()) {
@@ -176,18 +156,20 @@
return helpFile;
}
- public static void main(String[] args) {
+ private static I18n i18n;
- }
-
- public String tr(String message, Object... tmp) {
+ public static String tr(String message, Object... tmp) {
return i18n.tr(message, tmp);
}
- //public void buildI18n() {
- //i18n = I18nFactory.getI18n(new
File(interpreter.getWorkingPath(), "resources"));
- //GadgetDescription.i18n = i18n;
- //GadgetToken.i18n = i18n;
- //GadgetParameter.i18n = i18n;
- //}
+ /** called by the container when the gadget is fully loaded. */
+ void loaded() {
+ 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"));
+ parameters.add(new GadgetParameter("country", "string",
GadgetsContainer.getCountry(), "Country"));
+ parameters.add(new GadgetParameter("pitch", "integer",
GadgetsContainer.getPitch(), "Pitch"));
+ i18n = I18nFactory.getI18n(new
Locale(GadgetsContainer.getLanguage()), new
File(getInterpreter().getWorkingPath(), "resources"));
+ getInterpreter().loaded();
+ }
}
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetDescription.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetDescription.java
2008-08-31 02:32:44 UTC (rev 1662)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetDescription.java
2008-08-31 02:34:13 UTC (rev 1663)
@@ -24,8 +24,6 @@
import java.util.UUID;
-import net.karmaLab.po.I18n;
-
public class GadgetDescription {
private String name;
private String description;
@@ -65,13 +63,11 @@
this.name = name;
}
- static I18n i18n;
-
/**
* @return the description
*/
public String getDescription() {
- return i18n.tr(description);
+ return Gadget.tr(description);
}
/**
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetParameter.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetParameter.java
2008-08-31 02:32:44 UTC (rev 1662)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetParameter.java
2008-08-31 02:34:13 UTC (rev 1663)
@@ -22,7 +22,6 @@
package com.kysoh.tuxdroid.gadget.framework.container;
-import net.karmaLab.po.I18n;
import net.karmaLab.traces.ApplicationError;
public class GadgetParameter {
@@ -36,15 +35,39 @@
private Double minValue = null;
private Double maxValue = null;
private String category = null;
+ private boolean visible = true;
+ /**
+ * @return the visible
+ */
+ public boolean isVisible() {
+ return visible;
+ }
+
+ /**
+ * @param visible
+ * the visible to set
+ */
+ public void setVisible(boolean visible) {
+ this.visible = visible;
+ }
+
public GadgetParameter(String name) {
- this.name=name;
+ this.name = name;
}
public GadgetParameter() {
// TODO Auto-generated constructor stub
}
+ public GadgetParameter(String name, String type, Object defaultValue,
String description) {
+ this.name = name;
+ setType(type);
+ this.defaultValue = String.valueOf(defaultValue);
+ this.description = description;
+ this.visible = false;
+ }
+
/**
* @return the min
*/
@@ -119,13 +142,11 @@
this.name = name;
}
- static I18n i18n;
-
/**
* @return the description
*/
public String getDescription() {
- return i18n.tr(description);
+ return Gadget.tr(description);
}
/**
@@ -164,7 +185,7 @@
*/
public String getDefaultValue() {
if (kind == GadgetParameterType.stringParameter) {
- defaultValue = i18n.tr(defaultValue);
+ defaultValue = Gadget.tr(defaultValue);
}
return defaultValue;
}
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetToken.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetToken.java
2008-08-31 02:32:44 UTC (rev 1662)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetToken.java
2008-08-31 02:34:13 UTC (rev 1663)
@@ -22,12 +22,10 @@
package com.kysoh.tuxdroid.gadget.framework.container;
-import net.karmaLab.po.I18n;
public class GadgetToken {
private String name;
private String description;
- static I18n i18n;
/**
* @return the name
@@ -48,7 +46,7 @@
* @return the description
*/
public String getDescription() {
- return i18n.tr(description);
+ return Gadget.tr(description);
}
/**
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetsContainer.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetsContainer.java
2008-08-31 02:32:44 UTC (rev 1662)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetsContainer.java
2008-08-31 02:34:13 UTC (rev 1663)
@@ -24,13 +24,11 @@
import java.io.File;
import java.util.List;
-import java.util.Locale;
import java.util.Vector;
import java.util.logging.Logger;
import net.karmaLab.fileSystem.autoDeployer.AutoDeployer;
import net.karmaLab.fileSystem.autoDeployer.AutoDeployerListener;
-import net.karmaLab.po.I18n;
import net.karmaLab.tools.Files;
import net.karmaLab.tools.Listeners;
import net.karmaLab.traces.ApplicationError;
@@ -50,7 +48,46 @@
import
com.kysoh.tuxdroid.gadget.framework.container.interpreters.GadgetPythonInterpreter;
public class GadgetsContainer {
-
+ private static String language;
+ private static String locutor;
+ private static String country;
+ private static int pitch;
+
+ public static void setLocale(String language, String locutor, String
country, int pitch) {
+ GadgetsContainer.language = language;
+ GadgetsContainer.locutor = locutor;
+ GadgetsContainer.country = country;
+ GadgetsContainer.pitch = pitch;
+ }
+
+ /**
+ * @return the language
+ */
+ public static String getLanguage() {
+ return language;
+ }
+
+ /**
+ * @return the locutor
+ */
+ public static String getLocutor() {
+ return locutor;
+ }
+
+ /**
+ * @return the country
+ */
+ public static String getCountry() {
+ return country;
+ }
+
+ /**
+ * @return the pitch
+ */
+ public static int getPitch() {
+ return pitch;
+ }
+
class AutoDeployerObserver implements AutoDeployerListener {
public void deployementError(Throwable exception) {
listeners.fire().gadgetContainerError(exception);
@@ -99,14 +136,14 @@
deployer.start();
}
- public List<Gadget> buildGadgets(File descriptorFile) throws
GadgetsContainerException {
+ private List<Gadget> buildGadgets(File descriptorFile) throws
GadgetsContainerException {
Vector<Gadget> adapters = new Vector<Gadget>();
- Gadget adapter = null;
+ Gadget gadget = null;
try {
Document document = new
XMLParser().parse(descriptorFile);
for (Element interpreters : document.getRootElement()) {
try {
- adapter = new Gadget();
+ gadget = new Gadget();
XMLObjectReader xmlObjectReader = new
XMLObjectReader();
XMLObjectReaderDefaultClassResolver
defaultClassResolver = (XMLObjectReaderDefaultClassResolver)
xmlObjectReader.getClassResovler();
defaultClassResolver.registerConcreteClass(GadgetInterpreter.class,
GadgetBashInterpreter.class);
@@ -114,8 +151,9 @@
defaultClassResolver.registerConcreteClass(GadgetInterpreter.class,
GadgetPythonInterpreter.class);
defaultClassResolver.registerConcreteClass(GadgetInterpreter.class,
GadgetPerlInterpreter.class);
defaultClassResolver.registerConcreteClass(GadgetInterpreter.class,
GadgetGenericInterpreter.class);
- xmlObjectReader.deserialize(adapter,
interpreters);
- adapters.add(adapter);
+ xmlObjectReader.deserialize(gadget,
interpreters);
+ adapters.add(gadget);
+
} catch (XmlObjectReaderException e) {
throw new
GadgetsContainerException("Unable to read descriptor", e);
}
@@ -140,13 +178,12 @@
public Vector<Gadget> getGadgets() {
return gadgets;
}
-
/** [EMAIL PROTECTED] */
public void loadGadgets(File gadgetPath) throws
GadgetsContainerException {
- File descriptorFile = new File(gadgetPath, "gadgets.xml");
+ File descriptorFile = new File(gadgetPath,
"resources/gadgets.xml");
if (!descriptorFile.exists()) {
- throw new GadgetsContainerException("Unable to find any
descriptor at " + Files.cannonical(gadgetPath));
+ throw new GadgetsContainerException("Unable to find
descriptor we should have at " + Files.cannonical(descriptorFile));
}
List<Gadget> gadgets = buildGadgets(descriptorFile);
for (Gadget gadget : gadgets) {
@@ -169,6 +206,7 @@
validate(description.getUuid(), "UUID not defined");
validate(gadget.getInterpreter().getExecutable(),
"Interpreter/Excecutable not defined");
gadget.getInterpreter().setWorkingPath(Files.cannonical(gadgetPath));
+ gadget.loaded();
gadgets.add(gadget);
listeners.fire().gadgetLoaded(gadget);
}
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/interpreters/GadgetInterpreter.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/interpreters/GadgetInterpreter.java
2008-08-31 02:32:44 UTC (rev 1662)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/interpreters/GadgetInterpreter.java
2008-08-31 02:34:13 UTC (rev 1663)
@@ -35,11 +35,6 @@
abstract public class GadgetInterpreter {
private String executable = "";
private String parameters = "";
-
- private String cc_language;
- private String cc_locutor;
- private String cc_country;
- private String cc_pitch;
private File workingPath;
@@ -120,37 +115,8 @@
this.workingPath = workingPath;
}
-
-
- public void setLanguage(String lang){
- this.cc_language = lang;
- }
-
- public void setLocutor(String locutor){
- this.cc_locutor = locutor;
- }
-
- public void setContry(String country){
- this.cc_country = country;
- }
-
- public void setPitch(String pitch){
- this.cc_pitch = pitch;
- }
-
- public String getLanguage() {
- return this.cc_language;
- }
- public String getLocutor() {
- return this.cc_locutor;
+ public void loaded() {
}
- public String getCountry() {
- return this.cc_country;
- }
-
- public String getPitch() {
- return this.cc_pitch;
- }
}
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/interpreters/GadgetJavaInterpreter.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/interpreters/GadgetJavaInterpreter.java
2008-08-31 02:32:44 UTC (rev 1662)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/interpreters/GadgetJavaInterpreter.java
2008-08-31 02:34:13 UTC (rev 1663)
@@ -36,17 +36,13 @@
public class GadgetJavaInterpreter extends GadgetInterpreter {
/** Class logger. */
- private static final Logger logger = Traces
- .LOGGER(GadgetJavaInterpreter.class);
+ private static final Logger logger =
Traces.LOGGER(GadgetJavaInterpreter.class);
private static final String LIBRARIES_PATH = "libraries";
-private Vector<File> libraries = new Vector<File>();
- @Override
- protected void prepareCommandLine(Vector<String> arguments) {
- // Class path definition
- Vector<File> classPathFiles = new Vector<File>();
+ private final Vector<File> libraries = new Vector<File>();
+ @Override
+ public void loaded() {
// Load all libraries in ./libraries
- classPathFiles.addAll(libraries);
File librariesPath = new File(getWorkingPath(), LIBRARIES_PATH);
if (librariesPath.exists()) {
File[] jars = librariesPath.listFiles(new FileFilter() {
@@ -59,13 +55,17 @@
for (File jar : jars) {
if (Traces.isConfig(logger))
logger.config("Adding " + jar + " to
classpath");
- classPathFiles.add(new File(librariesPath,
jar.getName()));
+ libraries.add(new File(librariesPath,
jar.getName()));
}
}
-
- // Build classpath string
+ }
+
+ @Override
+ protected void prepareCommandLine(Vector<String> arguments) {// Build
+ // classpath
+ // string
StringBuffer classpath = new StringBuffer();
- for (File file : classPathFiles) {
+ for (File file : libraries) {
if (classpath.length() > 0) {
classpath.append(File.pathSeparatorChar);
}
@@ -76,27 +76,19 @@
}
}
String tmp = null;
- if (SystemInformation.isUnix()) {
- tmp = "\"" + classpath + "\"";
- } else {
- tmp = classpath.toString();
- }
+ // if (SystemInformation.isUnix()) {
+ // tmp = "\"" + classpath + "\"";
+ // } else {
+ tmp = classpath.toString();
+ // }
arguments.add("java");
arguments.add("-cp");
arguments.add(tmp.toString());
-
- // TODO ça ne doit pas être ici, mais dans la configuration
globale du
- // Gadget
- arguments.add("-DCC_SET_LANGUAGE=" + getLanguage());
- arguments.add("-DCC_SET_LOCUTOR=" + getLocutor());
- arguments.add("-DCC_SET_COUNTRY=" + getCountry());
- arguments.add("-DCC_SET_PITCH=" + getPitch());
arguments.add(getExecutable());
}
+
public Vector<File> getLibraries() {
return libraries;
}
-
-
}
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/propertyEditor/GadgetParameterEditorLabelRenderer.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/propertyEditor/GadgetParameterEditorLabelRenderer.java
2008-08-31 02:32:44 UTC (rev 1662)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/propertyEditor/GadgetParameterEditorLabelRenderer.java
2008-08-31 02:34:13 UTC (rev 1663)
@@ -20,44 +20,40 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package com.kysoh.tuxdroid.gadget.framework.propertyEditor;
-
+package com.kysoh.tuxdroid.gadget.framework.propertyEditor;
+
import java.awt.Color;
-import java.awt.Component;
+import java.awt.Component;
import java.awt.Font;
-import java.awt.Insets;
-
-import javax.swing.JLabel;
-import javax.swing.JTable;
-import javax.swing.table.DefaultTableCellRenderer;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableColumn;
-
-import com.kysoh.tuxdroid.gadget.framework.container.GadgetParameter;
-
-public final class GadgetParameterEditorLabelRenderer implements
TableCellRenderer {
+import javax.swing.JLabel;
+import javax.swing.JTable;
+import javax.swing.table.TableCellRenderer;
+
+import com.kysoh.tuxdroid.gadget.framework.container.GadgetParameter;
+
+public final class GadgetParameterEditorLabelRenderer implements
TableCellRenderer {
+
private static final long serialVersionUID = 1L;
- private final JLabel label = new JLabel();
-
- @Override
+ private final JLabel label = new JLabel();
+
+ @Override
public Component getTableCellRendererComponent(JTable table, Object
value, boolean isSelected, boolean hasFocus, int row, int column) {
-
- GadgetParameter record = (GadgetParameter) value;
-// if(record.getName().contains("traces")){
-// label.setText("");
-// label.setSize(0, 0);
-// label.setPreferredSize(label.getSize());
-// return label;
-// }
-
+
+ GadgetParameter record = (GadgetParameter) value;
+ if (!record.isVisible()) {
+ label.setText("");
+ label.setSize(0, 0);
+ label.setPreferredSize(label.getSize());
+ return label;
+ }
+
label.setHorizontalAlignment(JLabel.RIGHT);
label.setFont(new Font("dialog", Font.BOLD, 12));
label.setOpaque(true);
- label.setBackground(new Color(221,221,221));
- label.setText(record.getDescription() +" : ");
- label.setToolTipText(record.getName());
- return label;
- }
+ label.setBackground(new Color(221, 221, 221));
+ label.setText(record.getDescription() + " : ");
+ label.setToolTipText(record.getName());
+ return label;
+ }
}
\ No newline at end of file
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/propertyEditor/GadgetParametersEditorValueRenderer.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/propertyEditor/GadgetParametersEditorValueRenderer.java
2008-08-31 02:32:44 UTC (rev 1662)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/propertyEditor/GadgetParametersEditorValueRenderer.java
2008-08-31 02:34:13 UTC (rev 1663)
@@ -24,8 +24,6 @@
import java.awt.Component;
import java.awt.Font;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionListener;
import javax.swing.ImageIcon;
import javax.swing.JCheckBox;
@@ -35,10 +33,9 @@
import com.kysoh.tuxdroid.gadget.framework.container.Gadget;
import com.kysoh.tuxdroid.gadget.framework.container.GadgetInstanceParameters;
-import com.kysoh.tuxdroid.gadget.framework.container.GadgetParameter;
import com.kysoh.tuxdroid.gadget.framework.container.GadgetParameterType;
-public final class GadgetParametersEditorValueRenderer implements
TableCellRenderer{
+public final class GadgetParametersEditorValueRenderer implements
TableCellRenderer {
private final JLabel label = new JLabel();
private final JCheckBox checkbox = new JCheckBox();
public GadgetInstanceParameters values;
@@ -50,27 +47,28 @@
}
@Override
- public Component getTableCellRendererComponent(JTable table, Object
value, boolean isSelected, boolean hasFocus, int row, int column)
- {
-
if(gadget.getParameters().get(row).getKind().equals((GadgetParameterType.booleanParameter))){
+ public Component getTableCellRendererComponent(JTable table, Object
value, boolean isSelected, boolean hasFocus, int row, int column) {
+ if
(gadget.getParameters().get(row).getKind().equals((GadgetParameterType.booleanParameter)))
{
boolean val =
Boolean.valueOf(values.get(gadget.getParameters().get(row)));
checkbox.setSelected(val);
- if(val) checkbox.setIcon(new
ImageIcon(getClass().getResource("images/checkbox-active.png")));
- else checkbox.setIcon(new
ImageIcon(getClass().getResource("images/checkbox-empty.png")));
- checkbox.addMouseListener(new
java.awt.event.MouseAdapter(){
- public void
mousePressed(java.awt.event.MouseEvent event){
+ if (val)
+ checkbox.setIcon(new
ImageIcon(getClass().getResource("images/checkbox-active.png")));
+ else
+ checkbox.setIcon(new
ImageIcon(getClass().getResource("images/checkbox-empty.png")));
+ checkbox.addMouseListener(new
java.awt.event.MouseAdapter() {
+ @Override
+ public void
mousePressed(java.awt.event.MouseEvent event) {
checkbox.setIcon(new
ImageIcon(getClass().getResource("images/checkbox-empty.png")));
}
});
return checkbox;
- }
- else{
-//
if(gadget.getParameters().get(row).getName().contains("traces")){
-// label.setText("");
-// label.setSize(0, 0);
-// label.setPreferredSize(label.getSize());
-// return label;
-// }
+ } else {
+ if (!gadget.getParameters().get(row).isVisible()) {
+ label.setText("");
+ label.setSize(0, 0);
+ label.setPreferredSize(label.getSize());
+ return label;
+ }
label.setText(values.get(gadget.getParameters().get(row)));
label.setFont(new Font("dialog", Font.PLAIN, 12));
return label;
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
