[Buix-commits] r1279 - in jaxx/trunk/jaxx-runtime-swing/src/main: java/jaxx/runtime java/jaxx/runtime/swing/wizard resources resources/icons

24 Mar 2009

Author: tchemit
Date: 2009-03-24 14:37:47 +0000 (Tue, 24 Mar 2009)
New Revision: 1279

Added:
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-config-16.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-config.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-message-16.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-message.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-next-16.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-next.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-pause-16.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-pause.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-previous-16.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-previous.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-refresh-16.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-refresh.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-start-16.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-start.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-canceled-16.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-canceled.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-failed-16.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-failed.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-need_fix-16.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-need_fix.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-pending-16.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-pending.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-running-16.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-running.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-successed-16.png
   jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-successed.png
Modified:
   jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/SwingUtil.java
   jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard/WizardUI.java
   jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard/WizardUtil.java
Log:
add default icons for wizard framework

Modified: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/SwingUtil.java
===================================================================

--- jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/SwingUtil.java	2009-03-24 00:58:12 UTC (rev 1278)
+++ jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/SwingUtil.java	2009-03-24 14:37:47 UTC (rev 1279)
@@ -31,8 +31,10 @@
 import java.util.Map.Entry;
 import java.util.NoSuchElementException;
 import java.util.Properties;
+import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import javax.swing.JComponent;
+import javax.swing.JLabel;
 import javax.swing.JTabbedPane;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
@@ -461,4 +463,20 @@
             this.reverse = reverse;
         }
     }
+
+    public static JLabel newLabel(String text, Object iconKey, int aligment) {
+        Icon icon = null;
+        if (iconKey instanceof Icon) {
+            icon = (Icon) iconKey;
+        } else if (iconKey instanceof String) {
+            icon = jaxx.runtime.Util.getUIManagerActionIcon((String) iconKey);
+        }        
+        JLabel result;
+        if (icon == null) {
+            result = new JLabel(text, aligment);
+        } else {
+            result = new JLabel(text, icon, aligment);
+        }
+        return result;
+    }
 }

Modified: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard/WizardUI.java
===================================================================
--- jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard/WizardUI.java	2009-03-24 00:58:12 UTC (rev 1278)
+++ jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard/WizardUI.java	2009-03-24 14:37:47 UTC (rev 1279)
@@ -14,25 +14,81 @@
  */
 public interface WizardUI<E extends WizardStep, M extends WizardModel<E>> {
 
+    /**
+     * @return le modèle de wizard
+     */
     M getModel();
 
+    /**
+     *
+     * @return l'étape courante
+     */
     E getSelectedStep();
 
+    /**
+     *
+     * @return l'ui de l'étape courante
+     */
     WizardStepUI<E, M> getSelectedStepUI();
 
+    /**
+     *
+     * @param step l'étape donnée
+     * @return l'ui de l'étape donnée
+     */
     WizardStepUI<E, M> getStepUI(E step);
-    
+
+    /**
+     *
+     * @param stepIndex la position de l'étape
+     * @return l'ui de l'étape donée
+     */
     WizardStepUI<E, M> getStepUI(int stepIndex);
 
+    /**
+     * démarre le wizard
+     */
     void start();
 
+    /**
+     * //TODO il faudrait supprimer cette méthode
+     * @return le conteneur d'ui d'étapes
+     */
     JTabbedPane getTabs();
 
+    /**
+     * Méthode invoqué lorsque la première opération du modèlé a été démarrée.
+     */
+    void onWasStarted();
+    
+    /**
+     * Méthode invoquée lorsque l'univers des étapes a été modifié dans le
+     * modèle.
+     * 
+     * @param steps les nouvelles étapes
+     */
     void onStepsChanged(E[] steps);
-    
+
+    /**
+     * Méthode invoquée lorsque l'étape courante a changé dans le modèle.
+     *
+     * @param newStep la nouvelle étape courante
+     */
     void onStepChanged(E newStep);
 
+    /**
+     * Méthode invoquée lorsque l'état interne du modèle a changé.
+     *
+     * @param newState le nouvelle état du modèle de wizard
+     */
     void onModelStateChanged(WizardOperationState newState);
 
+    /**
+     * Méthode invoqué lorsque l'état d'une opération a changé.
+     *
+     * @param step l'étape dont l'état a changé
+     * @param newState le nouvel état pour l'étape donné
+     */
     void onOperationStateChanged(E step,WizardOperationState newState) ;
+
 }

Modified: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard/WizardUtil.java
===================================================================
--- jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard/WizardUtil.java	2009-03-24 00:58:12 UTC (rev 1278)
+++ jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard/WizardUtil.java	2009-03-24 14:37:47 UTC (rev 1279)
@@ -47,7 +47,7 @@
         }
     }
 
-    public static void addTraceLogListener(final Log log,WizardModel model) {
+    public static void addTraceLogListener(final Log log, WizardModel model) {
         if (log.isTraceEnabled()) {
             model.addPropertyChangeListener(new PropertyChangeListener() {
 
@@ -65,7 +65,11 @@
             @Override
             @SuppressWarnings("unchecked")
             public void propertyChange(PropertyChangeEvent evt) {
-                String propertyName = evt.getPropertyName();                
+                String propertyName = evt.getPropertyName();
+                if (WizardOperationModel.WAS_STARTED_PROPERTY_NAME.equals(propertyName)) {
+                    ui.onWasStarted();
+                    return;
+                }
                 if (WizardModel.STEPS_PROPERTY_NAME.equals(propertyName)) {
                     java.util.List<E> steps = (java.util.List<E>) evt.getNewValue();
                     ui.onStepsChanged(steps.toArray((E[]) Array.newInstance(ui.getModel().stepClass, steps.size())));

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-config-16.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-config-16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-config.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-config.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-message-16.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-message-16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-message.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-message.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-next-16.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-next-16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-next.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-next.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-pause-16.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-pause-16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-pause.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-pause.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-previous-16.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-previous-16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-previous.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-previous.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-refresh-16.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-refresh-16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-refresh.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-refresh.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-start-16.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-start-16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-start.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-start.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-canceled-16.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-canceled-16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-canceled.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-canceled.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-failed-16.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-failed-16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-failed.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-failed.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-need_fix-16.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-need_fix-16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-need_fix.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-need_fix.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-pending-16.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-pending-16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-pending.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-pending.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-running-16.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-running-16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-running.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-running.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-successed-16.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-successed-16.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-successed.png
===================================================================
(Binary files differ)


Property changes on: jaxx/trunk/jaxx-runtime-swing/src/main/resources/icons/action-wizard-state-successed.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

    

[Buix-commits] r1279 - in jaxx/trunk/jaxx-runtime-swing/src/main: java/jaxx/runtime java/jaxx/runtime/swing/wizard resources resources/icons

tchemit＠users.labs.libre-entreprise.org