This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 88f73ad1247ed4b327dd1afdc67f44978c93d1a4 Author: jcouteau <couteau@codelutin.com> Date: Mon Nov 9 14:45:26 2020 +0100 Clean code --- .../ui/swing/content/demande/DemandeUIHandler.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java index 219aa4cc..b7e78a08 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java @@ -40,10 +40,8 @@ import com.franciaflex.faxtomail.ui.swing.content.demande.actions.SaveDemandeAct import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailBeanUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; -import com.franciaflex.faxtomail.ui.swing.util.JImagePanel; import com.google.common.collect.Sets; import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; @@ -66,18 +64,13 @@ import org.nuiton.jaxx.application.swing.util.CloseableUI; import org.nuiton.util.beans.BeanMonitor; import javax.swing.*; -import javax.swing.event.AncestorEvent; -import javax.swing.event.AncestorListener; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.table.TableCellEditor; import java.awt.*; import java.awt.event.ActionEvent; -import java.awt.event.ComponentEvent; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; -import java.awt.image.BufferedImage; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.IOException; @@ -85,7 +78,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.Comparator; import java.util.Date; import java.util.List; import java.util.Map; @@ -490,14 +482,9 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, if (log.isDebugEnabled()) { log.debug("closing: " + ui); } - try (FaxToMailServiceContext serviceContext = getContext().newServiceContext()) { DemandeUIModel model = getModel(); - /*if (model.isEditable()) { - serviceContext.getEmailService().unlockEmail(model.getTopiaId()); - }*/ - model.removePropertyChangeListener(listModelListener); model.removePropertyChangeListener(Email.PROPERTY_DEMAND_TYPE, demandTypeListener); for (RangeRowModel row : model.getValidRangeRowModels()) { @@ -510,9 +497,6 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, ui.getDemandRepliesButton().onCloseUI(); clearValidators(); - } catch (IOException eee) { - log.error("Error closing UI", eee); - } } public void closeButtonPopups() { @@ -537,7 +521,7 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, askCancelEditBeforeLeavingMessage = n("faxtomail.demande.askCancelEditBeforeLeaving.cancelSave.noHelp"); askSaveBeforeLeavingMessage = n("faxtomail.demande.askSaveBeforeLeaving.save.noHelp"); } - Boolean result = quitScreen2( + boolean result = quitScreen2( true, getModel().isModify(), t(askCancelEditBeforeLeavingMessage), -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.