Author: tchemit Date: 2008-10-13 18:09:00 +0000 (Mon, 13 Oct 2008) New Revision: 1555 Added: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/CommitDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/UpdateConfirmDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/UpdateDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSConfigUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSPassPhraseUI.jaxx Removed: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/CommitDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateConfirmDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSConfigUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSGenerateSshKeyUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSPassPhraseUI.jaxx Log: remove jaxx package Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/CommitDialogUI.jaxx (from rev 1553, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/CommitDialogUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/CommitDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/CommitDialogUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -0,0 +1,64 @@ +<JDialog id="Update" modal="true" title='isisfish.vcs.commit'> + <!--width="400" height="300">--> + <script> + // FIXME a refaire + +// import org.codelutin.vcs.ui.FieldModelUtil.ModuleFile; +// import org.codelutin.vcs.VCSFileState; + +// protected ModuleFile<VCSFileState> model; + protected Object model; + + public CommitDialogUI(Dialog owner, boolean modal) { + super(owner, modal); + } + public boolean isEmpty() { + return items.getRowCount()==0; + } + public boolean isOkEnabled() { + return !isEmpty(); + } + public void doRefresh() { + fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"ok.enabled"); + } + protected void reSize(JTable table) { + // implements me... + } + + </script> + <Table weightx="1"> + <row> + <cell columns='2'> + <JLabel id='label' font-size='12' + foreground='{new Color(051,102,225)}' + text='isisfish.vcs.commit.label'/> + </cell> + </row> + <row> + <cell columns='2' weighty="1" weightx='1' fill='both'> + <JScrollPane id='scroll' verticalScrollBarPolicy='20' > + <JTable id="items" onComponentResized="reSize(items)"/> + </JScrollPane> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal'> + <JScrollPane height='50' verticalScrollBarPolicy='21' + horizontalScrollBarPolicy='30'> + <JTextArea id='message' rows='2' columns='80'/> + </JScrollPane> + </cell> + </row> + <row weightx="1" fill='horizontal'> + <cell> + <JButton id='ok' text='isisfish.vcs.commit.ok' + enabled='{isOkEnabled()}' + onActionPerformed='/*fr.ifremer.isisfish.versionning.ui.VCSUIHelper.COMMIT_MSG=message.getText();*/dispose()'/> + </cell> + <cell> + <JButton id='cancel' text='isisfish.vcs.commit.cancel' + onActionPerformed='dispose()'/> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/CommitDialogUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/UpdateConfirmDialogUI.jaxx (from rev 1553, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateConfirmDialogUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/UpdateConfirmDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/UpdateConfirmDialogUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -0,0 +1,70 @@ +<JDialog modal="true" title='isisfish.vcs.updateconfirm'> + <script> + // FIXME a refaire + + +// import org.codelutin.vcs.ui.FieldModelUtil.ModuleFile; +// import org.codelutin.vcs.VCSFileState; + +// protected ModuleFile<VCSFileState> model; + protected Object model; + + public void doCheckAll() { +// if (model != null && model.getRowCount()>0) { +// model.checkAll(); +// doRefresh(); +// } + } + public boolean isEmpty() { + return model==null; // || model.getRowCount()==0; + } + public boolean isOkEnabled() { + return !isEmpty(); // && model.getSelectedSize(0)>0; + } + protected void reSize(JTable table) { + // implements me... + } + public void doRefresh() { + fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"checkAll.enabled","ok.enabled"); + } + </script> + <Table weightx="1"> + <row> + <cell columns='4'> + <JLabel font-size='12' foreground='{new Color(051,102,225)}' + text='isisfish.vcs.updateconfirm.label'/> + </cell> + </row> + <row> + <cell columns='4'> + <JLabel id='label2' font-size='12' foreground='{Color.RED}' + text='isisfish.vcs.updateconfirm.label2'/> + </cell> + </row> + <row> + <cell columns='4' weighty="1" fill='both'> + <JScrollPane id='table'> + <JTable id="items" autoResizeMode='3' + rowSelectionAllowed="true" + onMouseClicked="doRefresh()" + onComponentResized="reSize(items)"/> + </JScrollPane> + </cell> + </row> + <row weightx="1" fill='horizontal'> + <cell columns="2" fill='both'> + <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> + <JCheckBox id='checkAll' + text='isisfish.vcs.updateconfirm.checkAll' + toolTipText='isisfish.vcs.updateconfirm.tooltip.checkAll' + enabled='{!isEmpty()}' + onActionPerformed="doCheckAll()"/> + <JButton id='ok' text='isisfish.vcs.updateconfirm.ok' + enabled='{isOkEnabled()}'/> + <JButton id='cancel' + text='isisfish.vcs.updateconfirm.cancel'/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/UpdateConfirmDialogUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/UpdateDialogUI.jaxx (from rev 1553, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateDialogUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/UpdateDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/UpdateDialogUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -0,0 +1,165 @@ +<JDialog modal="true" title='isisfish.vcs.update'> + <script> + // FIXME a refaire + +// import static org.codelutin.vcs.VCSState.*; +// import org.codelutin.vcs.VCSState; + +// protected org.codelutin.vcs.VCSRepositoryState model; + protected Object model; + + public void doCheckAll() { +// if (model!=null) { +// model.checkAll(checkAll.isSelected()); +// doRefresh(); +// } + } + + public boolean isEmpty() { + return model==null; // || model.isModelEmpty(); + } + + public boolean isOkEnabled() { + return !isEmpty(); // && model.getModelSelectedSize()>0; + } + + public void doRefresh() { + fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"checkAll.enabled","ok.enabled"); + } + +// protected void reSize(VCSState state,JTable table) { +// +// } + </script> + <Table weightx="1"> + <row> + <cell columns='3' weighty="1" fill='both'> + <JSplitPane id='splitPane' orientation='vertical' + oneTouchExpandable='true'> + <JSplitPane id='splitPane2' orientation='horizontal' + oneTouchExpandable='true'> + <Table weightx="1" id='tableRemote'> + <row> + <cell columns="2" anchor='northwest'> + <JLabel text='isisfish.vcs.update.remote' + toolTipText='isisfish.vcs.update.tooltip.remote'/> + </cell> + </row> + <row> + <cell> + <JLabel id='label_missing' + text='isisfish.vcs.update.remote.missing' + toolTipText='isisfish.vcs.update.remote.tooltip.missing'/> + </cell> + </row> + <row> + <cell weighty="1" fill='both'> + <JScrollPane id='scroll_missing'> + <JTable id="table_missing" + autoResizeMode='3' + onMouseClicked="doRefresh()"/> + </JScrollPane> + </cell> + </row> + <row> + <cell> + <JLabel id='label_outofdate' + text='isisfish.vcs.update.remote.outofdate' + toolTipText='isisfish.vcs.update.remote.tooltip.outofdate'/> + </cell> + </row> + <row> + <cell weighty="1" fill='both'> + <JScrollPane id='scroll_outofdate'> + <JTable id="table_outofdate" + autoResizeMode='3' + onMouseClicked="doRefresh()" + rowSelectionAllowed="true"/> + </JScrollPane> + </cell> + </row> + </Table> + <Table weightx="1" id='tableLocal'> + <row> + <cell columns="2" anchor='west'> + <JLabel text='isisfish.vcs.update.local' + toolTipText='isisfish.vcs.update.tooltip.local'/> + </cell> + </row> + <row> + <cell> + <JLabel id='label_unversionned' + text='isisfish.vcs.update.local.unversionned' + toolTipText='isisfish.vcs.update.local.tooltip.unversionned'/> + </cell> + </row> + <row> + <cell weighty="1" fill='both'> + <JScrollPane id='scroll_unversionned'> + <JTable id="table_unversionned" + autoResizeMode='3' + rowSelectionAllowed="true" + onMouseClicked="doRefresh()"/> + </JScrollPane> + </cell> + </row> + <row> + <cell> + <JLabel id='label_modified' + text='isisfish.vcs.update.local.modified' + toolTipText='isisfish.vcs.update.local.tooltip.modified'/> + </cell> + </row> + <row> + <cell weighty="1" fill='both'> + <JScrollPane id='scroll_modified'> + <JTable id="table_modified" + autoResizeMode='3' + rowSelectionAllowed="true" + onMouseClicked="doRefresh()"/> + </JScrollPane> + </cell> + </row> + <row> + <cell> + <JLabel id='label_outofdateAndModified' + text='isisfish.vcs.update.local.outofdateAndModified' + toolTipText='isisfish.vcs.update.local.tooltip.outofdateAndModified'/> + </cell> + </row> + <row> + <cell weighty="1" fill='both'> + <JScrollPane id='scroll_outofdateAndModified'> + <JTable id="table_outofdateAndModified" + autoResizeMode='3' + rowSelectionAllowed="true" + onMouseClicked="doRefresh()"/> + </JScrollPane> + </cell> + </row> + </Table> + </JSplitPane> + <JScrollPane> + <JTextPane id="logText" editable="false" + focusable='false'/> + </JScrollPane> + </JSplitPane> + </cell> + </row> + <row weightx="1" fill='horizontal'> + <cell columns="3" fill='both'> + <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> + <JCheckBox id='checkAll' + text='isisfish.vcs.update.checkAll' + toolTipText='isisfish.vcs.update.tooltip.checkAll' + enabled='{!isEmpty()}' + onActionPerformed="doCheckAll()"/> + <JButton id='ok' text='isisfish.vcs.update.ok' + enabled='{isOkEnabled()}' + onActionPerformed="dispose()"/> + <JButton id='cancel' text='isisfish.vcs.update.cancel'/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/UpdateDialogUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSConfigUI.jaxx (from rev 1553, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSConfigUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSConfigUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSConfigUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -0,0 +1,170 @@ +<JDialog> + <script> + import javax.swing.text.html.HTMLEditorKit; + import javax.swing.text.html.HTMLDocument; + import javax.swing.event.HyperlinkListener; + import javax.swing.text.html.HTMLFrameHyperlinkEvent; + import javax.swing.event.HyperlinkEvent; + import java.io.PrintWriter; + import java.io.StringWriter; + + public boolean cancel; + protected boolean invalidFirstName; + protected boolean invalidLastName; + protected boolean invalidKey; + protected boolean invalidEmail; + protected boolean invalidLogin; + + private String oldEmail; + private String oldServerLogin; + private boolean oldUseSsh; + private boolean oldNoPassPhrase; + private String oldLastname; + private String oldFirstname; + private String oldServerPrivateKeyFile; + + protected void saveOld() { + this.oldFirstname=firstname.getText(); + this.oldLastname=lasstname.getText(); + this.oldEmail =email.getText(); + this.oldServerLogin=serverLogin.getText(); + this.oldServerPrivateKeyFile=serverPrivateKeyFile.getText(); + this.oldUseSsh=serverAuthenticationMethodSsh.isSelected(); + this.oldNoPassPhrase =serverNoPassPhrase.isSelected(); + doCheck(); + } + + protected void restoreOld() { + firstname.setText(oldFirstname); + lasstname.setText(oldLastname); + email.setText(oldEmail); + serverLogin.setText(oldServerLogin); + serverPrivateKeyFile.setText(oldServerPrivateKeyFile); + serverAuthenticationMethodSsh.setSelected(oldUseSsh); + serverNoPassPhrase.setSelected(oldNoPassPhrase); + doCheck(); + } + public boolean isConfigValid() { + return check(serverAuthenticationMethodSsh.isSelected()); + } + + protected boolean check(boolean ssh) { + invalidFirstName=firstname.isVisible() && firstname.getText().isEmpty(); + invalidLastName=lasstname.isVisible() && lasstname.getText().isEmpty(); + invalidEmail=email.isVisible() && email.getText().isEmpty(); + if (ssh) { + String file = serverPrivateKeyFile.getText(); + invalidKey=file.isEmpty() || !new java.io.File(file).exists(); + invalidLogin=serverLogin.getText().isEmpty(); + } else { + invalidLogin=false; + invalidKey=false; + } + return !(invalidEmail||invalidFirstName||invalidLastName||invalidLogin||invalidKey); + } + + protected void doCheck() { + boolean ssh = serverAuthenticationMethodSsh.isSelected(); + ok.setEnabled(check(ssh)); + if (ssh) { + serverPrivateKeyGenerate.setEnabled(!invalidLogin); + } else { + serverPrivateKeyGenerate.setEnabled(false); + } + setColor(invalidFirstName, firstnameLabel); + setColor(invalidLastName, lasstnameLabel); + setColor(invalidEmail, emailLabel); + setColor(invalidLogin, serverLoginLabel); + setColor(invalidKey, serverPrivateKeyFileLabel); + } + + protected void setColor(boolean invalid, JComponent component) { + component.setForeground(invalid ? Color.red: Color.black); + } + </script> + <Table> + <row fill='horizontal'> + <cell columns='2' weighty="1" fill='both'> + <JScrollPane height="60"> + <JEditorPane id="doc" /> + </JScrollPane> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='firstnameLabel' text='isisfish.launch.firstname'/> + </cell> + <cell> + <JTextField id='firstname' onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='lasstnameLabel' text='isisfish.launch.lasstname'/> + </cell> + <cell> + <JTextField id='lasstname' onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='emailLabel' text='isisfish.launch.email'/> + </cell> + <cell> + <JTextField id='email' onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverAuthenticationMethodLabel' text='isisfish.launch.server.authenticationMethod'/> + </cell> + <cell> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JRadioButton id='serverAuthenticationMethodAnonymous' text='isisfish.launch.anonymous' buttonGroup='serverMethod' value='anonymous' onActionPerformed="doCheck()"/> + <JRadioButton id='serverAuthenticationMethodSsh' text='isisfish.launch.ssh' buttonGroup='serverMethod' value='ssh' onActionPerformed="doCheck()"/> + </JPanel> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverLoginLabel' text='isisfish.launch.server.login' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + </cell> + <cell> + <JTextField id='serverLogin' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverLoginNoPassPhraseLabel' text='isisfish.launch.server.ssh.no.passphrase' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + </cell> + <cell> + <JCheckBox id='serverNoPassPhrase' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}' selected="true"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverPrivateKeyFileLabel' text='isisfish.launch.server.ssh.privateKeyFile' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + </cell> + <cell> + <JTextField id='serverPrivateKeyFile' font-size='12' columns='28' height='25' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2"> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JButton id='serverPrivateKeyChangeFile' text='isisfish.launch.server.ssh.key.change' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + <JButton id='serverPrivateKeyGenerate' text='isisfish.launch.server.ssh.key.generate' /> + </JPanel> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2"> + <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> + <JButton id='ok' text='isisfish.common.apply' enabled='false'/> + <JButton id='reset' text='isisfish.common.reset' onActionPerformed="restoreOld();"/> + <JButton id='cancelAction' text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSConfigUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx (from rev 1554, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSGenerateSshKeyUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -0,0 +1,124 @@ +<JDialog title='isisfish.server.ssh.generateKey.title' modal='true'> + <script> + import com.sshtools.j2ssh.transport.publickey.OpenSSHPublicKeyFormat; + import com.sshtools.j2ssh.transport.publickey.SshKeyGenerator; + import org.codelutin.util.FileUtil; + import java.io.File; + import java.io.IOException; + import java.util.ArrayList; + import java.util.Arrays; + import java.util.HashMap; + import java.util.Map; + + private static VCSGenerateSshKeyUI instance; + + public static VCSGenerateSshKeyUI getInstance(JDialog parent) { + if (instance == null) { + instance = new VCSGenerateSshKeyUI(parent); + } + return instance; + } + + public boolean cancel; + public boolean noPassPhrase; + public Exception error; + protected boolean invalidPassPhrase; + protected String vcsLogin; + + private VCSGenerateSshKeyUI(JDialog instance) { + super(instance); + // block close operation + setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); + } + + public void setData(String vcsLogin, File privateKeyFile) { + this.vcsLogin = vcsLogin ; + serverPrivateKeyFile.setText(privateKeyFile.getAbsolutePath()); + serverPublicKeyFile.setText(privateKeyFile.getAbsolutePath() + ".pub"); + noPassPhrase=true; + error=null; + doCheck(); + } + + protected boolean doGenerate() { + File f = new File(getServerPrivateKeyFile().getText()); + try { + SshKeyGenerator sshkeygenerator = new SshKeyGenerator(); + char[] password = getServerPassPhrase().getPassword(); + noPassPhrase=password.length==0; + if (password.length > 0) { + sshkeygenerator.generateKeyPair("dsa", 1024, f.getAbsolutePath(), vcsLogin, Arrays.toString(password)); + Arrays.fill(password, '0'); + } else { + sshkeygenerator.generateKeyPair("dsa", 1024, f.getAbsolutePath(), vcsLogin, ""); + } + // convert to openSSH ? + File publicKeyFile = new File(serverPublicKeyFile.getText()); + log.info("public key before OpenSsh : "+ FileUtil.readAsString(publicKeyFile)); + String openSshPublicKey = SshKeyGenerator.convertPublicKeyFile(publicKeyFile, new OpenSSHPublicKeyFormat(vcsLogin + "@forIsisFish 1024-bit dsa")); + log.info("public key OpenSsh : "+openSshPublicKey); + FileUtil.writeString(publicKeyFile, openSshPublicKey); + } catch (Exception e) { + error=e; + return true; + } + return false; + } + protected boolean check() { + invalidPassPhrase=!Arrays.equals(serverPassPhrase.getPassword(),serverConfirmPassPhrase.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='horizontal'> + <cell> + <JLabel text='isisfish.launch.server.ssh.privateKeyFile'/> + </cell> + <cell> + <JTextField id='serverPrivateKeyFile' font-size='12' editable='false' columns='28' height='25'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel text='isisfish.launch.server.ssh.publicKeyFile'/> + </cell> + <cell> + <JTextField id='serverPublicKeyFile' font-size='12' editable='false' columns='28' height='25'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverPassPhraseLabel' text='isisfish.launch.server.ssh.passphrase'/> + </cell> + <cell> + <JPasswordField id='serverPassPhrase' onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverConfirmPassPhraseLabel' text='isisfish.launch.server.ssh.confirm.passphrase'/> + </cell> + <cell> + <JPasswordField id='serverConfirmPassPhrase' onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2"> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JButton id='ok' text='isisfish.common.apply' enabled='false' onActionPerformed="cancel = doGenerate();dispose()"/> + <JButton id='cancelAction' text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSPassPhraseUI.jaxx (from rev 1553, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSPassPhraseUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSPassPhraseUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSPassPhraseUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -0,0 +1,62 @@ +<JDialog title='isisfish.vcs.ask.passphrase.title' modal='true'> + <script> + private boolean cancel; + private static VCSPassPhraseUI instance; + + public static char[] getPassPhrase(boolean useUI) { + if (!useUI) { + System.out.print("Enter passphrase: "); + java.io.BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(java.lang.System.in)); + try { + java.lang.String s = ""; + s = bufferedreader.readLine(); + return s.toCharArray(); + } catch (IOException e) { + return null; + } finally { + if (bufferedreader!=null) { + try { + bufferedreader.close(); + } catch (IOException e) { + // ignore + } + } + } + } + if (instance == null) { + instance = new VCSPassPhraseUI(); + } + instance.setVisible(true); + if (instance.cancel) { + // use cancel + return null; + } + return instance.getServerPassPhrase().getPassword(); + } + private VCSPassPhraseUI(JDialog instance) { + super(instance); + // block close operation + setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); + } + </script> + <Table> + <row fill='horizontal'> + <cell> + <JLabel text='isisfish.vcs.ask.passphrase'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JPasswordField id='serverPassPhrase'/> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2"> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JButton text='isisfish.common.apply' onActionPerformed="dispose()"/> + <JButton text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSPassPhraseUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/CommitDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/CommitDialogUI.jaxx 2008-10-13 18:06:35 UTC (rev 1554) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/CommitDialogUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -1,64 +0,0 @@ -<JDialog id="Update" modal="true" title='isisfish.vcs.commit'> - <!--width="400" height="300">--> - <script> - // FIXME a refaire - -// import org.codelutin.vcs.ui.FieldModelUtil.ModuleFile; -// import org.codelutin.vcs.VCSFileState; - -// protected ModuleFile<VCSFileState> model; - protected Object model; - - public CommitDialogUI(Dialog owner, boolean modal) { - super(owner, modal); - } - public boolean isEmpty() { - return items.getRowCount()==0; - } - public boolean isOkEnabled() { - return !isEmpty(); - } - public void doRefresh() { - fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"ok.enabled"); - } - protected void reSize(JTable table) { - // implements me... - } - - </script> - <Table weightx="1"> - <row> - <cell columns='2'> - <JLabel id='label' font-size='12' - foreground='{new Color(051,102,225)}' - text='isisfish.vcs.commit.label'/> - </cell> - </row> - <row> - <cell columns='2' weighty="1" weightx='1' fill='both'> - <JScrollPane id='scroll' verticalScrollBarPolicy='20' > - <JTable id="items" onComponentResized="reSize(items)"/> - </JScrollPane> - </cell> - </row> - <row> - <cell columns='2' fill='horizontal'> - <JScrollPane height='50' verticalScrollBarPolicy='21' - horizontalScrollBarPolicy='30'> - <JTextArea id='message' rows='2' columns='80'/> - </JScrollPane> - </cell> - </row> - <row weightx="1" fill='horizontal'> - <cell> - <JButton id='ok' text='isisfish.vcs.commit.ok' - enabled='{isOkEnabled()}' - onActionPerformed='/*fr.ifremer.isisfish.versionning.ui.VCSUIHelper.COMMIT_MSG=message.getText();*/dispose()'/> - </cell> - <cell> - <JButton id='cancel' text='isisfish.vcs.commit.cancel' - onActionPerformed='dispose()'/> - </cell> - </row> - </Table> -</JDialog> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateConfirmDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateConfirmDialogUI.jaxx 2008-10-13 18:06:35 UTC (rev 1554) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateConfirmDialogUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -1,70 +0,0 @@ -<JDialog modal="true" title='isisfish.vcs.updateconfirm'> - <script> - // FIXME a refaire - - -// import org.codelutin.vcs.ui.FieldModelUtil.ModuleFile; -// import org.codelutin.vcs.VCSFileState; - -// protected ModuleFile<VCSFileState> model; - protected Object model; - - public void doCheckAll() { -// if (model != null && model.getRowCount()>0) { -// model.checkAll(); -// doRefresh(); -// } - } - public boolean isEmpty() { - return model==null; // || model.getRowCount()==0; - } - public boolean isOkEnabled() { - return !isEmpty(); // && model.getSelectedSize(0)>0; - } - protected void reSize(JTable table) { - // implements me... - } - public void doRefresh() { - fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"checkAll.enabled","ok.enabled"); - } - </script> - <Table weightx="1"> - <row> - <cell columns='4'> - <JLabel font-size='12' foreground='{new Color(051,102,225)}' - text='isisfish.vcs.updateconfirm.label'/> - </cell> - </row> - <row> - <cell columns='4'> - <JLabel id='label2' font-size='12' foreground='{Color.RED}' - text='isisfish.vcs.updateconfirm.label2'/> - </cell> - </row> - <row> - <cell columns='4' weighty="1" fill='both'> - <JScrollPane id='table'> - <JTable id="items" autoResizeMode='3' - rowSelectionAllowed="true" - onMouseClicked="doRefresh()" - onComponentResized="reSize(items)"/> - </JScrollPane> - </cell> - </row> - <row weightx="1" fill='horizontal'> - <cell columns="2" fill='both'> - <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> - <JCheckBox id='checkAll' - text='isisfish.vcs.updateconfirm.checkAll' - toolTipText='isisfish.vcs.updateconfirm.tooltip.checkAll' - enabled='{!isEmpty()}' - onActionPerformed="doCheckAll()"/> - <JButton id='ok' text='isisfish.vcs.updateconfirm.ok' - enabled='{isOkEnabled()}'/> - <JButton id='cancel' - text='isisfish.vcs.updateconfirm.cancel'/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateDialogUI.jaxx 2008-10-13 18:06:35 UTC (rev 1554) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateDialogUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -1,165 +0,0 @@ -<JDialog modal="true" title='isisfish.vcs.update'> - <script> - // FIXME a refaire - -// import static org.codelutin.vcs.VCSState.*; -// import org.codelutin.vcs.VCSState; - -// protected org.codelutin.vcs.VCSRepositoryState model; - protected Object model; - - public void doCheckAll() { -// if (model!=null) { -// model.checkAll(checkAll.isSelected()); -// doRefresh(); -// } - } - - public boolean isEmpty() { - return model==null; // || model.isModelEmpty(); - } - - public boolean isOkEnabled() { - return !isEmpty(); // && model.getModelSelectedSize()>0; - } - - public void doRefresh() { - fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"checkAll.enabled","ok.enabled"); - } - -// protected void reSize(VCSState state,JTable table) { -// -// } - </script> - <Table weightx="1"> - <row> - <cell columns='3' weighty="1" fill='both'> - <JSplitPane id='splitPane' orientation='vertical' - oneTouchExpandable='true'> - <JSplitPane id='splitPane2' orientation='horizontal' - oneTouchExpandable='true'> - <Table weightx="1" id='tableRemote'> - <row> - <cell columns="2" anchor='northwest'> - <JLabel text='isisfish.vcs.update.remote' - toolTipText='isisfish.vcs.update.tooltip.remote'/> - </cell> - </row> - <row> - <cell> - <JLabel id='label_missing' - text='isisfish.vcs.update.remote.missing' - toolTipText='isisfish.vcs.update.remote.tooltip.missing'/> - </cell> - </row> - <row> - <cell weighty="1" fill='both'> - <JScrollPane id='scroll_missing'> - <JTable id="table_missing" - autoResizeMode='3' - onMouseClicked="doRefresh()"/> - </JScrollPane> - </cell> - </row> - <row> - <cell> - <JLabel id='label_outofdate' - text='isisfish.vcs.update.remote.outofdate' - toolTipText='isisfish.vcs.update.remote.tooltip.outofdate'/> - </cell> - </row> - <row> - <cell weighty="1" fill='both'> - <JScrollPane id='scroll_outofdate'> - <JTable id="table_outofdate" - autoResizeMode='3' - onMouseClicked="doRefresh()" - rowSelectionAllowed="true"/> - </JScrollPane> - </cell> - </row> - </Table> - <Table weightx="1" id='tableLocal'> - <row> - <cell columns="2" anchor='west'> - <JLabel text='isisfish.vcs.update.local' - toolTipText='isisfish.vcs.update.tooltip.local'/> - </cell> - </row> - <row> - <cell> - <JLabel id='label_unversionned' - text='isisfish.vcs.update.local.unversionned' - toolTipText='isisfish.vcs.update.local.tooltip.unversionned'/> - </cell> - </row> - <row> - <cell weighty="1" fill='both'> - <JScrollPane id='scroll_unversionned'> - <JTable id="table_unversionned" - autoResizeMode='3' - rowSelectionAllowed="true" - onMouseClicked="doRefresh()"/> - </JScrollPane> - </cell> - </row> - <row> - <cell> - <JLabel id='label_modified' - text='isisfish.vcs.update.local.modified' - toolTipText='isisfish.vcs.update.local.tooltip.modified'/> - </cell> - </row> - <row> - <cell weighty="1" fill='both'> - <JScrollPane id='scroll_modified'> - <JTable id="table_modified" - autoResizeMode='3' - rowSelectionAllowed="true" - onMouseClicked="doRefresh()"/> - </JScrollPane> - </cell> - </row> - <row> - <cell> - <JLabel id='label_outofdateAndModified' - text='isisfish.vcs.update.local.outofdateAndModified' - toolTipText='isisfish.vcs.update.local.tooltip.outofdateAndModified'/> - </cell> - </row> - <row> - <cell weighty="1" fill='both'> - <JScrollPane id='scroll_outofdateAndModified'> - <JTable id="table_outofdateAndModified" - autoResizeMode='3' - rowSelectionAllowed="true" - onMouseClicked="doRefresh()"/> - </JScrollPane> - </cell> - </row> - </Table> - </JSplitPane> - <JScrollPane> - <JTextPane id="logText" editable="false" - focusable='false'/> - </JScrollPane> - </JSplitPane> - </cell> - </row> - <row weightx="1" fill='horizontal'> - <cell columns="3" fill='both'> - <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> - <JCheckBox id='checkAll' - text='isisfish.vcs.update.checkAll' - toolTipText='isisfish.vcs.update.tooltip.checkAll' - enabled='{!isEmpty()}' - onActionPerformed="doCheckAll()"/> - <JButton id='ok' text='isisfish.vcs.update.ok' - enabled='{isOkEnabled()}' - onActionPerformed="dispose()"/> - <JButton id='cancel' text='isisfish.vcs.update.cancel'/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSConfigUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSConfigUI.jaxx 2008-10-13 18:06:35 UTC (rev 1554) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSConfigUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -1,170 +0,0 @@ -<JDialog> - <script> - import javax.swing.text.html.HTMLEditorKit; - import javax.swing.text.html.HTMLDocument; - import javax.swing.event.HyperlinkListener; - import javax.swing.text.html.HTMLFrameHyperlinkEvent; - import javax.swing.event.HyperlinkEvent; - import java.io.PrintWriter; - import java.io.StringWriter; - - public boolean cancel; - protected boolean invalidFirstName; - protected boolean invalidLastName; - protected boolean invalidKey; - protected boolean invalidEmail; - protected boolean invalidLogin; - - private String oldEmail; - private String oldServerLogin; - private boolean oldUseSsh; - private boolean oldNoPassPhrase; - private String oldLastname; - private String oldFirstname; - private String oldServerPrivateKeyFile; - - protected void saveOld() { - this.oldFirstname=firstname.getText(); - this.oldLastname=lasstname.getText(); - this.oldEmail =email.getText(); - this.oldServerLogin=serverLogin.getText(); - this.oldServerPrivateKeyFile=serverPrivateKeyFile.getText(); - this.oldUseSsh=serverAuthenticationMethodSsh.isSelected(); - this.oldNoPassPhrase =serverNoPassPhrase.isSelected(); - doCheck(); - } - - protected void restoreOld() { - firstname.setText(oldFirstname); - lasstname.setText(oldLastname); - email.setText(oldEmail); - serverLogin.setText(oldServerLogin); - serverPrivateKeyFile.setText(oldServerPrivateKeyFile); - serverAuthenticationMethodSsh.setSelected(oldUseSsh); - serverNoPassPhrase.setSelected(oldNoPassPhrase); - doCheck(); - } - public boolean isConfigValid() { - return check(serverAuthenticationMethodSsh.isSelected()); - } - - protected boolean check(boolean ssh) { - invalidFirstName=firstname.isVisible() && firstname.getText().isEmpty(); - invalidLastName=lasstname.isVisible() && lasstname.getText().isEmpty(); - invalidEmail=email.isVisible() && email.getText().isEmpty(); - if (ssh) { - String file = serverPrivateKeyFile.getText(); - invalidKey=file.isEmpty() || !new java.io.File(file).exists(); - invalidLogin=serverLogin.getText().isEmpty(); - } else { - invalidLogin=false; - invalidKey=false; - } - return !(invalidEmail||invalidFirstName||invalidLastName||invalidLogin||invalidKey); - } - - protected void doCheck() { - boolean ssh = serverAuthenticationMethodSsh.isSelected(); - ok.setEnabled(check(ssh)); - if (ssh) { - serverPrivateKeyGenerate.setEnabled(!invalidLogin); - } else { - serverPrivateKeyGenerate.setEnabled(false); - } - setColor(invalidFirstName, firstnameLabel); - setColor(invalidLastName, lasstnameLabel); - setColor(invalidEmail, emailLabel); - setColor(invalidLogin, serverLoginLabel); - setColor(invalidKey, serverPrivateKeyFileLabel); - } - - protected void setColor(boolean invalid, JComponent component) { - component.setForeground(invalid ? Color.red: Color.black); - } - </script> - <Table> - <row fill='horizontal'> - <cell columns='2' weighty="1" fill='both'> - <JScrollPane height="60"> - <JEditorPane id="doc" /> - </JScrollPane> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='firstnameLabel' text='isisfish.launch.firstname'/> - </cell> - <cell> - <JTextField id='firstname' onKeyReleased="doCheck()"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='lasstnameLabel' text='isisfish.launch.lasstname'/> - </cell> - <cell> - <JTextField id='lasstname' onKeyReleased="doCheck()"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='emailLabel' text='isisfish.launch.email'/> - </cell> - <cell> - <JTextField id='email' onKeyReleased="doCheck()"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverAuthenticationMethodLabel' text='isisfish.launch.server.authenticationMethod'/> - </cell> - <cell> - <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> - <JRadioButton id='serverAuthenticationMethodAnonymous' text='isisfish.launch.anonymous' buttonGroup='serverMethod' value='anonymous' onActionPerformed="doCheck()"/> - <JRadioButton id='serverAuthenticationMethodSsh' text='isisfish.launch.ssh' buttonGroup='serverMethod' value='ssh' onActionPerformed="doCheck()"/> - </JPanel> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverLoginLabel' text='isisfish.launch.server.login' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - </cell> - <cell> - <JTextField id='serverLogin' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverLoginNoPassPhraseLabel' text='isisfish.launch.server.ssh.no.passphrase' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - </cell> - <cell> - <JCheckBox id='serverNoPassPhrase' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}' selected="true"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverPrivateKeyFileLabel' text='isisfish.launch.server.ssh.privateKeyFile' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - </cell> - <cell> - <JTextField id='serverPrivateKeyFile' font-size='12' columns='28' height='25' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - </cell> - </row> - <row fill='horizontal'> - <cell columns="2"> - <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> - <JButton id='serverPrivateKeyChangeFile' text='isisfish.launch.server.ssh.key.change' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - <JButton id='serverPrivateKeyGenerate' text='isisfish.launch.server.ssh.key.generate' /> - </JPanel> - </cell> - </row> - <row fill='horizontal'> - <cell columns="2"> - <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> - <JButton id='ok' text='isisfish.common.apply' enabled='false'/> - <JButton id='reset' text='isisfish.common.reset' onActionPerformed="restoreOld();"/> - <JButton id='cancelAction' text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSGenerateSshKeyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSGenerateSshKeyUI.jaxx 2008-10-13 18:06:35 UTC (rev 1554) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSGenerateSshKeyUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -1,124 +0,0 @@ -<JDialog title='isisfish.server.ssh.generateKey.title' modal='true'> - <script> - import com.sshtools.j2ssh.transport.publickey.OpenSSHPublicKeyFormat; - import com.sshtools.j2ssh.transport.publickey.SshKeyGenerator; - import org.codelutin.util.FileUtil; - import java.io.File; - import java.io.IOException; - import java.util.ArrayList; - import java.util.Arrays; - import java.util.HashMap; - import java.util.Map; - - private static VCSGenerateSshKeyUI instance; - - public static VCSGenerateSshKeyUI getInstance(JDialog parent) { - if (instance == null) { - instance = new VCSGenerateSshKeyUI(parent); - } - return instance; - } - - public boolean cancel; - public boolean noPassPhrase; - public Exception error; - protected boolean invalidPassPhrase; - protected String vcsLogin; - - private VCSGenerateSshKeyUI(JDialog instance) { - super(instance); - // block close operation - setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); - } - - public void setData(String vcsLogin, File privateKeyFile) { - this.vcsLogin = vcsLogin ; - serverPrivateKeyFile.setText(privateKeyFile.getAbsolutePath()); - serverPublicKeyFile.setText(privateKeyFile.getAbsolutePath() + ".pub"); - noPassPhrase=true; - error=null; - doCheck(); - } - - protected boolean doGenerate() { - File f = new File(getServerPrivateKeyFile().getText()); - try { - SshKeyGenerator sshkeygenerator = new SshKeyGenerator(); - char[] password = getServerPassPhrase().getPassword(); - noPassPhrase=password.length==0; - if (password.length > 0) { - sshkeygenerator.generateKeyPair("dsa", 1024, f.getAbsolutePath(), vcsLogin, Arrays.toString(password)); - Arrays.fill(password, '0'); - } else { - sshkeygenerator.generateKeyPair("dsa", 1024, f.getAbsolutePath(), vcsLogin, ""); - } - // convert to openSSH ? - File publicKeyFile = new File(serverPublicKeyFile.getText()); - log.info("public key before OpenSsh : "+ FileUtil.readAsString(publicKeyFile)); - String openSshPublicKey = SshKeyGenerator.convertPublicKeyFile(publicKeyFile, new OpenSSHPublicKeyFormat(vcsLogin + "@forIsisFish 1024-bit dsa")); - log.info("public key OpenSsh : "+openSshPublicKey); - FileUtil.writeString(publicKeyFile, openSshPublicKey); - } catch (Exception e) { - error=e; - return true; - } - return false; - } - protected boolean check() { - invalidPassPhrase=!Arrays.equals(serverPassPhrase.getPassword(),serverConfirmPassPhrase.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='horizontal'> - <cell> - <JLabel text='isisfish.launch.server.ssh.privateKeyFile'/> - </cell> - <cell> - <JTextField id='serverPrivateKeyFile' font-size='12' editable='false' columns='28' height='25'/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel text='isisfish.launch.server.ssh.publicKeyFile'/> - </cell> - <cell> - <JTextField id='serverPublicKeyFile' font-size='12' editable='false' columns='28' height='25'/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverPassPhraseLabel' text='isisfish.launch.server.ssh.passphrase'/> - </cell> - <cell> - <JPasswordField id='serverPassPhrase' onKeyReleased="doCheck()"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverConfirmPassPhraseLabel' text='isisfish.launch.server.ssh.confirm.passphrase'/> - </cell> - <cell> - <JPasswordField id='serverConfirmPassPhrase' onKeyReleased="doCheck()"/> - </cell> - </row> - <row fill='horizontal'> - <cell columns="2"> - <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> - <JButton id='ok' text='isisfish.common.apply' enabled='false' onActionPerformed="cancel = doGenerate();dispose()"/> - <JButton id='cancelAction' text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSPassPhraseUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSPassPhraseUI.jaxx 2008-10-13 18:06:35 UTC (rev 1554) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSPassPhraseUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -1,62 +0,0 @@ -<JDialog title='isisfish.vcs.ask.passphrase.title' modal='true'> - <script> - private boolean cancel; - private static VCSPassPhraseUI instance; - - public static char[] getPassPhrase(boolean useUI) { - if (!useUI) { - System.out.print("Enter passphrase: "); - java.io.BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(java.lang.System.in)); - try { - java.lang.String s = ""; - s = bufferedreader.readLine(); - return s.toCharArray(); - } catch (IOException e) { - return null; - } finally { - if (bufferedreader!=null) { - try { - bufferedreader.close(); - } catch (IOException e) { - // ignore - } - } - } - } - if (instance == null) { - instance = new VCSPassPhraseUI(); - } - instance.setVisible(true); - if (instance.cancel) { - // use cancel - return null; - } - return instance.getServerPassPhrase().getPassword(); - } - private VCSPassPhraseUI(JDialog instance) { - super(instance); - // block close operation - setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); - } - </script> - <Table> - <row fill='horizontal'> - <cell> - <JLabel text='isisfish.vcs.ask.passphrase'/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JPasswordField id='serverPassPhrase'/> - </cell> - </row> - <row fill='horizontal'> - <cell columns="2"> - <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> - <JButton text='isisfish.common.apply' onActionPerformed="dispose()"/> - <JButton text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> - </JPanel> - </cell> - </row> - </Table> -</JDialog>