From sletellier@users.nuiton.org Thu Jun 14 11:50:58 2012
From: sletellier@users.nuiton.org
To: jaxx-commits@list.nuiton.org
Subject: [Jaxx-commits] r2328 - in trunk:
	jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor
	jaxx-demo/src/main/java/jaxx/demo/tree	jaxx-demo/src/main/resources/i18n
 jaxx-widgets/src/main/java	jaxx-widgets/src/main/java/jaxx/runtime/swing
	jaxx-widgets/src/main/java/org	jaxx-widgets/src/main/java/org/jdesktop
	jaxx-widgets/src/main/java/org/jdesktop/swingx
	jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf
	jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/basic
Date: Thu, 14 Jun 2012 11:50:58 +0200
Message-ID: <20120614095058.A46F815827@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2963874836824740868=="

--===============2963874836824740868==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: sletellier
Date: 2012-06-14 11:50:58 +0200 (Thu, 14 Jun 2012)
New Revision: 2328

Url: http://nuiton.org/repositories/revision/jaxx/2328

Log:
- fixes #2136 : Create component extend JXDatePicker to hide popup button and=
 allow input time
- create ui in demo
- fixe translations



Added:
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/DatePickerDe=
mo.jaxx
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXDatePicker.jaxx
   trunk/jaxx-widgets/src/main/java/org/
   trunk/jaxx-widgets/src/main/java/org/jdesktop/
   trunk/jaxx-widgets/src/main/java/org/jdesktop/swingx/
   trunk/jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/
   trunk/jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/basic/
   trunk/jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/basic/ExtendedBa=
sicDatePickerUI.java
Modified:
   trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java
   trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties
   trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties
   trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties

Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/DatePick=
erDemo.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/DatePickerD=
emo.jaxx	                        (rev 0)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/DatePickerD=
emo.jaxx	2012-06-14 09:50:58 UTC (rev 2328)
@@ -0,0 +1,101 @@
+<!--
+  #%L
+  JAXX :: Demo
+  $Id:$
+  $HeadURL:$
+  %%
+  Copyright (C) 2008 - 2012 CodeLutin
+  %%
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as=20
+  published by the Free Software Foundation, either version 3 of the=20
+  License, or (at your option) any later version.
+ =20
+  This program 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 Lesser Public License for more details.
+ =20
+  You should have received a copy of the GNU General Lesser Public=20
+  License along with this program.  If not, see
+  <http://www.gnu.org/licenses/lgpl-3.0.html>.
+  #L%
+  -->
+<jaxx.demo.DemoPanel>
+
+  <import>
+    java.beans.PropertyChangeEvent
+    java.beans.PropertyChangeListener
+    java.text.SimpleDateFormat
+    java.util.Date
+  </import>
+
+  <String id=3D'patternLayout' javaBean=3D'"dd/MM/yyyy HH:mm:ss"'/>
+
+  <SimpleDateFormat id=3D'dateFormat' constructorParams=3D'patternLayout'/>
+
+  <Date id=3D'date' javaBean=3D'new Date()'/>
+
+  <script><![CDATA[
+    protected void $afterCompleteSetup() {
+
+        addPropertyChangeListener(PROPERTY_PATTERN_LAYOUT, new PropertyChang=
eListener() {
+
+            @Override
+            public void propertyChange(PropertyChangeEvent evt) {
+                dateFormat =3D new SimpleDateFormat(patternLayout);
+                datePicker.setPatternLayout(patternLayout);
+                resultView.setText(dateFormat.format(date));
+            }
+        });
+
+        addPropertyChangeListener(PROPERTY_DATE, new PropertyChangeListener(=
) {
+
+            @Override
+            public void propertyChange(PropertyChangeEvent evt) {
+                resultView.setText(dateFormat.format(date));
+            }
+        });
+    }
+  ]]></script>
+
+  <Table fill=3D'both'>
+    <row>
+      <cell columns=3D'2'>
+        <JCheckBox id=3D'showPopupButton'
+                   text=3D'jaxxdemo.datePickerEditor.showPopupButton'
+                   selected=3D'false'/>
+      </cell>
+    </row>
+    <row>
+      <cell>
+        <JLabel text=3D'jaxxdemo.datePickerEditor.patternLayout'/>
+      </cell>
+      <cell>
+        <JTextField id=3D'patternLayoutField'
+                    text=3D'{patternLayout}'
+                    onFocusLost=3D'setPatternLayout(patternLayoutField.getTe=
xt())'/>
+      </cell>
+    </row>
+    <row>
+      <cell>
+        <JLabel text=3D'jaxxdemo.i18neditor.datePicker'/>
+      </cell>
+      <cell>
+        <JAXXDatePicker id=3D'datePicker'
+                        date=3D'{date}'
+                        patternLayout=3D'{patternLayout}'
+                        showPopupButton=3D'{showPopupButton.isSelected()}'
+                        onActionPerformed=3D'setDate(datePicker.getDate())'/>
+      </cell>
+    </row>
+    <row>
+      <cell>
+        <JLabel text=3D'jaxxdemo.datePickerEditor.dateResult'/>
+      </cell>
+       <cell>
+         <JLabel id=3D'resultView' text=3D'{dateFormat.format(date)}'/>
+       </cell>
+    </row>
+  </Table>
+</jaxx.demo.DemoPanel>

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java	2012-0=
6-08 10:06:10 UTC (rev 2327)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java	2012-0=
6-14 09:50:58 UTC (rev 2328)
@@ -25,9 +25,14 @@
=20
 package jaxx.demo.tree;
