May 2011 - Lima-commits - mailman.cloud.codelutin.com

r3133 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox
by vsalaun＠users.chorem.org May 18, 2011

May 18, 2011

Author: vsalaun Date: 2011-05-18 16:26:46 +0200 (Wed, 18 May 2011) New Revision: 3133 Url: http://chorem.org/repositories/revision/lima/3133 Log: amelioration de la syntaxe du code Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java 2011-05-17 15:57:08 UTC (rev 3132) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java 2011-05-18 14:26:46 UTC (rev 3133) @@ -63,6 +63,8 @@ protected FinancialPeriodServiceMonitorable financialPeriodService; protected FiscalPeriod selectedFiscalPeriod; + + private boolean displayAllPeriods; /** * Constructor for locked period list. @@ -77,7 +79,10 @@ * @param all if {@code true}, display all available period, otherwize * display only locked ones */ - public FinancialPeriodComboBoxModel(boolean all) { + public FinancialPeriodComboBoxModel(boolean displayAllPeriods) { + + this.displayAllPeriods = displayAllPeriods; + financialPeriodService = LimaServiceFactory.getInstance().getService( FinancialPeriodServiceMonitorable.class); @@ -86,7 +91,7 @@ FiscalPeriodServiceMonitorable.class).addListener(this); LimaServiceFactory.getInstance().getService( ImportServiceMonitorable.class).addListener(this); - if (all) { + if (displayAllPeriods) { datasCache=getAllDataList(); } else { @@ -96,7 +101,13 @@ public void setFiscalPeriod(FiscalPeriod fiscalPeriod){ selectedFiscalPeriod=fiscalPeriod; - datasCache=getDataList(); + if (displayAllPeriods) { + datasCache=getAllDataList(); + } + else { + datasCache=getDataList(); + } + fireContentsChanged(this, 0, datasCache.size()); } @Override @@ -124,8 +135,7 @@ List<FinancialPeriod> result = null; try { if (selectedFiscalPeriod != null){ - result = (List<FinancialPeriod>) - selectedFiscalPeriod.getFinancialPeriod(); + result = financialPeriodService.getFinancialPeriods(selectedFiscalPeriod.getBeginDate(), selectedFiscalPeriod.getEndDate()); } else { result = financialPeriodService.getUnblockedFinancialPeriods(); @@ -144,8 +154,7 @@ List<FinancialPeriod> result = null; try { if (selectedFiscalPeriod != null){ - result = (List<FinancialPeriod>) - selectedFiscalPeriod.getFinancialPeriod(); + result = financialPeriodService.getFinancialPeriods(selectedFiscalPeriod.getBeginDate(), selectedFiscalPeriod.getEndDate()); } else { result = financialPeriodService.getAllFinancialPeriods(); @@ -162,6 +171,7 @@ public void refresh(){ datasCache = getDataList(); + System.out.println(datasCache); fireContentsChanged(this, 0, datasCache.size()); } @@ -173,7 +183,12 @@ @Override public void notifyMethod(String serviceName, String methodeName) { if (serviceName.contains("Period") || methodeName.contains("importAll")){ - refresh(); + if (displayAllPeriods) { + datasCache=getAllDataList(); + } + else { + datasCache=getDataList(); + } } } }

1 0

r3132 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: account entrybook financialstatementchart
by vsalaun＠users.chorem.org May 17, 2011

May 17, 2011

