r1434 - in guix/trunk/guix-test: . src/main/java/org/nuiton/guix src/main/java/org/nuiton/guix/demo - Buix-commits

19 May 2009

Author: kmorin
Date: 2009-05-19 08:39:27 +0000 (Tue, 19 May 2009)
New Revision: 1434

Added:
   guix/trunk/guix-test/src/main/java/org/nuiton/guix/GuixDemo.java
   guix/trunk/guix-test/src/main/java/org/nuiton/guix/GuixDemo2.java
Modified:
   guix/trunk/guix-test/pom.xml
   guix/trunk/guix-test/src/main/java/org/nuiton/guix/demo/GuixDemo.css
   guix/trunk/guix-test/src/main/java/org/nuiton/guix/demo/GuixDemo.guix
Log:


Modified: guix/trunk/guix-test/pom.xml
===================================================================

--- guix/trunk/guix-test/pom.xml	2009-05-19 08:39:17 UTC (rev 1433)
+++ guix/trunk/guix-test/pom.xml	2009-05-19 08:39:27 UTC (rev 1434)
@@ -25,6 +25,11 @@
             <artifactId>spring-beans</artifactId>
             <version>2.0.5</version>
         </dependency>
+		<dependency>
+			<groupId>org.jdesktop</groupId>
+            <artifactId>beansbinding</artifactId>
+            <version>1.2.1</version>
+		</dependency>
     </dependencies>
 
 
@@ -61,7 +66,7 @@
                     <guixFilesDir>/home/kevin/Workspaces/NetBeansProjects/guix/trunk/guix-test/src/main/java/org/nuiton/guix/demo/</guixFilesDir>
                     <targetDirectory>/home/kevin/Workspaces/NetBeansProjects/guix/trunk/guix-test/target/generatedFiles/</targetDirectory>
                     <rootPackage>org.nuiton.guix</rootPackage>
-                    <mainClass>org.nuiton.guix.GuixDemo2</mainClass>
+                    <mainClass>org.nuiton.guix.GuixDemo</mainClass>
                 </configuration>
                 <executions>
                     <execution>

Added: guix/trunk/guix-test/src/main/java/org/nuiton/guix/GuixDemo.java
===================================================================
--- guix/trunk/guix-test/src/main/java/org/nuiton/guix/GuixDemo.java	                        (rev 0)
+++ guix/trunk/guix-test/src/main/java/org/nuiton/guix/GuixDemo.java	2009-05-19 08:39:27 UTC (rev 1434)
@@ -0,0 +1,144 @@
+package org.nuiton.guix;
+
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.JLabel;
+import org.nuiton.guix.GuixDemo2;
+import javax.swing.*;
+import java.awt.*;
+
+public class GuixDemo extends javax.swing.JFrame {
+    private org.jdesktop.beansbinding.BindingGroup bindingGroup;
+    private GuixDemo2 gd2;
+    private JLabel label;
+    private JPanel panel;
+    private JTextField textfield;
+
+    /*---------------------------------------------------------------------------------*/
+    /*-- Statics methods --------------------------------------------------------------*/
+    /*---------------------------------------------------------------------------------*/
+
+    public static void main(String[] args) {
+        SwingUtilities.invokeLater(new Runnable() {public void run() {GuixDemo main = new GuixDemo();
+        main.pack();
+        main.setVisible(true);}});
+    }
+
+    /*---------------------------------------------------------------------------------*/
+    /*-- Constructors -----------------------------------------------------------------*/
+    /*---------------------------------------------------------------------------------*/
+
+    public GuixDemo() {
+        initialize();
+    }
+
+    /*---------------------------------------------------------------------------------*/
+    /*-- public acessor methods -------------------------------------------------------*/
+    /*---------------------------------------------------------------------------------*/
+
+    public org.jdesktop.beansbinding.BindingGroup getBindingGroup() {
+        return bindingGroup;
+    }
+
+    public GuixDemo2 getGd2() {
+        return gd2;
+    }
+
+    public JLabel getLabel() {
+        return label;
+    }
+
+    public JPanel getPanel() {
+        return panel;
+    }
+
+    public JTextField getTextfield() {
+        return textfield;
+    }
+
+    /*---------------------------------------------------------------------------------*/
+    /*-- public mutator methods -------------------------------------------------------*/
+    /*---------------------------------------------------------------------------------*/
+
+    public void setBindingGroup(org.jdesktop.beansbinding.BindingGroup newValue) {
+        this.bindingGroup = newValue;
+    }
+
+    public void setGd2(GuixDemo2 newValue) {
+        this.gd2 = newValue;
+    }
+
+    public void setLabel(JLabel newValue) {
+        this.label = newValue;
+    }
+
+    public void setPanel(JPanel newValue) {
+        this.panel = newValue;
+    }
+
+    public void setTextfield(JTextField newValue) {
+        this.textfield = newValue;
+    }
+
+    /*---------------------------------------------------------------------------------*/
+    /*-- public mutator methods -------------------------------------------------------*/
+    /*---------------------------------------------------------------------------------*/
+
+    public void createComponents() {
+        this.setLayout(new FlowLayout());
+        createPanel();
+        createTextfield();
+        createLabel();
+        createGd2();
+    }
+
+    public void initComponents() {
+        this.setTitle("JAXX Demo");
+        this.setSize(300,200);
+        this.add(panel);
+        panel.add(textfield);
+        panel.add(label);
+        this.add(gd2);
+    }
+
+    public void initDataBinding() {
+        bindingGroup = new org.jdesktop.beansbinding.BindingGroup();
+        bindingGroup.addBinding(
+        org.jdesktop.beansbinding.Bindings.createAutoBinding(
+        org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ,this,org.jdesktop.beansbinding.ELProperty.create("${gd2.button.selected}"),textfield,org.jdesktop.beansbinding.BeanProperty.create("enabled")));
+        bindingGroup.bind();
+        bindingGroup.addBinding(
+        org.jdesktop.beansbinding.Bindings.createAutoBinding(
+        org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ,this,org.jdesktop.beansbinding.ELProperty.create("${textfield.text}"),label,org.jdesktop.beansbinding.BeanProperty.create("text")));
+        bindingGroup.bind();
+    }
+
+    public void initialize() {
+        createComponents();
+        initComponents();
+        initDataBinding();
+    }
+
+    /*---------------------------------------------------------------------------------*/
+    /*-- ui creation methods ----------------------------------------------------------*/
+    /*---------------------------------------------------------------------------------*/
+
+    private void createGd2() {
+        gd2 = new GuixDemo2();
+    }
+
+    private void createLabel() {
+        label = new JLabel();
+        label.setForeground(Color.BLUE);
+
+    }
+
+    private void createPanel() {
+        panel = new JPanel();
+    }
+
+    private void createTextfield() {
+        textfield = new JTextField("test");
+    }
+
+}
\ No newline at end of file

