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

r2226 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by bpoussin＠users.labs.libre-entreprise.org 12 May '09

12 May '09

Author: bpoussin Date: 2009-05-12 17:14:55 +0000 (Tue, 12 May 2009) New Revision: 2226 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Log: changement de version passage en 3.2.0.5 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-12 17:09:16 UTC (rev 2225) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-05-12 17:14:55 UTC (rev 2226) @@ -119,7 +119,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static VersionNumber version = new VersionNumber(3, 2, 0, 4); + protected final static VersionNumber version = new VersionNumber(3, 2, 0, 5); protected final static VersionNumber databaseVersion = new VersionNumber( version.getNumber(0), version.getNumber(1)); protected final static VersionNumber apiVersion = new VersionNumber(

1 0

r2225 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/ui/versionning
by chatellier＠users.labs.libre-entreprise.org 12 May '09

12 May '09

Author: chatellier Date: 2009-05-12 17:09:16 +0000 (Tue, 12 May 2009) New Revision: 2225 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx Log: Remove sshtools dependency (all based on jsch) Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-05-12 17:00:38 UTC (rev 2224) +++ isis-fish/trunk/pom.xml 2009-05-12 17:09:16 UTC (rev 2225) @@ -188,20 +188,6 @@ </dependency> <dependency> - <groupId>sshtools</groupId> - <artifactId>j2ssh-common</artifactId> - <version>${sshtool.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>sshtools</groupId> - <artifactId>j2ssh-core</artifactId> - <version>${sshtool.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> <version>0.1.41</version> @@ -364,7 +350,6 @@ <license-switcher.version>0.6</license-switcher.version> <openmap.version>4.6.4</openmap.version> <aspectwerkz.version>2.0</aspectwerkz.version> - <sshtool.version>0.2.2</sshtool.version> <xmlrpc.version>3.1.2</xmlrpc.version>  Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx 2009-05-12 17:00:38 UTC (rev 2224) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx 2009-05-12 17:09:16 UTC (rev 2225) @@ -1,7 +1,7 @@ <JDialog title='isisfish.server.ssh.generateKey.title' modal='true'> <script><![CDATA[ - import com.sshtools.j2ssh.transport.publickey.OpenSSHPublicKeyFormat; - import com.sshtools.j2ssh.transport.publickey.SshKeyGenerator; + import com.jcraft.jsch.JSch; + import com.jcraft.jsch.KeyPair; import org.codelutin.util.FileUtil; import java.io.File; import java.io.IOException; @@ -41,31 +41,37 @@ error=null; doCheck(); } + + /** + * Generate ssh key. + * + * Return true if error occurs. + */ + protected boolean doGenerate() { + File privateKeyFile = new File(getServerPrivateKeyFile().getText()); + File publicKeyFile = new File(serverPublicKeyFile.getText()); - protected boolean doGenerate() { - File f = new File(getServerPrivateKeyFile().getText()); + // bug #1623, le dossier parent n'existe pas + if (privateKeyFile.getParentFile() != null && privateKeyFile.getParentFile().isDirectory()) { + privateKeyFile.mkdirs(); + } + try { - SshKeyGenerator sshkeygenerator = new SshKeyGenerator(); char[] password = getServerPassPhrase().getPassword(); - noPassPhrase=password.length==0; + + JSch jsch=new JSch(); + KeyPair kpair=KeyPair.genKeyPair(jsch, KeyPair.RSA); 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, ""); + kpair.setPassphrase(Arrays.toString(password)); } - // convert to openSSH ? - File publicKeyFile = new File(serverPublicKeyFile.getText()); - // bug #1623, le dossier parent n'existe pas - if (publicKeyFile.getParentFile() != null && publicKeyFile.getParentFile().isDirectory()) { - publicKeyFile.mkdirs(); + kpair.writePrivateKey(privateKeyFile.getAbsolutePath()); + kpair.writePublicKey(publicKeyFile.getAbsolutePath(), vcsLogin + "@forIsisFish 1024-bit rsa"); + if (log.isInfoEnabled()) { + log.info("Finger print: "+kpair.getFingerPrint()); } - 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); + kpair.dispose(); } catch (Exception e) { - error=e; + error=e; return true; } return false;

1 0

r2224 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions
by chatellier＠users.labs.libre-entreprise.org 12 May '09

12 May '09

Author: chatellier Date: 2009-05-12 17:00:38 +0000 (Tue, 12 May 2009) New Revision: 2224 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java Log: Recode ssh key generation based on jsch. 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-12 16:45:30 UTC (rev 2223) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java 2009-05-12 17:00:38 UTC (rev 2224) @@ -19,15 +19,17 @@ package fr.ifremer.isisfish.actions; -import com.sshtools.j2ssh.transport.publickey.OpenSSHPublicKeyFormat; -import com.sshtools.j2ssh.transport.publickey.SshKeyGenerator; -import fr.ifremer.isisfish.IsisConfig; import java.io.File; import java.util.Arrays; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.FileUtil; +import com.jcraft.jsch.JSch; +import com.jcraft.jsch.KeyPair; + +import fr.ifremer.isisfish.IsisConfig; + /** * * @author poussin @@ -50,28 +52,29 @@ public void sshCreateKey(boolean force) throws Exception { File f = config.getSSHPrivateKeyFilePath(); + // check already exist key if (f.exists() && !force) { log.error("the private key already exist " + f + ", use option [force] to overwrite"); return; } - File publicKeyFile = new File(f.getAbsolutePath() + ".pub"); + // bug #1623, le dossier parent n'existe pas - if (publicKeyFile.getParentFile() != null && publicKeyFile.getParentFile().isDirectory()) { - publicKeyFile.mkdirs(); + if (f.getParentFile() != null && f.getParentFile().isDirectory()) { + f.mkdirs(); } - log.info("Generate ssh key to " + f); - SshKeyGenerator.main(new String[]{"-b", "1024", "-t", "rsa", f.getAbsolutePath()}); - - log.info("public key before OpenSsh : " + FileUtil.readAsString(publicKeyFile)); - String openSshPublicKey = - SshKeyGenerator.convertPublicKeyFile(publicKeyFile, - new OpenSSHPublicKeyFormat( - config.getUserName() + - "@forIsisFish 1024-bit rsa")); - - log.info("public key OpenSsh : " + openSshPublicKey); - FileUtil.writeString(new File(publicKeyFile.getAbsolutePath()), openSshPublicKey); + if (log.isInfoEnabled()) { + log.info("Generate ssh key to " + f); + } + JSch jsch=new JSch(); + KeyPair kpair=KeyPair.genKeyPair(jsch, KeyPair.RSA); + //kpair.setPassphrase(passphrase); + kpair.writePrivateKey(f.getAbsolutePath()); + kpair.writePublicKey(f.getAbsolutePath()+".pub", config.getUserName() + "@forIsisFish 1024-bit rsa"); + if (log.isInfoEnabled()) { + log.info("Finger print: "+kpair.getFingerPrint()); + } + kpair.dispose(); } public void vcsUpdate() throws Exception {

1 0

r2223 - isis-fish/trunk/src/main/assembly
by chatellier＠users.labs.libre-entreprise.org 12 May '09

12 May '09

Author: chatellier Date: 2009-05-12 16:45:30 +0000 (Tue, 12 May 2009) New Revision: 2223 Modified: isis-fish/trunk/src/main/assembly/bin.xml Log: Ajout de la xsd Modified: isis-fish/trunk/src/main/assembly/bin.xml =================================================================== --- isis-fish/trunk/src/main/assembly/bin.xml 2009-05-12 15:40:58 UTC (rev 2222) +++ isis-fish/trunk/src/main/assembly/bin.xml 2009-05-12 16:45:30 UTC (rev 2223) @@ -1,4 +1,6 @@ -<assembly> +<?xml version="1.0" encoding="UTF-8"?> +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.0.0.xsd"> <id>bin</id> <formats> <format>zip</format>

1 0

r2222 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org 12 May '09

12 May '09

Author: chatellier Date: 2009-05-12 15:40:58 +0000 (Tue, 12 May 2009) New Revision: 2222 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java Log: Fix les entr?\195?\169es dupliqu?\195?\169es et/ou non normalis?\195?\169e du classpath Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2009-05-12 15:05:18 UTC (rev 2221) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2009-05-12 15:40:58 UTC (rev 2222) @@ -25,16 +25,23 @@ import java.io.IOException; import java.io.PrintWriter; import java.lang.reflect.Method; +import java.net.MalformedURLException; import java.net.URL; +import java.net.URLClassLoader; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Enumeration; import java.util.List; +import javax.tools.FileObject; +import javax.tools.ForwardingJavaFileManager; import javax.tools.JavaCompiler; +import javax.tools.JavaFileManager; import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; +import javax.tools.StandardLocation; +import javax.tools.JavaFileObject.Kind; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -246,8 +253,13 @@ public static String getClassPathAsString(List<File> classpath) throws Exception { String result = StringUtils.join(classpath.iterator(), - File.pathSeparator) - + File.pathSeparator + System.getProperty("java.class.path"); + File.pathSeparator); + + // chatellier : since 20090512 java.class.path in not added to + // classpath. + // result in duplicated entry or non normalised entry + // en compilation fail some times + //+ File.pathSeparator + System.getProperty("java.class.path"); // Ajout des jars for (Enumeration<?> e = CompileHelper.class.getClassLoader() @@ -265,6 +277,18 @@ } } + // chatellier : mais sous eclipse par exemple, on a besoin du classpath + // on test que le class path n'est pas un jar et qu'il n'apparait + // pas deja : + String systemClassPath = System.getProperty("java.class.path"); + String[] systemClassPathes = systemClassPath.split(File.pathSeparator); + for (String path : systemClassPathes) { + String absolutePath = new File(path).getCanonicalPath(); + if (!result.contains(absolutePath)) { + result += File.pathSeparator + absolutePath; + } + } + if (log.isDebugEnabled()) { log.debug("CLASSPATH : " + result); }

1 0

r2221 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 12 May '09

12 May '09

Author: chatellier Date: 2009-05-12 15:05:18 +0000 (Tue, 12 May 2009) New Revision: 2221 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Add comment to fix locked database 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-12 15:03:20 UTC (rev 2220) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-12 15:05:18 UTC (rev 2221) @@ -667,6 +667,8 @@ // on construit la liste des simulation storage // et on l'envoie au script d'analyse de sensibilite if (simulationStorageForAnalyze.size() == numberOfSimulation) { + // FIXME buggy because of hack in getParameter() + // getRegion() from simulation can be lockek SimulationParameter params = simulation.getParameter(); SensitivityCalculator sensitivityCalculator = params.getSensitivityCalculator(); if (sensitivityCalculator != null) {

1 0

r2220 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: input sensitivity
by sletellier＠users.labs.libre-entreprise.org 12 May '09

12 May '09

Author: sletellier Date: 2009-05-12 15:03:20 +0000 (Tue, 12 May 2009) New Revision: 2220 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx Log: UI optimisation Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-05-12 14:40:58 UTC (rev 2219) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-05-12 15:03:20 UTC (rev 2220) @@ -72,7 +72,6 @@ import jaxx.runtime.swing.navigation.NavigationUtil; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.entities.FisheryRegionImpl; -import jaxx.runtime.swing.navigation.NavigationTreeCellRenderer; import jaxx.runtime.swing.navigation.NavigationTreeModel; import jaxx.runtime.Decorator; import jaxx.runtime.JXPathDecorator; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2009-05-12 14:40:58 UTC (rev 2219) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2009-05-12 15:03:20 UTC (rev 2220) @@ -58,17 +58,15 @@ protected InputContentUI currentUI = null; protected TopiaEntity currentEntity = null; - public SensitivityNavigationTreeSelectionAdapter(SensitivityTabUI context, boolean register) { + public SensitivityNavigationTreeSelectionAdapter(SensitivityTabUI context) { super(SensitivityTabUI.class, null, context, Strategy.PER_UI_TYPE); if (context.getNavigation() == null) { throw new IllegalArgumentException("could not have a null 'navigation' in ui " + context); } - if (register) { - // register in tree this listener - context.getNavigation().addTreeSelectionListener(this); - } + // register in tree this listener + context.getNavigation().addTreeSelectionListener(this); } @Override Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-05-12 14:40:58 UTC (rev 2219) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-05-12 15:03:20 UTC (rev 2220) @@ -21,6 +21,8 @@ <javax.swing.tree.DefaultTreeSelectionModel id='navigationSelectionModel' selectionMode='{javax.swing.tree.TreeSelectionModel.SINGLE_TREE_SELECTION}'/> + <jaxx.runtime.swing.navigation.NavigationTreeCellRenderer id='navigationTreeCellRenderer' constructorParams='this'/> + <jaxx.runtime.swing.CardLayout2 id='cardlayout'/> <java.awt.CardLayout id='cardlayoutPrincipal'/> @@ -33,7 +35,6 @@ import fr.ifremer.isisfish.ui.input.InputAction; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; -import jaxx.runtime.swing.navigation.NavigationTreeCellRenderer; import jaxx.runtime.swing.navigation.NavigationTreeModel; import fr.ifremer.isisfish.ui.input.InputSaveVerifier; import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode; @@ -46,6 +47,7 @@ // end code constructor getVerifier().setSensPanel(this); +new fr.ifremer.isisfish.ui.sensitivity.SensitivityNavigationTreeSelectionAdapter(this); factors.addMouseListener(new MouseListener() { @Override @@ -125,12 +127,9 @@ String regionName = getRegion().getName(); setContextValue(getRegion()); NavigationTreeModel model = SensitivityNavigationTreeSelectionAdapter.getTreeModel(regionName, getRegion()); - navigation.setSelectionModel(navigationSelectionModel); - navigation.setCellRenderer(new NavigationTreeCellRenderer(this)); setContextValue(model); navigation.setModel(model); - new SensitivityNavigationTreeSelectionAdapter(this, true); setTreeSelection("$root"); } } @@ -187,7 +186,10 @@ <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTree id="navigation" rootVisible="true" selectionRow='0' model='{new DefaultTreeModel(null)}'/> + <JTree id="navigation" rootVisible="true" selectionRow='0' + selectionModel='{getNavigationSelectionModel()}' + cellRenderer='{getNavigationTreeCellRenderer()}' + model='{new DefaultTreeModel(null)}'/> </JScrollPane> </cell> </row>

1 0

r2219 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by sletellier＠users.labs.libre-entreprise.org 12 May '09

12 May '09

Author: sletellier Date: 2009-05-12 14:40:58 +0000 (Tue, 12 May 2009) New Revision: 2219 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx Log: Coeficient is set to 100 by default Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2009-05-12 14:20:28 UTC (rev 2218) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2009-05-12 14:40:58 UTC (rev 2219) @@ -81,7 +81,9 @@ } else if (columnIndex == 1){ return datas.get(rowIndex).getReferenceValue(); } else if (columnIndex == 2){ - return datas.get(rowIndex).getCoefficient() == null ? 100 : datas.get(rowIndex).getCoefficient() * 100; + Double result = datas.get(rowIndex).getCoefficient() == null ? 100 : datas.get(rowIndex).getCoefficient() * 100; + datas.get(rowIndex).setCoefficient(result / 100); + return result; } else if (columnIndex == 3){ return datas.get(rowIndex).getOperator(); } else if (columnIndex == 4){

1 0

r2218 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by sletellier＠users.labs.libre-entreprise.org 12 May '09

12 May '09

Author: sletellier Date: 2009-05-12 14:20:28 +0000 (Tue, 12 May 2009) New Revision: 2218 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx Log: Loading PreScript when old simulation selected Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-05-12 13:15:49 UTC (rev 2217) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-05-12 14:20:28 UTC (rev 2218) @@ -82,16 +82,6 @@ setListSimulParamsPopulationsItems(); setRulesItems(); fieldSimulParamsRegion.setSelectedItem(getContextValue(SimulAction.class).getSimulationParameter().getRegionName()); - if (!isSensitivity()) { - if (getContextValue(SimulAction.class).getSimulationParameter().getUsePreScript()) { - SimulUI simul = getParentContainer(SimulUI.class); - simul.enablePreSimul(); - } - if (getContextValue(SimulAction.class).getSimulationParameter().getUseAnalysePlan()) { - SimulUI simul = getParentContainer(SimulUI.class); - simul.enableAnalysePlan(); - } - } } protected void regionChange(ItemEvent e) { if (e.getStateChange() == ItemEvent.SELECTED) { @@ -114,6 +104,13 @@ } } } +protected void setPreScript() { + if (!isSensitivity()){ + String preScript = getContextValue(SimulAction.class).getSimulationParameter().getPreScript(); + fieldUseSimulPreScripts.setSelected(preScript != null && !preScript.isEmpty()); + getParentContainer(SimulUI.class).getPreSciptUI().getFieldSimulPreScript().setText(preScript); + } +} protected void setFactorRegion() { if (isSensitivity()){ try { @@ -156,6 +153,7 @@ refresh(); // mise a jour des années fieldSimulParamsNbAnnees.setText(String.valueOf(getContextValue(SimulAction.class).getNumberOfYear())); + setPreScript(); setFactorRegion(); setExportSens(); setSensitivityCalculator(); @@ -188,18 +186,24 @@ } protected void enablePreSimul(){ getContextValue(SimulAction.class).getSimulationParameter().setUsePreScript(fieldUseSimulPreScripts.isSelected()); - if (fieldUseSimulPreScripts.isSelected() && !isSensitivity()){ + if (!isSensitivity()){ SimulUI simul = getParentContainer(SimulUI.class); - simul.enablePreSimul(); + simul.enablePreSimul(fieldUseSimulPreScripts.isSelected()); } } protected void enableAnalysePlan(){ getContextValue(SimulAction.class).getSimulationParameter().setUseAnalysePlan(fieldSimulUseAnalysePlan.isSelected()); - if (fieldSimulUseAnalysePlan.isSelected() && !isSensitivity()){ + if (!isSensitivity()){ SimulUI simul = getParentContainer(SimulUI.class); - simul.enableAnalysePlan(); + simul.enableAnalysePlan(fieldSimulUseAnalysePlan.isSelected()); } } +protected void selTab(MouseEvent e, int i){ + if (((JCheckBox)e.getSource()).isSelected()){ + SimulUI simul = getParentContainer(SimulUI.class); + simul.selTab(i); + } +} protected void enableOnlyExport(){ if (fieldSimulOnlyExport.isSelected()){ getContextValue(SimulAction.class).getSimulationParameter().setOnlyExport(true); @@ -618,10 +622,14 @@ <Table> <row> <cell fill="horizontal" weightx="0.3"> - <JCheckBox text="isisfish.params.usePreSimulationScript" id="fieldUseSimulPreScripts" visible='{!isSensitivity()}' onItemStateChanged='enablePreSimul()'/> + <JCheckBox text="isisfish.params.usePreSimulationScript" id="fieldUseSimulPreScripts" + selected='{getContextValue(SimulAction.class).getSimulationParameter().getUsePreScript()}' + visible='{!isSensitivity()}' onItemStateChanged='enablePreSimul()' onMouseReleased='selTab(event, 1)'/> </cell> <cell fill="horizontal" weightx="0.3"> - <JCheckBox text="isisfish.params.useAnalysePlan" id="fieldSimulUseAnalysePlan" visible='{!isSensitivity()}' onItemStateChanged='enableAnalysePlan()'/> + <JCheckBox text="isisfish.params.useAnalysePlan" id="fieldSimulUseAnalysePlan" + selected='{getContextValue(SimulAction.class).getSimulationParameter().getUseAnalysePlan()}' + visible='{!isSensitivity()}' onItemStateChanged='enableAnalysePlan()' onMouseReleased='selTab(event, 2)'/> </cell> <cell fill="horizontal" weightx="0.3"> <JCheckBox text="isisfish.params.onlyExportSimulation" id="fieldSimulOnlyExport" onItemStateChanged='enableOnlyExport()'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-05-12 13:15:49 UTC (rev 2217) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-05-12 14:20:28 UTC (rev 2218) @@ -303,7 +303,6 @@ // all time reset number after load param.setAnalysePlanNumber(-1); regionStorage = param.getRegion(); - // Chargement des sensibilites sensitivityCalculator = param.getSensitivityCalculator(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2009-05-12 13:15:49 UTC (rev 2217) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2009-05-12 14:20:28 UTC (rev 2218) @@ -49,13 +49,11 @@ toolTipManager.setInitialDelay(0); toolTipManager.setDismissDelay(60000); } - protected void enablePreSimul() { - simulTabs.setEnabledAt(1,true); - selTab(1); + protected void enablePreSimul(boolean selected) { + simulTabs.setEnabledAt(1, selected); } - protected void enableAnalysePlan() { - simulTabs.setEnabledAt(2,true); - selTab(2); + protected void enableAnalysePlan(boolean selected) { + simulTabs.setEnabledAt(2, selected); } protected void selTab(int i) { simulTabs.setSelectedIndex(i);

1 0

r2217 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result
by sletellier＠users.labs.libre-entreprise.org 12 May '09

12 May '09

Author: sletellier Date: 2009-05-12 13:15:49 +0000 (Tue, 12 May 2009) New Revision: 2217 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateUI.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemUI.java Log: Sigma buttons are visibly selected Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateUI.java 2009-05-12 09:42:35 UTC (rev 2216) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateUI.java 2009-05-12 13:15:49 UTC (rev 2217) @@ -28,6 +28,7 @@ import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JScrollPane; +import javax.swing.JToggleButton; import javax.swing.JViewport; import javax.swing.ListSelectionModel; @@ -186,10 +187,10 @@ return __label__; } - private JRadioButton __sumAnButton__ = null; - public JRadioButton getSumAnButton(){ + private JToggleButton __sumAnButton__ = null; + public JToggleButton getSumAnButton(){ if(__sumAnButton__ == null){ - JRadioButton result = new JRadioButton(_("isisfish.common.blank"), false); + JToggleButton result = new JToggleButton(_("isisfish.common.blank"), false); result.setToolTipText(_("isisfish.common.sum")); __sumAnButton__ = result; @@ -197,10 +198,10 @@ return __sumAnButton__; } - private JRadioButton __sumButton__ = null; - public JRadioButton getSumButton(){ + private JToggleButton __sumButton__ = null; + public JToggleButton getSumButton(){ if(__sumButton__ == null){ - JRadioButton result = new JRadioButton(_("isisfish.common.blank"), false); + JToggleButton result = new JToggleButton(_("isisfish.common.blank"), false); result.setToolTipText(_("isisfish.infoItem.sum")); __sumButton__ = result; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemUI.java 2009-05-12 09:42:35 UTC (rev 2216) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemUI.java 2009-05-12 13:15:49 UTC (rev 2217) @@ -26,8 +26,8 @@ import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JPanel; -import javax.swing.JRadioButton; import javax.swing.JScrollPane; +import javax.swing.JToggleButton; import javax.swing.JViewport; import javax.swing.ListSelectionModel; @@ -175,10 +175,10 @@ return __label__; } - private JRadioButton __sumButton__ = null; - public JRadioButton getSumButton(){ + private JToggleButton __sumButton__ = null; + public JToggleButton getSumButton(){ if(__sumButton__ == null){ - JRadioButton result = new JRadioButton(_("isisfish.common.blank"), false); + JToggleButton result = new JToggleButton(_("isisfish.common.blank"), false); result.setToolTipText(_("isisfish.common.sum")); __sumButton__ = result;

1 0