From jpepin@users.chorem.org Mon Jun 28 13:03:52 2010
From: jpepin@users.chorem.org
To: lima-commits@list.chorem.org
Subject: [Lima-commits] r2950 - in trunk/lima-swing/src/main:
	java/org/chorem/lima/ui/fiscalperiod	java/org/chorem/lima/ui/home
 java/org/chorem/lima/util	resources/i18n
Date: Mon, 28 Jun 2010 13:03:51 +0200
Message-ID: <20100628110351.F3F5215926@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5866000968873963883=="

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

Author: jpepin
Date: 2010-06-28 13:03:51 +0200 (Mon, 28 Jun 2010)
New Revision: 2950

Url: http://chorem.org/repositories/revision/lima/2950

Log:
Ajout de lien hypertext d'acc?\195?\168s aux diff?\195?\169rentes fonctions d=
ans l'onglet d'accueil.

Modified:
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPerio=
dViewHandler.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.jaxx
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeViewHandler.java
   trunk/lima-swing/src/main/java/org/chorem/lima/util/DialogHelper.java
   trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/Fisc=
alPeriodViewHandler.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/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeri=
odViewHandler.java	2010-06-27 06:36:49 UTC (rev 2949)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeri=
odViewHandler.java	2010-06-28 11:03:51 UTC (rev 2950)
@@ -19,20 +19,16 @@
 package org.chorem.lima.ui.fiscalperiod;
=20
 import static org.nuiton.i18n.I18n._;
-
 import javax.swing.JOptionPane;
-
 import org.jdesktop.swingx.JXTable;
 import org.nuiton.util.DateUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.chorem.lima.business.LimaException;
-
 import org.chorem.lima.entity.FiscalPeriod;
 import org.chorem.lima.ui.fiscalperiod.AddPeriod;
 import org.chorem.lima.ui.fiscalperiod.FiscalPeriodView;
 import org.chorem.lima.util.DialogHelper;
-import org.chorem.lima.util.ErrorHelper;
=20
 /**
  * TODO add comment here.

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.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/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.jaxx	2010=
-06-27 06:36:49 UTC (rev 2949)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.jaxx	2010=
-06-28 11:03:51 UTC (rev 2950)
@@ -5,7 +5,7 @@
     <script>
     <![CDATA[
     import static org.nuiton.i18n.I18n._;
-           =20
+   =20
     void $afterCompleteSetup() {
         getHandler().refresh();
     }
@@ -23,7 +23,7 @@
           minimumSize=3D'{getFixedSize()}'
           preferredSize=3D'{getFixedSize()}'
           layout=3D'{new BoxLayout(limaHomeChartAccount,BoxLayout.X_AXIS)}'>
-             <JEditorPane id=3D"textHomeAccount" />
+             <JEditorPane id=3D"textHomeAccount"/>
           </JPanel>
      </cell>
   </row>

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeViewHand=
ler.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/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeViewHandler.ja=
va	2010-06-27 06:36:49 UTC (rev 2949)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeViewHandler.ja=
va	2010-06-28 11:03:51 UTC (rev 2950)
@@ -2,10 +2,17 @@
=20
 import static org.nuiton.i18n.I18n._;
 import java.awt.Color;
-import java.awt.Component;
+import java.io.IOException;
 import java.util.List;
+import javax.swing.JEditorPane;
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkListener;
+import javax.swing.text.html.HTMLDocument;
+import javax.swing.text.html.HTMLFrameHyperlinkEvent;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.chorem.lima.LimaContext;
 import org.chorem.lima.business.AccountService;
 import org.chorem.lima.business.EntryBookService;
 import org.chorem.lima.business.FinancialTransactionService;
@@ -16,8 +23,10 @@
 import org.chorem.lima.entity.FinancialTransaction;
 import org.chorem.lima.entity.FiscalPeriod;
 import org.chorem.lima.service.LimaServiceFactory;
+import org.chorem.lima.ui.MainView;
+import org.chorem.lima.util.DialogHelper;
=20
-public class HomeViewHandler {
+public class HomeViewHandler implements HyperlinkListener {
=20
     private static final Log log =3D LogFactory.getLog(HomeViewHandler.class=
);
    =20
@@ -30,13 +39,21 @@
     protected FinancialTransactionService financialTransactionService;
    =20
     protected FiscalPeriodService fiscalPeriodService;
+   =20
+    protected HyperlinkListener accountsListener;
+   =20
+    protected HyperlinkListener entrybookListener;
=20
    =20
     private Color greenBackground;
     private Color redBackground;
    =20
     protected HomeViewHandler(HomeView view) {
+    =09
+    =09
         this.view=3Dview;
+       =20
+       =20
         accountService =3D
         	LimaServiceFactory.getInstance().getAccountService();
         entryBookService =3D
@@ -48,54 +65,90 @@
=20
         greenBackground =3D new Color(153, 255, 153);
         redBackground =3D new Color(255, 102, 102);
+       =20
+       =20
     }
    =20
-    public void goToAccountChart(){
-    =09
-    }
    =20
+	public void hyperlinkUpdate(HyperlinkEvent e) {
+
+		if (e.getEventType() =3D=3D HyperlinkEvent.EventType.ACTIVATED) {
+
+			log.debug(e.getDescription());
+		=09
+            if (e.getDescription().equals("#accountschart")) {
+		        MainView ui =3D LimaContext.MAIN_UI_ENTRY_DEF.getContextValue(view=
);
+		        ui.getHandler().showAccountView(ui);
+			}
+            else if (e.getDescription().equals("#entrybookschart")) {
+		        MainView ui =3D LimaContext.MAIN_UI_ENTRY_DEF.getContextValue(view=
);
+		        ui.getHandler().showEntryBookView(ui);
+			}
+            else if (e.getDescription().equals("#fiscalperiodschart")) {
+		        MainView ui =3D LimaContext.MAIN_UI_ENTRY_DEF.getContextValue(view=
);
+		        ui.getHandler().showFiscalPeriodView(ui);
+			}
+            else if (e.getDescription().equals("#financialtransactionunbalan=
ced")) {
+		        MainView ui =3D LimaContext.MAIN_UI_ENTRY_DEF.getContextValue(view=
);
+		        ui.getHandler().showTransactionUnbalancedView(ui);
+			}
+            else if (e.getDescription().equals("#financialtransactionbalance=
d")) {
+		        MainView ui =3D LimaContext.MAIN_UI_ENTRY_DEF.getContextValue(view=
);
+		        ui.getHandler().showTransactionView(ui);
+			}
+		}
+
+	}
+   =20
+   =20
+   =20
     public void refresh(){
     =09
     	try {
     		//ACCOUNT
 			List<Account> accounts =3D accountService.getAllAccounts();
-	    	view.getTextHomeAccount().setUI(new javax.swing.plaf.basic.BasicEditor=
PaneUI());
-	    	view.getTextHomeAccount().setOpaque(true);
-			view.getTextHomeAccount().setContentType("text/html");
-			view.getTextHomeAccount().setEditable(false);
+			JEditorPane accountPane =3D view.getTextHomeAccount();
+			accountPane.setUI(new javax.swing.plaf.basic.BasicEditorPaneUI());
+			accountPane.setOpaque(true);
+			accountPane.setContentType("text/html");
+			accountPane.setEditable(false);
+			accountPane.addHyperlinkListener(this);
 			if (accounts.size()>0){
 		    	String accountsString =3D _("limahome.chartaccounts1") + " " +
 		    		accounts.size() + " " + _("limahome.chartaccounts2");
-				view.getTextHomeAccount().setBackground(greenBackground);
-				view.getTextHomeAccount().setText("<p style=3Dvertical-align:'bottom', h=
orizontal-align:'center'><a href=3D'lima://accountcharts'>"+accountsString+"<=
/a></p>");
+		    	accountPane.setBackground(greenBackground);
+		    	accountPane.setText("<p style=3Dvertical-align:'bottom', horizontal-a=
lign:'center'><a href=3D'#accountschart'>"+accountsString+"</a></p>");
 			}
 			else {
-				view.getTextHomeAccount().setBackground(redBackground);
+				accountPane.setBackground(redBackground);
 		    	String accountsString =3D "<p style=3Dvertical-align:'bottom', horizo=
ntal-align:'center'>"+_("limahome.fiscalperiodnoopen") +
-		    		"<br/><a href=3D'lima://accountcharts'>"+_("limahome.createchartacco=
unts")+"</a>";
-		    	view.getTextHomeAccount().setText(accountsString+"</p>");
+		    		"<br/><a href=3D'#accountschart'>"+_("limahome.createchartaccounts")=
+"</a>";
+		    	accountPane.setText(accountsString+"</p>");
 			}
 		=09
 			//ENTRYBOOK
 			List<EntryBook> entryBooks =3D entryBookService.getAllEntryBooks();
-			view.getTextHomeEntryBook().setUI(new javax.swing.plaf.basic.BasicEditorP=
aneUI());
-			view.getTextHomeEntryBook().setOpaque(true);
-			view.getTextHomeEntryBook().setContentType("text/html");
-			view.getTextHomeEntryBook().setEditable(false);
+			JEditorPane entryBookPane =3D view.getTextHomeEntryBook();
+			entryBookPane.setUI(new javax.swing.plaf.basic.BasicEditorPaneUI());
+			entryBookPane.setOpaque(true);
+			entryBookPane.setContentType("text/html");
+			entryBookPane.setEditable(false);
+			entryBookPane.addHyperlinkListener(this);		=09
+		=09
 			if (entryBooks.size()>0){
-		    	view.getTextHomeEntryBook().setBackground(greenBackground);
-		    	String entryBooksString =3D "<p style=3Dvertical-align:'bottom', hori=
zontal-align:'center'><a href=3D'lima://entrybookcharts'>"+_("limahome.entryb=
ooks1") +
+				entryBookPane.setBackground(greenBackground);
+		    	String entryBooksString =3D "<p style=3Dvertical-align:'bottom', hori=
zontal-align:'center'><a href=3D'#entrybookschart'>"+_("limahome.entrybooks1"=
) +
 		    		" " + entryBooks.size() + " " + _("limahome.entrybooks2") +
 		    		"</a><br/><ul>";
 		    	for (EntryBook entryBook : entryBooks) {
 					entryBooksString +=3D "<li>"+entryBook.getCode() +
 					" - "+entryBook.getLabel()+"</li>";
 				}
-		    	view.getTextHomeEntryBook().setText(entryBooksString+"</ul>"+"</p>");
+		    	entryBookPane.setText(entryBooksString+"</ul>"+"</p>");
 			}
 			else {
-				view.getTextHomeEntryBook().setBackground(redBackground);
-				view.getTextHomeEntryBook().setText("<p style=3Dvertical-align:'bottom',=
 horizontal-align:'center'><a href=3D'lima://entrybookcharts'>"+_("limahome.e=
ntrybooknoopen")+"</a></p>");
+				entryBookPane.setBackground(redBackground);
+				entryBookPane.setText("<p style=3Dvertical-align:'bottom', horizontal-al=
ign:'center'><a href=3D'#entrybookschart'>"+_("limahome.entrybooknoopen")+"</=
a></p>");
 			}
 		=09
 			//FISCAL PERIOD
@@ -104,52 +157,57 @@
 			List<FiscalPeriod> unblockedFiscalPeriods =3D
 				fiscalPeriodService.getAllUnblockedFiscalPeriods();
 		=09
-			view.getTextHomeFiscalYear().setUI(new javax.swing.plaf.basic.BasicEditor=
PaneUI());
-			view.getTextHomeFiscalYear().setOpaque(true);
-			view.getTextHomeFiscalYear().setContentType("text/html");
-			view.getTextHomeFiscalYear().setEditable(false);
-			view.getTextHomeDaily().setUI(new javax.swing.plaf.basic.BasicEditorPaneU=
I());
-			view.getTextHomeDaily().setOpaque(true);
-			view.getTextHomeDaily().setContentType("text/html");
-			view.getTextHomeDaily().setEditable(false);
+			JEditorPane fiscalYearPane =3D view.getTextHomeFiscalYear();
+			fiscalYearPane.setUI(new javax.swing.plaf.basic.BasicEditorPaneUI());
+			fiscalYearPane.setOpaque(true);
+			fiscalYearPane.setContentType("text/html");
+			fiscalYearPane.setEditable(false);
+			fiscalYearPane.addHyperlinkListener(this);
 		=09
+			JEditorPane dailyPane =3D view.getTextHomeDaily();
+			dailyPane.setUI(new javax.swing.plaf.basic.BasicEditorPaneUI());
+			dailyPane.setOpaque(true);
+			dailyPane.setContentType("text/html");
+			dailyPane.setEditable(false);
+			dailyPane.addHyperlinkListener(this);
+		=09
 			if (unblockedFiscalPeriods.size()>0){
-				view.getTextHomeFiscalYear().setBackground(greenBackground);
-		    	String fiscalString =3D "<p style=3Dvertical-align:'bottom', horizont=
al-align:'center'><a href=3D'lima://fiscalcharts'>"
+				fiscalYearPane.setBackground(greenBackground);
+		    	String fiscalString =3D "<p style=3Dvertical-align:'bottom', horizont=
al-align:'center'><a href=3D'#fiscalperiodschart'>"
 		    		+ unblockedFiscalPeriods.size() +
 		    		" " + _("limahome.fiscalperiodopened")+"<br/>" +
 		    			(fiscalPeriods.size()-unblockedFiscalPeriods.size()) +
 		    			" " + _("limahome.fiscalperiodclosed");
-		    	view.getTextHomeFiscalYear().setText(fiscalString+"</a></p>");
+		    	fiscalYearPane.setText(fiscalString+"</a></p>");
 			=09
 				//FINACIAL TRANSACTION
 				List<FinancialTransaction> financialTransactions =3D
 					financialTransactionService.
 					getAllFinancialTransactionsUnbalanced(fiscalPeriods.get(0));
 				if (financialTransactions.size()>0){
-					view.getTextHomeDaily().setBackground(redBackground);
-			    	String transactionsString =3D "<p style=3Dvertical-align:'bottom', h=
orizontal-align:'center'><a href=3D'lima://financialtransactionunbalanced'>"
+					dailyPane.setBackground(redBackground);
+			    	String transactionsString =3D "<p style=3Dvertical-align:'bottom', h=
orizontal-align:'center'><a href=3D'#financialtransactionunbalanced'>"
 			    		+ financialTransactions.size() +
 			    	_("limahome.transactionunbalanced")+"</a></p>";
-			    	view.getTextHomeDaily().setText(transactionsString);
+			    	dailyPane.setText(transactionsString);
 				}
 				else {
-					view.getTextHomeDaily().setBackground(greenBackground);
-			    	String transactionsString =3D "<p style=3Dvertical-align:'bottom', h=
orizontal-align:'center'><a href=3D'lima://financialtransactionbalanced'>"
+					dailyPane.setBackground(greenBackground);
+			    	String transactionsString =3D "<p style=3Dvertical-align:'bottom', h=
orizontal-align:'center'><a href=3D'#financialtransactionbalanced'>"
 			    		+ _("limahome.transactionbalanced");
-			    	view.getTextHomeDaily().setText(transactionsString+"</a></p>");
+			    	dailyPane.setText(transactionsString+"</a></p>");
 				}
 			=09
 			}
 			else {
-				view.getTextHomeFiscalYear().setBackground(redBackground);
-				view.getTextHomeDaily().setBackground(redBackground);
-		    	String fiscalString =3D "<p style=3Dvertical-align:'bottom', horizont=
al-align:'center'><a href=3D'lima://fiscalcharts'>" + _("limahome.fiscalperio=
dnoopen");
+				fiscalYearPane.setBackground(redBackground);
+				dailyPane.setBackground(redBackground);
+		    	String fiscalString =3D "<p style=3Dvertical-align:'bottom', horizont=
al-align:'center'><a href=3D'#fiscalperiodschart'>" + _("limahome.fiscalperio=
dnoopen");
 		    	if (fiscalPeriods.size()>0){
 		    		fiscalString +=3D fiscalPeriods.size() +
 		    			_("limahome.fiscalperiodclosed");
 		    	}
-		    	view.getTextHomeFiscalYear().setText(fiscalString+"</a></p>");
+		    	fiscalYearPane.setText(fiscalString+"</a></p>");
=20
 			}
 		} catch (LimaException eee) {

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/util/DialogHelper.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/lima-swing/src/main/java/org/chorem/lima/util/DialogHelper.java	201=
0-06-27 06:36:49 UTC (rev 2949)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/util/DialogHelper.java	201=
0-06-28 11:03:51 UTC (rev 2950)
@@ -1,21 +1,20 @@
-/**
- * *##% Lima Main
- * Copyright (C) 2008 CodeLutin
+/* *##% Lima Swing
+ * Copyright (C) 2008 - 2010 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
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
  * 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*
- */
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
+ * ##%*/
=20
 package org.chorem.lima.util;
=20

Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing-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/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties	2010=
-06-27 06:36:49 UTC (rev 2949)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties	2010=
-06-28 11:03:51 UTC (rev 2950)
@@ -174,6 +174,7 @@
 limahome.createchartaccounts=3D
 limahome.createchartaccounts1=3D
 limahome.createchartaccounts2=3D
+limahome.entrybooknoopen=3D
 limahome.entrybooks1=3D
 limahome.entrybooks2=3D
 limahome.fiscalperiodclosed=3D


--===============5866000968873963883==--