r2785 - trunk/lima-main/src/main/java/org/chorem/lima/ui - Lima-commits

26 Feb 2010

Author: echatellier
Date: 2010-02-26 14:17:56 +0100 (Fri, 26 Feb 2010)
New Revision: 2785

Modified:
   trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java
Log:
Fix #120, add previous year in period date combo box

Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java
===================================================================

--- trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java	2010-02-26 12:50:35 UTC (rev 2784)
+++ trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java	2010-02-26 13:17:56 UTC (rev 2785)
@@ -19,12 +19,27 @@
 
 package org.chorem.lima.ui;
 
+import static org.nuiton.i18n.I18n._;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.swing.JComboBox;
+import javax.swing.ListSelectionModel;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.chorem.lima.LimaContext;
 import org.chorem.lima.combobox.model.PeriodComboBoxModel;
 import org.chorem.lima.combobox.renderer.PeriodComboBoxRenderer;
-import static org.nuiton.i18n.I18n._;
 import org.chorem.lima.dto.PeriodDTO;
 import org.chorem.lima.dto.StatusDTO;
 import org.chorem.lima.dto.TransactionDTO;
@@ -32,15 +47,12 @@
 import org.chorem.lima.dto.util.TriPeriodDesc;
 import org.chorem.lima.table.model.ClosureTableModel;
 import org.jdesktop.swingx.JXTable;
+import org.jdesktop.swingx.decorator.Filter;
+import org.jdesktop.swingx.decorator.FilterPipeline;
+import org.jdesktop.swingx.decorator.HighlighterFactory;
+import org.jdesktop.swingx.decorator.PatternFilter;
 
-import javax.swing.*;
-import java.awt.event.*;
-import java.util.*;
 
-import org.jdesktop.swingx.decorator.*;
-import org.nuiton.util.PeriodDates;
-
-
 /**
  * Permet l'affichage du tableau avec les périodes mensuelles.
  *
@@ -48,10 +60,12 @@
  */
 public class ClosureViewImpl extends ClosureView {
 
-    /**
-     * log
-     */
+    /** serialVersionUID. */
+    private static final long serialVersionUID = -8759564865633991757L;
+    
+    /** log. */
     private static final Log log = LogFactory.getLog(ClosureViewImpl.class);
+
     private final JXTable table;
     private JComboBox comboBoxPeriod = new JComboBox();
     private final ClosureTimeSpanForm form;
@@ -73,7 +87,7 @@
         // Initialisation du choix pour les périodes
         initComboBoxPeriod();
 
-        /** Set Period model */
+        /* Set Period model */
         // Création du model pour le tableau
         table = new JXTable(LimaContext.getContext().getDataManager().getClosureModel());
         table.setRowHeight(24);
@@ -83,7 +97,7 @@
         table.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
         table.setColumnControlVisible(true);
 
-        /**
+        /*
          * Ajout d'un listener lorsque l'utilisateur change de période.
          */
         comboBoxPeriod.addItemListener(new ItemListener() {
@@ -97,7 +111,7 @@
             }
         });
         // Récupère la période master (celle de l'exercice)
-        /**
+        /*
          PeriodDTO periodMaster = (PeriodDTO) comboBoxPeriod.getSelectedItem();
          // Définition du tri avec une expression régulière
          Filter[] filterArray = { new PatternFilter("(.*"+(periodMaster.getBegin().getYear()+1900)+".*)|(.*Final.*)", 0, 0) };
@@ -108,7 +122,7 @@
         // Ajout du tableau dans l'UI
         getClosureScrollPane().setViewportView(table);
 
-        /**
+        /*
          * Initialisation du formulaire pour bloquer ou débloquer une période.
          */
         form = LimaContext.getContext().getMainUI().getClosureTimeSpanForm();
@@ -124,17 +138,25 @@
          */
         addPeriodForm = LimaContext.getContext().getMainUI().getAddPeriod();
 
-        Calendar cal = new GregorianCalendar();
+        Calendar cal = Calendar.getInstance();
 
         //Init YEAR Periode Combobox
-        cal.add(Calendar.YEAR, 0);
-        comboBeginYearPeriod.addItem(cal.get(Calendar.YEAR));
-        comboEndYearPeriod.addItem(cal.get(Calendar.YEAR));
-        for(int i = 0; i < 5; i++){
+        // take care about previous year #120
+        cal.add(Calendar.YEAR, -1);
+        for (int i = 0; i <= 6; i++) {
+           int newYear = cal.get(Calendar.YEAR);
+           comboBeginYearPeriod.addItem(newYear);
+           comboEndYearPeriod.addItem(newYear);
+           
+           // set current year selected
+           if (i == 0) {
+               comboBeginYearPeriod.setSelectedItem(newYear);
+               comboEndYearPeriod.setSelectedItem(newYear);
+           }
+
            cal.add(Calendar.YEAR, 1);
-           comboBeginYearPeriod.addItem(cal.get(Calendar.YEAR));
-           comboEndYearPeriod.addItem(cal.get(Calendar.YEAR));
         }
+        
 
         //Add BeginYear ComboBox to addPeriodForm
         addPeriodForm.getBeginYearPeriodPanel().add(comboBeginYearPeriod);

    

r2785 - trunk/lima-main/src/main/java/org/chorem/lima/ui

echatellier＠users.chorem.org

tags

participants (1)