Added: guix/trunk/guix-test/src/main/java/org/nuiton/guix/GuixDemo2.java
===================================================================
--- guix/trunk/guix-test/src/main/java/org/nuiton/guix/GuixDemo2.java	                        (rev 0)
+++ guix/trunk/guix-test/src/main/java/org/nuiton/guix/GuixDemo2.java	2009-05-19 08:39:27 UTC (rev 1434)
@@ -0,0 +1,76 @@
+package org.nuiton.guix;
+
+import javax.swing.JToggleButton;
+import javax.swing.*;
+import java.awt.*;
+
+public class GuixDemo2 extends javax.swing.JPanel {
+    private org.jdesktop.beansbinding.BindingGroup bindingGroup;
+    private JToggleButton button;
+
+    /*---------------------------------------------------------------------------------*/
+    /*-- Constructors -----------------------------------------------------------------*/
+    /*---------------------------------------------------------------------------------*/
+
+    public GuixDemo2() {
+        initialize();
+    }
+
+    /*---------------------------------------------------------------------------------*/
+    /*-- public acessor methods -------------------------------------------------------*/
+    /*---------------------------------------------------------------------------------*/
+
+    public org.jdesktop.beansbinding.BindingGroup getBindingGroup() {
+        return bindingGroup;
+    }
+
+    public JToggleButton getButton() {
+        return button;
+    }
+
+    /*---------------------------------------------------------------------------------*/
+    /*-- public mutator methods -------------------------------------------------------*/
+    /*---------------------------------------------------------------------------------*/
+
+    public void setBindingGroup(org.jdesktop.beansbinding.BindingGroup newValue) {
+        this.bindingGroup = newValue;
+    }
+
+    public void setButton(JToggleButton newValue) {
+        this.button = newValue;
+    }
+
+    /*---------------------------------------------------------------------------------*/
+    /*-- public mutator methods -------------------------------------------------------*/
+    /*---------------------------------------------------------------------------------*/
+
+    public void createComponents() {
+        this.setLayout(new FlowLayout());
+        createButton();
+    }
+
+    public void initComponents() {
+        this.add(button);
+    }
+
+    public void initDataBinding() {
+        bindingGroup = new org.jdesktop.beansbinding.BindingGroup();
+    }
+
+    public void initialize() {
+        createComponents();
+        initComponents();
+        initDataBinding();
+    }
+
+    /*---------------------------------------------------------------------------------*/
+    /*-- ui creation methods ----------------------------------------------------------*/
+    /*---------------------------------------------------------------------------------*/
+
+    private void createButton() {
+        button = new JToggleButton();
+        button.setText("-Push me");
+        button.setSelected(false);
+    }
+
+}
\ No newline at end of file

