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