- Isis-fish-commits - mailman.cloud.codelutin.com

r2269 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org May 25, 2009

May 25, 2009

Author: chatellier Date: 2009-05-25 13:24:45 +0000 (Mon, 25 May 2009) New Revision: 2269 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Parcours la liste des simulations en 2 temps (dossier/storage), c'est lent seulement pour la derniere boucle Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-25 13:23:59 UTC (rev 2268) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-25 13:24:45 UTC (rev 2269) @@ -30,6 +30,7 @@ import java.util.Date; import java.util.Iterator; import java.util.LinkedList; +import java.util.List; import java.util.Map; import java.util.Properties; import java.util.SortedSet; @@ -638,48 +639,15 @@ // this is a sensitivity simulation String simulationId = job.getId(); String simulationCommonPrefix = simulationId.substring(0, simulationId.lastIndexOf("_")); - - // simulation start at 0 - LinkedList<SimulationStorage> simulationStorageForAnalyze = new LinkedList<SimulationStorage>(); - // en sens inverse, il le fera carrement moins souvent - for (int simulationIndex = numberOfSimulation - 1; simulationIndex >= 0 ; --simulationIndex) { - String currentId = simulationCommonPrefix + "_" + simulationIndex; - if (SimulationStorage.localyExists(currentId)) { - SimulationControl currentSimulationControl = new SimulationControl(currentId); - SimulationStorage.readControl(currentId, currentSimulationControl); - - // condition for simulation "end" - if (currentSimulationControl.getProgress() > 0 - && currentSimulationControl.getProgress() >= currentSimulationControl.getProgressMax()) { - SimulationStorage storage = SimulationStorage.getSimulation(currentId); - // always add first (loop in reverse order) - // result list is keeped sorted - simulationStorageForAnalyze.addFirst(storage); - if (log.isDebugEnabled()) { - log.debug("Found simulation number = " + simulationIndex); - } - } - else { - if (log.isDebugEnabled()) { - log.debug("Miss simulation number = " + simulationIndex); - } - - // no need to continue - // if only miss one, break - break; - } - } - else { - break; - } - } + int numberFinished = getNumberOfFinishedSimulation(simulationCommonPrefix, numberOfSimulation); // si on a toutes les simulation est qu'elles sont finie // on construit la liste des simulation storage // et on l'envoie au script d'analyse de sensibilite - if (simulationStorageForAnalyze.size() == numberOfSimulation) { + if (numberFinished == numberOfSimulation) { + // FIXME buggy because of hack in getParameter() - // getRegion() from simulation can be lockek + // getRegion() from simulation can be locked SimulationParameter params = simulation.getParameter(); SensitivityCalculator sensitivityCalculator = params.getSensitivityCalculator(); if (sensitivityCalculator != null) { @@ -687,6 +655,9 @@ log.debug("Call analyzeResult on sensitivity script " + sensitivityCalculator.getClass().getSimpleName()); } try { + // get full storage list + List<SimulationStorage> simulationStorageForAnalyze = + getStorageListForSecondPass(simulationCommonPrefix, numberOfSimulation); // build master sensitivity export directory File masterExportDirectory = new File(IsisFish.config.getDefaultExportDirectory(), simulationCommonPrefix); // directory must already exists !!! @@ -703,6 +674,76 @@ } /** + * Parcourt le dossier de toutes les simulation commencant par le prefix donné, + * et retourne le nombre de simulation terminées. + * + * @param asPrefixName simulation name (without number suffix) + * @param numberOfSimulation total simulation number + * + * @return le nombre de simulation réellement terminée + */ + protected int getNumberOfFinishedSimulation(String asPrefixName, int numberOfSimulation) { + + int numberOfFinishedSimulation = 0; + + // en sens inverse, il le fera carrement moins souvent + for (int simulationIndex = numberOfSimulation - 1; simulationIndex >= 0 ; --simulationIndex) { + String currentId = asPrefixName + "_" + simulationIndex; + if (SimulationStorage.localyExists(currentId)) { + SimulationControl currentSimulationControl = new SimulationControl(currentId); + SimulationStorage.readControl(currentId, currentSimulationControl); + + // condition for simulation "end" + if (currentSimulationControl.getProgress() > 0 + && currentSimulationControl.getProgress() >= currentSimulationControl.getProgressMax()) { + + // new finished simulation found + numberOfFinishedSimulation++; + } + else { + if (log.isDebugEnabled()) { + log.debug("Miss simulation number = " + simulationIndex); + } + + // no need to continue + // if only miss one, break + break; + } + } + else { + break; + } + } + + return numberOfFinishedSimulation; + } + + /** + * Parcourt les dossiers et instancie les storages une fois + * qu'on est sur qu'on a toutes les simulations. + * + * @param asPrefixName simulation name (without number suffix) + * @param numberOfSimulation total simulation number + * + * @return la liste des storages + */ + protected List<SimulationStorage> getStorageListForSecondPass(String asPrefixName, int numberOfSimulation) { + + // simulation start at 0 + List<SimulationStorage> simulationStorageForAnalyze = new LinkedList<SimulationStorage>(); + // en sens inverse, il le fera carrement moins souvent + for (int simulationIndex = 0; simulationIndex < numberOfSimulation; ++simulationIndex) { + String currentId = asPrefixName + "_" + simulationIndex; + SimulationStorage storage = SimulationStorage.getSimulation(currentId); + // always add first (loop in reverse order) + // result list is keeped sorted + simulationStorageForAnalyze.add(storage); + } + + return simulationStorageForAnalyze; + } + + /** * Convertit une collection de string, en une chaine * séparée par des ",". *

