Author: vsalaun Date: 2011-05-23 10:39:31 +0200 (Mon, 23 May 2011) New Revision: 3140 Url: http://chorem.org/repositories/revision/lima/3140 Log: #395 correction du bug dans les JDialog lors de la fermeture (final) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/SubLedgerForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/AddLetterForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx 2011-05-23 08:39:31 UTC (rev 3140) @@ -23,7 +23,9 @@ #L% --> -<JDialog modal="true"> +<JDialog modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="performCancel();"> <org.chorem.lima.entity.Account id="account" javaBean='null'/> <Boolean id="addState" javaBean='true'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.jaxx 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.jaxx 2011-05-23 08:39:31 UTC (rev 3140) @@ -23,7 +23,9 @@ #L% --> -<JDialog modal="true"> +<JDialog modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="performCancel();"> <jaxx.runtime.swing.JAXXButtonGroup id="radioButtons" javaBean='new JAXXButtonGroup()'/> <Boolean id="addState" javaBean='true'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2011-05-23 08:39:31 UTC (rev 3140) @@ -27,7 +27,6 @@ import static org.nuiton.i18n.I18n._; -import javax.swing.JDialog; import javax.swing.JOptionPane; import javax.swing.tree.TreePath; import org.apache.commons.logging.Log; @@ -89,8 +88,8 @@ // jaxx constructor don't call super() ? accountForm.setLocationRelativeTo(view); accountForm.setVisible(true); - accountForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); + // null == cancel action newAccount = accountForm.getAccount(); if (newAccount != null) { @@ -136,7 +135,6 @@ // jaxx constructor don't call super() ? subledgerForm.setLocationRelativeTo(view); subledgerForm.setVisible(true); - subledgerForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); newAccount=subledgerForm.getAccount(); // null == cancel action @@ -193,7 +191,6 @@ // jaxx constructor don't call super() ? accountForm.setLocationRelativeTo(view); accountForm.setVisible(true); - accountForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); // null == cancel action selectedObject = accountForm.getAccount(); } @@ -204,7 +201,6 @@ // jaxx constructor don't call super() ? subLedgerForm.setLocationRelativeTo(view); subLedgerForm.setVisible(true); - subLedgerForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); // null == cancel action selectedObject = subLedgerForm.getAccount(); } @@ -282,7 +278,6 @@ // form.setLocationRelativeTo(view); form.setVisible(true); - form.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); ImportExport importExport = ImportExport.getInstance(view); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/SubLedgerForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/SubLedgerForm.jaxx 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/SubLedgerForm.jaxx 2011-05-23 08:39:31 UTC (rev 3140) @@ -23,7 +23,9 @@ #L% --> -<JDialog modal="true"> +<JDialog modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="performCancel();"> <org.chorem.lima.entity.Account id="account" javaBean='null'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx 2011-05-23 08:39:31 UTC (rev 3140) @@ -22,7 +22,9 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog modal="true"> +<JDialog modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="performCancel();"> <org.chorem.lima.entity.EntryBook id="entryBook" javaBean="null" /> <Boolean id="addState" javaBean='true'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx 2011-05-23 08:39:31 UTC (rev 3140) @@ -23,7 +23,9 @@ #L% --> -<JDialog modal="true"> +<JDialog modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="performCancel();"> <jaxx.runtime.swing.JAXXButtonGroup id="radioButtons" javaBean='new JAXXButtonGroup()'/> <Boolean id="addState" javaBean='true'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2011-05-23 08:39:31 UTC (rev 3140) @@ -27,7 +27,6 @@ import static org.nuiton.i18n.I18n._; -import javax.swing.JDialog; import javax.swing.JOptionPane; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -79,7 +78,6 @@ // jaxx constructor don't call super() ? entryBookForm.setLocationRelativeTo(view); entryBookForm.setVisible(true); - entryBookForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); // null == cancel action newEntryBook = entryBookForm.getEntryBook(); @@ -113,7 +111,6 @@ // jaxx constructor don't call super() ? entryBookForm.setLocationRelativeTo(view); entryBookForm.setVisible(true); - entryBookForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); // null == cancel action selectedEntryBook = entryBookForm.getEntryBook(); @@ -164,7 +161,6 @@ new EntryBookImportForm(); form.setLocationRelativeTo(view); form.setVisible(true); - form.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); Object value = form.getRadioButtons().getSelectedValue(); // if action confirmed Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2011-05-23 08:39:31 UTC (rev 3140) @@ -27,7 +27,6 @@ import static org.nuiton.i18n.I18n._; -import javax.swing.JDialog; import javax.swing.JOptionPane; import javax.swing.tree.TreePath; import org.apache.commons.logging.Log; @@ -94,7 +93,6 @@ // jaxx constructor don't call super() ? financialStatementHeaderForm.setLocationRelativeTo(view); financialStatementHeaderForm.setVisible(true); - financialStatementHeaderForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); // null == cancel action newFinancialStatementHeader = financialStatementHeaderForm.getFinancialStatement(); @@ -143,7 +141,6 @@ // jaxx constructor don't call super() ? financialStatementMovementForm.setLocationRelativeTo(view); financialStatementMovementForm.setVisible(true); - financialStatementMovementForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); newFinancialStatementMovement=financialStatementMovementForm.getFinancialStatement(); // null == cancel action @@ -204,7 +201,6 @@ // jaxx constructor don't call super() ? financialStatementHeaderForm.setLocationRelativeTo(view); financialStatementHeaderForm.setVisible(true); - financialStatementHeaderForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); // null == cancel action financialStatement = financialStatementHeaderForm.getFinancialStatement(); } @@ -216,7 +212,6 @@ // jaxx constructor don't call super() ? financialStatementMovementForm.setLocationRelativeTo(view); financialStatementMovementForm.setVisible(true); - financialStatementMovementForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); // null == cancel action financialStatement = financialStatementMovementForm.getFinancialStatement(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx 2011-05-23 08:39:31 UTC (rev 3140) @@ -23,7 +23,9 @@ #L% --> -<JDialog modal="true"> +<JDialog modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="performCancel();"> <org.chorem.lima.entity.FinancialStatement id="financialStatement" javaBean='null'/> <Boolean id="addState" javaBean='true'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx 2011-05-23 08:39:31 UTC (rev 3140) @@ -23,7 +23,9 @@ #L% --> -<JDialog modal="true"> +<JDialog modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="performCancel();"> <jaxx.runtime.swing.JAXXButtonGroup id="radioButtons" javaBean='new JAXXButtonGroup()'/> <Boolean id="addState" javaBean='true'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx 2011-05-23 08:39:31 UTC (rev 3140) @@ -23,7 +23,9 @@ #L% --> -<JDialog modal="true"> +<JDialog modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="performCancel();"> <org.chorem.lima.entity.FinancialStatement id="financialStatement" javaBean='null'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx 2011-05-23 08:39:31 UTC (rev 3140) @@ -22,7 +22,9 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog modal="true"> +<JDialog modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="performCancel();"> <org.chorem.lima.ui.fiscalperiod.FiscalPeriodTableModel id="modelFiscalPeriodTable"/> <script> <
vsalaun＠users.chorem.org