Author: ulhume
Date: 2008-09-09 11:30:28 +0200 (Tue, 09 Sep 2008)
New Revision: 1831
Added:
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/help.tar.bz2
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/JHtmlBrowser.java
Removed:
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/JConsole.java
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/JHtmlBrowser.java
Modified:
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/GadgetPanel.java
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/GadgetPropertiesEditorModel.java
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/GadgetTester.java
Log:
* some clean-up
Added:
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/help.tar.bz2
===================================================================
(Binary files differ)
Property changes on:
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/help.tar.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified:
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/GadgetPanel.java
===================================================================
---
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/GadgetPanel.java
2008-09-09 08:43:22 UTC (rev 1830)
+++
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/GadgetPanel.java
2008-09-09 09:30:28 UTC (rev 1831)
@@ -43,7 +43,9 @@
import javax.swing.tree.TreeModel;
import javax.swing.tree.TreePath;
-import net.karmaLab.beans.propertiesEditor.PropertiesEditor;
+import net.karmaLab.swing.JConsole;
+import net.karmaLab.swing.htmlBrowser.JHtmlBrowser;
+import net.karmaLab.swing.propertiesEditor.JPropertiesEditor;
import net.karmaLab.tools.Strings;
import net.karmaLab.traces.Traces;
@@ -317,7 +319,7 @@
private final JConsole console = new JConsole();
/** Current gadget id. */
final Gadget gadget;
- private final PropertiesEditor gadgetParametersEditor;
+ private final JPropertiesEditor gadgetParametersEditor;
private final GadgetsContainer container;
private final GadgetPropertiesEditorModel propertiesEditorModel;
@@ -343,7 +345,7 @@
actionsTree.addMouseListener(new ActionTreeMouseObserver());
gadget.addListener(new GadgetObserver());
setLayout(new BorderLayout());
- gadgetParametersEditor = new PropertiesEditor();
+ gadgetParametersEditor = new JPropertiesEditor();
gadgetParametersEditor.setShowInvisibleProperties(true);
propertiesEditorModel = new GadgetPropertiesEditorModel(gadget);
gadgetParametersEditor.setModel(propertiesEditorModel);
Modified:
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/GadgetPropertiesEditorModel.java
===================================================================
---
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/GadgetPropertiesEditorModel.java
2008-09-09 08:43:22 UTC (rev 1830)
+++
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/GadgetPropertiesEditorModel.java
2008-09-09 09:30:28 UTC (rev 1831)
@@ -24,8 +24,8 @@
import java.util.Vector;
-import net.karmaLab.beans.propertiesEditor.PropertiesEditorModel;
-import net.karmaLab.beans.propertiesEditor.PropertyModel;
+import net.karmaLab.swing.propertiesEditor.PropertiesEditorModel;
+import net.karmaLab.swing.propertiesEditor.PropertyModel;
import com.kysoh.tuxdroid.gadget.framework.container.Gadget;
import com.kysoh.tuxdroid.gadget.framework.container.GadgetInstanceParameters;
Modified:
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/GadgetTester.java
===================================================================
---
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/GadgetTester.java
2008-09-09 08:43:22 UTC (rev 1830)
+++
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/GadgetTester.java
2008-09-09 09:30:28 UTC (rev 1831)
@@ -47,6 +47,7 @@
import javax.swing.UnsupportedLookAndFeelException;
import net.karmaLab.application.Application;
+import net.karmaLab.swing.JConsole;
import net.karmaLab.tools.Files;
import net.karmaLab.traces.Traces;
Deleted:
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/JConsole.java
===================================================================
---
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/JConsole.java
2008-09-09 08:43:22 UTC (rev 1830)
+++
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/JConsole.java
2008-09-09 09:30:28 UTC (rev 1831)
@@ -1,55 +0,0 @@
-/* This file is part of "TuxDroid Gadget Tester".
- * Copyright 2008, kysoh
- * Author : Yoran Brault
- * eMail : [EMAIL PROTECTED] (remove _bad_ before sending an email)
- * Site : http://www.kysoh.com/
- *
- * "TuxDroid Gadget Tester" is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * "TuxDroid Gadget Tester" is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with "TuxDroid Gadget Tester"; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package com.kysoh.tuxdroid.gadget.framework.tester;
-
-import java.awt.Color;
-import java.awt.Font;
-
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-
-public class JConsole extends JScrollPane {
- private final JTextArea textArea = new JTextArea();
-
- public JConsole() {
- super();
- setViewportView(textArea);
- textArea.setEditable(false);
- textArea.setLineWrap(false);
- textArea.setFont(new Font("Monospaced", Font.PLAIN, 12));
- textArea.setForeground(Color.orange);
- textArea.setBackground(Color.black);
- }
-
- public void println(String message) {
- textArea.append(message + "\n");
- textArea.setCaretPosition(textArea.getDocument().getLength());
- textArea.repaint(0);
- }
-
- public void print(String message) {
- textArea.append(message);
- textArea.setCaretPosition(textArea.getDocument().getLength());
- textArea.repaint(0);
- }
-}
Deleted:
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/JHtmlBrowser.java
===================================================================
---
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/JHtmlBrowser.java
2008-09-09 08:43:22 UTC (rev 1830)
+++
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/JHtmlBrowser.java
2008-09-09 09:30:28 UTC (rev 1831)
@@ -1,125 +0,0 @@
-/* This file is part of "TuxDroid Gadget Tester".
- * Copyright 2008, kysoh
- * Author : Yoran Brault
- * eMail : [EMAIL PROTECTED] (remove _bad_ before sending an email)
- * Site : http://www.kysoh.com/
- *
- * "TuxDroid Gadget Tester" is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * "TuxDroid Gadget Tester" is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with "TuxDroid Gadget Tester"; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package com.kysoh.tuxdroid.gadget.framework.tester;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.Enumeration;
-
-import javax.swing.JEditorPane;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.event.HyperlinkEvent;
-import javax.swing.event.HyperlinkListener;
-import javax.swing.text.Style;
-import javax.swing.text.html.HTMLEditorKit;
-import javax.swing.text.html.StyleSheet;
-
-public class JHtmlBrowser extends JPanel implements HyperlinkListener {
- private final JEditorPane htmlPane;
-
- public JHtmlBrowser(URL url) {
- htmlPane = new JEditorPane();
-
- // Définition du style par défaut
- HTMLEditorKit editor = (HTMLEditorKit) htmlPane
- .getEditorKitForContentType("text/html");
- StyleSheet styles = editor.getStyleSheet();
- InputStream stylesStream =
getClass().getResourceAsStream("styles.css");
- InputStreamReader reader = new InputStreamReader(stylesStream);
- try {
- styles.loadRules(reader, null);
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- // Petit hack entre amis, cet abruti est incapable de trouver
la bonne
- // référence à l'image sinon...
- URL stylesURL = getClass().getResource("bg.png");
- styles.addRule("body { background-image: url('" + stylesURL +
"');}");
-
- // Ajout de la feuille de style à l'éditeur
- editor.setStyleSheet(styles);
- htmlPane.setEditorKit(editor);
-
- // Juste pour savoir ce qui se passe
-// Enumeration<?> rules = styles.getStyleNames();
-// while (rules.hasMoreElements()) {
-// String name = (String) rules.nextElement();
-// Style rule = styles.getStyle(name);
-// System.out.println(rule.toString());
-// }
-
- // Peaufinage
- htmlPane.setEditable(false);
- htmlPane.addHyperlinkListener(this);
- htmlPane.setBorder(null);
-
- // Ajout du scroller
- JScrollPane scrollPane = new JScrollPane(htmlPane);
- scrollPane.setBorder(null);
-
- // Load de l'URL (c'est plus joli avant affichage)
- if (url != null) {
- browse(url);
- }
-
- // Ajout du composant
- setLayout(new BorderLayout());
- add(scrollPane, BorderLayout.CENTER);
- }
-
- public JHtmlBrowser() {
- this(null);
- }
-
- public void show() {
- int width = 640;
- int height = 480;
- setBounds(width / 8, height / 8, width, height);
- JFrame frame = new JFrame("Gadget Help File");
- frame.getContentPane().add(this, BorderLayout.CENTER);
- frame.setSize(width, height);
- frame.setVisible(true);
- }
-
- public void browse(URL url) {
- try {
- htmlPane.setPage(url);
- htmlPane.setContentType("text/html; charset=utf-8");
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- public void hyperlinkUpdate(HyperlinkEvent event) {
- if (event.getEventType() == HyperlinkEvent.EventType.ACTIVATED)
{
- browse(event.getURL());
- }
- }
-}
Added:
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/JHtmlBrowser.java
===================================================================
---
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/JHtmlBrowser.java
(rev 0)
+++
software_suite_v2/software/development_tools/tuxdroid-gadget-tester/trunk/tuxdroid-gadget-tester/sources/com/kysoh/tuxdroid/gadget/framework/tester/JHtmlBrowser.java
2008-09-09 09:30:28 UTC (rev 1831)
@@ -0,0 +1,125 @@
+/* This file is part of "TuxDroid Gadget Tester".
+ * Copyright 2008, kysoh
+ * Author : Yoran Brault
+ * eMail : [EMAIL PROTECTED] (remove _bad_ before sending an email)
+ * Site : http://www.kysoh.com/
+ *
+ * "TuxDroid Gadget Tester" is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * "TuxDroid Gadget Tester" is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with "TuxDroid Gadget Tester"; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package com.kysoh.tuxdroid.gadget.framework.tester;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.Enumeration;
+
+import javax.swing.JEditorPane;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkListener;
+import javax.swing.text.Style;
+import javax.swing.text.html.HTMLEditorKit;
+import javax.swing.text.html.StyleSheet;
+
+public class JHtmlBrowser extends JPanel implements HyperlinkListener {
+ private final JEditorPane htmlPane;
+
+ public JHtmlBrowser(URL url) {
+ htmlPane = new JEditorPane();
+
+ // Définition du style par défaut
+ HTMLEditorKit editor = (HTMLEditorKit) htmlPane
+ .getEditorKitForContentType("text/html");
+ StyleSheet styles = editor.getStyleSheet();
+ InputStream stylesStream =
getClass().getResourceAsStream("styles.css");
+ InputStreamReader reader = new InputStreamReader(stylesStream);
+ try {
+ styles.loadRules(reader, null);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ // Petit hack entre amis, cet abruti est incapable de trouver
la bonne
+ // référence à l'image sinon...
+ URL stylesURL = getClass().getResource("bg.png");
+ styles.addRule("body { background-image: url('" + stylesURL +
"');}");
+
+ // Ajout de la feuille de style à l'éditeur
+ editor.setStyleSheet(styles);
+ htmlPane.setEditorKit(editor);
+
+ // Juste pour savoir ce qui se passe
+// Enumeration<?> rules = styles.getStyleNames();
+// while (rules.hasMoreElements()) {
+// String name = (String) rules.nextElement();
+// Style rule = styles.getStyle(name);
+// System.out.println(rule.toString());
+// }
+
+ // Peaufinage
+ htmlPane.setEditable(false);
+ htmlPane.addHyperlinkListener(this);
+ htmlPane.setBorder(null);
+
+ // Ajout du scroller
+ JScrollPane scrollPane = new JScrollPane(htmlPane);
+ scrollPane.setBorder(null);
+
+ // Load de l'URL (c'est plus joli avant affichage)
+ if (url != null) {
+ browse(url);
+ }
+
+ // Ajout du composant
+ setLayout(new BorderLayout());
+ add(scrollPane, BorderLayout.CENTER);
+ }
+
+ public JHtmlBrowser() {
+ this(null);
+ }
+
+ public void show() {
+ int width = 640;
+ int height = 480;
+ setBounds(width / 8, height / 8, width, height);
+ JFrame frame = new JFrame("Gadget Help File");
+ frame.getContentPane().add(this, BorderLayout.CENTER);
+ frame.setSize(width, height);
+ frame.setVisible(true);
+ }
+
+ public void browse(URL url) {
+ try {
+ htmlPane.setPage(url);
+ htmlPane.setContentType("text/html; charset=utf-8");
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public void hyperlinkUpdate(HyperlinkEvent event) {
+ if (event.getEventType() == HyperlinkEvent.EventType.ACTIVATED)
{
+ browse(event.getURL());
+ }
+ }
+}
-------------------------------------------------------------------------
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