=20
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import jaxx.demo.component.jaxx.BoxedDecoratorDemo;
 import jaxx.demo.component.jaxx.StatusMessagePanelDemo;
 import jaxx.demo.component.jaxx.editor.ComboEditorDemo;
+import jaxx.demo.component.jaxx.editor.DatePickerDemo;
 import jaxx.demo.component.jaxx.editor.I18nEditorDemo;
 import jaxx.demo.component.jaxx.editor.NumberEditorDemo;
 import jaxx.demo.component.jaxx.editor.TimeEditorDemo;
@@ -61,11 +66,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
=20
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import static org.nuiton.i18n.I18n.n_;
=20
 /**
@@ -152,7 +152,8 @@
                    TimeEditorDemo.class,
                    NumberEditorDemo.class,
                    ComboEditorDemo.class,
-                   I18nEditorDemo.class
+                   I18nEditorDemo.class,
+                   DatePickerDemo.class
         );
=20
         addMapping(n_("jaxxdemo.feature"),

Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties	2012-0=
6-08 10:06:10 UTC (rev 2327)
+++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties	2012-0=
6-14 09:50:58 UTC (rev 2328)
@@ -186,8 +186,11 @@
 jaxxdemo.config.ui.fontSize=3Ddefault font size to use in sources
 jaxxdemo.config.ui.fullscreen=3DTo change the screen mode (true for full scr=
een)
 jaxxdemo.config.ui.locale=3DLanguage used in application
-jaxxdemo.config.ui.logLevel=3D
-jaxxdemo.config.ui.logPatternLayout=3D
+jaxxdemo.config.ui.logLevel=3DLog level
+jaxxdemo.config.ui.logPatternLayout=3DLog pattern
+jaxxdemo.datePickerEditor.dateResult=3DResult display
+jaxxdemo.datePickerEditor.patternLayout=3DDate pattern
+jaxxdemo.datePickerEditor.showPopupButton=3DDisplay popup button
 jaxxdemo.feature=3DFeatures
 jaxxdemo.feature.databinding=3DData Binding
 jaxxdemo.feature.nav=3DJaxx nav API

Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties	2012-0=
6-08 10:06:10 UTC (rev 2327)
+++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties	2012-0=
6-14 09:50:58 UTC (rev 2328)
@@ -186,8 +186,11 @@
 jaxxdemo.config.ui.fontSize=3DLa taille de la police =C3=A0 utiliser pour vi=
sualiser dans les sources
 jaxxdemo.config.ui.fullscreen=3DPour afficher l'aplication en mode pleine =
=C3=A9cran
 jaxxdemo.config.ui.locale=3DLa langue utilis=C3=A9e par l'application
-jaxxdemo.config.ui.logLevel=3D
-jaxxdemo.config.ui.logPatternLayout=3D
+jaxxdemo.config.ui.logLevel=3DLevel de log
+jaxxdemo.config.ui.logPatternLayout=3DPattern des log
+jaxxdemo.datePickerEditor.dateResult=3DAffichage du r=C3=A9sultat
+jaxxdemo.datePickerEditor.patternLayout=3DPattern de date
+jaxxdemo.datePickerEditor.showPopupButton=3DAfficher le boutton pour ouvrir =
la popup
 jaxxdemo.feature=3DFonctionnalit=C3=A9s
 jaxxdemo.feature.databinding=3DData binding
 jaxxdemo.feature.nav=3DAPI JAXX pour les arbres

Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties	2012-0=
6-08 10:06:10 UTC (rev 2327)
+++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties	2012-0=
6-14 09:50:58 UTC (rev 2328)
@@ -186,8 +186,11 @@
 jaxxdemo.config.ui.fontSize=3DLa taille de la police =C3=A0 utiliser pour vi=
sualiser dans les sources
 jaxxdemo.config.ui.fullscreen=3DPour afficher l'aplication en mode pleine =
=C3=A9cran
 jaxxdemo.config.ui.locale=3DLa langue utilis=C3=A9e par l'application
-jaxxdemo.config.ui.logLevel=3D
-jaxxdemo.config.ui.logPatternLayout=3D
+jaxxdemo.config.ui.logLevel=3DLevel de log
+jaxxdemo.config.ui.logPatternLayout=3DPattern des log
+jaxxdemo.datePickerEditor.dateResult=3DAffichage du r=C3=A9sultat
+jaxxdemo.datePickerEditor.patternLayout=3DPattern de date
+jaxxdemo.datePickerEditor.showPopupButton=3DAfficher le boutton pour ouvrir =
la popup
 jaxxdemo.feature=3DFonctionnalit=C3=A9s
 jaxxdemo.feature.databinding=3DData binding
 jaxxdemo.feature.nav=3DAPI JAXX pour les arbres

Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXDatePicker.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXDatePicker.jaxx	 =
                       (rev 0)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXDatePicker.jaxx	2=
012-06-14 09:50:58 UTC (rev 2328)
@@ -0,0 +1,61 @@
+<!--
+  #%L
+  JAXX :: Widgets
+  $Id:$
+  $HeadURL:$
+  %%
+  Copyright (C) 2008 - 2012 CodeLutin
+  %%
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as=20
+  published by the Free Software Foundation, either version 3 of the=20
+  License, or (at your option) any later version.
+ =20
+  This program 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 Lesser Public License for more details.
+ =20
+  You should have received a copy of the GNU General Lesser Public=20
+  License along with this program.  If not, see
+  <http://www.gnu.org/licenses/lgpl-3.0.html>.
+  #L%
+  -->
+<org.jdesktop.swingx.JXDatePicker>
+
+  <import>
+    java.beans.PropertyChangeEvent
+    java.beans.PropertyChangeListener
+    org.jdesktop.swingx.plaf.basic.ExtendedBasicDatePickerUI
+    java.text.SimpleDateFormat
+  </import>
+
+  <Boolean id=3D'showPopupButton' javaBean=3D'Boolean.TRUE'/>
+
+  <String id=3D'patternLayout' javaBean=3D'"dd/MM/yyyy"'/>
+
+  <ExtendedBasicDatePickerUI id=3D'extendedUI' showPopupButton=3D'{showPopup=
Button}'/>
+
+  <script><![CDATA[
+    protected void $afterCompleteSetup() {
+
+        setUI(extendedUI);
+
+        addPropertyChangeListener(PROPERTY_SHOW_POPUP_BUTTON, new PropertyCh=
angeListener() {
+
+            @Override
+            public void propertyChange(PropertyChangeEvent evt) {
+                extendedUI.setShowPopupButton((Boolean) evt.getNewValue());
+            }
+        });
+
+        addPropertyChangeListener(PROPERTY_PATTERN_LAYOUT, new PropertyChang=
eListener() {
+
+            @Override
+            public void propertyChange(PropertyChangeEvent evt) {
+                setFormats(new SimpleDateFormat((String) evt.getNewValue()));
+            }
+        });
+    }
+  ]]></script>
+</org.jdesktop.swingx.JXDatePicker>
\ No newline at end of file

Added: trunk/jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/basic/Extend=
edBasicDatePickerUI.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/basic/ExtendedB=
asicDatePickerUI.java	                        (rev 0)
+++ trunk/jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/basic/ExtendedB=
asicDatePickerUI.java	2012-06-14 09:50:58 UTC (rev 2328)
@@ -0,0 +1,91 @@
+/*
+ * #%L
+ * JAXX :: Widgets
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2008 - 2012 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as=20
+ * published by the Free Software Foundation, either version 3 of the=20
+ * License, or (at your option) any later version.
+ *=20
+ * This program 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 Lesser Public License for more details.
+ *=20
+ * You should have received a copy of the GNU General Lesser Public=20
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ * #L%
+ */
+package org.jdesktop.swingx.plaf.basic;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.beans.PropertyVetoException;
+import java.util.Date;
+import javax.swing.JButton;
+
+/**
+ * @author sletellier <letellier@codelutin.com>
+ */
+public class ExtendedBasicDatePickerUI extends BasicDatePickerUI {
+
+    public static final String PROPERTY_SHOW_POPUP_BUTTON =3D "showPopupButt=
on";
+
+    protected JButton popupButton;
+    protected PropertyChangeSupport p;
+    protected boolean showPopupButton;
+
+    public ExtendedBasicDatePickerUI() {
+        p =3D new PropertyChangeSupport(this);
+        p.addPropertyChangeListener(PROPERTY_SHOW_POPUP_BUTTON, new Property=
ChangeListener() {
+
+            @Override
+            public void propertyChange(PropertyChangeEvent evt) {
+
+                // dont do this on init
+                if (datePicker !=3D null) {
+                    installComponents();
+                    installListeners();
+                }
+            }
+        });
+    }
+
+    public boolean isShowPopupButton() {
+        return showPopupButton;
+    }
+
+    public void setShowPopupButton(boolean showPopupButton) {
+        boolean oldValue =3D isShowPopupButton();
+        this.showPopupButton =3D showPopupButton;
+        p.firePropertyChange("showPopupButton", oldValue, showPopupButton);
+    }
+
+    @Override
+    protected JButton createPopupButton() {
+
+        if (datePicker !=3D null && popupButton !=3D null) {
+            datePicker.remove(popupButton);
+        }
+        if (isShowPopupButton()) {
+            popupButton =3D super.createPopupButton();
+            return popupButton;
+        }
+        return null;
+    }
+
+    @Override
+    public Date getSelectableDate(Date date) throws PropertyVetoException {
+        if (date =3D=3D null) {
+            // one place to interrupt the update spiral
+            throw new PropertyVetoException("date not selectable", null);
+        }
+        return date;
+    }
+}


--===============2963874836824740868==--