Author: vsalaun Date: 2011-05-17 17:57:08 +0200 (Tue, 17 May 2011) New Revision: 3132 Url: http://chorem.org/repositories/revision/lima/3132 Log: #359 possibilite de deselectionner une ligne dans certains tableaux (2/2) Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTable.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTable.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTable.java 2011-05-17 15:57:08 UTC (rev 3132) @@ -0,0 +1,78 @@ +package org.chorem.lima.ui.account; + +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTreeTable; + +public class AccountTreeTable extends JXTreeTable + implements KeyListener, MouseListener { + + /** serialVersionUID. */ + private static final long serialVersionUID = 1092873442245932784L; + + /** log. */ + private static final Log log = LogFactory + .getLog(AccountTreeTable.class); + + protected AccountViewHandler handler; + + public AccountTreeTable(AccountViewHandler handler) { + + this.handler = handler; + + addKeyListener(this); + addMouseListener(this); + + } + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.clearSelection(); + } + } + + @Override + public void mouseReleased(MouseEvent e) { + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } + + @Override + public void keyTyped(KeyEvent e) { + } + + /** + * for each action combination key are think + * for extend keyboard and laptop keyboard + */ + @Override + public void keyPressed(KeyEvent e) { + // clear row selection with the key: escape + if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { + if (!this.isEditing()) { + this.clearSelection(); + } + } + } + + @Override + public void keyReleased(KeyEvent e) { + } + +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx 2011-05-17 13:02:49 UTC (rev 3131) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx 2011-05-17 15:57:08 UTC (rev 3132) @@ -37,7 +37,8 @@ <row> <cell fill="both" weightx="1" weighty="1" rows='5'> <JScrollPane> - <org.jdesktop.swingx.JXTreeTable id="accountsTreeTable" + <AccountTreeTable id="accountsTreeTable" + constructorParams="getHandler()" selectionMode="{ListSelectionModel.SINGLE_SELECTION}" treeTableModel="{new org.chorem.lima.ui.account.AccountTreeTableModel()}" highlighters="{org.jdesktop.swingx.decorator.HighlighterFactory.createSimpleStriping(new java.awt.Color(222,222,222))}" /> Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTable.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTable.java 2011-05-17 15:57:08 UTC (rev 3132) @@ -0,0 +1,78 @@ +package org.chorem.lima.ui.entrybook; + +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTable; + +public class EntryBookTable extends JXTable + implements KeyListener, MouseListener { + + /** serialVersionUID. */ + private static final long serialVersionUID = 6228396251512013262L; + + /** log. */ + private static final Log log = LogFactory + .getLog(EntryBookTable.class); + + protected EntryBookViewHandler handler; + + public EntryBookTable(EntryBookViewHandler handler) { + + this.handler = handler; + + addKeyListener(this); + addMouseListener(this); + + } + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.clearSelection(); + } + } + + @Override + public void mouseReleased(MouseEvent e) { + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } + + @Override + public void keyTyped(KeyEvent e) { + } + + /** + * for each action combination key are think + * for extend keyboard and laptop keyboard + */ + @Override + public void keyPressed(KeyEvent e) { + // clear row selection with the key: escape + if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { + if (!this.isEditing()) { + this.clearSelection(); + } + } + } + + @Override + public void keyReleased(KeyEvent e) { + } + +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx 2011-05-17 13:02:49 UTC (rev 3131) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx 2011-05-17 15:57:08 UTC (rev 3132) @@ -38,7 +38,8 @@ <row> <cell fill="both" weightx="1" weighty="1" rows='5'> <JScrollPane> - <org.jdesktop.swingx.JXTable id="entryBooksTable" rowHeight="24" + <EntryBookTable id="entryBooksTable" rowHeight="24" + constructorParams="getHandler()" model="{new org.chorem.lima.ui.entrybook.EntryBookTableModel()}" highlighters="{org.jdesktop.swingx.decorator.HighlighterFactory.createSimpleStriping(new java.awt.Color(222,222,222))}" selectionMode="{ListSelectionModel.SINGLE_SELECTION}" Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTable.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTable.java 2011-05-17 15:57:08 UTC (rev 3132) @@ -0,0 +1,77 @@ +package org.chorem.lima.ui.financialstatementchart; + +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTreeTable; + +public class FinancialStatementChartTreeTable extends JXTreeTable + implements KeyListener, MouseListener { + + /** serialVersionUID. */ + private static final long serialVersionUID = 3221024449873737253L; + + /** log. */ + private static final Log log = LogFactory + .getLog(FinancialStatementChartTreeTable.class); + + protected FinancialStatementChartViewHandler handler; + + public FinancialStatementChartTreeTable(FinancialStatementChartViewHandler handler) { + this.handler = handler; + + addKeyListener(this); + addMouseListener(this); + + } + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.clearSelection(); + } + } + + @Override + public void mouseReleased(MouseEvent e) { + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } + + @Override + public void keyTyped(KeyEvent e) { + } + + /** + * for each action combination key are think + * for extend keyboard and laptop keyboard + */ + @Override + public void keyPressed(KeyEvent e) { + // clear row selection with the key: escape + if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { + if (!this.isEditing()) { + this.clearSelection(); + } + } + } + + @Override + public void keyReleased(KeyEvent e) { + } + +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx 2011-05-17 13:02:49 UTC (rev 3131) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx 2011-05-17 15:57:08 UTC (rev 3132) @@ -37,7 +37,8 @@ <row> <cell fill="both" weightx="1" weighty="1" rows='6'> <JScrollPane> - <org.jdesktop.swingx.JXTreeTable id="treeTable" + <FinancialStatementChartTreeTable id="treeTable" + constructorParams="getHandler()" selectionMode="{ListSelectionModel.SINGLE_SELECTION}" treeTableModel="{new org.chorem.lima.ui.financialstatementchart.FinancialStatementChartTreeTableModel()}" highlighters="{org.jdesktop.swingx.decorator.HighlighterFactory.createSimpleStriping(new java.awt.Color(222,222,222))}" />

