branch develop updated (c636f00 -> dba70c6)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from c636f00 fixes #6868: [IMPORT GENERIQUE] Ne plus interferer avec le modèle de catégorisation de l'application lors de l'import générique Merge branch 'feature/6868' into develop new dba70c6 fixes #6869: Impossible de valider ou d'annuler un login pour la récupération de la base The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit dba70c60f0508f521c88ede02ec63c04aed5b1be Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 17:29:12 2015 +0100 fixes #6869: Impossible de valider ou d'annuler un login pour la récupération de la base Summary of changes: .../ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx | 6 +++- .../tutti/ui/swing/util/auth/LoginUIHandler.java | 40 ++++++++++++---------- 2 files changed, 27 insertions(+), 19 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit dba70c60f0508f521c88ede02ec63c04aed5b1be Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 17:29:12 2015 +0100 fixes #6869: Impossible de valider ou d'annuler un login pour la récupération de la base --- .../ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx | 6 +++- .../tutti/ui/swing/util/auth/LoginUIHandler.java | 40 ++++++++++++---------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx index bbfb4c3..feb5ca2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx @@ -19,13 +19,17 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog id='loginDialog' layout='{new BorderLayout()}'> +<JDialog id='loginDialog' layout='{new BorderLayout()}' + implements='fr.ifremer.tutti.ui.swing.util.TuttiUI<TuttiUIContext, LoginUIHandler>'> <import> fr.ifremer.tutti.ui.swing.TuttiUIContext + fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil </import> + <TuttiUIContext id='model' initializer='getContextValue(TuttiUIContext.class)'/> + <script><![CDATA[ public LoginUI(TuttiUIContext context) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java index 00bca41..205251f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java @@ -23,10 +23,12 @@ package fr.ifremer.tutti.ui.swing.util.auth; */ import fr.ifremer.tutti.ui.swing.TuttiUIContext; +import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.SwingUtil; -import jaxx.runtime.spi.UIHandler; +import jaxx.runtime.validator.swing.SwingValidator; +import javax.swing.JComponent; import java.awt.Container; import static org.nuiton.i18n.I18n.t; @@ -37,22 +39,34 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit <chemit@codelutin.com> * @since 3.1 */ -public class LoginUIHandler implements UIHandler<LoginUI> { - - protected LoginUI ui; +public class LoginUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, LoginUI> { protected AuthenticationInfo authenticationInfo; - protected TuttiUIContext context; + @Override + public void onCloseUI() { + + } + + @Override + public SwingValidator<TuttiUIContext> getValidator() { + return null; + } + + @Override + protected JComponent getComponentToFocus() { + return null; + } @Override public void beforeInit(LoginUI ui) { - this.ui = ui; - this.context = TuttiUIUtil.getApplicationContext(ui); + super.beforeInit(ui); + ui.setContextValue(TuttiUIUtil.getApplicationContext(ui)); } @Override public void afterInit(LoginUI ui) { + initUI(ui); } public LoginUI getUi() { @@ -66,23 +80,13 @@ public class LoginUIHandler implements UIHandler<LoginUI> { ui.getPasswordField().setText(authenticationInfo == null ? null : new String(authenticationInfo.getPassword())); ui.pack(); - Container parent = context.getMainUI(); + Container parent = ui.getModel().getMainUI(); if (parent != null) { SwingUtil.center(parent, ui); } ui.setVisible(true); } -// public void cancel() { -// ui.dispose(); -// } -// -// public void accept() { -// authenticationInfo = new AuthenticationInfo(ui.getLoginField().getText(), -// ui.getPasswordField().getPassword()); -// ui.dispose(); -// } - protected AuthenticationInfo getAuthenticationInfo() { return authenticationInfo; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm