This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 42eed45d8d7a8c3ed751016a1bc6d9ba394bc759 Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 18:21:13 2015 +0200 déplacmeent du widget de validation de la main ui vers l'ui des demandes --- .../ui/swing/actions/ShowDemandeAction.java | 2 +- .../faxtomail/ui/swing/content/MainUI.css | 4 -- .../faxtomail/ui/swing/content/MainUI.jaxx | 3 -- .../faxtomail/ui/swing/content/MainUIHandler.java | 11 ---- .../content/demande/DemandeListUIHandler.java | 1 - .../ui/swing/content/demande/DemandeUIHandler.java | 21 ++++++-- .../ui/swing/content/demande/DemandesUI.css | 10 ++++ .../ui/swing/content/demande/DemandesUI.jaxx | 63 +++++++++++++--------- .../swing/content/demande/DemandesUIHandler.java | 19 +++++-- .../ui/swing/content/search/SearchUIHandler.java | 1 - .../ui/swing/util/AbstractFaxToMailUIHandler.java | 39 -------------- 11 files changed, 82 insertions(+), 92 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java index cd7ea57..7351c80 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java @@ -194,7 +194,7 @@ public class ShowDemandeAction extends AbstractMainUIFaxToMailAction { final DemandesUI screenUI = new DemandesUI(getUI()); String screenTitle = t("faxtomail.demand.title"); ImageIcon icon = JAXXWidgetUtil.createActionIcon("email-group"); - screenUI.setLeftDecoration(new JLabel(icon)); + screenUI.getDemandsPanel().setLeftDecoration(new JLabel(icon)); frame = getHandler().openFrame(screenUI, screenTitle, new Dimension(800, 600)); getContext().setFrameForDemande(currentEmail, frame); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css index af413bd..c255400 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css @@ -76,10 +76,6 @@ JSeparator { borderPainted: false; } -#validatorMessageWidget { - focusPainted: false; -} - #status { showClock: false; showMemoryStatus: true; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx index 83219c6..554d377 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx @@ -29,8 +29,6 @@ com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil com.franciaflex.faxtomail.ui.swing.actions.* - jaxx.runtime.validator.swing.SwingValidatorMessageWidget - org.jdesktop.swingx.JXTitledPanel javax.swing.Box @@ -56,7 +54,6 @@ </JToolBar> <JToolBar id='bottomBar'> - <SwingValidatorMessageWidget id='validatorMessageWidget'/> <JButton id='aboutButton'/> </JToolBar> diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java index 7eac0ff..2035969 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java @@ -270,15 +270,6 @@ public class MainUIHandler extends AbstractFaxToMailUIHandler<FaxToMailUIContext ui.getStatus().setStatus("<html><body>" + message + "</body></html>"); } - public void registerValidator(SwingValidator validator) { - ui.getValidatorMessageWidget().registerValidator(validator); - } - - @Override - public void clearValidators() { - ui.getValidatorMessageWidget().clearValidators(); - } - public boolean quitCurrentScreen() { boolean canClose; @@ -340,7 +331,6 @@ public class MainUIHandler extends AbstractFaxToMailUIHandler<FaxToMailUIContext JComponent screenUI; JToolBar rightDecoration = null; String screenTitle; - boolean validatorWidgetEnabled = false; Icon icon; switch (screen) { @@ -386,7 +376,6 @@ public class MainUIHandler extends AbstractFaxToMailUIHandler<FaxToMailUIContext ui.getBody().setLeftDecoration(new JLabel(icon)); ui.getBody().setRightDecoration(rightDecoration); ui.getBody().add(currentBody); - ui.getValidatorMessageWidget().setEnabled(validatorWidgetEnabled); } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java index 1b9ee0f..4480f48 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java @@ -639,7 +639,6 @@ public class DemandeListUIHandler extends AbstractFaxToMailDemandListHandler<Dem getContext().removePropertyChangeListener(FaxToMailUIContext.PROPERTY_ACTION_IN_PROGRESS, actionInProgressListener); - clearValidators(); } @Override 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 210a838..d37c69d 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 @@ -35,11 +35,12 @@ import com.franciaflex.faxtomail.persistence.entities.Range; import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; -import com.franciaflex.faxtomail.ui.swing.content.demande.actions.SaveDemandeAction; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentListener; +import com.franciaflex.faxtomail.ui.swing.content.demande.actions.SaveDemandeAction; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.google.common.collect.Sets; +import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -362,8 +363,6 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, // if new fishingOperation can already cancel his creation model.setModify(false); - registerValidators(validator); - ui.getAttachmentsButton().getBean().addAttachmentListener( new AttachmentListener() { @@ -564,6 +563,7 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, @Override public void onShowTab(int currentIndex, int newIndex) { + registerValidators(getValidator()); } @Override @@ -579,4 +579,19 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, JButton button = (JButton) event.getSource(); getUI().getMatchingClientsPopup().show(button, 0, button.getBounds().height); } + + protected void registerValidators(SwingValidator... validators) { + DemandesUI demandesUI = JAXXWidgetUtil.getParent(getUI(), DemandesUI.class); + DemandesUIHandler handler = demandesUI.getHandler(); + handler.clearValidators(); + for (SwingValidator validator : validators) { + handler.registerValidator(validator); + } + } + + protected void clearValidators() { + DemandesUI demandesUI = JAXXWidgetUtil.getParent(getUI(), DemandesUI.class); + DemandesUIHandler handler = demandesUI.getHandler(); + handler.clearValidators(); + } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css index 5feb326..317e2e0 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css @@ -73,3 +73,13 @@ actionIcon: group; enabled: { model.isGroupEnabled() }; } + +#bottomToolBar { + floatable: false; + margin: {new java.awt.Insets(0, 0, 0, 5)}; + borderPainted: false; +} + +#validatorMessageWidget { + focusPainted: false; +} \ No newline at end of file diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx index af11030..0e61050 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx @@ -21,10 +21,9 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<org.jdesktop.swingx.JXTitledPanel - id='demandsPanel' decorator='boxed' - implements='com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI<DemandesUIModel, DemandesUIHandler>' - onAncestorAdded="handler.showDemandGroupHighlightDialog()"> +<JPanel layout="{ new BorderLayout() }" + implements='com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI<DemandesUIModel, DemandesUIHandler>' + onAncestorAdded="handler.showDemandGroupHighlightDialog()"> <import> com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext @@ -32,6 +31,10 @@ com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup.ButtonEmailGroup com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup.DemandGroupHighlightDialog + + jaxx.runtime.validator.swing.SwingValidatorMessageWidget + + org.jdesktop.swingx.JXTitledPanel </import> <script><![CDATA[ @@ -45,31 +48,43 @@ <DemandesUIModel id='model' initializer='getContextValue(DemandesUIModel.class)'/> - <JToolBar id='topToolBar'> - <ButtonEmailGroup id="demandGroupButton"/> - </JToolBar> - <JPanel layout="{ new BorderLayout() }"> + <JXTitledPanel id='demandsPanel' + decorator='boxed' + constraints="BorderLayout.CENTER"> - <JTabbedPane id="demandsTabPane" constraints="BorderLayout.CENTER"> - <!--<tab id="mainDemandTab">--> - <!--<DemandeUI id="mainDemand" constructorParams="this"/>--> - <!--</tab>--> - </JTabbedPane> + <JToolBar id='topToolBar'> + <ButtonEmailGroup id="demandGroupButton"/> + </JToolBar> + + <JPanel layout="{ new BorderLayout() }"> + + <JTabbedPane id="demandsTabPane" constraints="BorderLayout.CENTER"> + <!--<tab id="mainDemandTab">--> + <!--<DemandeUI id="mainDemand" constructorParams="this"/>--> + <!--</tab>--> + </JTabbedPane> + + <JPanel layout='{new GridLayout(1,0)}' + constraints='BorderLayout.SOUTH'> + <JButton id="backButton" onActionPerformed="handler.closeFrame()"/> + <JButton id="saveButton" onActionPerformed="handler.save()"/> + <JButton id="transmitButton" onActionPerformed="handler.transmitDemande()"/> + <JButton id="printButton" onActionPerformed="handler.print()"/> + <JButton id="archiveButton" onActionPerformed="handler.archive()"/> + <JButton id="replyButton" onActionPerformed="handler.reply()"/> + <JButton id="groupButton" onActionPerformed="handler.group()"/> + </JPanel> - <JPanel layout='{new GridLayout(1,0)}' - constraints='BorderLayout.SOUTH'> - <JButton id="backButton" onActionPerformed="handler.closeFrame()"/> - <JButton id="saveButton" onActionPerformed="handler.save()"/> - <JButton id="transmitButton" onActionPerformed="handler.transmitDemande()"/> - <JButton id="printButton" onActionPerformed="handler.print()"/> - <JButton id="archiveButton" onActionPerformed="handler.archive()"/> - <JButton id="replyButton" onActionPerformed="handler.reply()"/> - <JButton id="groupButton" onActionPerformed="handler.group()"/> </JPanel> - </JPanel> + </JXTitledPanel> + + <JToolBar id='bottomToolBar' + constraints='BorderLayout.SOUTH'> + <SwingValidatorMessageWidget id='validatorMessageWidget'/> + </JToolBar> <DemandGroupHighlightDialog id="demandGroupHighlightDialog" constructorParams="getHandler().getContext(), demandGroupButton"/> -</org.jdesktop.swingx.JXTitledPanel> +</JPanel> diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java index ddf701f..fdebab4 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java @@ -312,19 +312,28 @@ public class DemandesUIHandler extends AbstractFaxToMailUIHandler<DemandesUIMode if (handler != null) { change = handler.onHideTab(currentIndex, newIndex); } - - handler = getTabHandler(newIndex); - if (handler != null) { - handler.onShowTab(currentIndex, newIndex); - } } if (change) { getModel().setCurrentIndex(newIndex); getContext().setCurrentEmail(getModel().getCurrentDemand()); + + TabHandler handler = getTabHandler(newIndex); + if (handler != null) { + handler.onShowTab(currentIndex, newIndex); + } + } return change; } + public void registerValidator(SwingValidator validator) { + ui.getValidatorMessageWidget().registerValidator(validator); + } + + public void clearValidators() { + ui.getValidatorMessageWidget().clearValidators(); + } + public void closeButtonPopups() { getUI().getDemandGroupHighlightDialog().setVisible(false); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java index cd985f9..c5b91a3 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java @@ -302,7 +302,6 @@ public class SearchUIHandler extends AbstractFaxToMailDemandListHandler<SearchUI if (log.isDebugEnabled()) { log.debug("closing: " + ui); } - clearValidators(); } @Override diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java index 658b300..37cf2be 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java @@ -31,8 +31,6 @@ import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.DecoratorService; import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; -import com.franciaflex.faxtomail.ui.swing.content.MainUI; -import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -40,7 +38,6 @@ import com.google.common.collect.Sets; import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.bean.BeanUIUtil; -import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.autocomplete.ComboBoxCellEditor; @@ -58,8 +55,6 @@ import org.nuiton.util.beans.BeanUtil; import org.nuiton.validator.bean.simple.SimpleBeanValidator; import javax.swing.*; -import javax.swing.event.TableModelEvent; -import javax.swing.event.TableModelListener; import javax.swing.table.TableColumnModel; import javax.swing.text.JTextComponent; import java.awt.*; @@ -126,14 +121,6 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> return getContext().getMainUI(); } - public void clearValidators() { - MainUI main = getContext().getMainUI(); - Preconditions.checkNotNull( - main, "No mainUI registred in application context"); - MainUIHandler handler = main.getHandler(); - handler.clearValidators(); - } - @Override public <O> Decorator<O> getDecorator(Class<O> type, String name) { DecoratorService decoratorService = getContext().newServiceContext().getDecoratorService(); @@ -174,17 +161,6 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> //-- Internal methods --// //------------------------------------------------------------------------// - protected void registerValidators(SwingValidator... validators) { - MainUI main = getContext().getMainUI(); - Preconditions.checkNotNull( - main, "No mainUI registred in application context"); - MainUIHandler handler = main.getHandler(); - handler.clearValidators(); - for (SwingValidator validator : validators) { - handler.registerValidator(validator); - } - } - protected void listenValidatorValid(SimpleBeanValidator validator, final AbstractFaxToMailBeanUIModel model) { validator.addPropertyChangeListener(SimpleBeanValidator.VALID_PROPERTY, new PropertyChangeListener() { @@ -200,21 +176,6 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> }); } - protected void listenValidationTableHasNoFatalError(final SimpleBeanValidator validator, - final AbstractFaxToMailBeanUIModel model) { - getContext().getMainUI().getValidatorMessageWidget().addTableModelListener(new TableModelListener() { - @Override - public void tableChanged(TableModelEvent e) { - boolean valid = !validator.hasFatalErrors(); - if (log.isDebugEnabled()) { - log.debug("Model [" + model + - "] pass to valid state [" + valid + "]"); - } - model.setValid(valid); - } - }); - } - protected void listModelIsModify(AbstractFaxToMailBeanUIModel model) { model.addPropertyChangeListener(listModelListener); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.