1 0

r3131 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: accountsreports balance entrybooksreports financialperiod financialstatementreport financialtransaction financialtransactionsearch financialtransactionunbalanced fiscalperiod ledger lettering
by vsalaun＠users.chorem.org May 17, 2011

May 17, 2011

Author: vsalaun Date: 2011-05-17 15:02:49 +0200 (Tue, 17 May 2011) New Revision: 3131 Url: http://chorem.org/repositories/revision/lima/3131 Log: #359 possibilite de deselectionner une ligne dans certains tableaux Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTable.java 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -1,5 +1,9 @@ package org.chorem.lima.ui.accountsreports; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; import java.math.BigDecimal; import org.apache.commons.logging.Log; @@ -9,7 +13,8 @@ import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; import org.jdesktop.swingx.JXTable; -public class AccountsReportsTable extends JXTable { +public class AccountsReportsTable extends JXTable + implements KeyListener, MouseListener { /** serialVersionUID. */ private static final long serialVersionUID = 6093850347322834480L; @@ -24,9 +29,57 @@ this.handler = handler; + addKeyListener(this); + addMouseListener(this); + //Get new BigDecimal renderer setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); } + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.clearSelection(); + } + } + + @Override + public void mouseReleased(MouseEvent e) { + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } + + @Override + public void keyTyped(KeyEvent e) { + } + + /** + * for each action combination key are think + * for extend keyboard and laptop keyboard + */ + @Override + public void keyPressed(KeyEvent e) { + // clear row selection with the key: escape + if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { + if (!this.isEditing()) { + this.clearSelection(); + } + } + } + + @Override + public void keyReleased(KeyEvent e) { + } + } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTable.java 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -1,5 +1,9 @@ package org.chorem.lima.ui.balance; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; import java.math.BigDecimal; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -7,7 +11,7 @@ import org.chorem.lima.ui.balance.BalanceViewHandler; import org.jdesktop.swingx.JXTable; -public class BalanceTable extends JXTable { +public class BalanceTable extends JXTable implements KeyListener, MouseListener{ /** serialVersionUID. */ private static final long serialVersionUID = 6093850347322834480L; @@ -22,9 +26,57 @@ this.handler = handler; + addKeyListener(this); + addMouseListener(this); + //Get new BigDecimal renderer setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); } + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.clearSelection(); + } + } + + @Override + public void mouseReleased(MouseEvent e) { + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } + + @Override + public void keyTyped(KeyEvent e) { + } + + /** + * for each action combination key are think + * for extend keyboard and laptop keyboard + */ + @Override + public void keyPressed(KeyEvent e) { + // clear row selection with the key: escape + if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { + if (!this.isEditing()) { + this.clearSelection(); + } + } + } + + @Override + public void keyReleased(KeyEvent e) { + } + } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -27,6 +27,10 @@ import java.awt.Color; import java.awt.Component; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; import java.math.BigDecimal; import org.chorem.lima.entity.Entry; @@ -39,7 +43,8 @@ import org.jdesktop.swingx.decorator.Highlighter; -public class EntryBooksReportsTable extends JXTable { +public class EntryBooksReportsTable extends JXTable + implements KeyListener, MouseListener { /** serialVersionUID. */ private static final long serialVersionUID = 1L; @@ -60,6 +65,10 @@ this.handler = handler; this.model = model; + + addKeyListener(this); + addMouseListener(this); + highlighterReportsDatasBoolean=true; //Get new BigDecimal renderer setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); @@ -97,4 +106,49 @@ new ColorHighlighter(predicate, new Color(222,222,222), null); addHighlighter(colorReportsDatas); } + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.clearSelection(); + } + } + + @Override + public void mouseReleased(MouseEvent e) { + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } + + @Override + public void keyTyped(KeyEvent e) { + } + + /** + * for each action combination key are think + * for extend keyboard and laptop keyboard + */ + @Override + public void keyPressed(KeyEvent e) { + // clear row selection with the key: escape + if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { + if (!this.isEditing()) { + this.clearSelection(); + } + } + } + + @Override + public void keyReleased(KeyEvent e) { + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -27,6 +27,10 @@ import java.awt.Color; import java.awt.Component; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; import java.text.SimpleDateFormat; import org.apache.commons.logging.Log; @@ -43,7 +47,8 @@ import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; -public class FinancialPeriodTable extends JXTable { +public class FinancialPeriodTable extends JXTable + implements KeyListener, MouseListener { private static final long serialVersionUID = -1960326844433064178L; @@ -64,6 +69,10 @@ public FinancialPeriodTable(FinancialPeriodViewHandler handler) { this.handler = handler; + + addKeyListener(this); + addMouseListener(this); + model = this.handler.getView().modelFinancialPeriodTable; financialPeriodService = LimaServiceFactory.getInstance().getService( @@ -125,5 +134,50 @@ new ColorHighlighter(predicate, null, new Color(222,0,0)); addHighlighter(colorTransaction); } + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.clearSelection(); + } + } + + @Override + public void mouseReleased(MouseEvent e) { + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } + + @Override + public void keyTyped(KeyEvent e) { + } + + /** + * for each action combination key are think + * for extend keyboard and laptop keyboard + */ + @Override + public void keyPressed(KeyEvent e) { + // clear row selection with the key: escape + if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { + if (!this.isEditing()) { + this.clearSelection(); + } + } + } + + @Override + public void keyReleased(KeyEvent e) { + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTable.java 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -27,6 +27,11 @@ import java.awt.Color; import java.awt.Component; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; + import org.chorem.lima.beans.FinancialStatementAmounts; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.ColorHighlighter; @@ -35,7 +40,8 @@ import org.jdesktop.swingx.decorator.Highlighter; -public class FinancialStatementReportTable extends JXTable { +public class FinancialStatementReportTable extends JXTable + implements KeyListener, MouseListener { private static final long serialVersionUID = 154211277688304679L; @@ -51,6 +57,10 @@ public FinancialStatementReportTable(FinancialStatementReportViewHandler handler) { super(handler.getView().modelTable); this.handler = handler; + + addKeyListener(this); + addMouseListener(this); + model = this.handler.getView().modelTable; //highlight financial financial transactions @@ -112,4 +122,49 @@ addHighlighter(colorTransaction); } + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.clearSelection(); + } + } + + @Override + public void mouseReleased(MouseEvent e) { + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } + + @Override + public void keyTyped(KeyEvent e) { + } + + /** + * for each action combination key are think + * for extend keyboard and laptop keyboard + */ + @Override + public void keyPressed(KeyEvent e) { + // clear row selection with the key: escape + if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { + if (!this.isEditing()) { + this.clearSelection(); + } + } + } + + @Override + public void keyReleased(KeyEvent e) { + } + } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -29,6 +29,8 @@ import java.awt.Component; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; import java.math.BigDecimal; import java.util.Date; import javax.swing.SwingWorker; @@ -56,7 +58,8 @@ * * @author jpepin */ -public class FinancialTransactionTable extends JXTable implements KeyListener { +public class FinancialTransactionTable extends JXTable + implements KeyListener, MouseListener { /** serialVersionUID. */ private static final long serialVersionUID = 3133690382049594727L; @@ -79,6 +82,7 @@ this.handler = handler; addKeyListener(this); + addMouseListener(this); //Get new date editor setDefaultEditor(Date.class, new DateTableCellEditor()); @@ -204,6 +208,13 @@ handler.addFinancialTransaction(); } + // clear row selection with the key: escape + if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { + if (!this.isEditing()) { + this.clearSelection(); + } + } + /** * Touche tab * Incrémente le curseur de case tant que la case n'est pas editable @@ -307,7 +318,29 @@ @Override public void keyReleased(KeyEvent e) { - } - + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.clearSelection(); + } + } + + @Override + public void mouseReleased(MouseEvent e) { + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } + } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -27,6 +27,10 @@ import java.awt.Color; import java.awt.Component; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; import java.math.BigDecimal; import java.util.Date; import org.chorem.lima.entity.Account; @@ -50,7 +54,8 @@ * @author ore * @author Rémi Chapelet */ -public class FinancialTransactionSearchTable extends JXTable { +public class FinancialTransactionSearchTable extends JXTable + implements KeyListener, MouseListener { /** serialVersionUID. */ private static final long serialVersionUID = 3133690382049594727L; @@ -67,6 +72,9 @@ this.handler = handler; + addKeyListener(this); + addMouseListener(this); + //Get new date editor setDefaultEditor(Date.class, new DateTableCellEditor()); //Get new entry book editor @@ -144,4 +152,51 @@ new ColorHighlighter(predicate, new Color(255, 198, 209), null); addHighlighter(colorTransaction); } + + @Override + public void keyTyped(KeyEvent e) { + } + + /** + * for each action combination key are think + * for extend keyboard and laptop keyboard + */ + @Override + public void keyPressed(KeyEvent e) { + + // clear row selection with the key: escape + if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { + if (!this.isEditing()) { + this.clearSelection(); + } + } + + } + + @Override + public void keyReleased(KeyEvent e) { + } + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.clearSelection(); + } + } + + @Override + public void mouseReleased(MouseEvent e) { + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -29,6 +29,8 @@ import java.awt.Component; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; import java.math.BigDecimal; import java.util.Date; import org.chorem.lima.entity.Account; @@ -53,7 +55,8 @@ * @author ore * @author Rémi Chapelet */ -public class FinancialTransactionUnbalancedTable extends JXTable implements KeyListener { +public class FinancialTransactionUnbalancedTable extends JXTable + implements KeyListener, MouseListener { /** serialVersionUID. */ private static final long serialVersionUID = 3133690382049594727L; @@ -71,6 +74,7 @@ this.handler = handler; addKeyListener(this); + addMouseListener(this); //Get new date editor setDefaultEditor(Date.class, new DateTableCellEditor()); @@ -173,6 +177,13 @@ && e.getModifiers() == KeyEvent.CTRL_MASK)) { handler.addEmptyEntry(); } + + // clear row selection with the key: escape + if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { + if (!this.isEditing()) { + this.clearSelection(); + } + } /** * Touche tab @@ -207,11 +218,30 @@ } - /* - * @see java.awt.event.KeyListener#keyReleased(java.awt.event.KeyEvent) - */ @Override public void keyReleased(KeyEvent e) { - } + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.clearSelection(); + } + } + + @Override + public void mouseReleased(MouseEvent e) { + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTable.java 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -27,6 +27,11 @@ import java.awt.Color; import java.awt.Component; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; + import org.chorem.lima.entity.FiscalPeriod; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.ColorHighlighter; @@ -34,7 +39,8 @@ import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; -public class FiscalPeriodTable extends JXTable { +public class FiscalPeriodTable extends JXTable + implements KeyListener, MouseListener { private static final long serialVersionUID = -8462838870024505659L; @@ -47,6 +53,10 @@ public FiscalPeriodTable(FiscalPeriodViewHandler handler) { this.handler = handler; + + addKeyListener(this); + addMouseListener(this); + model = this.handler.getView().getModelFiscalPeriodTable(); //highlight financial financial transactions @@ -67,5 +77,50 @@ new ColorHighlighter(predicate, null, new Color(222,0,0)); addHighlighter(colorTransaction); } + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.clearSelection(); + } + } + + @Override + public void mouseReleased(MouseEvent e) { + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } + + @Override + public void keyTyped(KeyEvent e) { + } + + /** + * for each action combination key are think + * for extend keyboard and laptop keyboard + */ + @Override + public void keyPressed(KeyEvent e) { + // clear row selection with the key: escape + if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { + if (!this.isEditing()) { + this.clearSelection(); + } + } + } + + @Override + public void keyReleased(KeyEvent e) { + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTable.java 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -27,6 +27,10 @@ import java.awt.Color; import java.awt.Component; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; import java.math.BigDecimal; import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; @@ -43,7 +47,7 @@ * @author ore * @author Rémi Chapelet */ -public class LedgerTable extends JXTable { +public class LedgerTable extends JXTable implements KeyListener, MouseListener { /** serialVersionUID. */ private static final long serialVersionUID = 3133690382049594727L; @@ -58,6 +62,9 @@ this.handler = handler; + addKeyListener(this); + addMouseListener(this); + //Get new BigDecimal renderer setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); @@ -86,4 +93,49 @@ new ColorHighlighter(predicate, new Color(222,222,222), null); addHighlighter(colorReportsDatas); } + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.clearSelection(); + } + } + + @Override + public void mouseReleased(MouseEvent e) { + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } + + @Override + public void keyTyped(KeyEvent e) { + } + + /** + * for each action combination key are think + * for extend keyboard and laptop keyboard + */ + @Override + public void keyPressed(KeyEvent e) { + // clear row selection with the key: escape + if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { + if (!this.isEditing()) { + this.clearSelection(); + } + } + } + + @Override + public void keyReleased(KeyEvent e) { + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -29,6 +29,8 @@ import java.awt.Component; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; import java.math.BigDecimal; import java.util.Date; @@ -55,7 +57,8 @@ * * @author jpepin */ -public class LetteringTable extends JXTable implements KeyListener { +public class LetteringTable extends JXTable + implements KeyListener, MouseListener { /** serialVersionUID. */ private static final long serialVersionUID = 3133690382049594727L; @@ -75,6 +78,7 @@ this.handler = handler; addKeyListener(this); + addMouseListener(this); //Get new date editor setDefaultEditor(Date.class, new DateTableCellEditor()); @@ -166,19 +170,47 @@ handler.addLetter(); } + // clear row selection with the key: escape + if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { + if (!this.isEditing()) { + this.clearSelection(); + } + } + } @Override public void keyTyped(KeyEvent e) { - } @Override public void keyReleased(KeyEvent e) { - } + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.clearSelection(); + } + } + + @Override + public void mouseReleased(MouseEvent e) { + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } + }

1 0

r3130 - trunk/lima-swing/src/main/java/org/chorem/lima/ui
by vsalaun＠users.chorem.org May 17, 2011

May 17, 2011

Author: vsalaun Date: 2011-05-17 10:24:05 +0200 (Tue, 17 May 2011) New Revision: 3130 Url: http://chorem.org/repositories/revision/lima/3130 Log: #359 pop up tab when it already exists Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2011-05-16 14:24:24 UTC (rev 3129) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2011-05-17 08:24:05 UTC (rev 3130) @@ -92,6 +92,9 @@ contentTabbedPane.remove(contentTabbedPane.indexOfTab(name)); } }); + // if contentTabbedPane contains tab + } else { + contentTabbedPane.setSelectedIndex(contentTabbedPane.indexOfTab(name)); } }

1 0

r3129 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod
by vsalaun＠users.chorem.org May 16, 2011

May 16, 2011

Author: vsalaun Date: 2011-05-16 16:24:24 +0200 (Mon, 16 May 2011) New Revision: 3129 Url: http://chorem.org/repositories/revision/lima/3129 Log: #353 maj automatique de la liste lorsqu'on bloque une periode comptable Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2011-05-16 13:54:24 UTC (rev 3128) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2011-05-16 14:24:24 UTC (rev 3129) @@ -186,6 +186,7 @@ public void blockFinancialPeriod(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException { financialPeriodService. blockClosedPeriodicEntryBook(closedPeriodicEntryBook); + getDataList(); fireTableDataChanged(); }