Modified: guix/trunk/guix-test/src/main/java/org/nuiton/guix/demo/GuixDemo.css
===================================================================
--- guix/trunk/guix-test/src/main/java/org/nuiton/guix/demo/GuixDemo.css	2009-05-19 08:39:17 UTC (rev 1433)
+++ guix/trunk/guix-test/src/main/java/org/nuiton/guix/demo/GuixDemo.css	2009-05-19 08:39:27 UTC (rev 1434)
@@ -1,5 +1,17 @@
-#display:{object . getText( ) . startsWith( "-" )}
+#button:{object . getText( ) . startsWith( "-" )}
 {
 	foreground: red;
-}
+}
 
+#label
+{
+    background : blue;
+}
+
+
+.bold
+{
+    font : bold;
+    margin-top: 10px;
+}
+

Modified: guix/trunk/guix-test/src/main/java/org/nuiton/guix/demo/GuixDemo.guix
===================================================================
--- guix/trunk/guix-test/src/main/java/org/nuiton/guix/demo/GuixDemo.guix	2009-05-19 08:39:17 UTC (rev 1433)
+++ guix/trunk/guix-test/src/main/java/org/nuiton/guix/demo/GuixDemo.guix	2009-05-19 08:39:27 UTC (rev 1434)
@@ -1,152 +1,9 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!-- test javadoc Application -->
-<Application title="JAXX Demo" width='1024' height='800' xmlns:swing='javax.swing.*'>
-    <script><![CDATA[
-
-org.codelutin.i18n.I18n.init();
-
-void $afterCompleteSetup() {
-    try { jaxx.runtime.SwingUtil.initNimbusLoookAndFeel(); } catch (Exception e) { log.error(e.getMessage(), e); }
-    SwingUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                int i=0;
-                while( i < list.getRowCount()) {
-                    list.expandRow(i++);
-                }
-            }
-        });
-}
-
-]]></script>
-
-	<style><![CDATA[
-#table {
-    border: { BorderFactory . createEmptyBorder( 4, 4, 4, 4 )
-}
-
-;
-font-face:
-
-"Trebuchet MS"
-;
-}
-
-#display {
-    background: #BCE5AD;
-    opaque: true;
-    horizontalAlignment: right;
-    border: { BorderFactory . createBevelBorder( BevelBorder . LOWERED )
-}
-
-;
-font-size:
-
-22
-;
-font-weight: bold
-
-;
-}
-]]></style>
-    <!-- test javadoc $JSplitPane1 -->
-    <swing:JSplitPane>
-        <!-- JSplitPane dividerLocation='200' -->
-        <swing:JScrollPane>
-            <swing:JTree id='list' showsRootHandles='true'
-                   onValueChanged='cardLayout.show(preview, list.getSelectionValue() instanceof DemoPanel ? ((DemoPanel) list.getSelectionValue()).getLabel() : emptyDemo.getLabel())'
-                   cellRenderer='{new javax.swing.tree.DefaultTreeCellRenderer() {
-                    public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) {
-                        if (value instanceof DemoPanel)
-                            value = ((DemoPanel) value).getLabel();
-                        return super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
-                    }
-                }
-            }'>
-		<!-- test javadoc $item1 -->
-                <item value="Components">
-                    <item value='Buttons'>
-                        <item value='{buttonDemo}'/>
-                        <item value='{checkBoxDemo}'/>
-                        <item value='{radioButtonDemo}'/>
-                        <item value='{toggleButtonDemo}'/>
-                    </item>
-
-                    <item value='Form elements'>
-                        <item value='Text'>
-                            <item value='{passwordFieldDemo}'/>
-                            <item value='{textFieldDemo}'/>
-                            <item value='{textAreaDemo}'/>
-                        </item>
-
-                        <item value='{comboBoxDemo}'/>
-                        <item value='{listDemo}'/>
-                        <item value='{sliderDemo}'/>
-                        <item value='{spinnerDemo}'/>
-                    </item>
-
-                    <item value='Layout components'>
-                        <item value='{splitPaneDemo}'/>
-                    </item>
-
-                    <item value='Menus'>
-                        <item value='{menuItemDemo}'/>
-                        <item value='{checkBoxMenuItemDemo}'/>
-                        <item value='{radioButtonMenuItemDemo}'/>
-                    </item>
-
-                    <item value='Windows'>
-                        <item value='{dialogDemo}'/>
-                    </item>
-
-                    <item value='{progressBarDemo}'/>
-
-                </item>
-
-                <item value='{labelStyleDemo}'/>
-
-                <item value='{counterDemo}'/>
-                <item value='{calculatorDemo}'/>
-
-                <item value='New features'>
-                    <item value='Validation'>
-                        <item value='{validationDemo1}'/>
-                        <item value='{validationDemo2}'/>
-                    </item>
-                    <item value='{dataBindingDemo}'/>
-                    <item value='{boxedDecoratorDemo}'/>
-                </item>
-            </swing:JTree>
-        </swing:JScrollPane>
-        <java.awt.CardLayout id='cardLayout'/>
-<script source="scriptFile.script" />
-        <Panel id='preview' layout='{cardLayout}'>
-            <EmptyDemo id='emptyDemo' constraints='emptyDemo.getLabel()'/>
-            <JButtonDemo id='buttonDemo' constraints='buttonDemo.getLabel()'/>
-            <JCheckBoxDemo id='checkBoxDemo' constraints='checkBoxDemo.getLabel()'/>
-            <JCheckBoxMenuItemDemo id='checkBoxMenuItemDemo' constraints='checkBoxMenuItemDemo.getLabel()'/>
-            <JComboBoxDemo id='comboBoxDemo' constraints='comboBoxDemo.getLabel()'/>
-            <JDialogDemo id='dialogDemo' constraints='dialogDemo.getLabel()'/>
-            <JListDemo id='listDemo' constraints='listDemo.getLabel()'/>
-            <JMenuItemDemo id='menuItemDemo' constraints='menuItemDemo.getLabel()'/>
-            <JPasswordFieldDemo id='passwordFieldDemo' constraints='passwordFieldDemo.getLabel()'/>
-            <JProgressBarDemo id='progressBarDemo' constraints='progressBarDemo.getLabel()'/>
-            <JSliderDemo id='sliderDemo' constraints='sliderDemo.getLabel()'/>
-            <JSpinnerDemo id='spinnerDemo' constraints='spinnerDemo.getLabel()'/>
-            <JSplitPaneDemo id='splitPaneDemo' constraints='splitPaneDemo.getLabel()'/>
-            <JRadioButtonDemo id='radioButtonDemo' constraints='radioButtonDemo.getLabel()'/>
-            <JRadioButtonMenuItemDemo id='radioButtonMenuItemDemo' constraints='radioButtonMenuItemDemo.getLabel()'/>
-            <JToggleButtonDemo id='toggleButtonDemo' constraints='toggleButtonDemo.getLabel()'/>
-            <JTextFieldDemo id='textFieldDemo' constraints='textFieldDemo.getLabel()'/>
-            <JTextAreaDemo id='textAreaDemo' constraints='textAreaDemo.getLabel()'/>
-            <ValidationListDemo id='validationDemo1' constraints='validationDemo1.getLabel()'/>
-            <ValidationTableDemo id='validationDemo2' constraints='validationDemo2.getLabel()'/>
-            <BeanDataBindingDemo id='dataBindingDemo' constraints='dataBindingDemo.getLabel()'/>
-            <LabelStyleDemo id='labelStyleDemo' constraints='labelStyleDemo.getLabel()'/>
-            <CounterDemo id='counterDemo' constraints='counterDemo.getLabel()'/>
-            <CalculatorDemo id='calculatorDemo' constraints='calculatorDemo.getLabel()'/>
-            <BoxedDecoratorDemo id='boxedDecoratorDemo' constraints='boxedDecoratorDemo.getLabel()'/>
-        </Panel>
-        <style source="JButton.css" />
-    </swing:JSplitPane>
-</Application>
+<swing:JFrame title="JAXX Demo" size="300,200" xmlns:swing='javax.swing.*'>
+    <swing:JPanel id="panel">
+        <swing:JTextField id="textfield" constructor='"test"' enabled="{gd2.getButton().isSelected()}" />
+        <swing:JLabel id="label" text="{textfield.getText()}" styleClass="bold" />
+    </swing:JPanel>
+    <GuixDemo2 id="gd2" />
+</swing:JFrame>

    

r1434 - in guix/trunk/guix-test: . src/main/java/org/nuiton/guix src/main/java/org/nuiton/guix/demo

kmorin＠users.labs.libre-entreprise.org

tags

participants (1)