1 0

r2268 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org May 25, 2009

May 25, 2009

Author: chatellier Date: 2009-05-25 13:23:59 +0000 (Mon, 25 May 2009) New Revision: 2268 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx Log: Desactive l'UI seulement quand la cl?\195?\169 est trouv?\195?\169e Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx 2009-05-25 12:35:11 UTC (rev 2267) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx 2009-05-25 13:23:59 UTC (rev 2268) @@ -89,7 +89,7 @@ // if ssh key is set, must be a valid file currentSSHKey = new File(sshKeyField.getText().trim()); - if (!currentSSHKey.exists()) { + if (!currentSSHKey.isFile()) { setColor(true, sshKeyField); } else {

1 0

r2267 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org May 25, 2009

May 25, 2009

Author: chatellier Date: 2009-05-25 12:35:11 +0000 (Mon, 25 May 2009) New Revision: 2267 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Parcours des storages pour la second passe en ordre inverse, mais garde la liste resultante ordon?\195?\169e. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-25 11:03:17 UTC (rev 2266) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-25 12:35:11 UTC (rev 2267) @@ -25,12 +25,11 @@ import java.io.FileOutputStream; import java.io.IOException; import java.rmi.RemoteException; -import java.util.ArrayList; import java.util.Collection; import java.util.Comparator; import java.util.Date; import java.util.Iterator; -import java.util.List; +import java.util.LinkedList; import java.util.Map; import java.util.Properties; import java.util.SortedSet; @@ -641,9 +640,9 @@ String simulationCommonPrefix = simulationId.substring(0, simulationId.lastIndexOf("_")); // simulation start at 0 - List<SimulationStorage> simulationStorageForAnalyze = new ArrayList<SimulationStorage>(); + LinkedList<SimulationStorage> simulationStorageForAnalyze = new LinkedList<SimulationStorage>(); // en sens inverse, il le fera carrement moins souvent - for (int simulationIndex = 0; simulationIndex < numberOfSimulation ; simulationIndex++) { + for (int simulationIndex = numberOfSimulation - 1; simulationIndex >= 0 ; --simulationIndex) { String currentId = simulationCommonPrefix + "_" + simulationIndex; if (SimulationStorage.localyExists(currentId)) { SimulationControl currentSimulationControl = new SimulationControl(currentId); @@ -653,7 +652,9 @@ if (currentSimulationControl.getProgress() > 0 && currentSimulationControl.getProgress() >= currentSimulationControl.getProgressMax()) { SimulationStorage storage = SimulationStorage.getSimulation(currentId); - simulationStorageForAnalyze.add(storage); + // always add first (loop in reverse order) + // result list is keeped sorted + simulationStorageForAnalyze.addFirst(storage); if (log.isDebugEnabled()) { log.debug("Found simulation number = " + simulationIndex); }