1 0

r3128 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by vsalaun＠users.chorem.org May 16, 2011

May 16, 2011

Author: vsalaun Date: 2011-05-16 15:54:24 +0200 (Mon, 16 May 2011) New Revision: 3128 Url: http://chorem.org/repositories/revision/lima/3128 Log: #266 les caracteres non unicodes ne sont plus affiches Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java 2011-05-16 10:21:28 UTC (rev 3127) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java 2011-05-16 13:54:24 UTC (rev 3128) @@ -133,8 +133,15 @@ @Override public void keyReleased(KeyEvent e) { if (keyPressed == false) { - datePicker.getEditor().setText(String.valueOf(e.getKeyChar())); - keyPressed = true; + if (e.getKeyCode() >= KeyEvent.VK_0 + && e.getKeyCode() <= KeyEvent.VK_Z) { + datePicker.getEditor().setText(String.valueOf(e.getKeyChar())); + keyPressed = true; + } + else if (e.getKeyChar() == KeyEvent.VK_BACK_SPACE){ + datePicker.getEditor().setText(""); + keyPressed = true; + } } }

1 0

r3127 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by vsalaun＠users.chorem.org May 16, 2011

May 16, 2011

Author: vsalaun Date: 2011-05-16 12:21:28 +0200 (Mon, 16 May 2011) New Revision: 3127 Url: http://chorem.org/repositories/revision/lima/3127 Log: amelioration de l'editeur de BigDecimal Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2011-05-16 09:45:16 UTC (rev 3126) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2011-05-16 10:21:28 UTC (rev 3127) @@ -1,30 +1,34 @@ package org.chorem.lima.ui.celleditor; import java.awt.Component; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; import java.awt.event.MouseEvent; import java.math.BigDecimal; -import java.util.Date; import java.util.EventObject; import javax.swing.AbstractCellEditor; -import javax.swing.DefaultCellEditor; import javax.swing.JTable; import javax.swing.JTextField; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; +import javax.swing.event.AncestorEvent; +import javax.swing.event.AncestorListener; import javax.swing.table.TableCellEditor; -import javax.swing.text.JTextComponent; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaContext; -public class BigDecimalTableCellEditor extends AbstractCellEditor implements TableCellEditor { +public class BigDecimalTableCellEditor extends AbstractCellEditor + implements TableCellEditor, FocusListener, AncestorListener, KeyListener { private static final Log log = LogFactory.getLog(BigDecimalTableCellEditor.class); private static final long serialVersionUID = 1L; protected final JTextField textField; + private boolean keyPressed; /** * constructor @@ -33,6 +37,10 @@ textField = new JTextField(); textField.setEditable(true); textField.setHorizontalAlignment(SwingConstants.RIGHT); + textField.addFocusListener(this); + textField.addAncestorListener(this); + textField.addKeyListener(this); + keyPressed = false; } @Override @@ -56,5 +64,61 @@ return bdValue; } } + + @Override + public boolean isCellEditable(EventObject evt) { + return !(evt instanceof MouseEvent) || ((MouseEvent) evt).getClickCount() == 2; + } + + /** + * Listeners + */ + @Override + public void focusGained(FocusEvent e) { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + textField.selectAll(); + } + }); + } + + @Override + public void focusLost(FocusEvent e) { + keyPressed = false; + } + + @Override + public void ancestorAdded(final AncestorEvent e) { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + textField.requestFocus(); + } + }); + } + @Override + public void ancestorRemoved(AncestorEvent e) { + } + + @Override + public void ancestorMoved(AncestorEvent e) { + } + + @Override + public void keyTyped(KeyEvent e) { + + } + + @Override + public void keyPressed(KeyEvent e) { + } + + @Override + public void keyReleased(KeyEvent e) { + if (keyPressed == false) { + textField.setText(String.valueOf(e.getKeyChar())); + keyPressed = true; + } + } + }

