Author: tchemit
Date: 2009-11-08 16:26:23 +0100 (Sun, 08 Nov 2009)
New Revision: 2744
Modified:
trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java
trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java
trunk/lima-main/src/main/java/org/chorem/lima/Main.java
trunk/lima-main/src/main/java/org/chorem/lima/export/XMLExport.java
trunk/lima-main/src/main/java/org/chorem/lima/ui/BilanViewImpl.java
trunk/lima-main/src/main/java/org/chorem/lima/ui/MainView.jaxx
trunk/lima-main/src/main/java/org/chorem/lima/ui/MainViewHandler.java
trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBar.jaxx
trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java
trunk/lima-main/src/main/resources/i18n/lima-main-en_GB.properties
trunk/lima-main/src/main/resources/i18n/lima-main-fr_FR.properties
Log:
- improve progress bar use : make it modal and center of main ui
- add fullscreen - normal screen actions
Modified: trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java
===================================================================
--- trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java 2009-11-08 15:18:38 UTC (rev 2743)
+++ trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java 2009-11-08 15:26:23 UTC (rev 2744)
@@ -20,13 +20,10 @@
/**
* La configuration de l'application.
* <p/>
- * Note : cette classe sera auto-instanciée par le contexte applicatif.
- * <p/>
* TODO ajouter d'autres propriete pour controler quel storage est utilise
* et quel est son type (local ou pas).
*
* @author chemit
- * @see jaxx.runtime.DefaultApplicationContext.AutoLoad
*/
public class LimaConfig extends org.nuiton.util.ApplicationConfig {
@@ -187,7 +184,7 @@
}
public static final String[] DEFAULT_JAXX_PCS = {
- "fullScreen"
+ "fullScreen", "locale"
};
public void removeJaxxPropertyChangeListener() {
Modified: trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java
===================================================================
--- trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java 2009-11-08 15:18:38 UTC (rev 2743)
+++ trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java 2009-11-08 15:26:23 UTC (rev 2744)
@@ -126,15 +126,6 @@
DTOHelper.setLocale(locale);
}
-// public void dispose(boolean reload) {
-//
-// disposeUI();
-//
-// if (reload) {
-// Main.launch(this);
-// }
-// }
-
public ServiceFactory getNeogiaFactory() {
if (neogiaFactory == null) {
neogiaFactory = ServiceFactory.getServiceFactory();
@@ -144,11 +135,6 @@
public MainViewImpl getMainUI() {
return (MainViewImpl) MAIN_UI_ENTRY_DEF.getContextValue(this);
-// if (mainUI == null) {
-// log.debug("getMainUI");
-// mainUI = new MainViewImpl();
-// }
-// return mainUI;
}
public DataManager getDataManager() {
@@ -158,13 +144,6 @@
return dataManager;
}
-// public void disposeUI() {
-// MainView mainUI = getMainUI();
-// if (mainUI != null) {
-// mainUI.dispose();
-// }
-// }
-
/**
* close the application's context.
*
@@ -177,14 +156,15 @@
// fermeture du context principal
MainView mainUI = getMainUI();
- if (mainUI != null) {
+ if (mainUI != null && mainUI.isVisible()) {
+ mainUI.setVisible(false);
mainUI.dispose();
}
if (log.isDebugEnabled()) {
- log.debug("context closed" + this);
+ log.debug("context closed " + this);
}
- System.exit(0);
+ //System.exit(0);
}
public static LimaContext getContext() {
Modified: trunk/lima-main/src/main/java/org/chorem/lima/Main.java
===================================================================
--- trunk/lima-main/src/main/java/org/chorem/lima/Main.java 2009-11-08 15:18:38 UTC (rev 2743)
+++ trunk/lima-main/src/main/java/org/chorem/lima/Main.java 2009-11-08 15:26:23 UTC (rev 2744)
@@ -151,7 +151,7 @@
return context;
}
- public static void launch(final LimaContext context) {
+ public static void launch(final LimaContext context) throws Exception {
MainViewHandler uiHandler = context.getContextValue(MainViewHandler.class);
@@ -160,6 +160,19 @@
log.info(_("lima.init.ui.done"));
+ final ProgressBarImpl b = new ProgressBarImpl(ui, ui);
+
+ // show ui
+ SwingUtilities.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ ui.setVisible(true);
+ b.setVisible(true);
+ }
+ });
+
+ Thread.sleep(100);
/**
* Lancement de la barre de chargement
* L'application va charger en mémoire les données
@@ -168,13 +181,13 @@
@Override
public void run() {
- ProgressBarImpl b = new ProgressBarImpl();
- b.setModal(true);
+// ProgressBarImpl b = new ProgressBarImpl(ui, ui);
// Chargement des journaux
b.getProgressBar().setString("5% : " + _("lima.progressBar.load.etape1"));
- b.getProgressBar().setValue(0);
+ b.getProgressBar().setValue(5);
DataManager dataManager = context.getDataManager();
dataManager.getJournalModel();
+
// Chargement des comptes
b.getProgressBar().setString("30% : " + _("lima.progressBar.load.etape2"));
b.getProgressBar().setValue(30);
@@ -185,26 +198,29 @@
b.getProgressBar().setString("50% : " + _("lima.progressBar.load.etape3"));
b.getProgressBar().setValue(50);
dataManager.getStatus();
+
// Chargement des periodes
b.getProgressBar().setString("60% : " + _("lima.progressBar.load.etape4"));
b.getProgressBar().setValue(60);
dataManager.getPeriodes();
+
// Chargement des transactions
b.getProgressBar().setString("70% : " + _("lima.progressBar.load.etape5"));
b.getProgressBar().setValue(70);
dataManager.getTransactionModel(b.getProgressBar());
b.dispose();
+
}
}.start();
- // show ui
- SwingUtilities.invokeLater(new Runnable() {
-
- @Override
- public void run() {
- ui.setVisible(true);
- }
- });
+// // show ui
+// SwingUtilities.invokeLater(new Runnable() {
+//
+// @Override
+// public void run() {
+// ui.setVisible(true);
+// }
+// });
}
public static class ShutdownHook extends Thread {
Modified: trunk/lima-main/src/main/java/org/chorem/lima/export/XMLExport.java
===================================================================
--- trunk/lima-main/src/main/java/org/chorem/lima/export/XMLExport.java 2009-11-08 15:18:38 UTC (rev 2743)
+++ trunk/lima-main/src/main/java/org/chorem/lima/export/XMLExport.java 2009-11-08 15:26:23 UTC (rev 2744)
@@ -27,6 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.chorem.lima.LimaContext;
+import org.chorem.lima.ui.MainViewImpl;
import org.jdom.*;
import org.jdom.output.*;
import org.chorem.lima.dto.AccountDTO;
@@ -39,7 +40,9 @@
import org.chorem.lima.util.Util;
import static org.nuiton.i18n.I18n._;
+import javax.swing.*;
+
/**
* Permet d'exporter les données dans un document xml.
*
@@ -47,7 +50,9 @@
*/
public class XMLExport {
- /** log */
+ /**
+ * log
+ */
protected static final Log log = LogFactory.getLog(XMLExport.class);
private static Element racine = new Element("Callao");
@@ -66,154 +71,167 @@
private static List<TransactionDTO> listTransactionDTO = LimaContext.getContext().getDataManager().getTransactionModel().getData();
-
/**
* Cete méthode permet d'exporter des données de Callao vers un fichier au
* format xml.
+ *
* @param pathFile
* @return
*/
- public String exportFile(String pathFile)
- {
+ public String exportFile(String pathFile) {
if (log.isDebugEnabled()) {
log.debug("Save file XML : ");
}
// Charge le nom du fichier
file = pathFile;
// Mise en place de la barre de progression
- new Thread()
- {
+ MainViewImpl context = LimaContext.get().getMainUI();
+ progressBar = new ProgressBarImpl(context, context);
+ Runnable runnable = new Runnable() {
+ public void run() {
+ progressBar.setVisible(true);
+ }
+ };
+ SwingUtilities.invokeLater(runnable);
+ new Thread() {
@Override
- public void run()
- {
- progressBar = new ProgressBarImpl();
- progressBar.setTitle(_("lima.progressBar.export.title"));
- progressBar.getProgressBar().setString("0% : "+_("lima.progressBar.export.etape1"));
- progressBar.getProgressBar().setValue(0);
+ public void run() {
+// MainViewImpl context = LimaContext.get().getMainUI();
+// progressBar = new ProgressBarImpl(context, context);
+ progressBar.setTitle(_("lima.progressBar.export.title"));
+ progressBar.getProgressBar().setString("0% : " + _("lima.progressBar.export.etape1"));
+ progressBar.getProgressBar().setValue(0);
- /**
- * Partie Informations
- */
- progressBar.getProgressBar().setString("10% : "+_("lima.progressBar.export.etape2"));
- progressBar.getProgressBar().setValue(10);
- Element info = new Element("informations");
- racine.addContent(info);
- Attribute date = new Attribute("date",new Date().toString());
- info.setAttribute(date);
- Attribute user = new Attribute("user","Name user");
- info.setAttribute(user);
- Attribute company = new Attribute("company","Name company");
- info.setAttribute(company);
- /**
- * Partie Save
- */
- // Création Element save
- Element save = new Element("save");
- racine.addContent(save);
- /**
- * Period
- */
- progressBar.getProgressBar().setString("25% : "+_("lima.progressBar.export.etape3"));
- progressBar.getProgressBar().setValue(25);
- Element periods = new Element("periods");
- Element timeSpans = new Element("timespans");
- save.addContent(periods);
- save.addContent(timeSpans);
- exportPeriod(periods,timeSpans);
- /**
- * Journal
- */
- progressBar.getProgressBar().setString("35% : "+_("lima.progressBar.export.etape4"));
- progressBar.getProgressBar().setValue(35);
- Element journals = new Element("journals");
- save.addContent(journals);
- exportJournal(journals);
- /**
- * Account
- */
- progressBar.getProgressBar().setString("50% : "+_("lima.progressBar.export.etape5"));
- progressBar.getProgressBar().setValue(50);
- Element accounts = new Element("accounts");
- save.addContent(accounts);
- // Appel une fonction récursive pour parcourir l'arborescence des comptes
- accountXML(AccountMasterDTO.getChildren(),accounts);
- /**
- * Transaction
- */
- progressBar.getProgressBar().setString("60% : "+_("lima.progressBar.export.etape6"));
- progressBar.getProgressBar().setValue(60);
- Element transactions = new Element("transactions");
- save.addContent(transactions);
- Element entries = new Element("entries");
- save.addContent(entries);
- exportTransaction(transactions,entries,progressBar);
- /**
- * Enregistre le fichier
- */
- progressBar.getProgressBar().setString("100% : "+_("lima.progressBar.export.etape7"));
- progressBar.getProgressBar().setValue(100);
- enregistre(file);
- progressBar.dispose();
-
+ /**
+ * Partie Informations
+ */
+ progressBar.getProgressBar().setString("10% : " + _("lima.progressBar.export.etape2"));
+ progressBar.getProgressBar().setValue(10);
+ Element info = new Element("informations");
+ racine.addContent(info);
+ Attribute date = new Attribute("date", new Date().toString());
+ info.setAttribute(date);
+ Attribute user = new Attribute("user", "Name user");
+ info.setAttribute(user);
+ Attribute company = new Attribute("company", "Name company");
+ info.setAttribute(company);
+ /**
+ * Partie Save
+ */
+ // Création Element save
+ Element save = new Element("save");
+ racine.addContent(save);
+ /**
+ * Period
+ */
+ progressBar.getProgressBar().setString("25% : " + _("lima.progressBar.export.etape3"));
+ progressBar.getProgressBar().setValue(25);
+ Element periods = new Element("periods");
+ Element timeSpans = new Element("timespans");
+ save.addContent(periods);
+ save.addContent(timeSpans);
+ exportPeriod(periods, timeSpans);
+ /**
+ * Journal
+ */
+ progressBar.getProgressBar().setString("35% : " + _("lima.progressBar.export.etape4"));
+ progressBar.getProgressBar().setValue(35);
+ Element journals = new Element("journals");
+ save.addContent(journals);
+ exportJournal(journals);
+ /**
+ * Account
+ */
+ progressBar.getProgressBar().setString("50% : " + _("lima.progressBar.export.etape5"));
+ progressBar.getProgressBar().setValue(50);
+ Element accounts = new Element("accounts");
+ save.addContent(accounts);
+ // Appel une fonction récursive pour parcourir l'arborescence des comptes
+ accountXML(AccountMasterDTO.getChildren(), accounts);
+ /**
+ * Transaction
+ */
+ progressBar.getProgressBar().setString("60% : " + _("lima.progressBar.export.etape6"));
+ progressBar.getProgressBar().setValue(60);
+ Element transactions = new Element("transactions");
+ save.addContent(transactions);
+ Element entries = new Element("entries");
+ save.addContent(entries);
+ exportTransaction(transactions, entries, progressBar);
+ /**
+ * Enregistre le fichier
+ */
+ progressBar.getProgressBar().setString("100% : " + _("lima.progressBar.export.etape7"));
+ progressBar.getProgressBar().setValue(100);
+ enregistre(file);
+ progressBar.dispose();
+
}
}.start();
return ServiceHelper.RESPOND_SUCCESS;
}
- public String exportAccount (String pathFile)
- {
+ public String exportAccount(String pathFile) {
if (log.isDebugEnabled()) {
log.debug("Save Account XML : ");
}
// Charge le nom du fichier
file = pathFile;
+
+ MainViewImpl context = LimaContext.get().getMainUI();
+ progressBar = new ProgressBarImpl(context, context);
+ Runnable runnable = new Runnable() {
+ public void run() {
+ progressBar.setVisible(true);
+ }
+ };
+ SwingUtilities.invokeLater(runnable);
+
// Mise en place de la barre de progression
- new Thread()
- {
+ new Thread() {
@Override
- public void run()
- {
- String i18;
- progressBar = new ProgressBarImpl();
- progressBar.setTitle(_("lima.progressBar.export.title"));
- progressBar.getProgressBar().setString("0% : "+_("lima.progressBar.export.etape1"));
- progressBar.getProgressBar().setValue(0);
- /**
- * Partie Informations
- */
- progressBar.getProgressBar().setString("10% : "+_("lima.progressBar.export.etape2"));
- progressBar.getProgressBar().setValue(10);
- Element info = new Element("informations");
- racine.addContent(info);
- Attribute date = new Attribute("date",new Date().toString());
- info.setAttribute(date);
- Attribute user = new Attribute("user","Name user");
- info.setAttribute(user);
- Attribute company = new Attribute("company","Name company");
- info.setAttribute(company);
- /**
- * Partie Save
- */
- // Création Element save
- Element save = new Element("save");
- racine.addContent(save);
- /**
- * Account
- */
- progressBar.getProgressBar().setString("50% : "+_("lima.progressBar.export.etape5"));
- progressBar.getProgressBar().setValue(50);
- Element accounts = new Element("accounts");
- save.addContent(accounts);
- // Appel une fonction récursive pour parcourir l'arborescence des comptes
- accountXML(AccountMasterDTO.getChildren(),accounts);
- /**
- * Enregistre le fichier
- */
- progressBar.getProgressBar().setString("100% : "+_("lima.progressBar.export.etape7"));
- progressBar.getProgressBar().setValue(100);
- enregistre(file);
- progressBar.dispose();
+ public void run() {
+// MainViewImpl context = LimaContext.get().getMainUI();
+// progressBar = new ProgressBarImpl(context, context);
+ progressBar.setTitle(_("lima.progressBar.export.title"));
+ progressBar.getProgressBar().setString("0% : " + _("lima.progressBar.export.etape1"));
+ progressBar.getProgressBar().setValue(0);
+ /**
+ * Partie Informations
+ */
+ progressBar.getProgressBar().setString("10% : " + _("lima.progressBar.export.etape2"));
+ progressBar.getProgressBar().setValue(10);
+ Element info = new Element("informations");
+ racine.addContent(info);
+ Attribute date = new Attribute("date", new Date().toString());
+ info.setAttribute(date);
+ Attribute user = new Attribute("user", "Name user");
+ info.setAttribute(user);
+ Attribute company = new Attribute("company", "Name company");
+ info.setAttribute(company);
+ /**
+ * Partie Save
+ */
+ // Création Element save
+ Element save = new Element("save");
+ racine.addContent(save);
+ /**
+ * Account
+ */
+ progressBar.getProgressBar().setString("50% : " + _("lima.progressBar.export.etape5"));
+ progressBar.getProgressBar().setValue(50);
+ Element accounts = new Element("accounts");
+ save.addContent(accounts);
+ // Appel une fonction récursive pour parcourir l'arborescence des comptes
+ accountXML(AccountMasterDTO.getChildren(), accounts);
+ /**
+ * Enregistre le fichier
+ */
+ progressBar.getProgressBar().setString("100% : " + _("lima.progressBar.export.etape7"));
+ progressBar.getProgressBar().setValue(100);
+ enregistre(file);
+ progressBar.dispose();
}
}.start();
return ServiceHelper.RESPOND_SUCCESS;
@@ -221,45 +239,41 @@
/**
- *
* @param periods
* @param timeSpans
*/
- public void exportPeriod (Element periods,Element timeSpans)
- {
+ public void exportPeriod(Element periods, Element timeSpans) {
// Pour chaque période
- for (PeriodDTO periodDTO : listPeriodDTO)
- {
+ for (PeriodDTO periodDTO : listPeriodDTO) {
// Création élément périod
Element period = new Element("period");
periods.addContent(period);
// Identifiant période
- Attribute id = new Attribute("id",periodDTO.getIdSeq());
+ Attribute id = new Attribute("id", periodDTO.getIdSeq());
period.setAttribute(id);
// BeginPeriod
// Découpage date
String dateTab[] = Util.arrayDate(periodDTO.getBegin());
- Attribute beginYear = new Attribute("beginYear",dateTab[0]);
+ Attribute beginYear = new Attribute("beginYear", dateTab[0]);
period.setAttribute(beginYear);
- Attribute beginMonth = new Attribute("beginMonth",dateTab[1]);
+ Attribute beginMonth = new Attribute("beginMonth", dateTab[1]);
period.setAttribute(beginMonth);
- Attribute beginDay = new Attribute("beginDay",dateTab[2]);
+ Attribute beginDay = new Attribute("beginDay", dateTab[2]);
period.setAttribute(beginDay);
// EndPeriod
dateTab = Util.arrayDate(periodDTO.getEnd());
- Attribute endYear = new Attribute("endYear",dateTab[0]);
+ Attribute endYear = new Attribute("endYear", dateTab[0]);
period.setAttribute(endYear);
- Attribute endMonth = new Attribute("endMonth",dateTab[1]);
+ Attribute endMonth = new Attribute("endMonth", dateTab[1]);
period.setAttribute(endMonth);
- Attribute endDay = new Attribute("endDay",dateTab[2]);
+ Attribute endDay = new Attribute("endDay", dateTab[2]);
period.setAttribute(endDay);
// Locked Period
- if ( periodDTO.getStatus().getIdName().equals(ServiceHelper.PE_CLOSE) )
- {
- Attribute locked = new Attribute("locked","true");
+ if (periodDTO.getStatus().getIdName().equals(ServiceHelper.PE_CLOSE)) {
+ Attribute locked = new Attribute("locked", "true");
period.setAttribute(locked);
} else {
- Attribute locked = new Attribute("locked","false");
+ Attribute locked = new Attribute("locked", "false");
period.setAttribute(locked);
}
/**
@@ -268,39 +282,37 @@
// Recherche des timeSpans de la période
List<PeriodDTO> listTimeSpanDTO = periodDTO.getChildren();
// Pour chaque timeSpan
- for (PeriodDTO timeSpanDTO : listTimeSpanDTO)
- {
+ for (PeriodDTO timeSpanDTO : listTimeSpanDTO) {
Element timeSpan = new Element("timespan");
timeSpans.addContent(timeSpan);
// Identifiant timeSpan
- Attribute idTimeSpan = new Attribute("id",timeSpanDTO.getIdSeq());
+ Attribute idTimeSpan = new Attribute("id", timeSpanDTO.getIdSeq());
timeSpan.setAttribute(idTimeSpan);
- Attribute idPeriod = new Attribute("idPeriod",periodDTO.getIdSeq());
+ Attribute idPeriod = new Attribute("idPeriod", periodDTO.getIdSeq());
timeSpan.setAttribute(idPeriod);
// Begin TimeSpan
// Découpage date
dateTab = Util.arrayDate(timeSpanDTO.getBegin());
- Attribute beginYearTimeSpan = new Attribute("beginYear",dateTab[0]);
+ Attribute beginYearTimeSpan = new Attribute("beginYear", dateTab[0]);
timeSpan.setAttribute(beginYearTimeSpan);
- Attribute beginMonthTimeSpan = new Attribute("beginMonth",dateTab[1]);
+ Attribute beginMonthTimeSpan = new Attribute("beginMonth", dateTab[1]);
timeSpan.setAttribute(beginMonthTimeSpan);
- Attribute beginDayTimeSpan = new Attribute("beginDay",dateTab[2]);
+ Attribute beginDayTimeSpan = new Attribute("beginDay", dateTab[2]);
timeSpan.setAttribute(beginDayTimeSpan);
// End TimeSpan
dateTab = Util.arrayDate(timeSpanDTO.getEnd());
- Attribute endYearTimeSpan = new Attribute("endYear",dateTab[0]);
+ Attribute endYearTimeSpan = new Attribute("endYear", dateTab[0]);
timeSpan.setAttribute(endYearTimeSpan);
- Attribute endMonthTimeSpan = new Attribute("endMonth",dateTab[1]);
+ Attribute endMonthTimeSpan = new Attribute("endMonth", dateTab[1]);
timeSpan.setAttribute(endMonthTimeSpan);
- Attribute endDayTimeSpan = new Attribute("endDay",dateTab[2]);
+ Attribute endDayTimeSpan = new Attribute("endDay", dateTab[2]);
timeSpan.setAttribute(endDayTimeSpan);
// Lock timeSpan
- if ( timeSpanDTO.getStatus().getIdName().equals(ServiceHelper.PE_CLOSE) )
- {
- Attribute locked = new Attribute("locked","true");
+ if (timeSpanDTO.getStatus().getIdName().equals(ServiceHelper.PE_CLOSE)) {
+ Attribute locked = new Attribute("locked", "true");
timeSpan.setAttribute(locked);
} else {
- Attribute locked = new Attribute("locked","false");
+ Attribute locked = new Attribute("locked", "false");
timeSpan.setAttribute(locked);
}
}
@@ -308,26 +320,23 @@
}
/**
- *
* @param journals
*/
- public void exportJournal (Element journals)
- {
- for (JournalDTO journalDTO : listJournalDTO)
- {
- Element journal = new Element ("journal");
+ public void exportJournal(Element journals) {
+ for (JournalDTO journalDTO : listJournalDTO) {
+ Element journal = new Element("journal");
journals.addContent(journal);
// Identification du journal
- Attribute idJournal = new Attribute ("id",journalDTO.getIdSeq());
+ Attribute idJournal = new Attribute("id", journalDTO.getIdSeq());
journal.setAttribute(idJournal);
// Label
- Attribute label = new Attribute ("label",journalDTO.getIdName());
+ Attribute label = new Attribute("label", journalDTO.getIdName());
journal.setAttribute(label);
// Prefix
- Attribute prefix = new Attribute ("prefix",journalDTO.getPrefix());
+ Attribute prefix = new Attribute("prefix", journalDTO.getPrefix());
journal.setAttribute(prefix);
// Description
- Attribute description = new Attribute ("description",journalDTO.getDescription());
+ Attribute description = new Attribute("description", journalDTO.getDescription());
journal.setAttribute(description);
}
}
@@ -335,132 +344,126 @@
/**
* Converti la liste des comptes pour être ajouté au document xml.
+ *
* @param listAccountDTO
* @param accounts
*/
- public void accountXML(List<AccountDTO> listAccountDTO,Element accounts)
- {
- for (AccountDTO accountDTO : listAccountDTO)
- {
- Element account = new Element ("account");
+ public void accountXML(List<AccountDTO> listAccountDTO, Element accounts) {
+ for (AccountDTO accountDTO : listAccountDTO) {
+ Element account = new Element("account");
accounts.addContent(account);
// Identification du account
- Attribute idAccount = new Attribute ("id",accountDTO.getIdSeq());
+ Attribute idAccount = new Attribute("id", accountDTO.getIdSeq());
account.setAttribute(idAccount);
// Label
- Attribute label = new Attribute ("label",accountDTO.getDescription());
+ Attribute label = new Attribute("label", accountDTO.getDescription());
account.setAttribute(label);
// Type
- Attribute type = new Attribute ("type",accountDTO.getType());
+ Attribute type = new Attribute("type", accountDTO.getType());
account.setAttribute(type);
// AccountNumber
- Attribute accountNumber = new Attribute ("accountNumber",accountDTO.getIdNumber());
+ Attribute accountNumber = new Attribute("accountNumber", accountDTO.getIdNumber());
account.setAttribute(accountNumber);
// MasterAccountNumber
- Attribute masterAccountNumber = new Attribute ("masterAccount",accountDTO.getParent().getIdNumber());
+ Attribute masterAccountNumber = new Attribute("masterAccount", accountDTO.getParent().getIdNumber());
account.setAttribute(masterAccountNumber);
// Ajoute les comptes enfants à la liste
- accountXML(accountDTO.getChildren(),accounts);
+ accountXML(accountDTO.getChildren(), accounts);
}
}
- public void exportTransaction (Element transactions,Element entries,ProgressBarImpl progressBar)
- {
+ public void exportTransaction(Element transactions, Element entries, ProgressBarImpl progressBar) {
// Nombre de transaction
float nbTransactions = listTransactionDTO.size();
float incremente = 20 / nbTransactions;
float value = 80;
// Pour chaque transaction
- for (TransactionDTO transactionDTO : listTransactionDTO)
- {
- Element transaction = new Element ("transaction");
+ for (TransactionDTO transactionDTO : listTransactionDTO) {
+ Element transaction = new Element("transaction");
transactions.addContent(transaction);
// Identification de la transaction
- Attribute idTransaction = new Attribute ("id",transactionDTO.getIdSeq());
+ Attribute idTransaction = new Attribute("id", transactionDTO.getIdSeq());
transaction.setAttribute(idTransaction);
// EntryDate
String dateTab[] = Util.arrayDate(transactionDTO.getEntryDate());
- Attribute entryDateYear = new Attribute ("entryDateYear",dateTab[0]);
+ Attribute entryDateYear = new Attribute("entryDateYear", dateTab[0]);
transaction.setAttribute(entryDateYear);
- Attribute entryDateMonth = new Attribute ("entryDateMonth",dateTab[1]);
+ Attribute entryDateMonth = new Attribute("entryDateMonth", dateTab[1]);
transaction.setAttribute(entryDateMonth);
- Attribute entryDateDay = new Attribute ("entryDateDay",dateTab[2]);
+ Attribute entryDateDay = new Attribute("entryDateDay", dateTab[2]);
transaction.setAttribute(entryDateDay);
// VoucherRef
- Attribute voucherRef = new Attribute ("voucherRef",transactionDTO.getVoucherRef());
+ Attribute voucherRef = new Attribute("voucherRef", transactionDTO.getVoucherRef());
transaction.setAttribute(voucherRef);
// Description
- Attribute description = new Attribute ("description",transactionDTO.getDescription());
+ Attribute description = new Attribute("description", transactionDTO.getDescription());
transaction.setAttribute(description);
// Id journal
- Attribute IdJournal = new Attribute ("idJournal",transactionDTO.getJournal().getIdSeq());
+ Attribute IdJournal = new Attribute("idJournal", transactionDTO.getJournal().getIdSeq());
transaction.setAttribute(IdJournal);
// Id timeSpan
- Attribute IdTimeSpan = new Attribute ("idTimeSpan",transactionDTO.getPeriod().getIdSeq());
+ Attribute IdTimeSpan = new Attribute("idTimeSpan", transactionDTO.getPeriod().getIdSeq());
transaction.setAttribute(IdTimeSpan);
/**
* Entry
*/
List<EntryDTO> listEntryDTO = transactionDTO.getEntries();
- for (EntryDTO entryDTO : listEntryDTO)
- {
- Element entry = new Element ("entry");
+ for (EntryDTO entryDTO : listEntryDTO) {
+ Element entry = new Element("entry");
entries.addContent(entry);
// Identification du entry
- Attribute idEntry = new Attribute ("id",entryDTO.getIdSeq());
+ Attribute idEntry = new Attribute("id", entryDTO.getIdSeq());
entry.setAttribute(idEntry);
// Description
- Attribute descriptionEntry = new Attribute ("description",entryDTO.getDescription());
+ Attribute descriptionEntry = new Attribute("description", entryDTO.getDescription());
entry.setAttribute(descriptionEntry);
// Amount
- Attribute amount = new Attribute ("amount",entryDTO.getAmount());
+ Attribute amount = new Attribute("amount", entryDTO.getAmount());
entry.setAttribute(amount);
// Lettering
- Attribute lettering = new Attribute ("lettering",entryDTO.getLettrage());
+ Attribute lettering = new Attribute("lettering", entryDTO.getLettrage());
entry.setAttribute(lettering);
// Detail
- Attribute detail = new Attribute ("detail",entryDTO.getDescription());
+ Attribute detail = new Attribute("detail", entryDTO.getDescription());
entry.setAttribute(detail);
// Debit / crédit
- if ( entryDTO.getDebit() )
- {
- Attribute debit = new Attribute("debit","true");
+ if (entryDTO.getDebit()) {
+ Attribute debit = new Attribute("debit", "true");
entry.setAttribute(debit);
} else {
- Attribute debit = new Attribute("debit","false");
+ Attribute debit = new Attribute("debit", "false");
entry.setAttribute(debit);
}
// Transaction
- Attribute idrefTransaction = new Attribute ("idTransaction",transactionDTO.getIdSeq());
+ Attribute idrefTransaction = new Attribute("idTransaction", transactionDTO.getIdSeq());
entry.setAttribute(idrefTransaction);
// Account
- Attribute idAccount = new Attribute ("idAccount",entryDTO.getAccount().getIdSeq());
+ Attribute idAccount = new Attribute("idAccount", entryDTO.getAccount().getIdSeq());
entry.setAttribute(idAccount);
}
// Mise à jour de la barre de chargement
value = value + incremente;
- progressBar.getProgressBar().setValue((int)value);
- progressBar.getProgressBar().setString(value+"% : "+_("lima.progressBar.export.etape6"));
-
+ progressBar.getProgressBar().setValue((int) value);
+ progressBar.getProgressBar().setString(value + "% : " + _("lima.progressBar.export.etape6"));
+
}
}
/**
* Permet d'enregistrer le fichier xml.
+ *
* @param fichier
*/
- static void enregistre(String fichier)
- {
- try
- {
- XMLOutputter sortie = new XMLOutputter(Format.getPrettyFormat());
- sortie.output(document, new FileOutputStream(fichier));
- }
- catch (java.io.IOException e){
+ static void enregistre(String fichier) {
+ try {
+ XMLOutputter sortie = new XMLOutputter(Format.getPrettyFormat());
+ sortie.output(document, new FileOutputStream(fichier));
+ }
+ catch (java.io.IOException e) {
log.error(e);
- }
+ }
}
}
Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/BilanViewImpl.java
===================================================================
--- trunk/lima-main/src/main/java/org/chorem/lima/ui/BilanViewImpl.java 2009-11-08 15:18:38 UTC (rev 2743)
+++ trunk/lima-main/src/main/java/org/chorem/lima/ui/BilanViewImpl.java 2009-11-08 15:26:23 UTC (rev 2744)
@@ -163,17 +163,25 @@
passifTab.get("PASSIF").add(passifTab.get("PASSIF_DETTES"));
}
-
/**
* Permet de calculer le bilan
*/
public void updateBilan() {
log.debug("Update bilan :");
+ MainViewImpl context = LimaContext.get().getMainUI();
+ progressBar = new ProgressBarImpl(context, context);
+ Runnable runnable = new Runnable() {
+ public void run() {
+ progressBar.setVisible(true);
+ }
+ };
+ SwingUtilities.invokeLater(runnable);
+
new Thread() {
@Override
public void run() {
- progressBar = new ProgressBarImpl();
+
progressBar.setTitle("Chargement du bilan");
progressBar.getProgressBar().setString("0% : Préparation des données");
progressBar.getProgressBar().setValue(0);
Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/MainView.jaxx
===================================================================
--- trunk/lima-main/src/main/java/org/chorem/lima/ui/MainView.jaxx 2009-11-08 15:18:38 UTC (rev 2743)
+++ trunk/lima-main/src/main/java/org/chorem/lima/ui/MainView.jaxx 2009-11-08 15:26:23 UTC (rev 2744)
@@ -1,5 +1,7 @@
<JFrame title="lima.title" onWindowClosing="getHandler().close(this)"
- defaultCloseOperation="do_nothing_on_close" resizable="true" width="800" height="600"
+ defaultCloseOperation="do_nothing_on_close"
+ undecorated='{getConfig().isFullScreen()}'
+ resizable="true" width="800" height="600"
extendedState='{this.MAXIMIZED_BOTH}'>
<style source="css/lima.css"/>
<script><