1 0

r2266 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish java/fr/ifremer/isisfish/ui/simulator/launcher resources/i18n
by chatellier＠users.labs.libre-entreprise.org May 25, 2009

May 25, 2009

Author: chatellier Date: 2009-05-25 11:03:17 +0000 (Mon, 25 May 2009) New Revision: 2266 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Add generate key option on caparmor config UI Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-05-25 11:02:22 UTC (rev 2265) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-05-25 11:03:17 UTC (rev 2266) @@ -493,6 +493,15 @@ return result; } + /** + * Set ssh private key file path. + * + * @param sshFile new value + */ + public void setSSHPrivateKeyFilePath(File sshFile) { + setOption(Option.SSH_KEY_FILE.key, sshFile.getAbsolutePath()); + } + /* * Le type de simulation par defaut a utiliser (local, remote, ...) * @return Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx 2009-05-25 11:02:22 UTC (rev 2265) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx 2009-05-25 11:03:17 UTC (rev 2266) @@ -18,9 +18,11 @@ <JDialog resizable="false" title="isisfish.simulator.ssh.configuration.title" layout="{new BoxLayout(this.getContentPane(), BoxLayout.PAGE_AXIS)}"> <script><![CDATA[ + import java.io.IOException; import fr.ifremer.isisfish.IsisFish; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; + import com.jcraft.jsch.KeyPair; import com.jcraft.jsch.Session; import fr.ifremer.isisfish.util.ssh.InvalidPassphraseException; import fr.ifremer.isisfish.util.ssh.SSHAgent; @@ -30,7 +32,7 @@ protected String currentSSHserver; protected String currentSSHUsername; - protected String currentSSHKey; + protected File currentSSHKey; protected String currentSSHUserhome; protected String currentSSHDatapath; protected String currentSSHIsisHome; @@ -85,7 +87,16 @@ setColor(false, usernameField); } - //currentSSHKey + // if ssh key is set, must be a valid file + currentSSHKey = new File(sshKeyField.getText().trim()); + if (!currentSSHKey.exists()) { + setColor(true, sshKeyField); + } + else { + sshKeyButton.setEnabled(false); + sshKeyField.setEnabled(false); + setColor(false, sshKeyField); + } currentSSHDatapath = sshDatapathField.getText().trim(); if (currentSSHDatapath.isEmpty()) { @@ -142,6 +153,7 @@ protected void saveSSHConfiguration() { IsisFish.config.setSimulatorSshServer(currentSSHserver); IsisFish.config.setSimulatorSshUsername(currentSSHUsername); + IsisFish.config.setSSHPrivateKeyFilePath(currentSSHKey); //IsisFish.config.setSimulatorSshUserHome(currentSSHUserhome); IsisFish.config.setSimulatorSshDataPath(currentSSHDatapath); @@ -161,21 +173,11 @@ protected void cancelSSHConfiguration() { dispose(); } - - protected void testSSHConfiguration() { - // pour ne pas bloquer le bouton test - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - testSSHConfigurationRunnable(); - } - }); - } /** * Realise une connexion ssh et teste les données. */ - protected void testSSHConfigurationRunnable() { + protected void testSSHConfiguration() { JSch jsch = new JSch(); String host = currentSSHserver; @@ -191,18 +193,17 @@ // add ssh key boolean sshKeyUsed = false; - File sshKey = IsisFish.config.getSSHPrivateKeyFilePath(); - if (sshKey.canRead()) { + if (currentSSHKey.canRead()) { if (log.isInfoEnabled()) { log.info(_("Ssh key found '%s' will be used to connect to", - sshKey.getAbsoluteFile(), host)); + currentSSHKey.getAbsoluteFile(), host)); } - jsch.addIdentity(sshKey.getAbsolutePath()); + jsch.addIdentity(currentSSHKey.getAbsolutePath()); sshKeyUsed = true; } else { if (log.isInfoEnabled()) { - log.info(_("Can't read ssh key : %s", sshKey)); + log.info(_("Can't read ssh key : %s", currentSSHKey)); } } @@ -212,7 +213,7 @@ SSHUserInfo ui = new SSHUserInfo(); if (sshKeyUsed) { String passphrase = null; - passphrase = SSHAgent.getAgent().getPassphrase(sshKey); + passphrase = SSHAgent.getAgent().getPassphrase(currentSSHKey); ui.setPassphrase(passphrase); setTestMessage(_("isisfish.simulator.ssh.configuration.connectingpk"), false); } @@ -231,16 +232,27 @@ validButton.setEnabled(true); } catch (NumberFormatException e) { + if (log.isErrorEnabled()) { + log.error("Can't connect", e); + } setTestMessage(_("isisfish.error.simulation.remote.wrongportvalue", sPort), true); } catch (JSchException e) { + if (log.isErrorEnabled()) { + log.error("Can't connect", e); + } setTestMessage(_("isisfish.simulator.ssh.configuration.connectionerror", e.getMessage()), true); } catch (InvalidPassphraseException e) { + if (log.isErrorEnabled()) { + log.error("Can't connect", e); + } setTestMessage(_("isisfish.simulator.ssh.configuration.invalidpassphrase"), true); } } /** * Get user home directory with an opened session. + * + * @deprecated not used anymore */ protected String getUserHomeDirectory(Session session) throws SSHException { @@ -256,7 +268,45 @@ String out = output.toString(); return out; } - + + /** + * Generate new SSH key. + */ + protected void generateSSHKey() { + if (currentSSHKey.exists()) { + throw new IllegalArgumentException("Can't overwrite ssh key"); + } + + try { + // make parent dir + if (currentSSHKey.getParentFile() != null && !currentSSHKey.getParentFile().exists()) { + currentSSHKey.getParentFile().mkdirs(); + } + JSch jsch=new JSch(); + KeyPair kpair=KeyPair.genKeyPair(jsch, KeyPair.RSA, 2048); + //kpair.setPassphrase(passphrase); + kpair.writePrivateKey(currentSSHKey.getAbsolutePath()); + kpair.writePublicKey(currentSSHKey.getAbsolutePath()+".pub", currentSSHUsername + "@forIsisFish"); + if (log.isInfoEnabled()) { + log.info("Finger print: "+kpair.getFingerPrint()); + } + kpair.dispose(); + } + catch (JSchException e) { + if (log.isErrorEnabled()) { + log.error("Can't make ssh key", e); + } + } + catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Can't make ssh key", e); + } + } + + // refresh ckeck + doCheck(); + } + protected void setColor(boolean invalid, JComponent component) { component.setForeground(invalid ? Color.RED: Color.BLACK); } @@ -273,7 +323,7 @@ <JLabel id='sshServerLabel' text='isisfish.config.main.simulation.ssh.server' toolTipText='isisfish.config.main.simulation.ssh.server' /> </cell> - <cell fill='horizontal' weightx="2.0"> + <cell fill='horizontal' columns="2"> <JTextField id='sshServerField' toolTipText='isisfish.config.main.simulation.ssh.server' onKeyReleased="doCheck()" /> </cell> @@ -283,7 +333,7 @@ <JLabel id='usernameLabel' text='isisfish.config.main.simulation.ssh.username' toolTipText='isisfish.config.main.simulation.ssh.username.description' /> </cell> - <cell> + <cell columns="2"> <JTextField id='usernameField' toolTipText='isisfish.config.main.simulation.ssh.username.description' onKeyReleased="doCheck()" /> </cell> @@ -292,10 +342,13 @@ <cell> <JLabel id='sshKeyLabel' text='isisfish.config.ssh.key.file' toolTipText='isisfish.config.ssh.key.file.description' /> </cell> - <cell> - <JTextField id='sshKeyField' enabled='false' toolTipText='isisfish.config.ssh.key.file.description' + <cell weightx="2.0"> + <JTextField id='sshKeyField' toolTipText='isisfish.config.ssh.key.file.description' onKeyReleased="doCheck()" /> </cell> + <cell> + <JButton id='sshKeyButton' text='isisfish.simulator.ssh.configuration.keygenerate' onActionPerformed="generateSSHKey()" /> + </cell> </row> </Table> <Table border='{BorderFactory.createTitledBorder(_("isisfish.simulator.ssh.configuration.environment"))}'> Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-05-25 11:02:22 UTC (rev 2265) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-05-25 11:03:17 UTC (rev 2266) @@ -928,6 +928,7 @@ isisfish.simulator.ssh.configuration.connectionok=Connection successfull isisfish.simulator.ssh.configuration.environment=Caparmor configuration isisfish.simulator.ssh.configuration.invalidpassphrase=Invalid passphrase +isisfish.simulator.ssh.configuration.keygenerate=Generate isisfish.simulator.ssh.configuration.test=Test configuration isisfish.simulator.ssh.configuration.title=Caparmor launcher configuration isisfish.simulator.subprocess.readoutput.error= Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-05-25 11:02:22 UTC (rev 2265) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-05-25 11:03:17 UTC (rev 2266) @@ -928,6 +928,7 @@ isisfish.simulator.ssh.configuration.connectionok=Connect\u00E9 avec succ\u00E8s isisfish.simulator.ssh.configuration.environment=Configuration sur Caparmor isisfish.simulator.ssh.configuration.invalidpassphrase=Passphrase invalide +isisfish.simulator.ssh.configuration.keygenerate=G\u00E9n\u00E9rer isisfish.simulator.ssh.configuration.test=Tester la configuration isisfish.simulator.ssh.configuration.title=Configuration du lanceur Caparmor isisfish.simulator.subprocess.readoutput.error=

1 0

r2265 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh
by chatellier＠users.labs.libre-entreprise.org May 25, 2009

May 25, 2009

Author: chatellier Date: 2009-05-25 11:02:22 +0000 (Mon, 25 May 2009) New Revision: 2265 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java Log: Reenable password connection Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java 2009-05-25 10:37:29 UTC (rev 2264) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java 2009-05-25 11:02:22 UTC (rev 2265) @@ -18,9 +18,18 @@ package fr.ifremer.isisfish.util.ssh; +import java.awt.Container; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; + +import javax.swing.JLabel; import javax.swing.JOptionPane; +import javax.swing.JPanel; import javax.swing.JPasswordField; +import javax.swing.JTextField; +import com.jcraft.jsch.UIKeyboardInteractive; import com.jcraft.jsch.UserInfo; /** @@ -34,7 +43,7 @@ * Last update : $Date: 1 déc. 2008 $ * By : $Author: chatellier $ */ -public class SSHUserInfo implements UserInfo { +public class SSHUserInfo implements UserInfo, UIKeyboardInteractive { /** * Passphrase. @@ -115,4 +124,56 @@ public void showMessage(String message) { JOptionPane.showMessageDialog(null, message); } + + /* + * @see com.jcraft.jsch.UIKeyboardInteractive#promptKeyboardInteractive(java.lang.String, java.lang.String, java.lang.String, java.lang.String[], boolean[]) + */ + @Override + public String[] promptKeyboardInteractive(String destination, String name, + String instruction, String[] prompt, boolean[] echo) { + final GridBagConstraints gbc = new GridBagConstraints(0, 0, 1, 1, 1, 1, + GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, + new Insets(0, 0, 0, 0), 0, 0); + Container panel = new JPanel(); + panel.setLayout(new GridBagLayout()); + + gbc.weightx = 1.0; + gbc.gridwidth = GridBagConstraints.REMAINDER; + gbc.gridx = 0; + panel.add(new JLabel(instruction), gbc); + gbc.gridy++; + + gbc.gridwidth = GridBagConstraints.RELATIVE; + + JTextField[] texts = new JTextField[prompt.length]; + for (int i = 0; i < prompt.length; i++) { + gbc.fill = GridBagConstraints.NONE; + gbc.gridx = 0; + gbc.weightx = 1; + panel.add(new JLabel(prompt[i]), gbc); + + gbc.gridx = 1; + gbc.fill = GridBagConstraints.HORIZONTAL; + gbc.weighty = 1; + if (echo[i]) { + texts[i] = new JTextField(20); + } else { + texts[i] = new JPasswordField(20); + } + panel.add(texts[i], gbc); + gbc.gridy++; + } + + String[] response = null; + if (JOptionPane.showConfirmDialog(null, panel, destination + ": " + + name, JOptionPane.OK_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE) == JOptionPane.OK_OPTION) { + response = new String[prompt.length]; + for (int i = 0; i < prompt.length; i++) { + response[i] = texts[i].getText(); + } + } + // else = cancel + return response; + } }

1 0

r2264 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: actions ui/vcs
by chatellier＠users.labs.libre-entreprise.org May 25, 2009

May 25, 2009

Author: chatellier Date: 2009-05-25 10:37:29 +0000 (Mon, 25 May 2009) New Revision: 2264 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx Log: Augmentation de la taille des cl?\195?\169s a 2048 bits Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java 2009-05-25 09:25:18 UTC (rev 2263) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java 2009-05-25 10:37:29 UTC (rev 2264) @@ -67,10 +67,10 @@ log.info("Generate ssh key to " + f); } JSch jsch=new JSch(); - KeyPair kpair=KeyPair.genKeyPair(jsch, KeyPair.RSA); + KeyPair kpair=KeyPair.genKeyPair(jsch, KeyPair.RSA, 2048); //kpair.setPassphrase(passphrase); kpair.writePrivateKey(f.getAbsolutePath()); - kpair.writePublicKey(f.getAbsolutePath()+".pub", config.getUserName() + "@forIsisFish 1024-bit rsa"); + kpair.writePublicKey(f.getAbsolutePath()+".pub", config.getUserName() + "@forIsisFish"); if (log.isInfoEnabled()) { log.info("Finger print: "+kpair.getFingerPrint()); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2009-05-25 09:25:18 UTC (rev 2263) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2009-05-25 10:37:29 UTC (rev 2264) @@ -60,12 +60,12 @@ char[] password = getServerPassPhrase().getPassword(); JSch jsch=new JSch(); - KeyPair kpair=KeyPair.genKeyPair(jsch, KeyPair.RSA); + KeyPair kpair=KeyPair.genKeyPair(jsch, KeyPair.RSA, 2048); if (password.length > 0) { kpair.setPassphrase(Arrays.toString(password)); } kpair.writePrivateKey(privateKeyFile.getAbsolutePath()); - kpair.writePublicKey(publicKeyFile.getAbsolutePath(), vcsLogin + "@forIsisFish 1024-bit rsa"); + kpair.writePublicKey(publicKeyFile.getAbsolutePath(), vcsLogin + "@forIsisFish"); if (log.isInfoEnabled()) { log.info("Finger print: "+kpair.getFingerPrint()); }

1 0

r2263 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org May 25, 2009

May 25, 2009

Author: chatellier Date: 2009-05-25 09:25:18 +0000 (Mon, 25 May 2009) New Revision: 2263 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java Log: Display remove entities list into textarea Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-05-25 08:41:15 UTC (rev 2262) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-05-25 09:25:18 UTC (rev 2263) @@ -21,6 +21,8 @@ import static org.codelutin.i18n.I18n._; +import java.awt.Component; +import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.beans.PropertyChangeEvent; @@ -30,13 +32,19 @@ import java.util.Collection; import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Map.Entry; import javax.swing.JButton; +import javax.swing.JLabel; import javax.swing.JOptionPane; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; import jaxx.runtime.JAXXAction; import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXInitialContext; +import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode; import org.apache.commons.beanutils.MethodUtils; @@ -51,9 +59,6 @@ import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.ui.SaveVerifier; import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI; -import java.util.Map; -import java.util.Map.Entry; -import jaxx.runtime.swing.ErrorDialogUI; /** * InputSaveVerifier. @@ -191,11 +196,12 @@ TopiaEntity topiaEntity = (TopiaEntity) currentNode.getJAXXContextValue(rootUI); List<TopiaEntity> allWillBeRemoved = topiaEntity.getComposite(); if (allWillBeRemoved.size() > 0) { - String text = _("isisfish.message.delete.object", topiaEntity.toString()); + String label = _("isisfish.message.delete.object", topiaEntity.toString()); + String text = ""; for (TopiaEntity e : allWillBeRemoved) { text += ClassUtils.getShortClassName(e.getClass()) + " - " + e.toString() + "\n"; } - int resp = JOptionPane.showConfirmDialog(null, text, _("isisfish.message.delete.entities"), JOptionPane.YES_NO_OPTION); + int resp = showTextAreaConfirmationMessage(null, label, text, _("isisfish.message.delete.entities"), JOptionPane.YES_NO_OPTION); doDelete = resp == JOptionPane.YES_OPTION; } else { String text = _("isisfish.message.confirm.delete.object", topiaEntity.toString()); @@ -223,6 +229,28 @@ noModif(); } + /** + * Display a JOptionPane with a JTextArea as main component. + * + * @param parent parent + * @param labelMessage label message + * @param textMessage text message into area + * @param title + * @param option + * @return user response + */ + protected int showTextAreaConfirmationMessage(Component parent, String labelMessage, String textMessage, String title, int option) { + JLabel labelForMessage = new JLabel(labelMessage); + JTextArea areaForMessage = new JTextArea(textMessage); + areaForMessage.setEditable(false); + areaForMessage.setAutoscrolls(true); + JScrollPane spMessage = new JScrollPane(areaForMessage); + spMessage.setPreferredSize(new Dimension(500, 100)); // don't remove popup is huge + + int response = JOptionPane.showConfirmDialog(parent, new Object[]{labelForMessage, spMessage}, title, option); + return response; + } + protected void topiaCreate() { if (log.isTraceEnabled()) {

1 0

r2262 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org May 25, 2009

May 25, 2009

Author: chatellier Date: 2009-05-25 08:41:15 +0000 (Mon, 25 May 2009) New Revision: 2262 Modified: isis-fish/trunk/pom.xml Log: Update h2 Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-05-25 08:03:20 UTC (rev 2261) +++ isis-fish/trunk/pom.xml 2009-05-25 08:41:15 UTC (rev 2262) @@ -158,7 +158,7 @@ <scope>compile</scope> </dependency> -  +  <dependency> <groupId>org.apache.xmlrpc</groupId> <artifactId>xmlrpc-client</artifactId> @@ -221,7 +221,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.1.112</version> + <version>1.1.113</version> <scope>compile</scope> </dependency>

1 0

r2261 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org May 25, 2009

May 25, 2009

Author: chatellier Date: 2009-05-25 08:03:20 +0000 (Mon, 25 May 2009) New Revision: 2261 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx Log: RSynthax has his own scrollpane Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-05-20 13:44:19 UTC (rev 2260) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-05-25 08:03:20 UTC (rev 2261) @@ -223,9 +223,7 @@ </Table> </cell> <cell fill='both' weightx='1.0' weighty='1.0'> - <JScrollPane> - <org.codelutin.widget.editor.Editor id='editor' askIfNotSaved="false" enabled='{isActif()}'/> - </JScrollPane> + <org.codelutin.widget.editor.Editor id='editor' askIfNotSaved="false" enabled='{isActif()}'/> </cell> </row> </Table>

1 0

r2260 - isis-fish/trunk/src/main/resources
by chatellier＠users.labs.libre-entreprise.org May 20, 2009

May 20, 2009

Author: chatellier Date: 2009-05-20 13:44:19 +0000 (Wed, 20 May 2009) New Revision: 2260 Modified: isis-fish/trunk/src/main/resources/log4j.properties Log: Set log info Modified: isis-fish/trunk/src/main/resources/log4j.properties =================================================================== --- isis-fish/trunk/src/main/resources/log4j.properties 2009-05-20 13:43:44 UTC (rev 2259) +++ isis-fish/trunk/src/main/resources/log4j.properties 2009-05-20 13:44:19 UTC (rev 2260) @@ -6,7 +6,7 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.fr.ifremer.isisfish=DEBUG +log4j.logger.fr.ifremer.isisfish=INFO log4j.logger.org.codelutin=INFO log4j.logger.analyseplans=INFO log4j.logger.exports=INFO

1 0