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

r3370 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish: . ui vcs
by chatellier＠users.labs.libre-entreprise.org 08 Jun '11

08 Jun '11

Author: chatellier Date: 2011-06-08 13:03:49 +0000 (Wed, 08 Jun 2011) New Revision: 3370 Log: Add configuration for community VCS Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-06-08 13:02:19 UTC (rev 3369) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-06-08 13:03:49 UTC (rev 3370) @@ -206,6 +206,16 @@ File result = getOptionAsFile(Option.DATABASE_DIRECTORY.key); return result; } + + /** + * Retourne le repertoire racine de toutes les donnees communauté (commit utilisateur). + * + * @return community database directory + */ + public File getCommunityDatabaseDirectory() { + File result = getOptionAsFile(Option.COMMUNITY_DATABASE_DIRECTORY.key); + return result; + } /** * Get database directory to use for script. @@ -957,10 +967,10 @@ */ public static enum Option implements OptionDef { + CONFIG_FILE(CONFIG_FILE_NAME, n_("isisfish.config.main.configFileName.description"), CONFIG_FILENAME), COMPILATION_DIRECTORY("compilation.directory", n_("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-build"), MONITORING_DIRECTORY("monitoring.directory", n_("isisfish.config.main.monitoringDirectory.description"), getUserHome() + File.separator + "isis-monitoring"), JAVADOC_DIRECTORY("javadoc.directory", n_("isisfish.config.main.javadocDirectory.description"), getUserHome() + File.separator + "isis-docs"), - CONFIG_FILE(CONFIG_FILE_NAME, n_("isisfish.config.main.configFileName.description"), CONFIG_FILENAME), BACKUP_DIRECTORY("backup.directory", n_("isisfish.config.main.defaultBackupDirectory.description"), getUserHome() + File.separator + "isis-backup"), DEFAULT_EXPORT_NAMES("default.export.names", n_("isisfish.config.main.defaultExportNames.description"), ""), @@ -1002,7 +1012,7 @@ /** Application locale (for i18n init). */ LOCALE("locale", n_("isisfish.config.main.locale.description"), "fr_FR"), SIMULATION_SHOW_ONLY_ERROR("simulationShowOnlyError", n_("isisfish.config.main.simulationShowOnlyError.description"), "false"), - + /** Perform ui launch option. */ LAUNCH_UI("launch.ui", n_("isisfish.config.main.launchUI.description"), "true"), /** Perform data migration option. */ @@ -1011,32 +1021,35 @@ PERFORM_VCS_UPDATE("perform.vcsupdate", n_("isisfish.config.main.performvcsupdate.description"), "true"), /** Perform cron option. */ PERFORM_CRON("perform.cron", n_("isisfish.config.main.performcron.description"), "true"), - - /** Database directory. */ - DATABASE_DIRECTORY("database.directory", n_("isisfish.config.vcs.localDatabasePath.description"), getUserHome() + File.separator + "isis-database-3"), + /** Database lock mode (h2).*/ DATABASE_LOCK_MODE("database.lockmode", n_("isisfish.config.database.lockmode.description"), "file"), - + // SSH (global, for both VCS and caparmor) SSH_KEY_FILE("ssh.key.file", n_("isisfish.config.ssh.key.file.description"), getUserHome() + File.separator + ".ssh" + File.separator + "isis_rsa"), - //SSH_PASSPHRASE_ENABLED("ssh.passphrase.enabled", _("isisfish.config.vcs.noPassPhrase.description"), "false"), - //SSH_PASSPHRASE("ssh.passphrase", _("isisfish.config.vcs.passphrase.description"), ""), - // can be None, CVS or SVN. only None or SVN work + DATABASE_DIRECTORY("database.directory", n_("isisfish.config.vcs.localDatabasePath.description"), getUserHome() + File.separator + "isis-database-3"), VCS_TYPE(VCS.VCS_TYPE, n_("isisfish.config.vcs.type.description"), VCS.TYPE_SVN), - // depend of VCS_TYPE, for SVN can be svn, svn+ssh, http or file - VCS_PROTOCOL(VCS.VCS_PROTOCOL, n_("isisfish.config.vcs.useSshConnexion.description"), "svn"), - - // user login to access vcs + VCS_PROTOCOL(VCS.VCS_PROTOCOL, n_("isisfish.config.vcs.protocol.description"), "svn"), VCS_USER_NAME(VCS.VCS_USER_NAME, n_("isisfish.config.vcs.userName.description"), ""), VCS_USER_PASSWORD(VCS.VCS_USER_PASSWORD, n_("isisfish.config.vcs.userPassword.description"), ""), VCS_HOST_NAME(VCS.VCS_HOST_NAME, n_("isisfish.config.vcs.hostName.description"), "labs.libre-entreprise.org"), VCS_PATH(VCS.VCS_PATH, n_("isisfish.config.vcs.remotePath.description"), "/svnroot/isis-fish-data/"), + // community vsc + COMMUNITY_DATABASE_DIRECTORY("community.database.directory", n_("isisfish.config.vcs.localCommunityDatabasePath.description"), getUserHome() + File.separator + "isis-community-database-3"), + VCS_COMMUNITY_TYPE("vcs.community.type", n_("isisfish.config.vcs.community.type.description"), VCS.TYPE_SVN), + VCS_COMMUNITY_PROTOCOL("vcs.community.protocole", n_("isisfish.config.vcs.community.protocol.description"), "http"), + VCS_COMMUNITY_USER_NAME("vcs.community.username", n_("isisfish.config.vcs.community.username.description"), ""), + VCS_COMMUNITY_PASSWORD("vcs.community.password", n_("isisfish.config.vcs.community.password.description"), ""), + VCS_COMMUNITY_HOST_NAME("vcs.community.hostname", n_("isisfish.config.vcs.community.hostname.description"), "www.isis-fish.org"), + VCS_COMMUNITY_PATH("vcs.community.path", n_("isisfish.config.vcs.community.remotepath.description"), "/svn/isis-fish-community/"), + + // misc options USER_NAME("user.name", n_("isisfish.config.main.userName.description"), System.getProperty("user.name")), SMTP_SERVER("smtpServer", n_("isisfish.config.main.smtpServer.description"), "smtp"), USER_MAIL("userMail", n_("isisfish.config.main.userMail.description"), USER_NAME.key + "@" + VCS_HOST_NAME.key); - + public String key; public String description; public String defaultValue; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-06-08 13:02:19 UTC (rev 3369) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-06-08 13:03:49 UTC (rev 3370) @@ -112,6 +112,8 @@ static public IsisConfig config = null; static public VCS vcs = null; + + static public VCS communityVcs = null; /** * ask for application quit @@ -141,6 +143,7 @@ // static vcs init (needed for some actions) try { initVCS(); + initCommunityVCS(); } catch (Exception eee) { log.warn(_("Error during vcs initialisation"), eee); } @@ -151,8 +154,6 @@ // after init vcs and local data config.doAction(IsisConfig.STEP_AFTER_INIT_VCS); - - doNuitonMigration(); launchUI(); @@ -174,82 +175,6 @@ } /** - * Move user script to nuiton dependants packages. - * - * Find all files containing "org.codelutin." into "org.nuiton." - */ - protected static void doNuitonMigration() { - if (config.isPerformMigration()) { - // Search in a set of directories - // Searching throw simulations/* can take a huge time... - File[] folders = new File[]{ - AnalysePlanStorage.getAnalysePlanDirectory(), - ExportStorage.getExportDirectory(), - FormuleStorage.getFormuleDirectory(), - RuleStorage.getRuleDirectory(), - ScriptStorage.getScriptDirectory(), - SensitivityStorage.getSensitivityDirectory(), - SensitivityExportStorage.getSensitivityExportDirectory(), - SimulatorStorage.getSimulatorDirectory() - }; - - try { - Map<File, List<CharSequence>> filesToMigrate = new HashMap<File, List<CharSequence>>(); - for (File folder : folders) { - filesToMigrate.putAll(FileUtil.grep("org\\.codelutin\\.", folder, ".*\\.java", "ISO-8859-1")); - } - - if (!filesToMigrate.isEmpty()) { - - // yes by defaut (for tests) - // but ask user if UI launch - boolean migrationOption = true; - if (IsisFish.config.isLaunchUI()) { - // display a user frame - String migratedFiles = ""; - String separator = ""; - for (File fileToMigrate : filesToMigrate.keySet()) { - migratedFiles += separator + fileToMigrate.toString(); - separator = "\n"; - } - JLabel labelModifiedFiles = new JLabel(_("isisfish.misc.nuitonmigration")); - JTextArea areaModifiedFiles = new JTextArea(migratedFiles); - areaModifiedFiles.setEditable(false); - areaModifiedFiles.setAutoscrolls(true); - JScrollPane sp = new JScrollPane(areaModifiedFiles); - sp.setPreferredSize(new Dimension(500, 100)); // don't remove popup is huge - migrationOption = ask(new Component[] { labelModifiedFiles, sp} ); - } - - // if migration has to be done - if (migrationOption) { - if (log.isInfoEnabled()) { - log.info("Starting nuiton.org migration for user scripts :"); - } - - for (File fileToMigrate : filesToMigrate.keySet()) { - if (log.isInfoEnabled()) { - log.info(" migrate file : " + fileToMigrate.getAbsolutePath()); - } - FileUtil.sed("org\\.codelutin\\.", "org.nuiton.", fileToMigrate, "ISO-8859-1"); - } - } - } - } - catch(IOException eee) { - if (log.isErrorEnabled()) { - log.error("Can't to nuiton migration", eee); - } - } - } - else { - if (log.isInfoEnabled()) { - log.info(_("Skip data migration (disabled)")); - } - } - } - - /** * Install "Nimbus" LookAndFeel if available. * * @throws InstantiationException @@ -297,6 +222,7 @@ // i18n is not inited here if (log.isInfoEnabled()) { log.info("Starting Isis-Fish with args : " + java.util.Arrays.toString(args)); + log.info("Isis Version: " + IsisConfig.getVersion()); log.info("Date: " + SimpleDateFormat.getInstance().format(new java.util.Date())); log.info("Java version: " + System.getProperty("java.runtime.version")); log.info("Java VM: " + System.getProperty("java.vm.name")); @@ -385,16 +311,6 @@ } /** - * Switch le vcs vers VCSNone et le sauvegarde pour le prochain lancement - */ - protected static void switchToNoneVCS() { - log.info(_("Switch repository type to none")); - config.setOption(IsisConfig.Option.VCS_TYPE.key, VCS.TYPE_NONE); - config.saveForUser(); - vcs = VCSFactory.createVCS(config); - } - - /** * Initialise le VCS et check s'il y a des mises à jour pour * prevenir l'utilisateur. * @@ -436,7 +352,10 @@ "Can't rename local repository that don't use svn"); } } else { - switchToNoneVCS(); + log.info(_("Switch repository type to none")); + config.setOption(IsisConfig.Option.VCS_TYPE.key, VCS.TYPE_NONE); + config.saveForUser(); + vcs = VCSFactory.createVCS(config); } } } @@ -447,8 +366,7 @@ log.info(_("Local repository don't exist")); } if (!vcs.isConnected()) { - ErrorHelper.showErrorDialog(_( - "isisfish.vcs.init.notfoundcantdownload", + ErrorHelper.showErrorDialog(_("isisfish.vcs.init.notfoundcantdownload", IsisConfig.getApiVersion()), null); } else { // Si on utilise pas le bon tag on change de tag @@ -540,11 +458,94 @@ else { // VCS can't be null // set none if ui isn't launched - config.setOption(VCS.VCS_TYPE, "none"); // to make him happy + config.setOption(VCS.VCS_TYPE, VCS.TYPE_NONE); // to make him happy vcs = VCSFactory.createVCS(config); } } + + /** + * Initialise le VCS et check s'il y a des mises à jour pour + * prevenir l'utilisateur. + * + * @throws VCSException + */ + static public void initCommunityVCS() throws VCSException { + // vcs must be done is ui is enabled too + if (config.isLaunchUI() && config.isPerformVcsUpdate()) { + + // init vcs + // in graphical mode, real VCS + communityVcs = VCSFactory.createPublicVCS(config); + + VCSActionAsker asker = new VCSActionAsker(); + communityVcs.addVetoableActionListener(asker); + + // Si le repo local exist mais n'est pas du bon type, on renome ce repertoire + File local = config.getCommunityDatabaseDirectory(); + + if (local.exists()) { + if (!communityVcs.isValidLocalRepository()) { + if (log.isInfoEnabled()) { + log.info(_("Local repository exists but it's not valide for current vcs: %s", + config.getOption(VCS.VCS_TYPE))); + } + if (ask(_("isisfish.vcs.init.wrongprotocol", local))) { + File localBackup = new File(local.getParentFile(), + local.getName() + "-" + + new SimpleDateFormat("yyyy-mm-dd-HH-mm-ss").format(new java.util.Date())); + if (log.isInfoEnabled()) { + log.info(_("Rename data directory to %s", localBackup)); + } + if (!local.renameTo(localBackup)) { + throw new IsisFishRuntimeException( + "Can't rename local repository that don't use svn"); + } + } else { + log.info(_("Switch repository type to none")); + config.setOption(IsisConfig.Option.VCS_COMMUNITY_TYPE.key, VCS.TYPE_NONE); + config.saveForUser(); + communityVcs = VCSFactory.createPublicVCS(config); + } + } + } + + // Si le repo local n'existe pas on fait un check out complet + if (!local.exists()) { + if (log.isInfoEnabled()) { + log.info(_("Local repository don't exist")); + } + if (!communityVcs.isConnected()) { + ErrorHelper.showErrorDialog(_("isisfish.vcs.init.notfoundcantdownload", + "trunk"), null); + } else { + // initialise le repo local + communityVcs.checkout(null, true); + } + } + + // on s'arrete la si on est pas connecte + if (communityVcs.isConnected()) { + + // cleanup + communityVcs.cleanup(null); + + // check protocol, user, host + communityVcs.checkProtocol(); + + } + + // fin de l'init on supprime le vetoable du vcs + communityVcs.remoteVetoableActionListener(asker); + } + else { + // VCS can't be null + // set none if ui isn't launched + config.setOption(IsisConfig.Option.VCS_COMMUNITY_TYPE.key, VCS.TYPE_NONE); // to make him happy + communityVcs = VCSFactory.createPublicVCS(config); + } + } + /** * Display dialog with files list, and specifique label. * @@ -625,8 +626,6 @@ // init IsisTray IsisTray.getInstance(); - //initRSyntaxJavaSupport(config); - // configure swing session // can't be in config ? getUserConfigDirectory() not static File isisConfigDirectory = new File(config.getUserConfigDirectory(), "isis-fish"); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2011-06-08 13:02:19 UTC (rev 3369) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2011-06-08 13:03:49 UTC (rev 3370) @@ -202,7 +202,7 @@ } /** - * Show config frame (Jaxx based). + * Show config frame. * * @param welcomeUI parent ui */ @@ -213,6 +213,7 @@ modelBuilder.addCategory(_("isisfish.config.category.main"), _("isisfish.config.category.main.description")); modelBuilder.addOption(IsisConfig.Option.CONFIG_FILE); modelBuilder.addOption(IsisConfig.Option.DATABASE_DIRECTORY); + modelBuilder.addOption(IsisConfig.Option.COMMUNITY_DATABASE_DIRECTORY); modelBuilder.addOption(IsisConfig.Option.COMPILATION_DIRECTORY); modelBuilder.addOption(IsisConfig.Option.MONITORING_DIRECTORY); modelBuilder.addOption(IsisConfig.Option.JAVADOC_DIRECTORY); @@ -220,15 +221,24 @@ modelBuilder.addOption(IsisConfig.Option.LOCALE); modelBuilder.addOption(IsisConfig.Option.SIMULATION_SHOW_ONLY_ERROR); - // category control - modelBuilder.addCategory(_("isisfish.config.category.versioning"), _("isisfish.config.category.versioning.description")); + // category database vcs + modelBuilder.addCategory(_("isisfish.config.category.officialvcs"), _("isisfish.config.category.officialvcs.description")); modelBuilder.addOption(IsisConfig.Option.VCS_TYPE); modelBuilder.addOption(IsisConfig.Option.VCS_PROTOCOL); + modelBuilder.addOption(IsisConfig.Option.VCS_HOST_NAME); + modelBuilder.addOption(IsisConfig.Option.VCS_PATH); modelBuilder.addOption(IsisConfig.Option.VCS_USER_NAME); modelBuilder.addOption(IsisConfig.Option.VCS_USER_PASSWORD); - modelBuilder.addOption(IsisConfig.Option.VCS_HOST_NAME); - modelBuilder.addOption(IsisConfig.Option.VCS_PATH); + // category community vcs + modelBuilder.addCategory(_("isisfish.config.category.communityvcs"), _("isisfish.config.category.communityvcs.description")); + modelBuilder.addOption(IsisConfig.Option.VCS_COMMUNITY_TYPE); + modelBuilder.addOption(IsisConfig.Option.VCS_COMMUNITY_PROTOCOL); + modelBuilder.addOption(IsisConfig.Option.VCS_COMMUNITY_HOST_NAME); + modelBuilder.addOption(IsisConfig.Option.VCS_COMMUNITY_PATH); + modelBuilder.addOption(IsisConfig.Option.VCS_COMMUNITY_USER_NAME); + modelBuilder.addOption(IsisConfig.Option.VCS_COMMUNITY_PASSWORD); + // category misc modelBuilder.addCategory(_("isisfish.config.category.misc"), _("isisfish.config.category.misc.description")); modelBuilder.addOption(IsisConfig.Option.SSH_KEY_FILE); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java 2011-06-08 13:02:19 UTC (rev 3369) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java 2011-06-08 13:03:49 UTC (rev 3370) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -49,26 +49,29 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static Log log = LogFactory.getLog(VCSFactory.class); - private VCSFactory() {} + protected static final Properties TYPE_ALIASES = new Properties(); + static { + TYPE_ALIASES.setProperty("", VCSNone.class.getName()); + TYPE_ALIASES.setProperty(VCS.TYPE_NONE, VCSNone.class.getName()); + TYPE_ALIASES.setProperty(VCS.TYPE_SVN, VCSSVN.class.getName()); + } + + private VCSFactory() { + + } + /** - * VCSNone factory, looking for vcs.type key in config to find vcs class to used. + * VCS factory, looking for vcs.type key in config to find vcs class to used. * If no vcs.type found or is not valid class, use {@link VCSNone}. * - * @param config - * @return usable VCSNone + * @param config config + * @return usable VCS */ static public VCS createVCS(IsisConfig config) { - Properties aliases = new Properties(); - // for empty and TYPE_NONE we used this class - aliases.setProperty("", VCSNone.class.getName()); - aliases.setProperty(VCS.TYPE_NONE, VCSNone.class.getName()); - aliases.setProperty(VCS.TYPE_SVN, VCSSVN.class.getName()); - - VCS result = null; String type = config.getOption(VCS.VCS_TYPE); // try to convert if type is not class name but an alias - String classname = aliases.getProperty(type, type); + String classname = TYPE_ALIASES.getProperty(type, type); File dataDir = config.getDatabaseDirectory(); String protocol = config.getOption(VCS.VCS_PROTOCOL); @@ -78,13 +81,56 @@ String login = config.getOption(VCS.VCS_USER_NAME); String password = config.getOption(VCS.VCS_USER_PASSWORD); + VCS result = makeVCSInstance(classname, dataDir, protocol, host, path, sshKeyFile, login, password); + return result; + } + + /** + * Create VCS to manage community VCS repository. + * + * @param config config + * @return usable VCS + */ + static public VCS createPublicVCS(IsisConfig config) { + String type = config.getOption(IsisConfig.Option.VCS_COMMUNITY_TYPE.key); + // try to convert if type is not class name but an alias + String classname = TYPE_ALIASES.getProperty(type, type); + + File dataDir = config.getCommunityDatabaseDirectory(); + String protocol = config.getOption(IsisConfig.Option.VCS_COMMUNITY_PROTOCOL.key); + String host = config.getOption(IsisConfig.Option.VCS_COMMUNITY_HOST_NAME.key); + String path = config.getOption(IsisConfig.Option.VCS_COMMUNITY_PATH.key); + File sshKeyFile = config.getSSHPrivateKeyFilePath(); + String login = config.getOption(IsisConfig.Option.VCS_COMMUNITY_USER_NAME.key); + String password = config.getOption(IsisConfig.Option.VCS_COMMUNITY_PASSWORD.key); + + VCS result = makeVCSInstance(classname, dataDir, protocol, host, path, sshKeyFile, login, password); + return result; + } + + /** + * Make CSV instance. + * + * @param classname class name + * @param dataDir root data dir + * @param protocol protocol + * @param host host + * @param path path + * @param sshKeyFile ssh key file + * @param login login + * @param password password + * @return CSV instance + */ + static protected VCS makeVCSInstance(String classname, File dataDir, String protocol, + String host, String path, File sshKeyFile, String login, String password) { + VCS result = null; try { - Class<?> clazz = (Class<?>) ConvertUtils.convert(classname, Class.class); + Class clazz = (Class) ConvertUtils.convert(classname, Class.class); result = (VCS) ConstructorUtils.invokeConstructor(clazz, new Object[]{dataDir, protocol, host, path, sshKeyFile, login, password}); } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error(_("isisfish.vcs.factory.cantinstanciate", type), eee); + log.error(_("isisfish.vcs.factory.cantinstanciate", classname), eee); } result = new VCSNone(dataDir, protocol, host, path, sshKeyFile, login, password); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2011-06-08 13:02:19 UTC (rev 3369) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2011-06-08 13:03:49 UTC (rev 3370) @@ -168,7 +168,7 @@ passphrase = SSHAgent.getAgent().getPassphrase(sshKeyFile); } catch(InvalidPassphraseException e) { - if(log.isWarnEnabled()) { + if (log.isWarnEnabled()) { log.warn("Can't get passphrase for key", e); } } @@ -283,8 +283,7 @@ || !url.getHost().equals(newUrl.getHost())) { if (fireAction(VCSActionEvent.SWITCH_PROTOCOL)) { if (log.isInfoEnabled()) { - log.info(_( - "isisfish.vcs.vcssvn.checkProtocol.relocate", + log.info(_("isisfish.vcs.vcssvn.checkProtocol.relocate", localRoot, url, newUrl)); }

1 0

r3369 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org 08 Jun '11

08 Jun '11

Author: chatellier Date: 2011-06-08 13:02:19 +0000 (Wed, 08 Jun 2011) New Revision: 3369 Log: Fix rule list management Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2011-06-08 12:59:30 UTC (rev 3368) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2011-06-08 13:02:19 UTC (rev 3369) @@ -37,17 +37,17 @@ java.beans.PropertyChangeEvent java.beans.PropertyChangeListener java.util.List - fr.ifremer.isisfish.IsisFishException + fr.ifremer.isisfish.IsisFishException fr.ifremer.isisfish.IsisFishRuntimeException - fr.ifremer.isisfish.datastore.RuleStorage - fr.ifremer.isisfish.rule.Rule - fr.ifremer.isisfish.ui.models.rule.RuleListModel - fr.ifremer.isisfish.ui.models.rule.RuleParametersTableModel - fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellEditor - fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellRenderer + fr.ifremer.isisfish.datastore.RuleStorage + fr.ifremer.isisfish.rule.Rule + fr.ifremer.isisfish.ui.models.rule.RuleListModel + fr.ifremer.isisfish.ui.models.rule.RuleParametersTableModel + fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellEditor + fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellRenderer fr.ifremer.isisfish.ui.models.rule.RuleParametersFactorTableCellRenderer fr.ifremer.isisfish.ui.models.rule.RuleParametersFactorTableCellEditor - fr.ifremer.isisfish.ui.util.ErrorHelper + fr.ifremer.isisfish.ui.util.ErrorHelper fr.ifremer.isisfish.ui.SimulationUI fr.ifremer.isisfish.datastore.RegionStorage </import> @@ -111,6 +111,7 @@ rulesList.remove(selectedRuleValue); } selectedRulesListModel.setRules(rulesList); + selectedRulesList.clearSelection(); } /** @@ -127,7 +128,9 @@ } getContextValue(SimulationUI.class, "SimulationUI").refreshFactorTree(); } + rulesList.clear(); selectedRulesListModel.setRules(rulesList); + selectedRulesList.clearSelection(); } /**

1 0

r3368 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org 08 Jun '11

08 Jun '11

Author: chatellier Date: 2011-06-08 12:59:30 +0000 (Wed, 08 Jun 2011) New Revision: 3368 Log: Remove useless {} Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2011-06-08 10:26:57 UTC (rev 3367) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2011-06-08 12:59:30 UTC (rev 3368) @@ -72,7 +72,7 @@ ]]></script> <JTabbedPane id="bodyTabbedPane"> <tab title='isisfish.params.title'> - <fr.ifremer.isisfish.ui.simulator.ParamsUI id='paramsUI' sensitivity='{true}' regionStorage="{getRegionStorage()}" + <fr.ifremer.isisfish.ui.simulator.ParamsUI id='paramsUI' sensitivity='true' regionStorage="{getRegionStorage()}" constructorParams='new JAXXInitialContext().add(new InputAction()).add(new SensitivitySaveVerifier()).add("SimulationUI", this).add(this)' /> </tab> <tab title='isisfish.sensitivity.title' enabled="false">

1 0

r3367 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui: input/check sensitivity
by chatellier＠users.labs.libre-entreprise.org 08 Jun '11

08 Jun '11

Author: chatellier Date: 2011-06-08 10:26:57 +0000 (Wed, 08 Jun 2011) New Revision: 3367 Log: Fix imports Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2011-06-08 10:24:16 UTC (rev 3366) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2011-06-08 10:26:57 UTC (rev 3367) @@ -34,7 +34,7 @@ import java.util.Set; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.xwork.StringUtils; +import org.apache.commons.lang.StringUtils; import org.nuiton.math.matrix.MatrixIterator; import org.nuiton.math.matrix.MatrixND; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-06-08 10:24:16 UTC (rev 3366) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-06-08 10:26:57 UTC (rev 3367) @@ -48,8 +48,8 @@ import jaxx.runtime.context.JAXXInitialContext; +import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.xwork.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND;

1 0

r3366 - isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity
by chatellier＠users.labs.libre-entreprise.org 08 Jun '11

08 Jun '11

Author: chatellier Date: 2011-06-08 10:24:16 +0000 (Wed, 08 Jun 2011) New Revision: 3366 Log: Fix tests Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2011-06-08 10:24:05 UTC (rev 3365) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2011-06-08 10:24:16 UTC (rev 3366) @@ -170,7 +170,7 @@ // factor Factor factor = new Factor("testmatrix"); - MatrixContinuousDomain domain = new MatrixContinuousDomain (); + MatrixContinuousDomain domain = new MatrixContinuousDomain(true); domain.setReferenceValue(matrix1); domain.setCoefficient(0.1); factor.setDomain(domain); @@ -179,8 +179,6 @@ Assert.assertEquals(0.92, ((MatrixND)factor.getValue()).getValue(new int[] { 0, 0 }),0.0000001); Assert.assertEquals(2.76, ((MatrixND)factor.getValue()).getValue(new int[] { 2, 0 }),0.0000001); - Assert.assertTrue(minBound.equalsValues((MatrixND)((ContinuousDomain)factor.getDomain()).getMinBound())); - Assert.assertTrue(maxBound.equalsValues((MatrixND)((ContinuousDomain)factor.getDomain()).getMaxBound())); Assert.assertEquals(0.1, (Double)factor.getDisplayedValue(),0); // matrix 2 @@ -195,7 +193,7 @@ // factor 2 Factor factor2 = new Factor("testmatrix"); - MatrixContinuousDomain domain2 = new MatrixContinuousDomain(); + MatrixContinuousDomain domain2 = new MatrixContinuousDomain(true); domain2.setReferenceValue(matrix2); domain2.setCoefficient(0.1); factor2.setDomain(domain2); @@ -204,8 +202,8 @@ Assert.assertEquals(0.94, ((MatrixND)factor2.getValue()).getValue(new int[] { 0, 0 }),0.0000001); Assert.assertEquals(2.82, ((MatrixND)factor2.getValue()).getValue(new int[] { 2, 0 }),0.0000001); - Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0); - Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0); + //Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0); + //Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0); // matrix 3 MatrixND matrix3 = MatrixFactory.getInstance().create("test1", @@ -219,7 +217,7 @@ // factor 3 Factor factor3 = new Factor("testmatrix"); - MatrixContinuousDomain domain3 = new MatrixContinuousDomain(); + MatrixContinuousDomain domain3 = new MatrixContinuousDomain(true); domain3.setReferenceValue(matrix3); domain3.setCoefficient(0.2); factor3.setDomain(domain3); @@ -228,8 +226,8 @@ Assert.assertEquals(0.84, ((MatrixND)factor3.getValue()).getValue(new int[] { 0, 0 }),0.0000001); Assert.assertEquals(2.52, ((MatrixND)factor3.getValue()).getValue(new int[] { 2, 0 }),0.0000001); - Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0); - Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0); + //Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0); + //Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0); // matrix 3 MatrixND matrix4 = MatrixFactory.getInstance().create("test1", @@ -243,7 +241,7 @@ // factor 3 Factor factor4 = new Factor("testmatrix"); - MatrixContinuousDomain domain4 = new MatrixContinuousDomain(); + MatrixContinuousDomain domain4 = new MatrixContinuousDomain(true); domain4.setReferenceValue(matrix4); domain4.setCoefficient(0.3); factor4.setDomain(domain4); @@ -252,8 +250,8 @@ Assert.assertEquals(0.94, ((MatrixND)factor4.getValue()).getValue(new int[] { 0, 0 }),0.0000001); Assert.assertEquals(2.82, ((MatrixND)factor4.getValue()).getValue(new int[] { 2, 0 }),0.0000001); - Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0); - Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0); + //Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0); + //Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0); if (log.isInfoEnabled()) { log.info("factor#toString() = " + factor); @@ -270,11 +268,10 @@ // factor Factor factor = new Factor("testequation"); - EquationContinuousDomain domain = new EquationContinuousDomain(); + EquationContinuousDomain domain = new EquationContinuousDomain(true); domain.setCoefficient(0.1); domain.setVariableName("Linf"); domain.setReferenceValue(3.0); - domain.setPercentageType(true); factor.setDomain(domain); factor.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor.setValueForIdentifier(0.1); @@ -285,11 +282,10 @@ // factor 2 Factor factor2 = new Factor("testequation"); - EquationContinuousDomain domain2 = new EquationContinuousDomain(); + EquationContinuousDomain domain2 = new EquationContinuousDomain(true); domain2.setCoefficient(0.1); domain2.setVariableName("Linf"); domain2.setReferenceValue(3.0); - domain2.setPercentageType(true); factor2.setDomain(domain2); factor2.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor2.setValueForIdentifier(0.1); @@ -300,11 +296,10 @@ // factor 3 Factor factor3 = new Factor("testequation"); - EquationContinuousDomain domain3 = new EquationContinuousDomain(); + EquationContinuousDomain domain3 = new EquationContinuousDomain(true); domain3.setCoefficient(0.1); domain3.setVariableName("Linf"); domain3.setReferenceValue(3.0); - domain3.setPercentageType(true); factor3.setDomain(domain3); factor3.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor3.setValueForIdentifier(0.2); @@ -315,11 +310,10 @@ // factor 4 Factor factor4 = new Factor("testequation"); - EquationContinuousDomain domain4 = new EquationContinuousDomain(); + EquationContinuousDomain domain4 = new EquationContinuousDomain(true); domain4.setCoefficient(0.05); domain4.setVariableName("Linf"); domain4.setReferenceValue(3.0); - domain4.setPercentageType(true); factor4.setDomain(domain4); factor4.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor4.setValueForIdentifier(0.1);

1 0

r3365 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org 08 Jun '11

08 Jun '11

Author: chatellier Date: 2011-06-08 10:24:05 +0000 (Wed, 08 Jun 2011) New Revision: 3365 Log: Fix factor reloading Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-06-08 10:23:49 UTC (rev 3364) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-06-08 10:24:05 UTC (rev 3365) @@ -287,7 +287,7 @@ // Chargement des facteurs // clear list even if mexico file doesn't exists - //factors.clear(); + factorGroup.clearFactors(); File f = SimulationStorage.getMexicoDesignPlan(SimulationStorage.getSimulationDirectory(simulName)); if (f != null && f.canRead()) { if (log.isInfoEnabled()) { @@ -300,6 +300,7 @@ log.debug("Find factor : " + factor.getName()); } //factors.put(factor.getPath() + factor.getName(), factor); + factorGroup = designPlan.getFactorGroup(); } } else { @@ -929,7 +930,7 @@ public void addContinuousPercentageFactor(String name, String comment, String path, Double referenceValue, Double coefficient, boolean exist) { Factor f = new Factor(name); - ContinuousDomain domain = new ContinuousDomain(); + ContinuousDomain domain = new ContinuousDomain(true); domain.setReferenceValue(referenceValue); domain.setCoefficient(coefficient); f.setDomain(domain); @@ -996,7 +997,7 @@ public void addContinuousMatrixFactor(String name, String comment, String path, MatrixND referenceValue, Double coef, boolean exist) { Factor f = new Factor(name); - MatrixContinuousDomain domain = new MatrixContinuousDomain(); + MatrixContinuousDomain domain = new MatrixContinuousDomain(true); domain.setReferenceValue(referenceValue); domain.setCoefficient(coef); f.setComment(comment);

1 0

r3364 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org 08 Jun '11

08 Jun '11

Author: chatellier Date: 2011-06-08 10:23:49 +0000 (Wed, 08 Jun 2011) New Revision: 3364 Log: Fix factor deletion Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-06-08 10:23:38 UTC (rev 3363) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-06-08 10:23:49 UTC (rev 3364) @@ -49,6 +49,7 @@ import jaxx.runtime.context.JAXXInitialContext; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.xwork.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; @@ -294,27 +295,33 @@ } /** - * Delete selection factor. + * Delete selection factors. */ protected void deleteSelectedFactors(SensitivityTabUI sensitivityTabUI) { // get selected factor - TreePath selectedPath = sensitivityTabUI.getFactorsTree().getSelectionPath(); - Object[] pathWay = selectedPath.getPath(); - Object selectedObject = pathWay[pathWay.length - 1]; - - if (selectedObject != null) { - if (selectedObject instanceof Factor) { - Factor selectedFactor = (Factor)selectedObject; - FactorGroup selectedFactorGroup = (FactorGroup)pathWay[pathWay.length - 2]; - if (log.isDebugEnabled()) { - log.debug("Deleting factor " + selectedFactor.getName()); + TreePath[] selectedPaths = sensitivityTabUI.getFactorsTree().getSelectionPaths(); + if (!ArrayUtils.isEmpty(selectedPaths)) { // can happen + for (TreePath selectedPath : selectedPaths) { + Object[] pathWay = selectedPath.getPath(); + // > 2 : can't delete root + if (pathWay.length >= 2) { + Object selectedObject = pathWay[pathWay.length - 1]; + if (selectedObject != null) { + if (selectedObject instanceof Factor) { + Factor selectedFactor = (Factor)selectedObject; + FactorGroup selectedFactorGroup = (FactorGroup)pathWay[pathWay.length - 2]; + if (log.isDebugEnabled()) { + log.debug("Deleting factor " + selectedFactor.getName()); + } + selectedFactorGroup.remove(selectedFactor); + sensitivityTabUI.setFactorModel(); + } + } } - selectedFactorGroup.remove(selectedFactor); - sensitivityTabUI.setFactorModel(); } } } - + /** * Un init new se fait toujours sur une entité. * @@ -712,7 +719,7 @@ } else if (domain instanceof MatrixContinuousDomain) { MatrixContinuousPanelUI continuousPanel = new MatrixContinuousPanelUI(); // factor numerique continue (percentage) - if (domain.getReferenceValue() != null || domain.getCoefficient() != null) { + if (domain.isPercentageType()) { MatrixND matrix = (MatrixND)domain.getReferenceValue(); // il y a bien 3 fois domain.getReferenceValue() pas d'erreur continuousPanel.initExisting( @@ -737,7 +744,7 @@ DefaultContinuousPanelUI continuousPanel = new DefaultContinuousPanelUI(); // factor numerique continue (percentage) - if (domain.getReferenceValue() != null || domain.getCoefficient() != null) { + if (domain.isPercentageType()) { // il y a bien 3 fois domain.getReferenceValue() pas d'erreur continuousPanel.initExisting( String.valueOf(domain.getReferenceValue()),

1 0

r3363 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org 08 Jun '11

08 Jun '11

Author: chatellier Date: 2011-06-08 10:23:38 +0000 (Wed, 08 Jun 2011) New Revision: 3363 Log: Fix equation domain creation (type) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-06-08 10:21:58 UTC (rev 3362) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-06-08 10:23:38 UTC (rev 3363) @@ -78,15 +78,13 @@ EquationContinuousDomain selectedDomain = (EquationContinuousDomain)variablesList.getSelectedValue(); selectedDomain.setVariableName(variableNameField.getText().trim()); if (isPercentageTypeDomain()) { - selectedDomain.setMinBound(null); // important - selectedDomain.setMaxBound(null); // important + selectedDomain.setPercentageType(true); selectedDomain.setReferenceValue(Double.parseDouble(referenceValueField.getText())); selectedDomain.setCoefficient(Double.parseDouble(coefficientField.getText()) / 100); } else { + selectedDomain.setPercentageType(false); selectedDomain.setMinBound(Double.parseDouble(minBoundField.getText())); selectedDomain.setMaxBound(Double.parseDouble(maxBoundField.getText())); - selectedDomain.setReferenceValue(null); // important - selectedDomain.setCoefficient(null); // important }

1 0

r3362 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish: mexico/xml simulator/sensitivity simulator/sensitivity/domain
by chatellier＠users.labs.libre-entreprise.org 08 Jun '11

08 Jun '11

Author: chatellier Date: 2011-06-08 10:21:58 +0000 (Wed, 08 Jun 2011) New Revision: 3362 Log: Add constructor with percentage type Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-06-08 09:59:48 UTC (rev 3361) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-06-08 10:21:58 UTC (rev 3362) @@ -158,7 +158,7 @@ if(property.equals(MATRIXCONTINUOUS)) { // matrix specific // <coefficient operator="-" value="0.799"/> - MatrixContinuousDomain mdomain = new MatrixContinuousDomain(); + MatrixContinuousDomain mdomain = new MatrixContinuousDomain(true); Element coefficientElement = fixedElement.element(COEFFICIENT); mdomain.setCoefficient(Double.valueOf(coefficientElement.attributeValue(VALUE))); @@ -166,20 +166,18 @@ Element matrixElement = fixedElement.element(MX); MatrixND matrix = MexicoHelper.getMatrixFromXml(matrixElement, topiaContext); mdomain.setReferenceValue(matrix); - mdomain.setPercentageType(true); domain = mdomain; } else if (property.equals(EQUATIONCONTINUOUS)) { // equation specific - EquationContinuousDomain edomain = new EquationContinuousDomain(); + EquationContinuousDomain edomain = new EquationContinuousDomain(true); Element coefficientElement = fixedElement.element(COEFFICIENT); edomain.setCoefficient(Double.valueOf(coefficientElement.attributeValue(VALUE))); Element equationElement = fixedElement.element(EQUATION); edomain.setReferenceValue(Double.valueOf(equationElement.attributeValue(REFERENCE))); edomain.setVariableName(equationElement.attributeValue(VARIABLE)); - edomain.setPercentageType(true); domain = edomain; } @@ -226,7 +224,7 @@ if(property.equals(MATRIXCONTINUOUS)) { // matrix specific - MatrixContinuousDomain mdomain = new MatrixContinuousDomain(); + MatrixContinuousDomain mdomain = new MatrixContinuousDomain(true); Element coefficientElement = fixedElement.element(COEFFICIENT); mdomain.setCoefficient(Double.valueOf(coefficientElement.attributeValue(VALUE))); @@ -235,14 +233,13 @@ Element matrixElement = fixedElement.element(MX); MatrixND matrix = MexicoHelper.getMatrixFromXml(matrixElement, topiaContext); mdomain.setReferenceValue(matrix); - mdomain.setPercentageType(true); domain = mdomain; } else if (property.equals(EQUATIONCONTINUOUS)) { // equation specific - EquationContinuousDomain edomain = new EquationContinuousDomain(); + EquationContinuousDomain edomain = new EquationContinuousDomain(true); Element coefficientElement = fixedElement.element(COEFFICIENT); edomain.setCoefficient(Double.valueOf(coefficientElement.attributeValue(VALUE))); @@ -250,7 +247,6 @@ Element equationElement = fixedElement.element(EQUATION); edomain.setReferenceValue(Double.valueOf(equationElement.attributeValue(REFERENCE))); edomain.setVariableName(equationElement.attributeValue(VARIABLE)); - edomain.setPercentageType(true); domain = edomain; } @@ -354,7 +350,7 @@ ContinuousDomain domain; if(property.equals(MATRIXCONTINUOUS)) { - MatrixContinuousDomain mdomain = new MatrixContinuousDomain(); + MatrixContinuousDomain mdomain = new MatrixContinuousDomain(true); Element referenceElement = fixedElement.element(REFERENCE); if (referenceElement != null) { // matrix specific Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2011-06-08 09:59:48 UTC (rev 3361) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2011-06-08 10:21:58 UTC (rev 3362) @@ -65,6 +65,15 @@ } /** + * Return design plan main factor group. + * + * @return design plan factor group + */ + public FactorGroup getFactorGroup() { + return factorGroup; + } + + /** * Add factor. * * @param f factor to add Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2011-06-08 09:59:48 UTC (rev 3361) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2011-06-08 10:21:58 UTC (rev 3362) @@ -173,6 +173,13 @@ } /** + * Clear all factor group sub factors. + */ + public void clearFactors() { + factors.clear(); + } + + /** * Convenient method to access specific factor. * * @param index index Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2011-06-08 09:59:48 UTC (rev 3361) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2011-06-08 10:21:58 UTC (rev 3362) @@ -25,10 +25,9 @@ package fr.ifremer.isisfish.simulator.sensitivity.domain; +import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.simulator.sensitivity.Domain; import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor; -import org.nuiton.math.matrix.MapFunction; -import org.nuiton.math.matrix.MatrixND; /** * @@ -76,10 +75,10 @@ protected boolean percentageType; /** - * Empty constructor. + * Min/max type constructor. */ public ContinuousDomain() { - + this(false); } /** @@ -94,10 +93,29 @@ this.maxBound = maxBound; } + /** + * Constructor with type. + * + * @param percentageType if {@code true} percentage type + */ + public ContinuousDomain(boolean percentageType) { + this.percentageType = percentageType; + } + + /** + * Return factor type (min/max or percentage). + * + * @return {@code true} if percentage type + */ public boolean isPercentageType() { return percentageType; } + /** + * Set domain type (min/max or percentage). + * + * @param percentageType new type value + */ public void setPercentageType(boolean percentageType) { this.percentageType = percentageType; } @@ -109,13 +127,13 @@ * @return the minimum bound */ public Object getMinBound() { + Object result; if (isPercentageType()) { - - return ((Double)referenceValue + (((Double)referenceValue * coefficient) * ((2 * getCalculatorMinBound() - 1)))); - + result = ((Double)referenceValue + (((Double)referenceValue * coefficient) * ((2 * getCalculatorMinBound() - 1)))); } else { - return minBound; + result = minBound; } + return result; } /** @@ -143,13 +161,15 @@ * @return the maximum bound */ public Object getMaxBound() { + Object result; if (isPercentageType()) { - return ((Double) referenceValue + + result = ((Double) referenceValue + (((Double) referenceValue * coefficient) * ((2 * getCalculatorMaxBound() - 1)))); } else { - return maxBound; + result = maxBound; } + return result; } /** @@ -215,8 +235,8 @@ Double result; if (isPercentageType()) { - // since 3.4.0.0, operator is always * - result = ((Double)referenceValue + (((Double)referenceValue * coefficient) + // since 3.4.0.0, operator is always * + result = ((Double)referenceValue + (((Double)referenceValue * coefficient) * ((2 * (Double)identifier - 1)))); } else { result = ((Double)identifier * ((Double)maxBound - (Double)minBound)) @@ -259,7 +279,7 @@ try { cloned = (ContinuousDomain)super.clone(); } catch (CloneNotSupportedException e) { - throw new RuntimeException("Error on clone()", e); + throw new IsisFishRuntimeException("Can't clone domain", e); } return cloned; } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2011-06-08 09:59:48 UTC (rev 3361) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2011-06-08 10:21:58 UTC (rev 3362) @@ -29,6 +29,7 @@ import java.util.SortedMap; import java.util.TreeMap; +import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.simulator.sensitivity.Domain; import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor; @@ -115,7 +116,7 @@ // special copy for values cloned.setValues(new TreeMap<Object, Object>(this.values)); } catch (CloneNotSupportedException e) { - throw new RuntimeException("Error on clone()", e); + throw new IsisFishRuntimeException("Can't clone domain", e); } return cloned; } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2011-06-08 09:59:48 UTC (rev 3361) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2011-06-08 10:21:58 UTC (rev 3362) @@ -45,6 +45,22 @@ protected String variableName; /** + * Min/max type constructor. + */ + public EquationContinuousDomain() { + super(); + } + + /** + * Constructor with type. + * + * @param percentageType if {@code true} percentage type + */ + public EquationContinuousDomain(boolean percentageType) { + super(percentageType); + } + + /** * Get variable name. * * @return the variableName Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2011-06-08 09:59:48 UTC (rev 3361) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2011-06-08 10:21:58 UTC (rev 3362) @@ -41,6 +41,22 @@ /** serialVersionUID. */ private static final long serialVersionUID = -2037768174807839046L; + /** + * Min/max type constructor. + */ + public MatrixContinuousDomain() { + super(); + } + + /** + * Constructor with type. + * + * @param percentageType if {@code true} percentage type + */ + public MatrixContinuousDomain(boolean percentageType) { + super(percentageType); + } + @Override public Object getValueForIdentifier(Object identifier) { return getValueForIdentifier((Double)identifier);

1 0

r3361 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export
by chatellier＠users.labs.libre-entreprise.org 08 Jun '11

08 Jun '11

Author: chatellier Date: 2011-06-08 09:59:48 +0000 (Wed, 08 Jun 2011) New Revision: 3361 Log: Move log to debug Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2011-06-08 09:59:37 UTC (rev 3360) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2011-06-08 09:59:48 UTC (rev 3361) @@ -153,7 +153,7 @@ Object value = beanUtils.convert(valueString, type); if (log.isDebugEnabled()) { - log.debug("DEBUG: set sensitivityexport param: " + paramTag + + log.debug("Set sensitivityexport param: " + paramTag + propName + " = " + value + "(" + valueString + ")"); }

1 0