From tchemit@users.nuiton.org Sat Sep  4 22:12:30 2010
From: tchemit@users.nuiton.org
To: jaxx-commits@list.nuiton.org
Subject: [Jaxx-commits] r2056 - in trunk/jaxx-widgets/src/main:
	java/jaxx/runtime/swing/editor resources/i18n
Date: Sat, 04 Sep 2010 22:12:30 +0200
Message-ID: <20100904201230.7D24915A04@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5648778935631545572=="

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

Author: tchemit
Date: 2010-09-04 22:12:30 +0200 (Sat, 04 Sep 2010)
New Revision: 2056

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

Log:
Evolution #845: Improve TimeEditor

Modified:
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditor.css
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditor.jaxx
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditorHandl=
er.java
   trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-en_GB.properties
   trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEdit=
or.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/editor/TimeEditor.css=
	2010-08-30 10:01:11 UTC (rev 2055)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditor.css=
	2010-09-04 20:12:30 UTC (rev 2056)
@@ -23,28 +23,33 @@
  * #L%
  */
=20
-#title{
+#title {
     text:{getLabel()};
     horizontalAlignment:center;
 }
=20
-#hour{
-    value:{getTimeModel()/60};
+#hour {
+    value:{getTimeModel() / 60};
     enabled:{isEnabled()};
-    model:{new SpinnerNumberModel(0,0,23,1)};
+    model:{new SpinnerNumberModel(0, 0, 23, 1)};
 }
=20
 #labelH {
     text:"timeeditor.H";
     horizontalAlignment:center;
 }
-#minute{
-    value:{getTimeModel()%60};
+
+#minuteModel {
+    calendarField:{java.util.Calendar.MINUTE};
+    value:{getHandler().setMinuteModel(getDate())};
+}
+
+#minute {
     enabled:{isEnabled()};
-    model:{new SpinnerNumberModel(0,0,59,1)};
+    model:{minuteModel};
 }
=20
-#slider{
+#slider {
     font-size: 11;
     paintTicks:true;
     paintLabels:true;
@@ -52,5 +57,5 @@
     minorTickSpacing:30;
     value:{getTimeModel()};
     enabled:{isEnabled()};
-    model:{new DefaultBoundedRangeModel(0,1,0,60*24)};
+    model:{new DefaultBoundedRangeModel(0, 1, 0, 60 * 24)};
 }

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEdit=
or.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/editor/TimeEditor.jax=
x	2010-08-30 10:01:11 UTC (rev 2055)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditor.jax=
x	2010-09-04 20:12:30 UTC (rev 2056)
@@ -26,7 +26,9 @@
=20
 <JPanel layout=3D'{new BorderLayout()}'>
=20
-    <!--<style source=3D'TimeEditor.css'/>-->
+  <import>
+    java.util.Date
+  </import>
=20
     <!-- bean property -->
     <String id=3D'property' javaBean=3D'""'/>
@@ -43,11 +45,15 @@
     <!-- the real date -->
     <java.util.Date id=3D"date" javaBean=3D'null'/>
=20
+    <!-- spinner minute editor -->
+    <SpinnerDateModel id=3D"minuteModel"/>
+
     <!-- ui handler -->
     <TimeEditorHandler id=3D'handler' constructorParams=3D'this'/>
=20
     <script><![CDATA[
 public void init() {
+    minute.setEditor(new JSpinner.DateEditor(minute, "mm"));
     handler.init();
 }
 ]]>
@@ -63,14 +69,14 @@
             </cell>
             <cell>
                 <JSpinner id=3D'hour'
-                          onStateChanged=3D'setTimeModel((Integer)hour.getVa=
lue()* 60 + timeModel % 60)'/>
+                          onStateChanged=3D'setTimeModel((Integer)hour.getVa=
lue() * 60 + getHandler().getMinute())'/>
             </cell>
             <cell>
                 <JLabel id=3D'labelH'/>
             </cell>
             <cell>
                 <JSpinner id=3D'minute'
