- Jaxx-commits - mailman.cloud.codelutin.com

[Buix-commits] r597 - trunk/lutinui/src/main/java/org/codelutin/ui
by tchemit＠users.labs.libre-entreprise.org 19 Apr '08

19 Apr '08

Author: tchemit Date: 2008-04-19 18:31:55 +0000 (Sat, 19 Apr 2008) New Revision: 597 Modified: trunk/lutinui/src/main/java/org/codelutin/ui/UIHelper.java Log: javadoc Modified: trunk/lutinui/src/main/java/org/codelutin/ui/UIHelper.java =================================================================== --- trunk/lutinui/src/main/java/org/codelutin/ui/UIHelper.java 2008-04-19 18:31:23 UTC (rev 596) +++ trunk/lutinui/src/main/java/org/codelutin/ui/UIHelper.java 2008-04-19 18:31:55 UTC (rev 597) @@ -18,16 +18,20 @@ * ##% */ package org.codelutin.ui; +import javax.swing.AbstractAction; +import javax.swing.Action; import javax.swing.ImageIcon; +import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JRootPane; -import javax.swing.Action; -import javax.swing.AbstractAction; -import javax.swing.JComponent; import javax.swing.KeyStroke; import java.awt.event.ActionEvent; -/** @author tony */ +/** + * Ui helper class. + * + * @author tony + */ public class UIHelper { public static ImageIcon createImageIcon(String path) { @@ -35,7 +39,7 @@ if (imgURL != null) { return new ImageIcon(imgURL); } else { - throw new RuntimeException("could not find icon " + path); + throw new IllegalArgumentException("could not find icon " + path); } }

1 0

[Buix-commits] r596 - trunk/lutinui/src/main/java/org/codelutin/ui
by tchemit＠users.labs.libre-entreprise.org 19 Apr '08

19 Apr '08

Author: tchemit Date: 2008-04-19 18:31:23 +0000 (Sat, 19 Apr 2008) New Revision: 596 Modified: trunk/lutinui/src/main/java/org/codelutin/ui/DialogUI.java Log: log sur listener Modified: trunk/lutinui/src/main/java/org/codelutin/ui/DialogUI.java =================================================================== --- trunk/lutinui/src/main/java/org/codelutin/ui/DialogUI.java 2008-04-19 18:31:02 UTC (rev 595) +++ trunk/lutinui/src/main/java/org/codelutin/ui/DialogUI.java 2008-04-19 18:31:23 UTC (rev 596) @@ -14,6 +14,9 @@ */ package org.codelutin.ui; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import javax.swing.AbstractAction; import javax.swing.AbstractButton; import javax.swing.ImageIcon; @@ -30,6 +33,8 @@ */ public abstract class DialogUI<H extends DialogUIHandler> extends JDialog implements WindowListener { + protected static Log log = LogFactory.getLog(DialogUI.class); + private H handler; public abstract AbstractButton getHelp(); @@ -74,4 +79,20 @@ public void windowDeactivated(WindowEvent e) { } + + @Override + public synchronized void addWindowListener(WindowListener l) { + super.addWindowListener(l); + if (log.isDebugEnabled()) { + log.debug("after added (" + getWindowListeners().length + ") : " + l); + } + } + + @Override + public synchronized void removeWindowListener(WindowListener l) { + super.removeWindowListener(l); + if (log.isDebugEnabled()) { + log.debug("after removed (" + getWindowListeners().length + ") : " + l); + } + } } \ No newline at end of file

1 0

[Buix-commits] r595 - trunk/lutinui/src/main/resources
by tchemit＠users.labs.libre-entreprise.org 19 Apr '08

19 Apr '08

Author: tchemit Date: 2008-04-19 18:31:02 +0000 (Sat, 19 Apr 2008) New Revision: 595 Removed: trunk/lutinui/src/main/resources/META-INF/ Log: mise en place listener sur ui et factory

1 0

[Buix-commits] r594 - trunk/lutinui/src/main/java/org/codelutin/ui
by tchemit＠users.labs.libre-entreprise.org 19 Apr '08

19 Apr '08

