From tchemit@users.labs.libre-entreprise.org Tue Apr 15 10:46:45 2008
From: tchemit@users.labs.libre-entreprise.org
To: buix-commits@list.nuiton.org
Subject: [Buix-commits] r521 -
	trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui
Date: Tue, 15 Apr 2008 10:46:45 +0200
Message-ID: <20080415084645.62BD6461AF8@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4646089711871075912=="

--===============4646089711871075912==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: tchemit
Date: 2008-04-15 08:46:45 +0000 (Tue, 15 Apr 2008)
New Revision: 521

Added:
   trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSGenerateS=
shKey.jaxx
   trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI.=
jaxx
   trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css
Modified:
   trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxSynchUI.j=
axx
   trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxVCSUIProv=
ider.java
Log:
mise en place ui de config

Added: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSGener=
ateSshKey.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSGenerate=
SshKey.jaxx	                        (rev 0)
+++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSGenerate=
SshKey.jaxx	2008-04-15 08:46:45 UTC (rev 521)
@@ -0,0 +1,148 @@
+<JDialog title=3D'isisfish.server.ssh.generateKey.title' modal=3D'true'>
+    <script>
+        import org.apache.commons.logging.Log;
+        import org.apache.commons.logging.LogFactory;
+
+        import java.io.File;
+        import java.io.IOException;
+        import java.util.ArrayList;
+        import java.util.Arrays;
+        import java.util.HashMap;
+        import java.util.Map;
+
+        static protected final Log log =3D LogFactory.getLog(JVCSGenerateSsh=
Key.class);
+
+        private static JVCSGenerateSshKey instance;
+
+        public static JVCSGenerateSshKey getInstance(JDialog parent) {
+        if (instance =3D=3D null) {
+        instance =3D new JVCSGenerateSshKey(parent);
+        }
+        return instance;
+        }
+
+        /*import com.sshtools.j2ssh.transport.publickey.OpenSSHPublicKeyForm=
at;
+        import com.sshtools.j2ssh.transport.publickey.SshKeyGenerator;
+        import org.codelutin.util.FileUtil;*/
+
+        public boolean cancel;
+        public boolean noPassPhrase;
+        public Exception error;
+        protected boolean invalidPassPhrase;
+        protected String vcsLogin;
+
+        private JVCSGenerateSshKey(JDialog instance) {
+        super(instance);
+        // block close operation
+        setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
+        }
+
+        public void setData(String vcsLogin, File privateKeyFile) {
+        this.vcsLogin =3D vcsLogin ;
+        serverPrivateKeyFile.setText(privateKeyFile.getAbsolutePath());
+        serverPublicKeyFile.setText(privateKeyFile.getAbsolutePath() + ".pub=
");
+        noPassPhrase=3Dtrue;
+        error=3Dnull;
+        doCheck();
+        }
+
+        protected boolean doGenerate() {
+        /*File f =3D new File(getServerPrivateKeyFile().getText());
+        try {
+        SshKeyGenerator sshkeygenerator =3D new SshKeyGenerator();
+        char[] password =3D getServerPassPhrase().getPassword();
+        noPassPhrase=3Dpassword.length=3D=3D0;
+        if (password.length > 0) {
+        sshkeygenerator.generateKeyPair("dsa", 1024, f.getAbsolutePath(), vc=
sLogin, Arrays.toString(password));
+        Arrays.fill(password, '0');
+        } else {
+        sshkeygenerator.generateKeyPair("dsa", 1024, f.getAbsolutePath(), vc=
sLogin, "");
+        }
+        // convert to openSSH ?
+        File publicKeyFile =3D new File(serverPublicKeyFile.getText());
+        log.info("public key before OpenSsh : "+ FileUtil.readAsString(publi=
cKeyFile));
+        String openSshPublicKey =3D SshKeyGenerator.convertPublicKeyFile(pub=
licKeyFile, new
+        OpenSSHPublicKeyFormat(vcsLogin + "@forIsisFish 1024-bit dsa"));
+        log.info("public key OpenSsh : "+openSshPublicKey);
+        FileUtil.writeString(publicKeyFile, openSshPublicKey);
+        } catch (Exception e) {
+        error=3De;
+        return true;
+        }*/
+        return false;
+        }
+        protected boolean check() {
+        invalidPassPhrase=3D!Arrays.equals(serverPassPhrase.getPassword(),se=
rverConfirmPassPhrase.getPassword());
+        return !invalidPassPhrase;
+        }
+
+        protected void doCheck() {
+        ok.setEnabled(check());
+        setColor(invalidPassPhrase, serverPassPhraseLabel);
+        setColor(invalidPassPhrase, serverConfirmPassPhraseLabel);
+        }
+
+        protected void setColor(boolean invalid, JComponent component) {
+        component.setForeground(invalid ? Color.red: Color.black);
+        }
+    </script>
+    <Table>
+        <row fill=3D'horizontal'>
+            <cell>
+                <JToolBar id=3D'top'>
+                    <JLabel id=3D"actionLabel"/>
+                    <Table fill=3D'both' insets=3D'0,0,0,0'>
+                        <row>
+                            <cell fill=3D'both'/>
+                        </row>
+                    </Table>
+                    <!--JSeparator orientation=3D"vertical"/-->
+                    <JButton id=3D'help'/>
+                    <!--JButton id=3D'help' action=3D'{createHelpAction()}'/=
-->
+                </JToolBar>
+
+            </cell>
+        </row>
+        <row fill=3D'horizontal'>
+            <cell>
+                <JLabel text=3D'lutinvcs.config.server.ssh.privateKeyFile'/>
+            </cell>
+            <cell>
+                <JTextField id=3D'serverPrivateKeyFile' font-size=3D'12' edi=
table=3D'false' columns=3D'28' height=3D'25'/>
+            </cell>
+        </row>
+        <row fill=3D'horizontal'>
+            <cell>
+                <JLabel text=3D'lutinvcs.config.server.ssh.publicKeyFile'/>
+            </cell>
+            <cell>
+                <JTextField id=3D'serverPublicKeyFile' font-size=3D'12' edit=
able=3D'false' columns=3D'28' height=3D'25'/>
+            </cell>
+        </row>
+        <row fill=3D'horizontal'>
+            <cell>
+                <JLabel id=3D'serverPassPhraseLabel' text=3D'lutinvcs.config=
.server.ssh.passphrase'/>
+            </cell>
+            <cell>
+                <JPasswordField id=3D'serverPassPhrase' onKeyReleased=3D"doC=
heck()"/>
+            </cell>
+        </row>
+        <row fill=3D'horizontal'>
+            <cell>
+                <JLabel id=3D'serverConfirmPassPhraseLabel' text=3D'lutinvcs=
.config.server.ssh.confirm.passphrase'/>
+            </cell>
+            <cell>
+                <JPasswordField id=3D'serverConfirmPassPhrase' onKeyReleased=
=3D"doCheck()"/>
+            </cell>
+        </row>
+        <row fill=3D'horizontal'>
+            <cell columns=3D"2">
+                <JPanel layout=3D'{new GridLayout(0, 2, 2, 2)}'>
+                    <JButton id=3D'ok' text=3D'lutinvcs.apply' enabled=3D'fa=
lse'
+                             onActionPerformed=3D"cancel =3D doGenerate();di=
spose()"/>
+                    <JButton id=3D'cancelAction' text=3D'lutinvcs.cancel' on=
ActionPerformed=3D"cancel =3D true;dispose()"/>
+                </JPanel>
+            </cell>
+        </row>
+    </Table>
+</JDialog>

Added: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfi=
gUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI=
.jaxx	                        (rev 0)
+++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI=
.jaxx	2008-04-15 08:46:45 UTC (rev 521)
@@ -0,0 +1,120 @@
+<ConfigUI title=3D'lutinvcs.config.title' resizable=3D'false'>
+    <style source=3D"config.css"/>
+    <script>import static org.codelutin.vcs.type.VCSConnexionMode.*;</script>
+    <JToolBar id=3D'top'>
+        <JLabel text=3D'lutinvcs.config.message'/>
+        <Table fill=3D'both' insets=3D'0,0,0,0'>
+            <row>
+                <cell fill=3D'both'/>
+            </row>
+        </Table>
+        <JButton id=3D'help' action=3D'{createHelpAction()}'/>
+    </JToolBar>
+    <Table fill=3D'both' insets=3D"1,1,1,1">
+        <row fill=3D'horizontal'>
+            <cell columns=3D'2'>
+                <JScrollPane height=3D"60" columnHeaderView=3D'{top}'>
+                    <JEditorPane id=3D"doc"/>
+                </JScrollPane>
+            </cell>
+        </row>
+        <row fill=3D'horizontal'>
+            <cell>
+                <JLabel id=3D'firstnameLabel'/>
+            </cell>
+            <cell>
+                <JTextField id=3D'firstname' onKeyReleased=3D"doCheck(Elemen=
t.firstname)"/>
+            </cell>
+        </row>
+        <row fill=3D'horizontal'>
+            <cell>
+                <JLabel id=3D'lastnameLabel'/>
+            </cell>
+            <cell>
+                <JTextField id=3D'lastname' onKeyReleased=3D"doCheck(Element=
.lastname)"/>
+            </cell>
+        </row>
+        <row fill=3D'horizontal'>
+            <cell>
+                <JLabel id=3D'emailLabel'/>
+            </cell>
+            <cell>
+                <JTextField id=3D'email' onKeyReleased=3D"doCheck(Element.em=
ail)"/>
+            </cell>
+        </row>
+        <row fill=3D'horizontal'>
+            <cell>
+                <JLabel width=3D'150' height=3D'20' id=3D'serverAuthenticati=
onMethodLabel'/>
+            </cell>
+            <cell>
+                <JPanel layout=3D'{new GridLayout(0, 3, 2, 2)}'>
+                    <JRadioButton id=3D'serverAuthenticationMethodAnonymous'=
 value=3D'anonymous' onActionPerformed=3D"changeAutheticationMode(ANONYMOUS)"=