-                          onStateChanged=3D'setTimeModel((timeModel / 60) * =
60 + (Integer) minute.getValue())'/>
+                          onStateChanged=3D'getHandler().updateTimeModelFrom=
MinuteModel(minuteModel.getDate())'/>
             </cell>
         </row>
     </Table>

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEdit=
orHandler.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/jaxx/runtime/swing/editor/TimeEditorHand=
ler.java	2010-08-30 10:01:11 UTC (rev 2055)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditorHand=
ler.java	2010-09-04 20:12:30 UTC (rev 2056)
@@ -25,13 +25,16 @@
=20
 package jaxx.runtime.swing.editor;
=20
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
=20
 import javax.swing.JLabel;
+import javax.swing.JSlider;
+import javax.swing.plaf.basic.BasicSliderUI;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseWheelEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyDescriptor;
@@ -41,26 +44,34 @@
 import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.Map;
-import javax.swing.JSlider;
-import javax.swing.plaf.basic.BasicSliderUI;
=20
 /** @author tchemit <chemit@codelutin.com> */
 public class TimeEditorHandler {
=20
     public static final Log log =3D LogFactory.getLog(TimeEditorHandler.clas=
s);
+
     public static final String BEAN_PROPERTY =3D "bean";
+
     public static final String PROPERTY_PROPERTY =3D "property";
+
     public static final String DATE_PROPERTY =3D "date";
+
     public static final String TIME_MODEL_PROPERTY =3D "timeModel";
+
     /** editor ui */
     protected TimeEditor editor;
+
     /** the mutator method on the property of boxed bean in the editor */
     protected Method mutator;
+
     protected Calendar calendar;
=20
+    protected Calendar calendarMinute;
+
     public TimeEditorHandler(TimeEditor ui) {
-        this.editor =3D ui;
-        this.calendar =3D Calendar.getInstance();
+        editor =3D ui;
+        calendar =3D Calendar.getInstance();
+        calendarMinute =3D Calendar.getInstance();
     }
=20
     public void init() {
@@ -75,7 +86,7 @@
             labelTable.put(i * 60, new JLabel(i + ""));
         }
         JSlider slider =3D editor.getSlider();
-        slider.setLabelTable((Dictionary<?,?>) labelTable);
+        slider.setLabelTable((Dictionary<?, ?>) labelTable);
=20
         MouseAdapter m =3D new MouseAdapter() {
=20
@@ -111,6 +122,21 @@
                 showToolTip(e);
             }
=20
+            @Override
+            public void mouseWheelMoved(MouseWheelEvent e) {
+                JSlider slider =3D (JSlider) e.getComponent();
+
+                // compute new value
+                int nb =3D e.getWheelRotation();
+                int value =3D slider.getValue() - nb;
+
+                // set the value
+                slider.setValueIsAdjusting(true);
+                slider.setValue(value);
+                slider.setValueIsAdjusting(false);
+                e.consume();
+            }
+
             int getSliderValue(MouseEvent e) {
                 JSlider slider =3D (JSlider) e.getSource();
                 int value =3D -1;
@@ -149,6 +175,7 @@
         };
         slider.addMouseListener(m);
         slider.addMouseMotionListener(m);
+        slider.addMouseWheelListener(m);
=20
         // listen when date changes (should come from outside)
         editor.addPropertyChangeListener(DATE_PROPERTY, new PropertyChangeLi=
stener() {
@@ -166,7 +193,7 @@
                 if (log.isDebugEnabled()) {
                     log.debug("date changed : new value " + hours + ":" + mi=
nutes);
                 }
-                getEditor().setTimeModel((hours * 60) + minutes);
+                getEditor().setTimeModel(hours * 60 + minutes);
             }
         });
=20
@@ -189,6 +216,97 @@
         return editor;
     }
