Author: jpepin Date: 2010-12-04 22:01:22 +0100 (Sat, 04 Dec 2010) New Revision: 3064 Url: http://chorem.org/repositories/revision/lima/3064 Log: - fix splash bug on lima first run - fix bigdecimal bug on tablemodel (new bug from 0.4.1 >) - fix importexport message dialog Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java 2010-12-01 09:50:28 UTC (rev 3063) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java 2010-12-04 21:01:22 UTC (rev 3064) @@ -127,8 +127,9 @@ splashGraphics.setFont(font); splashGraphics.drawString(message + "...", 65, 249); } - - splash.update(); + if (splash != null ){ + splash.update(); + } } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2010-12-01 09:50:28 UTC (rev 3063) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2010-12-04 21:01:22 UTC (rev 3064) @@ -169,10 +169,10 @@ result = Letter.class; break; case 6: - result = BigDecimal.class; + result = Double.class; break; case 7: - result = BigDecimal.class; + result = Double.class; break; case 8: result = BigDecimal.class; @@ -510,11 +510,13 @@ currentEntry.setLetter((Letter)value); break; case 6: - currentEntry.setAmount((BigDecimal)value); + //FIXME jpepin 20101231 transtypage "superflu" pour éviter un bug de getColumnName + // qui ne fonctionne plus avec les BigDecimal + currentEntry.setAmount(new BigDecimal((Double)value)); currentEntry.setDebit(true); break; case 7: - currentEntry.setAmount((BigDecimal)value); + currentEntry.setAmount(new BigDecimal((Double)value)); currentEntry.setDebit(false); break; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2010-12-01 09:50:28 UTC (rev 3063) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2010-12-04 21:01:22 UTC (rev 3064) @@ -175,10 +175,10 @@ result = String.class; break; case 5: - result = BigDecimal.class; + result = Double.class; break; case 6: - result = BigDecimal.class; + result = Double.class; break; case 7: result = BigDecimal.class; @@ -432,11 +432,13 @@ currentEntry.setDescription((String)value); break; case 5 : - currentEntry.setAmount((BigDecimal)value); + //FIXME jpepin 20101231 transtypage "superflu" pour éviter un bug de getColumnName + // qui ne fonctionne plus avec les BigDecimal + currentEntry.setAmount(new BigDecimal((Double)value)); currentEntry.setDebit(true); break; case 6: - currentEntry.setAmount((BigDecimal)value); + currentEntry.setAmount(new BigDecimal((Double)value)); currentEntry.setDebit(false); break; case 8: Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2010-12-01 09:50:28 UTC (rev 3063) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2010-12-04 21:01:22 UTC (rev 3064) @@ -115,6 +115,7 @@ final EncodingEnum charset = encodingEnum; final String filePath = file; final Boolean verboseMode = verbose; + final Boolean importMode = importExportMethode.getImportMode(); new SwingWorker<String,Void>() { @Override protected String doInBackground() throws LimaException { String datas = ""; @@ -186,7 +187,12 @@ DialogHelper.showReportDialog(result, _("lima.importexport.import"), viewComponent); } else { - DialogHelper.showMessageDialog(_("lima.importexport.import.terminated")); + if (importMode){ + DialogHelper.showMessageDialog(_("lima.importexport.import.terminated")); + } + else { + DialogHelper.showMessageDialog(_("lima.importexport.export.terminated")); + } } } } catch (InterruptedException eee) { Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties 2010-12-01 09:50:28 UTC (rev 3063) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties 2010-12-04 21:01:22 UTC (rev 3064) @@ -165,6 +165,7 @@ lima.importexport.ebp=Import/Export EBP lima.importexport.entries=Entries lima.importexport.export=Export +lima.importexport.export.terminated=Export terminated lima.importexport.financialstatements=FinancialStatements chart lima.importexport.import=Import lima.importexport.import.terminated=Import terminated Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties 2010-12-01 09:50:28 UTC (rev 3063) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties 2010-12-04 21:01:22 UTC (rev 3064) @@ -165,6 +165,7 @@ lima.importexport.ebp=Import/Export EBP lima.importexport.entries=\u00C9critures lima.importexport.export=Export +lima.importexport.export.terminated=Export termin\u00E9 lima.importexport.financialstatements=Plan BCR lima.importexport.import=Import lima.importexport.import.terminated=Import termin\u00E9