/>
+                    <JRadioButton id=3D'serverAuthenticationMethodPassword' =
value=3D'pass' onActionPerformed=3D"changeAutheticationMode(PASSWORD)"/>
+                    <JRadioButton id=3D'serverAuthenticationMethodSsh' value=
=3D'ssh' onActionPerformed=3D"changeAutheticationMode(SSH)"/>
+                </JPanel>
+            </cell>
+        </row>
+        <row fill=3D'horizontal'>
+            <cell>
+                <JLabel id=3D'serverLoginLabel' visible=3D'{!serverAuthentic=
ationMethodAnonymous.isSelected()}'/>
+            </cell>
+            <cell>
+                <JTextField id=3D'serverLogin' onKeyReleased=3D"doCheck(Elem=
ent.login)" visible=3D'{!serverAuthenticationMethodAnonymous.isSelected()}'/>
+            </cell>
+        </row>
+        <row fill=3D'horizontal'>
+            <cell>
+                <JLabel id=3D'serverPasswordLabel' visible=3D'{serverAuthent=
icationMethodPassword.isSelected()}'/>
+            </cell>
+            <cell>
+                <JPasswordField id=3D'serverPassword' visible=3D'{serverAuth=
enticationMethodPassword.isSelected()}' onKeyReleased=3D"doCheck(Element.pass=
word)"/>
+            </cell>
+        </row>
+        <row fill=3D'horizontal'>
+            <cell>
+                <JLabel id=3D'serverLoginNoPassPhraseLabel' visible=3D'{serv=
erAuthenticationMethodSsh.isSelected()}'/>
+            </cell>
+            <cell>
+                <JCheckBox id=3D'serverNoPassPhrase' onKeyReleased=3D"doChec=
k(Element.nopassphrase)" visible=3D'{serverAuthenticationMethodSsh.isSelected=
()}'/>
+            </cell>
+        </row>
+        <row fill=3D'horizontal'>
+            <cell>
+                <JLabel id=3D'serverPassphraseLabel' visible=3D'{serverAuthe=
nticationMethodSsh.isSelected()}' enabled=3D'{!serverNoPassPhrase.isSelected(=
)}'/>
+            </cell>
+            <cell>
+                <JPasswordField id=3D'serverPassphrase' onKeyReleased=3D"doC=
heck(Element.passphrase)" visible=3D'{serverAuthenticationMethodSsh.isSelecte=
d()}' enabled=3D'{!serverNoPassPhrase.isSelected()}'/>
+            </cell>
+        </row>
+        <row fill=3D'horizontal'>
+            <cell>
+                <JLabel id=3D'serverPrivateKeyFileLabel' visible=3D'{serverA=
uthenticationMethodSsh.isSelected()}'/>
+            </cell>
+            <cell>
+                <JTextField id=3D'serverPrivateKeyFile' onKeyReleased=3D"doC=
heck(Element.privatekey)" visible=3D'{serverAuthenticationMethodSsh.isSelecte=
d()}'/>
+            </cell>
+        </row>
+        <row fill=3D'horizontal'>
+            <cell columns=3D"2">
+                <JToolBar>
+                    <JPanel layout=3D'{new GridLayout(0, 3, 2, 2)}'>
+                        <JButton id=3D'serverPrivateKeyChangeFile' text=3D'l=
utinvcs.config.server.ssh.key.change' visible=3D'{serverAuthenticationMethodS=
sh.isSelected()}' onActionPerformed=3D"changePrivateKeyFile()"/>
+                        <JButton id=3D'serverPrivateKeyGenerate' text=3D'lut=
invcs.config.server.ssh.key.generate' visible=3D'{serverAuthenticationMethodS=
sh.isSelected()}'/>
+                        <JButton id=3D'testConnection' text=3D'lutinvcs.conf=
ig.test'/>
+                    </JPanel>
+                </JToolBar>
+            </cell>
+        </row>
+        <row fill=3D'horizontal'>
+            <cell columns=3D"2">
+                <JToolBar>
+                    <JPanel layout=3D'{new GridLayout(0, 3, 2, 2)}'>
+                        <JButton id=3D'ok' text=3D'lutinvcs.apply' onActionP=
erformed=3D"save();"/>
+                        <JButton id=3D'reset' text=3D'lutinvcs.reset' onActi=
onPerformed=3D"reset();"/>
+                        <JButton id=3D'cancelAction' text=3D'lutinvcs.cancel=
' onActionPerformed=3D"dispose();"/>
+                    </JPanel>
+                </JToolBar>
+            </cell>
+        </row>
+    </Table>
+</ConfigUI>

Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxSy=
nchUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxSynchUI.=
jaxx	2008-04-15 08:46:05 UTC (rev 520)
+++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxSynchUI.=
jaxx	2008-04-15 08:46:45 UTC (rev 521)
@@ -36,6 +36,7 @@
                     <JButton id=3D'addAll' action=3D'{createAction(ADD,false=
)}'/>
                     <JButton id=3D'deleteAll' action=3D'{createAction(DELETE=