=20
+    protected Date setMinuteModel(Date incomingDate) {
+        if (incomingDate =3D=3D null) {
+            incomingDate =3D new Date();
+        }
+        calendarMinute.setTime(incomingDate);
+        calendarMinute.set(Calendar.HOUR_OF_DAY, 0);
+        incomingDate =3D calendarMinute.getTime();
+        return incomingDate;
+    }
+
+    public int getMinute() {
+        return getEditor().getTimeModel() % 60;
+    }
+
+    public int getHour() {
+        return getEditor().getTimeModel() / 60;
+    }
+
+    public void updateTimeModelFromMinuteModel(Date minuteDate) {
+
+        calendarMinute.setTime(minuteDate);
+        int newHour =3D calendarMinute.get(Calendar.HOUR_OF_DAY);
+        int newMinute =3D calendarMinute.get(Calendar.MINUTE);
+
+        int oldHour =3D getHour();
+        int oldMinute =3D getMinute();
+
+        if (oldHour =3D=3D newHour && oldMinute =3D=3D newMinute) {
+
+            // do nothing, same data
+            if (log.isDebugEnabled()) {
+                log.debug("Do not update time model , stay on same time =3D =
" + oldHour + ":" + oldMinute);
+            }
+            return;
+        }
+
+        // by default stay on same hour
+        int hour =3D oldHour;
+
+        // by default, use the new minute data
+        int minute =3D newMinute;
+
+        if (log.isDebugEnabled()) {
+            log.debug("hh:mm (old from dateModel)   =3D " + oldHour + ":" + =
oldMinute);
+            log.debug("hh:mm (new from minuteModel) =3D " + newHour + ":" + =
newMinute);
+        }
+
+        if (newMinute =3D=3D 0) {
+
+            // minute pass to zero (check if a new hour is required)
+            if (newHour =3D=3D 1) {
+
+                if (oldHour =3D=3D 23) {
+
+                    // can't pass from 23:59 to 0:00, stay on 23:59
+                    if (log.isDebugEnabled()) {
+                        log.debug("Do not update time model , stay on hh:mm =
=3D " + oldHour + ":" + oldMinute);
+                    }
+                    getEditor().getMinuteModel().setValue(getEditor().getMin=
uteModel().getPreviousValue());
+                    return;
+                }
+                hour =3D (oldHour + 1) % 24;
+            }
+        } else if (newMinute =3D=3D 59) {
+
+            // minute pass to 59 (check if a new hour is required)
+
+            if (newHour =3D=3D 23) {
+
+                if (oldHour =3D=3D 0) {
+
+                    // can't pass from 0:00 to 23:59, stay on 0:00
+                    if (log.isDebugEnabled()) {
+                        log.debug("Do not update time model , stay on hh:mm =
=3D " + oldHour + ":" + oldMinute);
+                    }
+                    getEditor().getMinuteModel().setValue(getEditor().getMin=
uteModel().getNextValue());
+                    return;
+                }
+
+                // decrease hour
+                hour =3D (oldHour - 1) % 24;
+            }
+        }
+
+        // date has changed
+        if (log.isDebugEnabled()) {
+            log.debug("Update time model to hh:mm =3D " + hour + ":" + minut=
e);
+        }
+        getEditor().setTimeModel(hour * 60 + minute);
+    }
+
     protected void setDate(Date oldValue, Date newValue) {
         if (editor.getBean() =3D=3D null) {
             return;

Modified: trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-en_GB.prope=
rties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/resources/i18n/jaxx-widgets-en_GB.properties	=
2010-08-30 10:01:11 UTC (rev 2055)
+++ trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-en_GB.properties	=
2010-09-04 20:12:30 UTC (rev 2056)
@@ -9,13 +9,9 @@
 config.action.reset.tip=3DCancel the modifications for the category
 config.action.save=3DSave
 config.action.save.tip=3DSave the modifications for the category
-config.category.needReloadApplication=3DCategory '%1$s' \:
-config.category.needReloadUI=3DCategory '%1$s' \:
-config.category.saved=3DThe category '%1$s' was modified \:
 config.choice.cancel=3DCancel
 config.choice.continue=3DContinue
 config.choice.doNotSave=3DDo not save
-config.choice.ok=3DOk
 config.choice.save=3DSave
 config.defaultValue=3DDefault value
 config.defaultValue.tip=3DDefault value of the option
@@ -29,8 +25,6 @@
 config.launch.callBack.tip=3DPerform necessary actions
 config.message.quit.invalid.category=3DThe category '%1$s' is not valid\!
 config.message.quit.valid.and.modified.category=3DThe category '%1$s' has so=
me modified options \:
-config.model.needReloadApplication=3DSome options were modified and need to =
reload application.\n
-config.model.needReloadUI=3DSome options were modified and need to reload GU=
I.\n
 config.modified=3DOption was modified (previous value \: %1$s)
 config.no.option.selected=3D< No selected option >
 config.option.final=3DThis option can not be modified
@@ -38,8 +32,6 @@
 config.option.modified=3DValue is modified < original value \: '%1$s' - new =
value \: '%2$s' >
 config.title=3DPreferences
 config.title.need.confirm=3DA confirmation is required
-config.title.will.reload.application=3DThe application need to be restarted
-config.title.will.reload.ui=3DThe graphical interface must be relauched
 config.unmodifiable=3DCan not be modified
 config.unvalid=3DOption is not valid \! (previous value \: %1$s, required ty=
pe \: %2$s)
 config.value=3DValue

Modified: trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.prope=
rties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/resources/i18n/jaxx-widgets-fr_FR.properties	=
2010-08-30 10:01:11 UTC (rev 2055)
+++ trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties	=
2010-09-04 20:12:30 UTC (rev 2056)
@@ -9,13 +9,9 @@
 config.action.reset.tip=3DAnnuler les modifications de cette cat\u00E9gorie
 config.action.save=3DEnregistrer
 config.action.save.tip=3DSauver les modifications de cette cat\u00E9gorie
-config.category.needReloadApplication=3DCat\u00E9gorie '%1$s' \:
-config.category.needReloadUI=3DCat\u00E9gorie '%1$s' \:
-config.category.saved=3DLa cat\u00E9gorie '%1$s' a \u00E9t\u00E9 modifi\u00E=
9e \:
 config.choice.cancel=3DAnnuler
 config.choice.continue=3DContinuer
 config.choice.doNotSave=3DNe pas enregistrer
-config.choice.ok=3DOk
 config.choice.save=3DEnregistrer
 config.defaultValue=3DValeur par d\u00E9faut
 config.defaultValue.tip=3DValeur par d\u00E9faut de l'option
@@ -29,8 +25,6 @@
 config.launch.callBack.tip=3DLancer les actions n\u00E9cessaires
 config.message.quit.invalid.category=3DLa cat\u00E9gorie '%1$s' n'est pas va=
lide\!
 config.message.quit.valid.and.modified.category=3DLa cat\u00E9gorie '%1$s' p=
oss\u00E8dent des options modifi\u00E9es \:
-config.model.needReloadApplication=3DDes options ont \u00E9t\u00E9 modifi\u0=
0E9es qui n\u00E9cessitent le red\u00E9marrage de l'application.\n
-config.model.needReloadUI=3DDes options ont \u00E9t\u00E9 modifi\u00E9es qui=
 n\u00E9cessitent le red\u00E9marrage de l'interface graphique.\n
 config.modified=3DOption modifi\u00E9e (valeur originale \: %1$s)
 config.no.option.selected=3D< Pas d'option s\u00E9lectionn\u00E9e >
 config.option.final=3DOption non modifiable
@@ -38,8 +32,6 @@
 config.option.modified=3DValeur modifi\u00E9e < ancienne valeur \: '%1$s' - =
nouvelle valeur \: '%2$s' >
 config.title=3DPr\u00E9f\u00E9rences
 config.title.need.confirm=3DUne confirmation de votre part est requise...
-config.title.will.reload.application=3DL'application doit \u00EAtre red\u00E=
9marrer...
-config.title.will.reload.ui=3DL'interface graphique doit \u00EAtre relancer.=
..
 config.unmodifiable=3DNe peut pas \u00EAtre modifi\u00E9
 config.unvalid=3DOption non valide (valeur originale \: %1$s, type requis \:=
 %2$s)
 config.value=3DValeur


--===============5648778935631545572==--