1 0

r3126 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by vsalaun＠users.chorem.org May 16, 2011

May 16, 2011

Author: vsalaun Date: 2011-05-16 11:45:16 +0200 (Mon, 16 May 2011) New Revision: 3126 Url: http://chorem.org/repositories/revision/lima/3126 Log: #266 amelioration dans l'edition d'une date (selection automatique du texte) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java 2011-05-14 11:46:09 UTC (rev 3125) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java 2011-05-16 09:45:16 UTC (rev 3126) @@ -29,26 +29,40 @@ import org.jdesktop.swingx.JXDatePicker; import javax.swing.*; +import javax.swing.event.AncestorEvent; +import javax.swing.event.AncestorListener; import javax.swing.table.TableCellEditor; -import java.awt.*; + +import java.awt.Component; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; import java.awt.event.MouseEvent; + import java.util.Date; import java.util.EventObject; /** * @author ore */ -public class DateTableCellEditor extends AbstractCellEditor implements TableCellEditor { +public class DateTableCellEditor extends AbstractCellEditor + implements TableCellEditor, FocusListener, AncestorListener, KeyListener { private final JXDatePicker datePicker; private static final long serialVersionUID = 1L; private static DateTableCellEditor editor; + private boolean keyPressed; /** * constructor */ public DateTableCellEditor() { datePicker = new JXDatePicker(LimaContext.getContext().getConfig().getLocale()); + datePicker.getEditor().addFocusListener(this); + datePicker.getEditor().addAncestorListener(this); + datePicker.getEditor().addKeyListener(this); + keyPressed = false; } @Override @@ -75,4 +89,53 @@ } return editor; } + + /** + * Listeners + */ + public void focusGained(FocusEvent e) { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + datePicker.getEditor().selectAll(); + } + }); + } + + public void focusLost(FocusEvent e) { + keyPressed = false; + } + + @Override + public void ancestorAdded(final AncestorEvent e) { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + datePicker.requestFocus(); + } + }); + } + + @Override + public void ancestorRemoved(AncestorEvent e) { + } + + @Override + public void ancestorMoved(AncestorEvent e) { + } + + @Override + public void keyTyped(KeyEvent e) { + } + + @Override + public void keyPressed(KeyEvent e) { + } + + @Override + public void keyReleased(KeyEvent e) { + if (keyPressed == false) { + datePicker.getEditor().setText(String.valueOf(e.getKeyChar())); + keyPressed = true; + } + } + }