,false)}'/>
                     <JSeparator orientation=3D"vertical"/>
+                    <JButton id=3D'config' action=3D'{createShowConfigAction=
()}'/>
                     <JButton id=3D'help' action=3D'{createHelpAction()}'/>
                 </JToolBar>
             </cell>

Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxVC=
SUIProvider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxVCSUIPro=
vider.java	2008-04-15 08:46:05 UTC (rev 520)
+++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxVCSUIPro=
vider.java	2008-04-15 08:46:45 UTC (rev 521)
@@ -18,6 +18,6 @@
 public class JaxxVCSUIProvider extends VCSUIProvider {
=20
     public JaxxVCSUIProvider() {
-        super("jaxx", JaxxSynchUI.class, JaxxDiffUI.class, JaxxChangelogUI.c=
lass,JaxxConfirmUI.class);
+        super("jaxx", JaxxSynchUI.class, JaxxDiffUI.class, JaxxChangelogUI.c=
lass,JaxxConfirmUI.class,JaxxConfigUI.class);
     }
 }
\ No newline at end of file

Copied: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.c=
ss (from rev 518, trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/u=
i/common.css)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css	 =
                       (rev 0)
+++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css	2=
008-04-15 08:46:45 UTC (rev 521)
@@ -0,0 +1,69 @@
+JToolBar {
+    floatable: false;
+    focusable: false;
+    margin: 0;
+}
+
+JButton {
+    margin: 0; /*font-size:10;*/
+}
+
+JTextField {
+    columns: 30;
+}
+
+#top, #help {
+    borderPainted: false;
+    opaque: false;
+}
+
+#serverPrivateKeyFileLabel {
+    text: "lutinvcs.config.server.ssh.privateKeyFile";
+}
+
+#serverLoginNoPassPhraseLabel {
+    text: "lutinvcs.config.server.ssh.no.passphrase";
+}
+
+#serverLoginLabel {
+    text: "lutinvcs.config.server.login";
+}
+
+#firstnameLabel {
+    text: "lutinvcs.config.firstname";
+}
+
+#lastnameLabel {
+    text: "lutinvcs.config.lastname";
+}
+
+#emailLabel {
+    text: "lutinvcs.config.email";
+}
+
+#serverAuthenticationMethodLabel {
+    text: "lutinvcs.config.server.authenticationMethod";
+}
+
+#serverPasswordLabel {
+    text: "lutinvcs.config.server.password";
+}
+
+#serverPassphraseLabel {
+    text: "lutinvcs.config.server.passphrase";
+}
+
+#serverAuthenticationMethodAnonymous {
+    text: "lutinvcs.config.anonymous";
+    buttonGroup: "serverMethod";
+}
+
+#serverAuthenticationMethodPassword {
+    text: "lutinvcs.config.pass";
+    buttonGroup: "serverMethod";
+}
+
+#serverAuthenticationMethodSsh {
+    text: "lutinvcs.config.ssh";
+    buttonGroup: "serverMethod";
+}


--===============4646089711871075912==--