Author: tchemit Date: 2008-04-19 18:30:46 +0000 (Sat, 19 Apr 2008) New Revision: 594 Added: trunk/lutinui/src/main/java/org/codelutin/ui/FactoryWindowListener.java Log: mise en place listener sur ui et factory Added: trunk/lutinui/src/main/java/org/codelutin/ui/FactoryWindowListener.java =================================================================== --- trunk/lutinui/src/main/java/org/codelutin/ui/FactoryWindowListener.java (rev 0) +++ trunk/lutinui/src/main/java/org/codelutin/ui/FactoryWindowListener.java 2008-04-19 18:30:46 UTC (rev 594) @@ -0,0 +1,86 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.ui; + +import static org.codelutin.ui.UIFactory.log; + +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; + +/** + * A windowListenr for ui managed by {@link org.codelutin.ui.UIFactory}. + * <p/> + * To be used when all ui from factory are closed, via {@link #allWindowsClosed(java.awt.event.WindowEvent)} method. + * + * @author chemit + */ +public abstract class FactoryWindowListener extends WindowAdapter { + + /** + * method to be invoked when all ui registred in factory are really disposed. + * + * @param e event + */ + public abstract void allWindowsClosed(WindowEvent e); + + /** underlying factory of ui */ + private UIFactory factory; + + /** flag to make sure {@link #allWindowsClosed(java.awt.event.WindowEvent)} is called only once. */ + private boolean wasClosed; + + @Override + public void windowClosed(WindowEvent e) { + if (log.isDebugEnabled()) { + log.debug(this + " : " + e); + } + if (e.getWindow().isVisible()) { + // only deal with real closed and none visible windows... + return; + } + for (DialogUIDef def : factory.getDefs()) { + DialogUI ui = def.uiInstance; + if (ui != null && ui.isVisible()) { + // at least one ui visible, do not close all + return; + } + } + + if (wasClosed) { + // make sure to process only once + return; + } + if (log.isInfoEnabled()) { + log.info("closing factory listener " + this); + } + + synchronized (this) { + try { + allWindowsClosed(e); + } finally { + wasClosed = true; + factory.removeFactoryWindowListener(this); + } + } + } + + protected UIFactory getFactory() { + return factory; + } + + protected void setFactory(UIFactory factory) { + this.factory = factory; + } +}

1 0

[Buix-commits] r593 - trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org 19 Apr '08

19 Apr '08

Author: tchemit Date: 2008-04-19 09:20:07 +0000 (Sat, 19 Apr 2008) New Revision: 593 Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/VCSUI.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/VCSUIFactory.java Log: continue generateSshKey ui Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/VCSUI.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/VCSUI.java 2008-04-19 09:19:22 UTC (rev 592) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/VCSUI.java 2008-04-19 09:20:07 UTC (rev 593) @@ -14,9 +14,9 @@ */ package org.codelutin.vcs.ui; -import org.codelutin.vcs.ui.util.ui.AbstractUI; import org.codelutin.vcs.ui.util.handler.AbstractUIHandler; import org.codelutin.vcs.ui.util.model.AbstractUIModel; +import org.codelutin.vcs.ui.util.ui.AbstractUI; /** * @author chemit @@ -30,7 +30,8 @@ diff(DiffUI.class, org.codelutin.vcs.ui.handler.DiffUIHandler.class), changelog(ChangelogUI.class, org.codelutin.vcs.ui.handler.ChangelogUIHandler.class), confirm(ConfirmUI.class, org.codelutin.vcs.ui.handler.ConfirmUIHandler.class), - config(ConfigUI.class, org.codelutin.vcs.ui.handler.ConfigUIHandler.class); + config(ConfigUI.class, org.codelutin.vcs.ui.handler.ConfigUIHandler.class), + generateSshKey(GenerateSshKeyUI.class, org.codelutin.vcs.ui.handler.GenerateSshKeyUIHandler.class); private final Class<? extends AbstractUI> uiClass; private final Class<? extends AbstractUIHandler> handlerClass; @@ -48,4 +49,13 @@ return uiClass; } + public static VCSUI valueOf(Class<AbstractUI> uiClass) { + for (VCSUI vcsui : values()) { + if (vcsui.getUiClass() == uiClass) { + return vcsui; + } + } + throw new IllegalStateException("could not find a UI for " + uiClass + ", availables : " + java.util.Arrays.toString(values())); + } + } Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/VCSUIFactory.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/VCSUIFactory.java 2008-04-19 09:19:22 UTC (rev 592) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/VCSUIFactory.java 2008-04-19 09:20:07 UTC (rev 593) @@ -76,6 +76,10 @@ return (ConfigUI) getInstance().newUI(VCSUI.config); } + public static GenerateSshKeyUI newGenerateSshKeyUI() { + return (GenerateSshKeyUI) getInstance().newUI(VCSUI.generateSshKey); + } + public void close() { if (cache != null) { cache.clear(); @@ -154,7 +158,7 @@ protected VCSUIFactory() { defaultWindowListener = new VCSWindowListener() { - protected void allWindowsClosed() { + protected void allWindowsClosed() { } protected void closeConnexion(VCSConnexion connexion) {

1 0

[Buix-commits] r592 - in trunk/lutinvcs/ui/jaxx/src/main: resources/i18n uimodel/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org 19 Apr '08

19 Apr '08

Author: tchemit Date: 2008-04-19 09:19:22 +0000 (Sat, 19 Apr 2008) New Revision: 592 Added: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxGenerateSshKeyUI.jaxx Modified: trunk/lutinvcs/ui/jaxx/src/main/resources/i18n/jaxx-en_GB.properties trunk/lutinvcs/ui/jaxx/src/main/resources/i18n/jaxx-fr_FR.properties trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxVCSUIProvider.java trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css Log: continue generateSshKey ui Modified: trunk/lutinvcs/ui/jaxx/src/main/resources/i18n/jaxx-en_GB.properties =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/resources/i18n/jaxx-en_GB.properties 2008-04-19 09:19:08 UTC (rev 591) +++ trunk/lutinvcs/ui/jaxx/src/main/resources/i18n/jaxx-en_GB.properties 2008-04-19 09:19:22 UTC (rev 592) @@ -4,8 +4,10 @@ lutinvcs.changelog.title=Changelog UI lutinvcs.commit.message=Please fill a message for your commit lutinvcs.config.anonymous= +lutinvcs.config.change.dir=Change dir lutinvcs.config.email= lutinvcs.config.firstname= +lutinvcs.config.generate=Generate lutinvcs.config.identiy= lutinvcs.config.lastname= lutinvcs.config.message= @@ -25,6 +27,8 @@ lutinvcs.config.title= lutinvcs.confirm.title=Confirm UI lutinvcs.diff.title=Diff UI +lutinvcs.generateSshKey.message=Generate +lutinvcs.generateSskKey.title=Generate ssh keys lutinvcs.no.config= lutinvcs.reset= lutinvcs.synch.title=Synch UI Modified: trunk/lutinvcs/ui/jaxx/src/main/resources/i18n/jaxx-fr_FR.properties =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/resources/i18n/jaxx-fr_FR.properties 2008-04-19 09:19:08 UTC (rev 591) +++ trunk/lutinvcs/ui/jaxx/src/main/resources/i18n/jaxx-fr_FR.properties 2008-04-19 09:19:22 UTC (rev 592) @@ -4,8 +4,10 @@ lutinvcs.changelog.title=Changelog UI lutinvcs.commit.message=Renseigner le message de publication lutinvcs.config.anonymous=anonyme +lutinvcs.config.change.dir=Changer le r\u00E9pertoire contenant les clef ssh g\u00E9n\u00E9r\u00E9es lutinvcs.config.email=Courriel lutinvcs.config.firstname=Pr\u00E9nom +lutinvcs.config.generate=G\u00E9n\u00E9rer lutinvcs.config.identiy=Identit\u00E9 lutinvcs.config.lastname=Nom lutinvcs.config.message=Configuration de la connexion @@ -25,6 +27,8 @@ lutinvcs.config.title=Config UI lutinvcs.confirm.title=Confirm UI lutinvcs.diff.title=Diff UI +lutinvcs.generateSshKey.message=G\u00E9n\u00E9rer +lutinvcs.generateSskKey.title=G\u00E9n\u00E9rer la paire de clef ssh lutinvcs.no.config=< Pas de configuration > lutinvcs.reset=R\u00E9initialiser lutinvcs.synch.title=Synch UI Copied: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxGenerateSshKeyUI.jaxx (from rev 540, trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI.jaxx) =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxGenerateSshKeyUI.jaxx (rev 0) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxGenerateSshKeyUI.jaxx 2008-04-19 09:19:22 UTC (rev 592) @@ -0,0 +1,102 @@ +<GenerateSshKeyUI title='lutinvcs.generateSskKey.title'> +  + <style source="config.css"/> + <script> + import static org.codelutin.vcs.ui.util.UIHelper.createActionIcon; + + public String getElementValue(Element element) { + JComponent o = getElement(element); + if (o instanceof JPasswordField) { + return Arrays.toString(((JPasswordField) o).getPassword()); + } + if (o instanceof JTextField) { + return ((JTextField) o).getText(); + } + if (o instanceof JRadioButton) { + return String.valueOf(((JRadioButton) o).isSelected()); + } + if (o instanceof JCheckBox) { + return String.valueOf(((JCheckBox) o).isSelected()); + } + return ""; + } + + public JLabel getElementLabel(Element element) { + return (JLabel) $objectMap.get(element.name() + "Label"); + } + + public JComponent getElement(Element element) { + return (JComponent) $objectMap.get(element.name()); + } + </script> + + <JToolBar id='top'> + <JLabel text='lutinvcs.generateSshKey.message'/> + <Table fill='both' insets='0,0,0,0'> + <row> + <cell fill='both'/> + </row> + </Table> + <JButton id='reset' onActionPerformed="reset()" icon='{createActionIcon("revert")}' borderPainted='false'/> + <JButton id='help' action='{createHelpAction()}' borderPainted='false'/> + </JToolBar> + <Table fill='both' insets="1,1,1,1"> + <row fill='horizontal'> + <cell columns="2" fill='both'> + <JScrollPane columnHeaderView='{top}' styleClass='connexionScroll'> + <Table id='sshPanel' opaque="false" insets='2,2,2,2'> + <row fill='horizontal'> + <cell> + <JLabel id='loginLabel'/> + </cell> + <cell> + <JTextField id='login' onKeyReleased="doCheck(Element.login)"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='passphraseLabel'/> + </cell> + <cell> + <JToolBar opaque='false' borderPainted='false' height="24"> + <JCheckBox id='noPassPhrase' onKeyReleased="doCheck(Element.nopassphrase)"/> + <JPasswordField id='passphrase' onKeyReleased="doCheck(Element.passphrase)" + enabled='{!noPassPhrase.isSelected()}'/> + </JToolBar> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='keyNameLabel'/> + </cell> + <cell> + <JTextField id='keyName' onKeyReleased="doCheck(Element.keyName)"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='dirLabel'/> + </cell> + <cell> + <JToolBar opaque='false' borderPainted='false' height="24"> + <JTextField id='dir' onKeyReleased="doCheck(Element.dir)"/> + <JButton id='changeDir' icon='{createActionIcon("filechooser")}' + onActionPerformed="changeDir()"/> + </JToolBar> + </cell> + </row> + </Table> + </JScrollPane> + </cell> + </row> + <row fill='horizontal'> + <cell weightx='1'> + <JButton id='generate' icon='{createActionIcon("generatekey")}' onActionPerformed="generateKey()"/> + </cell> + <cell weightx='1'> + <JButton id='cancel' onActionPerformed="dispose()"/> + </cell> + </row> + </Table> + +</GenerateSshKeyUI> Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxVCSUIProvider.java =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxVCSUIProvider.java 2008-04-19 09:19:08 UTC (rev 591) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxVCSUIProvider.java 2008-04-19 09:19:22 UTC (rev 592) @@ -18,6 +18,6 @@ public class JaxxVCSUIProvider extends VCSUIProvider { public JaxxVCSUIProvider() { - super("jaxx", JaxxSynchUI.class, JaxxDiffUI.class, JaxxChangelogUI.class,JaxxConfirmUI.class,JaxxConfigUI.class); + super("jaxx", JaxxSynchUI.class, JaxxDiffUI.class, JaxxChangelogUI.class,JaxxConfirmUI.class,JaxxConfigUI.class,JaxxGenerateSshKeyUI.class); } } \ No newline at end of file Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css 2008-04-19 09:19:08 UTC (rev 591) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css 2008-04-19 09:19:22 UTC (rev 592) @@ -78,6 +78,21 @@ margin:0; } +#changeDir { + toolTipText: "lutinvcs.config.change.dir"; + opaque:false; + borderPainted:false; + margin:0; +} + +#generate { + toolTipText: "lutinvcs.config.server.ssh.key.generate"; + text: "lutinvcs.config.generate"; + opaque:false; + borderPainted:false; + margin:0; +} + #generateKey { toolTipText: "lutinvcs.config.server.ssh.key.generate"; }

1 0

[Buix-commits] r591 - in trunk/lutinvcs/ui/common/src/main: java/org/codelutin/vcs/ui java/org/codelutin/vcs/ui/handler resources/i18n
by tchemit＠users.labs.libre-entreprise.org 19 Apr '08

19 Apr '08

Author: tchemit Date: 2008-04-19 09:19:08 +0000 (Sat, 19 Apr 2008) New Revision: 591 Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/GenerateSshKeyUI.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/GenerateSshKeyUIHandler.java trunk/lutinvcs/ui/common/src/main/resources/i18n/common-en_GB.properties trunk/lutinvcs/ui/common/src/main/resources/i18n/common-fr_FR.properties Log: continue generateSshKey ui Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/GenerateSshKeyUI.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/GenerateSshKeyUI.java 2008-04-19 09:18:35 UTC (rev 590) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/GenerateSshKeyUI.java 2008-04-19 09:19:08 UTC (rev 591) @@ -22,11 +22,9 @@ import javax.swing.AbstractButton; import javax.swing.JCheckBox; import javax.swing.JComponent; -import javax.swing.JEditorPane; import javax.swing.JLabel; import javax.swing.JPasswordField; import javax.swing.JTextField; -import java.io.File; /** @author chemit */ public abstract class GenerateSshKeyUI extends AbstractUI<GenerateSshKeyUIHandler> { @@ -45,8 +43,6 @@ public abstract JComponent getElement(Element element); - public abstract JEditorPane getDoc(); - public abstract JTextField getLogin(); public abstract JTextField getKeyName(); @@ -57,10 +53,8 @@ public abstract JTextField getDir(); - public abstract AbstractButton getGenerateKey(); + public abstract AbstractButton getGenerate(); - public abstract AbstractButton getOk(); - public abstract AbstractButton getReset(); public abstract AbstractButton getCancel(); @@ -81,31 +75,22 @@ getHandler().reset(); } - protected void save() { - getHandler().save(); - dispose(); - } - protected void doCheck(Element element) { getHandler().doCheck(element); } - protected void changeDirFile() { - //TODO add title in lutinutil :) - File file = FileUtil.getFile(".*.pub$", _("lutinvcs.config.find.public.key")); + protected void changeDir() { + String file = FileUtil.getDirectory(_("lutinvcs.config.find.ssh.dir"), _("lutinvcs.config.accept")); if (file != null) { - String path = file.getAbsolutePath(); - getDir().setText(path.substring(0, path.length() - 4)); + getDir().setText(file); doCheck(Element.dir); } } protected void generateKey() { - //TODO + getHandler().generateKey(); + dispose(); } - protected void testConnexion() { - //TODO - } } \ No newline at end of file Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/GenerateSshKeyUIHandler.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/GenerateSshKeyUIHandler.java 2008-04-19 09:18:35 UTC (rev 590) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/handler/GenerateSshKeyUIHandler.java 2008-04-19 09:19:08 UTC (rev 591) @@ -69,7 +69,7 @@ if (ConfigUIModel.MODIFIED_PROPERTY_CHANGED.equals(action)) { Boolean newValue = (Boolean) evt.getNewValue(); getUi().getReset().setEnabled(newValue != null && newValue); - getUi().getGenerateKey().setEnabled(isConfigValid()); + getUi().getGenerate().setEnabled(isConfigValid()); return; } throw new IllegalStateException("unimplemented property changed : " + evt + " for " + this); @@ -161,19 +161,15 @@ protected void populateUI(GenerateSshKeyUIModel model) { GenerateSshKeyUI ui = getUi(); - ui.getLogin().setText(model.getLogin()); ui.getNoPassPhrase().setSelected(model.isNoPassPhrase()); ui.getDir().setText(model.getDir() == null ? "" : model.getDir().getAbsolutePath()); ui.getPassphrase().setText(model.getPassphrase() == null ? "" : model.getPassphrase()); - } protected void updateUI(List<Element> errors) { GenerateSshKeyUI ui = getUi(); - boolean valid = isConfigValid(); - ui.getOk().setEnabled(valid && getModel().isModified()); - ui.getGenerateKey().setEnabled(isConfigValid()); + ui.getGenerate().setEnabled(isConfigValid()); for (Element element : values()) { setLabelColor(errors, element); } @@ -208,4 +204,9 @@ log.info("save " + element); } } + + public void generateKey() { + save(); + log.info("TODO "+this); + } } \ No newline at end of file Modified: trunk/lutinvcs/ui/common/src/main/resources/i18n/common-en_GB.properties =================================================================== --- trunk/lutinvcs/ui/common/src/main/resources/i18n/common-en_GB.properties 2008-04-19 09:18:35 UTC (rev 590) +++ trunk/lutinvcs/ui/common/src/main/resources/i18n/common-en_GB.properties 2008-04-19 09:19:08 UTC (rev 591) @@ -17,7 +17,9 @@ lutinvcs.action.showconfig.tip= lutinvcs.action.showmessages.tip=show previous commit messages lutinvcs.action.single.tip=Launch action ''{0}'' on selected file ''{1}'' +lutinvcs.config.accept=Accept lutinvcs.config.find.public.key=Public ssh key (*.pub) associated with the required private key +lutinvcs.config.find.ssh.dir=Change container dir of shh keys lutinvcs.file=File lutinvcs.module=Module lutinvcs.status=Status Modified: trunk/lutinvcs/ui/common/src/main/resources/i18n/common-fr_FR.properties =================================================================== --- trunk/lutinvcs/ui/common/src/main/resources/i18n/common-fr_FR.properties 2008-04-19 09:18:35 UTC (rev 590) +++ trunk/lutinvcs/ui/common/src/main/resources/i18n/common-fr_FR.properties 2008-04-19 09:19:08 UTC (rev 591) @@ -17,7 +17,9 @@ lutinvcs.action.showconfig.tip=Modifier la configuration vcs lutinvcs.action.showmessages.tip=voir les messages de publication pr\u00E9c\u00E9dents lutinvcs.action.single.tip=ex\u00E9cuter l''action ''{0}'' sur le fichier s\u00E9l\u00E9ctionn\u00E9 ''{1}'' +lutinvcs.config.accept=Accepter lutinvcs.config.find.public.key=Clef publique ssh (*.pub) associ\u00E9e \u00E0 la clef priv\u00E9e +lutinvcs.config.find.ssh.dir=Changer le r\u00E9pertoire contenant la paire de clef ssh g\u00E9n\u00E9r\u00E9 lutinvcs.file=Fichier lutinvcs.module=Module lutinvcs.status=Status

1 0

[Buix-commits] r590 - trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org 19 Apr '08

19 Apr '08

Author: tchemit Date: 2008-04-19 09:18:35 +0000 (Sat, 19 Apr 2008) New Revision: 590 Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/VCSInitializer.java Log: supression de l'h?\195?\169ritage Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/VCSInitializer.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/VCSInitializer.java 2008-04-19 09:16:28 UTC (rev 589) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/VCSInitializer.java 2008-04-19 09:18:35 UTC (rev 590) @@ -18,11 +18,9 @@ import static jaxx.tags.TagManager.registerBean; import static jaxx.tags.TagManager.registerDefaultNamespace; -public class VCSInitializer extends jaxx.tags.swing.SwingInitializer implements jaxx.spi.Initializer { +public class VCSInitializer implements jaxx.spi.Initializer { - @Override public void initialize() { - super.initialize(); registerBean(getClassDescriptor(javax.swing.JMenuItem.class), jaxx.tags.swing.JRadioButtonHandler.class); for (VCSUI vcsui : VCSUI.values()) { Class<?> uiClass = vcsui.getUiClass();

1 0

[Buix-commits] r589 - in trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util: . handler model ui
by tchemit＠users.labs.libre-entreprise.org 19 Apr '08

19 Apr '08

Author: tchemit Date: 2008-04-19 09:16:28 +0000 (Sat, 19 Apr 2008) New Revision: 589 Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/UIHelper.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractUIHandler.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/model/AbstractUIModel.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractUI.java Log: use lutinui generic ui objects Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/UIHelper.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/UIHelper.java 2008-04-19 08:59:07 UTC (rev 588) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/UIHelper.java 2008-04-19 09:16:28 UTC (rev 589) @@ -19,17 +19,10 @@ import org.codelutin.vcs.type.VCSEntryLocation; import org.codelutin.vcs.type.VCSState; -import javax.swing.AbstractAction; -import javax.swing.Action; import javax.swing.ImageIcon; -import javax.swing.JComponent; -import javax.swing.JDialog; -import javax.swing.JRootPane; import javax.swing.JTable; -import javax.swing.KeyStroke; import javax.swing.ListSelectionModel; import java.awt.Color; -import java.awt.event.ActionEvent; import java.util.EnumMap; import java.util.EnumSet; @@ -41,25 +34,6 @@ public class UIHelper { /** - * Attach to <code>ui</code> an abort action,accessible by <code>ESC</code> key. - * - * @param ui ui - */ - public static void setQuitAction(final JDialog ui) { - JRootPane rootPane = ui.getRootPane(); - - Action quitAction = new AbstractAction("quit") { - private static final long serialVersionUID = -869095664995763057L; - - public void actionPerformed(ActionEvent e) { - ui.dispose(); - } - }; - rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "quit"); - rootPane.getActionMap().put("quit", quitAction); - } - - /** * Prepare an table of VCSEntries. * * @param table table @@ -131,7 +105,7 @@ } public static ImageIcon createActionIcon(String name) { - return jaxx.runtime.UIHelper.createImageIcon("action-" + name + ".png"); + return org.codelutin.ui.UIHelper.createImageIcon("action-" + name + ".png"); } public static ImageIcon createActionIcon(VCSAction location) { @@ -139,6 +113,6 @@ } public static ImageIcon createLocationIcon(VCSEntryLocation location) { - return jaxx.runtime.UIHelper.createImageIcon("location-" + location.name().toLowerCase() + ".png"); + return org.codelutin.ui.UIHelper.createImageIcon("location-" + location.name().toLowerCase() + ".png"); } } Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractUIHandler.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractUIHandler.java 2008-04-19 08:59:07 UTC (rev 588) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractUIHandler.java 2008-04-19 09:16:28 UTC (rev 589) @@ -14,22 +14,22 @@ */ package org.codelutin.vcs.ui.util.handler; +import org.codelutin.vcs.VCSConnexionConfig; import org.codelutin.vcs.ui.util.model.AbstractUIModel; import org.codelutin.vcs.ui.util.ui.AbstractUI; -import org.codelutin.vcs.VCSConnexionConfig; /** - * TODO Move this classe in jaxx + * Base ui handler to be used in vcs project. * * @author chemit */ -public abstract class AbstractUIHandler<M extends AbstractUIModel, U extends AbstractUI<? extends AbstractUIHandler>> extends jaxx.DialogUIHandler<M, U> { +public abstract class AbstractUIHandler<M extends AbstractUIModel, U extends AbstractUI<? extends AbstractUIHandler>> extends org.codelutin.ui.DialogUIHandler<M, U> { private VCSConnexionConfig config; - protected AbstractUIHandler(U ui, M model,VCSConnexionConfig config) { + protected AbstractUIHandler(U ui, M model, VCSConnexionConfig config) { super(ui, model); - this.config=config; + this.config = config; } public VCSConnexionConfig getConfig() { Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/model/AbstractUIModel.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/model/AbstractUIModel.java 2008-04-19 08:59:07 UTC (rev 588) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/model/AbstractUIModel.java 2008-04-19 09:16:28 UTC (rev 589) @@ -14,14 +14,11 @@ */ package org.codelutin.vcs.ui.util.model; -import jaxx.DialogUIModel; - /** - * TODO Move this classe in jaxx - * Abstract ui model, with property change support. + * Base ui model tobe used in vcs project * * @author chemit */ -public abstract class AbstractUIModel extends DialogUIModel { +public abstract class AbstractUIModel extends org.codelutin.ui.DialogUIModel { } Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractUI.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractUI.java 2008-04-19 08:59:07 UTC (rev 588) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractUI.java 2008-04-19 09:16:28 UTC (rev 589) @@ -17,13 +17,11 @@ import org.codelutin.vcs.ui.util.handler.AbstractUIHandler; /** - * A abstract dialog contract to be realised by a dialog - * <p/> - * TODO : make jaxx authorized implementing interface for root tag :) + * The base dialog to be used in vcs project * * @author chemit */ -public abstract class AbstractUI<H extends AbstractUIHandler> extends jaxx.DialogUI<H> { +public abstract class AbstractUI<H extends AbstractUIHandler> extends org.codelutin.ui.DialogUI<H> { protected javax.swing.AbstractAction createHelpAction() { return org.codelutin.vcs.ui.action.HelpAction.createAction(this);

1 0

[Buix-commits] r588 - trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org 19 Apr '08

19 Apr '08

Author: tchemit Date: 2008-04-19 08:59:07 +0000 (Sat, 19 Apr 2008) New Revision: 588 Removed: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/diff/ Log: del unused

1 0