1 0

r3125 - trunk
by tchemit＠users.chorem.org May 14, 2011

May 14, 2011

Author: tchemit Date: 2011-05-14 13:46:09 +0200 (Sat, 14 May 2011) New Revision: 3125 Url: http://chorem.org/repositories/revision/lima/3125 Log: Update mavenpom4redmine to 2.5.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-13 14:59:57 UTC (rev 3124) +++ trunk/pom.xml 2011-05-14 11:46:09 UTC (rev 3125) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.5.3</version> + <version>2.5.4</version> </parent> <groupId>org.chorem</groupId>

1 0

r3124 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: celleditor financialtransaction financialtransactionsearch financialtransactionunbalanced
by vsalaun＠users.chorem.org May 13, 2011

May 13, 2011

Author: vsalaun Date: 2011-05-13 16:59:57 +0200 (Fri, 13 May 2011) New Revision: 3124 Url: http://chorem.org/repositories/revision/lima/3124 Log: #286 mise a jour dans la prise en charge des champs invalides Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EmptyCellRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EmptyCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EmptyCellRenderer.java 2011-05-13 12:17:45 UTC (rev 3123) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EmptyCellRenderer.java 2011-05-13 14:59:57 UTC (rev 3124) @@ -9,6 +9,8 @@ import javax.swing.border.EmptyBorder; import javax.swing.table.DefaultTableCellRenderer; +import org.chorem.lima.entity.EntryBook; + import sun.swing.DefaultLookup; @SuppressWarnings("restriction") @@ -19,8 +21,8 @@ public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - //Create a new JLabel to avoid colouring only when row is selected - JLabel mycell = new JLabel(); + //Create a new JLabel to avoid colouring only when row is selected + JLabel mycell = new JLabel(); mycell.setOpaque(true); setBorder(new EmptyBorder(1, 1, 1, 1)); setName("Table.cellRenderer"); @@ -30,10 +32,10 @@ if (isSelected) { mycell.setForeground(table.getSelectionForeground()); mycell.setBackground(table.getSelectionBackground()); - } + } //Setting default foreGround and backGround colours when hasFocus if (hasFocus) { - Border border = null; + Border border = null; if (isSelected) { border = DefaultLookup.getBorder(this, ui, "Table.focusSelectedCellHighlightBorder"); } @@ -42,19 +44,21 @@ } mycell.setBorder(border); } - // true for voucher and description - // false for Account Class - // if empty or null, colour background in red - // else setText - if (value instanceof String) { - if (String.valueOf(value).isEmpty() || (String.valueOf(value) == null)) { - mycell.setBackground(new Color(255, 198, 209)); - } else { - mycell.setText(value.toString()); - } - } else { - mycell.setBackground(new Color(255, 198, 209)); - } + if (table.isCellEditable(row, column)) { + // true for voucher and description + // false for Account Class + // if empty or null, colour background in red + // else setText + if (value instanceof String) { + if (String.valueOf(value).isEmpty() || (String.valueOf(value) == null)) { + mycell.setBackground(new Color(255, 198, 209)); + } else { + mycell.setText(value.toString()); + } + } else { + mycell.setBackground(new Color(255, 198, 209)); + } + } return mycell; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2011-05-13 12:17:45 UTC (rev 3123) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2011-05-13 14:59:57 UTC (rev 3124) @@ -94,6 +94,8 @@ setDefaultRenderer(String.class, new EmptyCellRenderer()); //get new Account renderer for empty cells setDefaultRenderer(Account.class, new EmptyCellRenderer()); + //get new EntryBook renderer for empty cells + setDefaultRenderer(EntryBook.class, new EmptyCellRenderer()); //highlight financial financial transactions addColorTransaction(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2011-05-13 12:17:45 UTC (rev 3123) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2011-05-13 14:59:57 UTC (rev 3124) @@ -81,6 +81,8 @@ setDefaultRenderer(String.class, new EmptyCellRenderer()); //get new Account renderer for empty cells setDefaultRenderer(Account.class, new EmptyCellRenderer()); + //get new EntryBook renderer for empty cells + setDefaultRenderer(EntryBook.class, new EmptyCellRenderer()); //highlight financial financial transactions addColorTransaction(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2011-05-13 12:17:45 UTC (rev 3123) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2011-05-13 14:59:57 UTC (rev 3124) @@ -86,6 +86,8 @@ setDefaultRenderer(String.class, new EmptyCellRenderer()); //get new Account renderer for empty cells setDefaultRenderer(Account.class, new EmptyCellRenderer()); + //get new EntryBook renderer for empty cells + setDefaultRenderer(EntryBook.class, new EmptyCellRenderer()); //highlight financial financial transactions addColorTransaction();

1 0