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

r2791 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish src/main/java/fr/ifremer/isisfish/datastore src/main/java/fr/ifremer/isisfish/simulator src/main/java/fr/ifremer/isisfish/simulator/launcher src/main/java/fr/ifremer/isisfish/ui/simulator src/main/resources/i18n src/test/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org 02 Dec '09

02 Dec '09

Author: chatellier Date: 2009-12-02 17:32:03 +0000 (Wed, 02 Dec 2009) New Revision: 2791 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 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/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java Log: Remove "isis-export" directory Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-12-02 15:47:44 UTC (rev 2790) +++ isis-fish/trunk/changelog.txt 2009-12-02 17:32:03 UTC (rev 2791) @@ -1,5 +1,8 @@ isis-fish (3.3.0.0) stable; urgency=low + * Remove "isis-export" directory + * Fix editor deactivation in input ui. + * Remove deprecated method SimulationStorage#getFisheryRegion() * Update to jfreechart 1.0.13 (major version) * #1585 : Analyze plans are now reloaded before each simulation * Editing sensitivity factors after simulation reload now works @@ -11,7 +14,7 @@ * Add -m n option to qsub to not send email for each simulation * Remove duplicated SSH key configuration, common configuration for VCS and caparmor * Global VCS improvement (code, script UI, input UI) - * Update to svnkit 1.3.1 + * Update to svnkit 1.3.2 * Unification of error frames * Add ".shp" extension to database map files list (database migration) * Move codelutin librairies to nuiton.org (database migration) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-12-02 15:47:44 UTC (rev 2790) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-12-02 17:32:03 UTC (rev 2791) @@ -567,20 +567,8 @@ public boolean isSimulationShowOnlyError() { Boolean result = getOptionAsBoolean(Option.SIMULATION_SHOW_ONLY_ERROR.key); return result; - } - - public File getDefaultExportDirectory() { - File result = getOptionAsFile(Option.DEFAULT_EXPORT_DIRECTORY.key); - if (!result.exists()) { - result.mkdirs(); - } - return result; } - public void setDefaultExportDirectory(String value) { - setOption(Option.DEFAULT_EXPORT_DIRECTORY.key, value); - } - public String getDefaultExportNames() { String result = getOption(Option.DEFAULT_EXPORT_NAMES.key); return result; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2009-12-02 15:47:44 UTC (rev 2790) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2009-12-02 17:32:03 UTC (rev 2791) @@ -68,12 +68,12 @@ public static final String RESULT_XML_FILENAME = "isis-mexico-output.xml"; public static final String RESULT_EXPORT_DIRECTORY = "resultExports"; public static final String DESIGN_PLAN_FILENAME = "isis-mexico-designplan.xml"; + public static final String SENSITIVITY_RESULTS = "sensitivityresults"; /** to use log facility, just put in your code: log.info(\"...\"); */ private static Log log = LogFactory.getLog(SimulationStorage.class); - /** cache des simulation storage */ - @SuppressWarnings("unchecked") + /** Cache des simulation storage. */ protected static Map<String, SimulationStorage> simulations = (Map<String, SimulationStorage>) new ReferenceMap(); /** some free information, that user can add during simulation */ @@ -89,7 +89,8 @@ protected transient File simulationControlFile = null; /** - * Pour la lecture d'une simulation existante + * Pour la lecture d'une simulation existante. + * * @param directory repertoire de base du storage (inclu le nom de la sim) * @param name le nom de la simulation * @param parameter les paramètres de la simulation @@ -101,8 +102,9 @@ } /** - * Retourne le repertoire de base de stockage des simulations - * @return + * Retourne le repertoire de base de stockage des simulations. + * + * @return simulation directory */ public static File getSimulationDirectory() { File result = IsisFish.config.getDatabaseDirectory(); @@ -114,9 +116,10 @@ } /** - * Retourne le repertoire de stockage d'une simulation portant le nom name + * Retourne le repertoire de stockage d'une simulation portant le nom name. + * * @param name le nom de la simulation dont on souhaite le repertoire - * @return + * @return simulation name directory */ public static File getSimulationDirectory(String name) { File result = getSimulationDirectory(); @@ -128,6 +131,21 @@ } /** + * Retourne le repertoire de base de stockage des resutats des analyses + * de sensibilité. + * + * @return sensitivity result directory + */ + public static File getSensitivityResultsDirectory() { + File result = IsisFish.config.getDatabaseDirectory(); + result = new File(result, SENSITIVITY_RESULTS); + if (!result.exists()) { + result.mkdirs(); + } + return result; + } + + /** * Retourne le repertoire de stockage des exports de resulatat d'une * simulation. * @param root le repertoire de stockage de la simulation @@ -193,7 +211,7 @@ File result = new File(root, DESIGN_PLAN_FILENAME); return result; } - + /** * Retourne le fichier de stockage du fichier de control de la simulation. * Ce fichier conserve l'etat de la simulation, cela permet a un processus @@ -580,30 +598,6 @@ } /** - * Retourne la {@link FisheryRegion} associee a cette simulation. - * - * Attention, toujours utilisée dans les scripts !!! - * - * @return la {@link FisheryRegion} - * @throws StorageException - * @deprecated ne plus utiliser car le context n'est jamais ferme, plutot - * utiliser {@link #getFisheryRegion(TopiaContext)} - */ - public FisheryRegion getFisheryRegion() throws StorageException { - // FIXME voir si la methode est vraiment utilisée car le context n'est - // jamais fermé, ce qui est dérangeant - try { - TopiaContext tx = getStorage().beginTransaction(); - FisheryRegion result = getFisheryRegion(tx); - tx.commitTransaction(); - return result; - } catch (TopiaException eee) { - throw new StorageException(_("isisfish.error.get.fisheryRegion"), - eee); - } - } - - /** * Checkout not existing Simulation localy from server * * @param name name of simulation to retrieve @@ -612,8 +606,7 @@ */ public static void checkout(String name) throws VCSException, TopiaException { - checkout(IsisFish.config.getDatabaseDirectory(), SIMULATION_PATH + "/" - + name); + checkout(IsisFish.config.getDatabaseDirectory(), SIMULATION_PATH + "/" + name); SimulationStorage sim = getSimulation(name); File file = sim.getDataBackupFile(); TopiaContext tx = sim.getStorage().beginTransaction(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-12-02 15:47:44 UTC (rev 2790) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-12-02 17:32:03 UTC (rev 2791) @@ -140,9 +140,6 @@ /** Ma liste des exports automatique a faire en fin de simulation. */ protected List<String> exportNames; - /** Repertoire d'enregistrement des exports. */ - protected String exportDirectory; - /** Utilisation du script de pre simulation. */ protected Boolean usePreScript; @@ -1375,64 +1372,6 @@ } /** - * Get only export properties. - * - * Default to false. - * - * @return only export. - */ - public boolean getOnlyExport() { - - if (onlyExport == null) { - if (propertiesParameters != null) { - onlyExport = Boolean.valueOf(propertiesParameters.getProperty("onlyExport", "false")); - } else { - onlyExport = Boolean.FALSE; - } - } - - return onlyExport; - } - - /** - * Set only export property. - * - * @param onlyExport only export to set - */ - public void setOnlyExport(boolean onlyExport) { - this.onlyExport = onlyExport; - } - - /** - * Get export directory path. - * - * Default to /tmp. - * - * @return export directory path - */ - public String getExportDirectory() { - - if (exportDirectory == null) { - - if (propertiesParameters != null) { - exportDirectory = propertiesParameters.getProperty("exportDirectory", "/tmp"); - } else { - exportDirectory = "/tmp"; - } - } - return this.exportDirectory; - } - - /** - * Set export directory path. - * - * @param exportDirectory export directory path. - */ - public void setExportDirectory(String exportDirectory) { - this.exportDirectory = exportDirectory; - } - - /** * Get simulator log level. * * Default to "info". @@ -1612,11 +1551,9 @@ result.preScript = getPreScript(); result.useAnalysePlan = getUseAnalysePlan(); result.analysePlanNumber = getAnalysePlanNumber(); - result.onlyExport = getOnlyExport(); if (exportNames != null) { result.exportNames = new LinkedList<String>(exportNames); } - result.exportDirectory = getExportDirectory(); if (strategies != null) { result.strategies = new LinkedList<Strategy>(strategies); } @@ -1950,9 +1887,6 @@ result.setProperty("tagValue." + e.getKey(), e.getValue()); } - result.setProperty("onlyExport", String.valueOf(getOnlyExport())); - result.setProperty("exportDirectory", String.valueOf(getExportDirectory())); - result.setProperty("simulLogLevel", getSimulLogLevel()); result.setProperty("scriptLogLevel", getScriptLogLevel()); result.setProperty("libLogLevel", getLibLogLevel()); @@ -1972,191 +1906,6 @@ this.propertiesParameters = props; this.directory = directory; - // when reading new properties files, clean some information - // to force re instantion on next call - //sensitivityExports = null; - //rules = null; - - //isisFishVersion = props.getProperty("isisFishVersion", ""); - //description = props.getProperty("description", ""); - //regionName = props.getProperty("regionName", ""); - //numberOfYear = Integer.parseInt(props.getProperty("numberOfYear", "1")); - //simulatorName = props.getProperty("simulatorName", "DefaultSimulator.java"); - //useOptimization = Boolean.parseBoolean(props.getProperty( - // "useOptimization", "true")); - //useStatistic = Boolean.parseBoolean(props.getProperty("useStatistic", - // "true")); - - // FIXME not good place and code - // FIXME regionName is null - /*if (directory != null && (this.region == null || !region.getName().equals(regionName))) { - // ATTENTION: directory pointe sur le repertoire de la simulation et non de la region - this.region = new RegionStorage(directory, regionName); // RegionStorage.getRegion(directory, regionName); - }*/ - - /*try { - // On verifie tout d'abord que l'on ai pas dans une simulation - // si on y es, on utilise le context static non null du thread local - // Resoud les lazy exceptions des parametres des regles - boolean mustClose = false; - TopiaContext tx = SimulationContext.get().getDB(); - - if (tx == null) { - // not in simulation, create transaction - tx = getRegion().getStorage().beginTransaction(); - mustClose = true; - } - - // strategies - try { - StrategyDAO strategyDAO = IsisFishDAOHelper.getStrategyDAO(tx); - String[] strategyList = props.getProperty("strategies", "") - .split(","); - for (String name : strategyList) { - if (name != null && !"".equals(name)) { - try { - Strategy str = strategyDAO.findByName(name); - getStrategies().add(str); - } catch (TopiaException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't find strategy: " + name, eee); - } - } - } - } - } catch (TopiaException eee1) { - if (log.isWarnEnabled()) { - log.warn("Can't get StrategyDAO", eee1); - } - } - - // populations - try { - PopulationDAO populationDAO = IsisFishDAOHelper - .getPopulationDAO(tx); - String[] populationList = props.getProperty("populations", "") - .split(","); - for (String name : populationList) { - if (name != null && !"".equals(name)) { - try { - Population population = populationDAO - .findByName(name); - getPopulations().add(population); - - String numberAsString = props - .getProperty("population." + name - + ".number"); - List number = MatrixHelper - .convertStringToList(numberAsString); - MatrixND mat = getNumberOf(population); - mat.fromList(number); - } catch (TopiaException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't find population: " + name, eee); - } - } - } - } - } catch (TopiaException eee1) { - if (log.isWarnEnabled()) { - log.warn("Can't get PopulationDAO", eee1); - } - } - - tx.commitTransaction(); - - // si la transaction a été ouverte (pas dans une simulation) - // on la referme - if (mustClose) { - tx.closeContext(); - } - } catch (TopiaException eee1) { - if (log.isWarnEnabled()) { - log.warn("Can't get TopiaContext", eee1); - } - }*/ - - // analyse plan - /*String[] planList = props.getProperty("plans", "").split(","); - int planIndex = 0; - for (String name : planList) { - if (name != null && !"".equals(name)) { - try { - AnalysePlan plan = AnalysePlanStorage.getAnalysePlan(name) - .getNewAnalysePlanInstance(); - populateAnalysePlan(planIndex++, plan, props); - getAnalysePlans().add(plan); - } catch (IsisFishException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't find plan: " + name, eee); - } - } - } - }*/ - - // exports - /*String[] exportList = props.getProperty("exports", "").split(","); - for (String name : exportList) { - if (name != null && !"".equals(name)) { - getExportNames().add(name); - } - }*/ - - // number of sensitivity simulation - //numberOfSensitivitySimulation = Integer.parseInt(props.getProperty( - // "numberOfSensitivitySimulation", "-1")); - // calculator name - /*String sensitivityCalculator = props.getProperty( - "sensitivitycalculator", null); - if (!StringUtils.isEmpty(sensitivityCalculator)) { - try { - SensitivityCalculator calculator = SensitivityStorage - .getSensitivity(sensitivityCalculator) - .getNewSensitivityInstance(); - // 0 = only single sensitivity - populateSensitivityCalculator(0, calculator, props); - setSensitivityCalculator(calculator); - } catch (IsisFishException eee) { - if (log.isWarnEnabled()) { - log.warn( - "Can't find sensitivity: " + sensitivityCalculator, - eee); - } - } - }*/ - - //usePreScript = Boolean.parseBoolean(props.getProperty("usePreScript", - // "false")); - //preScript = props.getProperty("preScript"); - //useAnalysePlan = Boolean.parseBoolean(props.getProperty( - // "useAnalysePlan", "false")); - //analysePlan = props.getProperty("analysePlan"); - //analysePlanNumber = Integer.parseInt(props.getProperty( - // "analysePlanNumber", "-1")); - - /*String[] resultList = props.getProperty("resultNames", "").split(","); - for (String name : resultList) { - if (name != null && !"".equals(name)) { - getResultEnabled().add(name); - } - }*/ - - /*for (Object k : props.keySet()) { - if (k.toString().startsWith("tagValue.")) { - String key = k.toString().substring("tagValue.".length()); - String value = props.getProperty(k.toString()); - getTagValue().put(key, value); - } - }*/ - - //onlyExport = Boolean.parseBoolean(props.getProperty("onlyExport", - // "false")); - - //exportDirectory = props.getProperty("exportDirectory"); - - /*simulLogLevel = props.getProperty("simulLogLevel", "info"); - scriptLogLevel = props.getProperty("scriptLogLevel", "info"); - libLogLevel = props.getProperty("libLogLevel", "info");*/ } /** Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2009-12-02 15:47:44 UTC (rev 2790) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2009-12-02 17:32:03 UTC (rev 2791) @@ -232,14 +232,6 @@ && !SimulationStorage.exists(control.getId())); } - // nettoyage si besoin apres toutes les simulations - if (param.getOnlyExport()) { - for (File file : FileUtil.find(SimulationStorage - .getSimulationDirectory(), id + "_[0-9]+$", false)) { - log.debug("Delete simulation " + file); - FileUtil.deleteRecursively(file); - } - } } else { // on est sur une simple simulation, ou le resultat d'un plan 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-12-02 15:47:44 UTC (rev 2790) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-12-02 17:32:03 UTC (rev 2791) @@ -44,7 +44,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; -import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.datastore.AnalysePlanStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; @@ -207,16 +206,18 @@ // 1 = date // 2 = export // 3 = plan dependent + // 4 = use analyse plan + // 5 = plans list String[] simulationInfos = simulationInfo.split(MONITORFILESEPARATOR); String simulationLauncher = simulationInfos[0]; String simulationDate = simulationInfos[1]; - String simulationOnlyExport = simulationInfos[2]; - String simulationExports = simulationInfos[3]; - String simulationUseAnalysePlan = simulationInfos[4]; - String simulationPlans = ""; - if(simulationInfos.length >= 6) { - simulationPlans = simulationInfos[5]; - } + //String simulationOnlyExport = simulationInfos[2]; + //String simulationExports = simulationInfos[3]; + //String simulationUseAnalysePlan = simulationInfos[4]; + //String simulationPlans = ""; + //if(simulationInfos.length >= 6) { + // simulationPlans = simulationInfos[5]; + //} if (log.isInfoEnabled()) { log.info("Restart monitoring of " + simulationId); @@ -236,9 +237,9 @@ SimulationParameter params = new SimulationParameter(); // UseAnalysePlan - params.setUseAnalysePlan("true".equalsIgnoreCase(simulationUseAnalysePlan)); + //params.setUseAnalysePlan("true".equalsIgnoreCase(simulationUseAnalysePlan)); // plans - String[] planList = simulationPlans.split(","); + /*String[] planList = simulationPlans.split(","); for (String name : planList) { if (name != null && !name.isEmpty()) { try { @@ -250,20 +251,17 @@ } } } - } + }*/ // OnlyExport - params.setOnlyExport("true".equalsIgnoreCase(simulationOnlyExport)); + //params.setOnlyExport("true".equalsIgnoreCase(simulationOnlyExport)); // exports - String[] exportList = simulationExports.split(","); + /*String[] exportList = simulationExports.split(","); for (String name : exportList) { if (name != null && !name.isEmpty()) { params.getExportNames().add(name); } - } - - // FIXME needed - params.setExportDirectory(IsisFish.config.getDefaultExportDirectory().toString()); - + }*/ + service.submitForCheckOnly(simulationId, params, launcher, 0); } catch (ClassNotFoundException e) { if (log.isErrorEnabled()) { @@ -285,24 +283,24 @@ String monitorKey = job.getId(); SimulatorLauncher launcher = job.getLauncher(); - SimulationParameter params = job.getItem().getParameter(); + //SimulationParameter params = job.getItem().getParameter(); // 0 = launcher String monitorValue = launcher.getClass().getName(); // 1 = date monitorValue += MONITORFILESEPARATOR + System.currentTimeMillis(); // 2 = onlyexport - monitorValue += MONITORFILESEPARATOR + params.getOnlyExport(); + //monitorValue += MONITORFILESEPARATOR + params.getOnlyExport(); // 3 = exports - monitorValue += MONITORFILESEPARATOR + collectionToString(params.getExportNames()); + //monitorValue += MONITORFILESEPARATOR + collectionToString(params.getExportNames()); // 4 = plan dependent - monitorValue += MONITORFILESEPARATOR + params.getUseAnalysePlan(); + //monitorValue += MONITORFILESEPARATOR + params.getUseAnalysePlan(); // 5 = plan dependent - String planList = ""; - for (AnalysePlan plan : params.getAnalysePlans()) { + //String planList = ""; + /*for (AnalysePlan plan : params.getAnalysePlans()) { planList += AnalysePlanStorage.getName(plan) + ","; } - monitorValue += MONITORFILESEPARATOR + planList; + monitorValue += MONITORFILESEPARATOR + planList;*/ properties.put(monitorKey, monitorValue); OutputStream out = null; @@ -550,10 +548,6 @@ SimulationService service = SimulationService.getService(); SimulationControl control = job.getItem().getControl(); - - // Release one available resource on launcher - // FIXME done by launcher himself - //launcher.simulationEnded(); if (log.isInfoEnabled()) { log.info("Do post simulation operation for " + control.getId()); @@ -571,8 +565,19 @@ // la simulation n'a pas été arretée if (!control.isStopSimulationRequest()) { // post manage this storage - boolean simulationAvailble = exportResult(job, simulation); + boolean simulationAvailble = true; //exportResult(job, simulation); + // do posts actions + for (PostAction action : job.getPostActions()) { + try { + action.finished(job, simulation); + } catch (Exception eee) { + if (log.isErrorEnabled()) { + log.error(_("Can't do post action %s", action), eee); + } + } + } + // sensitivity calculator analyze result call // can't do analyze second pass if simulation // has been deleted @@ -604,12 +609,14 @@ * been selected. * * @return <tt>true</tt> if simulation is still available (not delete by onlyExport) + * + * @deprecated there is no export anymore */ protected boolean exportResult(SimulationJob job, SimulationStorage simulation) { boolean simulationAvailble = true; - SimulationParameter param = job.getItem().getParameter(); + /*SimulationParameter param = job.getItem().getParameter(); SimulationControl control = job.getItem().getControl(); String id = control.getId(); @@ -675,18 +682,8 @@ if (log.isErrorEnabled()) { log.error(_("Can't delete simulation %s ", id), eee); } - } + }*/ - for (PostAction action : job.getPostActions()) { - try { - action.finished(job, simulation); - } catch (Exception eee) { - if (log.isErrorEnabled()) { - log.error(_("Can't do post action %s", action), eee); - } - } - } - return simulationAvailble; } @@ -725,7 +722,7 @@ List<SimulationStorage> simulationStorageForAnalyze = getStorageListForSecondPass(simulationCommonPrefix, numberOfSimulation); // build master sensitivity export directory - File masterExportDirectory = new File(IsisFish.config.getDefaultExportDirectory(), simulationCommonPrefix); + File masterExportDirectory = new File(SimulationStorage.getSimulationDirectory(), simulationCommonPrefix); // directory must already exists !!! sensitivityCalculator.analyzeResult(simulationStorageForAnalyze, masterExportDirectory); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-12-02 15:47:44 UTC (rev 2790) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-12-02 17:32:03 UTC (rev 2791) @@ -423,7 +423,7 @@ try { // build master sensitivity export directory - File masterExportDirectory = new File(IsisFish.config.getDefaultExportDirectory(), id); + File masterExportDirectory = new File(SimulationStorage.getSensitivityResultsDirectory(), id); if (!masterExportDirectory.isDirectory()) { masterExportDirectory.mkdirs(); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2009-12-02 15:47:44 UTC (rev 2790) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2009-12-02 17:32:03 UTC (rev 2791) @@ -30,9 +30,6 @@ } public void refresh() { - // fill ExportDirectory - String exportDirectory = getSimulAction().getSimulationParameter().getExportDirectory(); - fieldSimulExportFolder.setText(exportDirectory); // fill export setListSimulExportChooseModel(); } @@ -67,10 +64,6 @@ } protected void saveConfigExports() { - // set export directory - String exportDirectory = fieldSimulExportFolder.getText(); - getSimulAction().getSimulationParameter().setExportDirectory(exportDirectory); - // Set exports (this can save empty list (not a big deal)) Object[] values = listSimulExportChoose.getSelectedValues(); java.util.List<String> exportNames = new LinkedList<String>(); @@ -91,7 +84,7 @@ ]]> </script> <row> - <cell columns="4" fill="both" weightx="1.0" weighty="1.0"> + <cell fill="both" weightx="1.0" weighty="1.0"> <JScrollPane> <JList id="listSimulExportChoose" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" cellRenderer='{new fr.ifremer.isisfish.ui.models.export.ExportNameListRenderer()}' @@ -100,16 +93,7 @@ </cell> </row> <row> - <cell> - <JLabel text="isisfish.export.directory"/> - </cell> - <cell fill="horizontal" weightx="1.0"> - <JTextField id="fieldSimulExportFolder" /> - </cell> - <cell> - <JButton text="isisfish.common.ellipsis" onActionPerformed='getSimulAction().updateDirectory()'/> - </cell> - <cell> + <cell fill="horizontal"> <JButton text="isisfish.common.saveNextSimulation" onActionPerformed='saveConfigExports()'/> </cell> </row> 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-12-02 15:47:44 UTC (rev 2790) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-12-02 17:32:03 UTC (rev 2791) @@ -228,14 +228,6 @@ simul.selTab(i); } } -protected void enableOnlyExport(){ - if (fieldSimulOnlyExport.isSelected()){ - simulAction.getSimulationParameter().setOnlyExport(true); - } - else { - simulAction.getSimulationParameter().setOnlyExport(false); - } -} protected void setNbAnnees() { simulAction.setNumberOfYear(fieldSimulParamsNbAnnees.getText()); } @@ -603,9 +595,6 @@ selected='{simulAction.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()'/> - </cell> </row> </Table> </cell> 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-12-02 15:47:44 UTC (rev 2790) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-12-02 17:32:03 UTC (rev 2791) @@ -133,8 +133,7 @@ // put default value in param param.setSimulatorName(IsisFish.config.getSimulatorClassfile()); param.setTagValue(IsisFish.config.getDefaultTagValueAsMap()); - param.setExportDirectory(IsisFish.config - .getDefaultExportDirectory().toString()); + param.setExportNames(IsisFish.config.getDefaultExportNamesAsList()); List<String> defaultResultNames = IsisFish.config .getDefaultResultNamesAsList(); @@ -562,15 +561,11 @@ return result; } - public void updateDirectory() { - param.setExportDirectory(FileUtil.getDirectory()); - } - /** * Save current parameters exports names in configuration. */ public void saveExport() { - IsisFish.config.setDefaultExportDirectory(param.getExportDirectory()); + if (param.getExportNames() != null) { if (log.isDebugEnabled()) { @@ -1063,8 +1058,7 @@ if (sensitivityCalculator != null) { try { // build master sensitivity export directory - File masterExportDirectory = new File(IsisFish.config - .getDefaultExportDirectory(), + File masterExportDirectory = new File(SimulationStorage.getSensitivityResultsDirectory(), masterSensitivitySimulationName); if (!masterExportDirectory.isDirectory()) { masterExportDirectory.mkdirs(); @@ -1098,8 +1092,7 @@ List<File> result = new ArrayList<File>(); // build master sensitivity export directory - File masterExportDirectory = new File(IsisFish.config - .getDefaultExportDirectory(), masterSensitivitySimulationName); + File masterExportDirectory = new File(SimulationStorage.getSensitivityResultsDirectory(), masterSensitivitySimulationName); if (masterExportDirectory.isDirectory()) { for (File exportFile : masterExportDirectory.listFiles()) { if (exportFile.isFile() 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-12-02 15:47:44 UTC (rev 2790) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-12-02 17:32:03 UTC (rev 2791) @@ -266,7 +266,6 @@ isisfish.error.evalute.plan.script=Can't evaluate plan script isisfish.error.factor.invalid=Factor is not valid isisfish.error.file.already.exists=The file %1$s already exist -isisfish.error.get.fisheryRegion=Can't get FisheryRegion isisfish.error.growth.equation.before.create.group.population=Error, You must input growth equation before create the group population isisfish.error.immigration.negative=immigration negative isisfish.error.import.convertible=Erreur lors de l'import, la version du fichier que vous souhaitez importer n'est pas transformable en une version importable. @@ -395,7 +394,6 @@ isisfish.error.wait.simThread=Can't wait SimThread isisfish.error.warning.title=Warning isisfish.error.write.simulation=Can't write information %1$s -isisfish.export.directory=Export directory isisfish.export.saved=Export saved isisfish.export.title=Results export isisfish.filter=Filter @@ -663,7 +661,6 @@ isisfish.params.lblLauncher=Simulation launcher isisfish.params.loadOldSimulation=Load old simulation isisfish.params.numberYear=Number of year -isisfish.params.onlyExportSimulation=Only export simulation isisfish.params.populationNumbers=Population numbers input isisfish.params.ruleParameters=Rule's parameters isisfish.params.sensitivityName=Sensitivity name 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-12-02 15:47:44 UTC (rev 2790) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-12-02 17:32:03 UTC (rev 2791) @@ -266,7 +266,6 @@ isisfish.error.evalute.plan.script=Can't evaluate plan script isisfish.error.factor.invalid=Le facteur n'est pas valide isisfish.error.file.already.exists=The file %1$s already exist -isisfish.error.get.fisheryRegion=Can't get FisheryRegion isisfish.error.growth.equation.before.create.group.population=Error, You must input growth equation before create the group population isisfish.error.immigration.negative=immigration negative isisfish.error.import.convertible=Erreur lors de l'import, la version du fichier que vous souhaitez importer n'est pas transformable en une version importable. @@ -395,7 +394,6 @@ isisfish.error.wait.simThread=Can't wait SimThread isisfish.error.warning.title=Attention isisfish.error.write.simulation=Can't write information %1$s -isisfish.export.directory=Dossier d'export isisfish.export.saved=Exports des r\u00E9sultats sauvegard\u00E9s isisfish.export.title=Export des r\u00E9sultats isisfish.filter=Filtrer @@ -663,7 +661,6 @@ isisfish.params.lblLauncher=Lanceur de simulation isisfish.params.loadOldSimulation=Charger une ancienne simulation isisfish.params.numberYear=Nombre d'ann\u00E9es -isisfish.params.onlyExportSimulation=Exporter uniquement des simulations isisfish.params.populationNumbers=Donn\u00E9es de population isisfish.params.ruleParameters=Param\u00E8tres des r\u00E8gles isisfish.params.sensitivityName=Nom de l'analyse de sensibilit\u00E9 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java 2009-12-02 15:47:44 UTC (rev 2790) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java 2009-12-02 17:32:03 UTC (rev 2791) @@ -68,7 +68,6 @@ Assert.assertTrue(params.getExtraRules().isEmpty()); Assert.assertTrue(params.getAnalysePlans().isEmpty()); Assert.assertTrue(params.getExportNames().isEmpty()); - Assert.assertEquals("/tmp", params.getExportDirectory()); Assert.assertFalse(params.getUsePreScript()); Assert.assertEquals("", params.getPreScript()); Assert.assertFalse(params.getUseAnalysePlan()); @@ -78,12 +77,11 @@ Assert.assertNull(params.getSensitivityCalculator()); Assert.assertTrue(params.getResultEnabled().isEmpty()); Assert.assertTrue(params.getTagValue().isEmpty()); - Assert.assertFalse(params.getOnlyExport()); Assert.assertEquals("info", params.getSimulLogLevel()); Assert.assertEquals("info", params.getScriptLogLevel()); Assert.assertEquals("error", params.getLibLogLevel()); } - + /** * Test to build one simulation parameters. * @@ -119,7 +117,7 @@ */ @Test public void testBasicFilePropertiesLoading() throws IOException { - + InputStream basicFileStream = SimulationParameterTest.class.getResourceAsStream("parameters_basic.properties"); Properties props = new SortedProperties();

1 0

r2790 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 02 Dec '09

02 Dec '09

Author: chatellier Date: 2009-12-02 15:47:44 +0000 (Wed, 02 Dec 2009) New Revision: 2790 Modified: isis-fish/trunk/pom.xml Log: Update rsyntaxtexarea Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-12-02 15:26:09 UTC (rev 2789) +++ isis-fish/trunk/pom.xml 2009-12-02 15:47:44 UTC (rev 2790) @@ -183,9 +183,9 @@ </dependency> <dependency> - <groupId>org.fife</groupId> + <groupId>org.nuiton.thirdparty</groupId> <artifactId>rsyntaxtextarea</artifactId> - <version>1.3.4</version> + <version>1.4.0</version> <scope>runtime</scope> </dependency>

1 0

r2789 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 02 Dec '09

02 Dec '09

Author: chatellier Date: 2009-12-02 15:26:09 +0000 (Wed, 02 Dec 2009) New Revision: 2789 Modified: isis-fish/trunk/pom.xml Log: Update svnkit Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-12-02 09:41:41 UTC (rev 2788) +++ isis-fish/trunk/pom.xml 2009-12-02 15:26:09 UTC (rev 2789) @@ -294,15 +294,9 @@ <dependency> <groupId>org.tmatesoft.svnkit</groupId> <artifactId>svnkit</artifactId> - <version>1.3.1</version> + <version>1.3.2-1</version> <scope>compile</scope> </dependency> - <dependency> - <groupId>com.trilead</groupId> - <artifactId>trilead-ssh2</artifactId> - <version>build213-svnkit-1.3-patch</version> - <scope>runtime</scope> - </dependency>  <dependency>

1 0

r2788 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/result resources/i18n
by chatellier＠users.labs.libre-entreprise.org 02 Dec '09

02 Dec '09

Author: chatellier Date: 2009-12-02 09:41:41 +0000 (Wed, 02 Dec 2009) New Revision: 2788 Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUIJAXX.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUIJAXX.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUIJAXX.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUIJAXX.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUIJAXX.jaxx Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUI.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUI.java 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 isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUI.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUI.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUI.java 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: Remove all tooltips displayed by default an all components. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUI.java 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUI.java 2009-12-02 09:41:41 UTC (rev 2788) @@ -120,7 +120,6 @@ JPanel result = new JPanel(new GridBagLayout()); for(int i=0; i<childs.size(); i++) result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.dataResult.table2")); __table2__ = result; } @@ -139,7 +138,6 @@ public JLabel getDescriptionLabel(){ if(__descriptionLabel__ == null){ JLabel result = new JLabel(_("isisfish.simulation.name")); - result.setToolTipText(_("isisfish.dataResult.descriptionLabel")); __descriptionLabel__ = result; } @@ -152,7 +150,6 @@ ImageIcon icon = null; JButton result = new JButton(_("isisfish.dataResult.export.csv"), icon); - result.setToolTipText(_("isisfish.dataResult.exportButton")); result.addMouseListener(new MouseAdapter(){ public void mouseClicked(MouseEvent e){ on_exportButton_clicked(); @@ -179,7 +176,6 @@ } else result = new JScrollPane(child); - result.setToolTipText(_("isisfish.dataResult.scrolledwindow2")); __scrolledwindow2__ = result; } @@ -200,7 +196,6 @@ new JTable(new DefaultTableModel(new Vector(), head)); result.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); setSignalMatriceTableHeader(result); - result.setToolTipText(_("isisfish.dataResult.matriceTable")); __matriceTable__ = result; } Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUIJAXX.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUIJAXX.jaxx 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUIJAXX.jaxx 2009-12-02 09:41:41 UTC (rev 2788) @@ -1,57 +0,0 @@ - -<Table> - <script> - <![CDATA[ - public DataResultUIJAXX (ResultAction action){ - - setContextValue(action); - } - ]]> - </script> - <row> - <cell fill='horizontal' weightx='1.0'> - <JLabel id='descriptionLabel' text="isisfish.simulation.name"/> - </cell> - </row> - <row> - <cell fill='both' weightx='1.0' weighty='1.0'> - <JTable id="matriceTable"/> - </cell> - </row> - <row> - <cell fill='horizontal' weightx='1.0'> - <JButton id="exportButton" text="isisfish.dataResult.export.csv"/> - </cell> - </row> -</Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUI.java 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUI.java 2009-12-02 09:41:41 UTC (rev 2788) @@ -92,8 +92,6 @@ result.setOneTouchExpandable(true); result.setDividerSize(10); - result.setToolTipText(_("isisfish.graphBean.graphSplitPane")); - __graphSplitPane__ = result; } return __graphSplitPane__; @@ -146,7 +144,6 @@ JPanel result = new JPanel(new GridBagLayout()); for(int i=0; i<childs.size(); i++) result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.graphBean.table3")); __table3__ = result; } @@ -165,7 +162,6 @@ public JLabel getLabel1(){ if(__label1__ == null){ JLabel result = new JLabel(_("isisfish.graphBean.graph.render")); - result.setToolTipText(_("isisfish.graphBean.label")); __label1__ = result; } @@ -187,7 +183,6 @@ } else result = new JScrollPane(child); - result.setToolTipText(_("isisfish.graphBean.scrolledwindow")); __scrolledwindow1__ = result; } @@ -238,7 +233,6 @@ JPanel result = new JPanel(new GridBagLayout()); for(int i=0; i<childs.size(); i++) result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.graphBean.table")); __table99__ = result; } @@ -255,7 +249,6 @@ public javax.swing.JPanel getGraphPanel(){ if(__graphPanel__ == null){ javax.swing.JPanel result = new javax.swing.JPanel(); - result.setToolTipText(_("isisfish.graphBean.graphPanel")); __graphPanel__ = result; } @@ -267,7 +260,6 @@ if(__graphRendererCombo__ == null){ JComboBox result = new JComboBox(); result.setEditable(true); - result.setToolTipText(_("isisfish.graphBean.graphRendererCombo")); result.addItemListener(new ItemListener(){ public void itemStateChanged(ItemEvent e){ on_graphRendererCombo_selectionChanged(e); @@ -309,7 +301,6 @@ JPanel result = new JPanel(new GridBagLayout()); for(int i=0; i<childs.size(); i++) result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.graphBean.table")); __table1__ = result; } @@ -343,7 +334,6 @@ JPanel result = new JPanel(new GridBagLayout()); for(int i=0; i<childs.size(); i++) result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.graphBean.table")); __table2__ = result; } @@ -360,7 +350,6 @@ public javax.swing.JPanel getPalettePanel(){ if(__palettePanel__ == null){ javax.swing.JPanel result = new javax.swing.JPanel(); - result.setToolTipText(_("isisfish.graphBean.palettePanel")); __palettePanel__ = result; } @@ -373,7 +362,6 @@ ImageIcon icon = null; JButton result = new JButton(_("isisfish.common.apply"), icon); - result.setToolTipText(_("isisfish.common.apply")); result.addMouseListener(new MouseAdapter(){ public void mouseClicked(MouseEvent e){ on_appliquer_clicked(); Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUIJAXX.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUIJAXX.jaxx 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUIJAXX.jaxx 2009-12-02 09:41:41 UTC (rev 2788) @@ -1,149 +0,0 @@ - -<Table> - <script> - <![CDATA[ - import org.jfree.chart.*; - import org.jfree.chart.PolarChartPanel; - - protected GraphBeanModel model; - protected JFreeChart chart; - protected PolarChartPanel graphPalette; - protected ChartPanel chartPanel; - - init(); - public GraphBeanUIJAXX (ResultAction action){ - - setContextValue(action); - } - protected void init(){ - model = new GraphBeanModel(); - JFreeChart chart = new JFreeChart(model.getTitle(), - JFreeChart.DEFAULT_TITLE_FONT, - model.getCategoryPlot(), - true); - graphPalette = new PolarChartPanel(chart); - jpanel1.add(graphPalette); - chartPanel = new ChartPanel(chart,true,true,true,true,true); - jpanel2.add(chartPanel); - model.addGraphListener(new GraphListener() { - - @Override - public void graphChanged(GraphEvent e) { - - } - public void on_graphRendererCombo_selectionChanged(ItemEvent e){ - if (e.getStateChange() == ItemEvent.SELECTED){ - //compile pas model.setRenderer((CategoryItemRenderer)graphRenderer.getSelectedItem()); - } - } - - }); - } - protected DefaultComboBoxModel loadGraphRendererCombo(){ - DefaultComboBoxModel model = new DefaultComboBoxModel(); - //model.addElement(new VerticalBarRenderer()); - //model.addElement(new VerticalBarRenderer3D()); - //model.addElement(new StackedVerticalBarRenderer()); - //model.addElement(new VerticalIntervalBarRenderer()); - //model.addElement(new VerticalStatisticalBarRenderer()); - //model.addElement(new HorizontalBarRenderer()); - //model.addElement(new HorizontalBarRenderer3D()); - //model.addElement(new StackedHorizontalBarRenderer()); - //model.addElement(new HorizontalIntervalBarRenderer()); - //model.addElement(new HorizontalShapeRenderer()); - //model.addElement(new AreaCategoryItemRenderer()); - //model.addElement(new LineAndShapeRenderer()); - //model.addElement(new MinMaxCategoryRenderer()); - //model.setSelectedItem(null); - return model; - } - - protected void displayGraph(){ - - //compile pas jaxx.runtime.SwingUtil.assignment(chart = new JFreeChart(model.getTitle(), JFreeChart.DEFAULT_TITLE_FONT, model.getCategoryPlot(), true), "chart", fr.ifremer.isisfish.ui.result.GraphBeanUIJAXX.this); - - //compile pas jaxx.runtime.SwingUtil.assignment(chartPanel = new ChartPanel(chart,true,true,true,true,true), "chartPanel", fr.ifremer.isisfish.ui.result.GraphBeanUIJAXX.this); - //compile pas jaxx.runtime.SwingUtil.assignment(graphPalette = new ChartPropertyEditPanel(chart), "graphPalette", fr.ifremer.isisfish.ui.result.GraphBeanUIJAXX.this); - - //getGraphSplitPane().setDividerLocation(1.0); - - graphPalette.removeAll(); - palettePanel.removeAll(); - graphPalette.add(chartPanel); - palettePanel.add(graphPalette); - graphPalette.invalidate(); - palettePanel.invalidate(); - graphPalette.validate(); - palettePanel.validate(); - graphPalette.repaint(); - palettePanel.repaint(); - } - protected void graphRenderChanged(){ - //compile pas model.setRenderer((CategoryItemRenderer)graphRenderer.getSelectedItem()); - displayGraph(); - } - public void appliquer(){ - //compile pas graphPalette.updateChartProperties(chart); - } - ]]> - </script> - <row> - <cell fill='horizontal' weightx='0.5'> - <JLabel id='label' text='isisfish.graphBean.graph.render'/> - </cell> - <cell fill='horizontal' weightx='0.5'> - <JComboBox id='graphRenderer' model='{loadGraphRendererCombo()}' renderer='{new GraphComboRenderer()}' onActionPerformed='graphRenderChanged()'/> - </cell> - </row> - <row> - <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <JPanel id='jpanel1' layout='{new BorderLayout()}'/> - </cell> - </row> - <row> - <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <JPanel id='jpanel2' layout='{new BorderLayout()}'/> - </cell> - </row> - <row> - <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <JPanel id='palettePanel' layout='{new BorderLayout()}'/> - </cell> - </row> - <row> - <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <JButton id='appliquer' text="isisfish.common.apply" onActionPerformed='appliquer()'/> - </cell> - </row> -</Table> 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-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateUI.java 2009-12-02 09:41:41 UTC (rev 2788) @@ -107,7 +107,6 @@ JPanel result = new JPanel(new GridBagLayout()); for(int i=0; i<childs.size(); i++) result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.infoItem.table")); __table31__ = result; } @@ -161,7 +160,6 @@ JPanel result = new JPanel(new GridBagLayout()); for(int i=0; i<childs.size(); i++) result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.infoItem.table")); __table32__ = result; } @@ -180,7 +178,6 @@ public JLabel getLabel(){ if(__label__ == null){ JLabel result = new JLabel(_("isisfish.infoItem.label")); - result.setToolTipText(_("isisfish.infoItem.label")); __label__ = result; } @@ -224,7 +221,6 @@ } else result = new JScrollPane(child); - result.setToolTipText(_("isisfish.infoItem.scrolledwindow")); __scrolledwindow2__ = result; } @@ -242,7 +238,6 @@ if(__list__ == null){ JList result = new JList(new DefaultListModel()); result.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - result.setToolTipText(_("isisfish.infoItem.list")); __list__ = 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-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemUI.java 2009-12-02 09:41:41 UTC (rev 2788) @@ -106,7 +106,6 @@ JPanel result = new JPanel(new GridBagLayout()); for(int i=0; i<childs.size(); i++) result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.infoItem..table")); __table29__ = result; } @@ -150,7 +149,6 @@ JPanel result = new JPanel(new GridBagLayout()); for(int i=0; i<childs.size(); i++) result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.infoItem.table")); __table30__ = result; } @@ -168,7 +166,6 @@ public JLabel getLabel(){ if(__label__ == null){ JLabel result = new JLabel(_("isisfish.infoItem.label")); - result.setToolTipText(_("isisfish.infoItem.label")); __label__ = result; } @@ -201,7 +198,6 @@ } else result = new JScrollPane(child); - result.setToolTipText(_("isisfish.infoItem.scrolledwindow")); __scrolledwindow1__ = result; } @@ -219,7 +215,6 @@ if(__list__ == null){ JList result = new JList(new DefaultListModel()); result.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - result.setToolTipText(_("isisfish.infoItem.list")); __list__ = result; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUI.java 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUI.java 2009-12-02 09:41:41 UTC (rev 2788) @@ -102,7 +102,6 @@ Vector childs = getVbox2Childs(); Box result = Box.createVerticalBox(); for (Object child : childs) result.add((Component) child); - result.setToolTipText(_("isisfish.result.vbox")); __vbox2__ = result; } @@ -121,7 +120,6 @@ Vector childs = getMenubar2Childs(); JMenuBar result = new JMenuBar(); for (Object child : childs) result.add((JMenuItem) child); - result.setToolTipText(_("isisfish.result.menubar")); __menubar2__ = result; } @@ -140,7 +138,6 @@ Vector childs = getMenuExport_menuChilds(); JMenu result = new JMenu(_("isisfish.result.export")); for (Object child : childs) result.add((Component) child); - result.setToolTipText(_("isisfish.result.menuExport")); __menuExport__ = result; } @@ -157,7 +154,6 @@ public JSeparator getMenuitem6(){ if(__menuitem6__ == null){ JSeparator result = new JSeparator(); - result.setToolTipText(_("isisfish.result.menuitem")); __menuitem6__ = result; } @@ -194,7 +190,6 @@ JPanel result = new JPanel(new GridBagLayout()); for(int i=0; i<childs.size(); i++) result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.result.table")); __table23__ = result; } @@ -238,7 +233,6 @@ JPanel result = new JPanel(new GridBagLayout()); for(int i=0; i<childs.size(); i++) result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.result.table")); __table22__ = result; } @@ -258,7 +252,6 @@ ImageIcon icon = null; JButton result = new JButton(_("isisfish.common.blank"), icon); - result.setToolTipText(_("isisfish.result.statusImage")); __statusImage__ = result; } @@ -269,7 +262,6 @@ public JLabel getStatusbar1(){ if(__statusbar1__ == null){ JLabel result = new JLabel(_("isisfish.result.statusBar")); - result.setToolTipText(_("isisfish.result.statusBar")); __statusbar1__ = result; } @@ -291,8 +283,6 @@ child1, child2); result.setOneTouchExpandable(true); result.setDividerSize(10); - - result.setToolTipText(_("isisfish.result.hpaned")); __hpaned2__ = result; } @@ -336,7 +326,6 @@ JPanel result = new JPanel(new GridBagLayout()); for(int i=0; i<childs.size(); i++) result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.result.table")); __table1__ = result; } @@ -380,7 +369,6 @@ JPanel result = new JPanel(new GridBagLayout()); for(int i=0; i<childs.size(); i++) result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.result.table")); __table7__ = result; } @@ -414,7 +402,6 @@ JPanel result = new JPanel(new GridBagLayout()); for(int i=0; i<childs.size(); i++) result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.result.table")); __table8__ = result; } @@ -460,7 +447,6 @@ } else result = new JScrollPane(child); - result.setToolTipText(_("isisfish.result.scroll")); __scroll__ = result; } @@ -483,7 +469,6 @@ JPanel result = new JPanel(new GridBagLayout()); for(int i=0; i<childs.size(); i++) result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.result.infoPanel")); __infoPanel__ = result; } @@ -501,7 +486,6 @@ if(__resultat__ == null){ JComboBox result = new JComboBox(); result.setEditable(true); - result.setToolTipText(_("isisfish.result.resultat")); result.addItemListener(new ItemListener(){ public void itemStateChanged(ItemEvent e){ on_resultat_selection_notify_event(e); @@ -543,7 +527,6 @@ JPanel result = new JPanel(new GridBagLayout()); for(int i=0; i<childs.size(); i++) result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.result.table")); __table25__ = result; } @@ -561,7 +544,6 @@ public javax.swing.JPanel getViewPanel(){ if(__viewPanel__ == null){ javax.swing.JPanel result = new javax.swing.JPanel(); - result.setToolTipText(_("isisfish.result.viewPanel")); __viewPanel__ = result; } @@ -618,7 +600,6 @@ JPanel result = new JPanel(new GridBagLayout()); for(int i=0; i<childs.size(); i++) result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.result.table")); __table26__ = result; } @@ -638,7 +619,6 @@ public JRadioButton getGraphRadioButton(){ if(__graphRadioButton__ == null){ JRadioButton result = new JRadioButton(_("isisfish.result.graph"), false); - result.setToolTipText(_("isisfish.result.graphRadioButton")); result.addChangeListener(new ChangeListener(){ public void stateChanged(ChangeEvent e){ on_graphRadioButton_toggled(e); @@ -654,7 +634,6 @@ public JRadioButton getMapRadioButton(){ if(__mapRadioButton__ == null){ JRadioButton result = new JRadioButton(_("isisfish.result.map"), false); - result.setToolTipText(_("isisfish.result.mapRadioButton")); result.addChangeListener(new ChangeListener(){ public void stateChanged(ChangeEvent e){ on_mapRadioButton_toggled(e); @@ -670,7 +649,6 @@ public JRadioButton getDonneeRadioButton(){ if(__donneeRadioButton__ == null){ JRadioButton result = new JRadioButton(_("isisfish.result.datas"), false); - result.setToolTipText(_("isisfish.result.datasRadioButton")); result.addChangeListener(new ChangeListener(){ public void stateChanged(ChangeEvent e){ on_donneeRadioButton_toggled(e); @@ -686,7 +664,6 @@ public JRadioButton getResumeRadioButton(){ if(__resumeRadioButton__ == null){ JRadioButton result = new JRadioButton(_("isisfish.result.summary"), false); - result.setToolTipText(_("isisfish.result.summaryRadioButton")); result.addChangeListener(new ChangeListener(){ public void stateChanged(ChangeEvent e){ on_resumeRadioButton_toggled(e); Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUIJAXX.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUIJAXX.jaxx 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUIJAXX.jaxx 2009-12-02 09:41:41 UTC (rev 2788) @@ -1,205 +0,0 @@ - -<JInternalFrame title='{getFrameName()}' size='{new Dimension(800,600)}' resizable="true" location='{new Point(0,23)}' layout='{new BorderLayout()}'> - <script> - <![CDATA[ - public ResultEditUIJAXX (ResultAction action){ - - setContextValue(action); - } - protected String getFrameName(){ - return getContextValue(ResultAction.class).getSimulationStorage().getName(); - } - protected void resultatChanged(){ - } - protected void changePanel(String s) { - ((CardLayout) content.getLayout()).show(content, s); - } - ]]> - </script> - <JSplitPane constraints='BorderLayout.CENTER' orientation="HORIZONTAL"> - <JPanel layout='{new BorderLayout()}'> - <JComboBox id='resultat' constraints='BorderLayout.NORTH' onActionPerformed='resultatChanged()'/> - - <JTree constraints='BorderLayout.CENTER'> - - </JTree> - </JPanel> - <JPanel layout='{new BorderLayout()}'> - <JPanel id='content' layout='{new CardLayout()}' constraints='BorderLayout.CENTER'> - <DataResultUIJAXX id='dataResult' constraints='new String("dataResult")' constructorParams='getContextValue(ResultAction.class)'/> - - <SimpleResultatMapBeanUIJAXX id='simpleResultatMapBean' constraints='new String("simpleResultatMapBean")' constructorParams='getContextValue(ResultAction.class)'/> - <GraphBeanUIJAXX id='graphBean' constraints='new String("graphBean")' constructorParams='getContextValue(ResultAction.class)'/> - <ResumePanelUIJAXX id='resumeBean' constraints='new String("resumeBean")' constructorParams='getContextValue(ResultAction.class)'/> - </JPanel> - <Table constraints='BorderLayout.SOUTH'> - <row> - <cell fill='horizontal' weightx='0.2'> - <JRadioButton id='graphRadioButton' text='isisfish.result.graph' buttonGroup='radioGroup' onActionPerformed='changePanel("graphBean")'/> - </cell> - <cell fill='horizontal' weightx='0.2'> - <JRadioButton id='mapRadioButton' text='isisfish.result.map' buttonGroup='radioGroup' onActionPerformed='changePanel("simpleResultatMapBean")'/> - </cell> - <cell fill='horizontal' weightx='0.2'> - <JRadioButton id='donneeRadioButton' text='isisfish.result.datas' buttonGroup='radioGroup' onActionPerformed='changePanel("dataResult")'/> - </cell> - <cell fill='horizontal' weightx='0.2'> - <JRadioButton id='resumeRadioButton' text='isisfish.result.summary' buttonGroup='radioGroup' onActionPerformed='changePanel("resumeBean")'/> - </cell> - - </row> - </Table> - </JPanel> - </JSplitPane> - <JPanel constraints='BorderLayout.SOUTH' layout='{new BorderLayout()}'> - <JLabel id='statusbar' constraints='BorderLayout.WEST'/> - - - <JPanel constraints='BorderLayout.CENTER'/> - <JButton id='ajoutRendu' constraints='BorderLayout.EAST' text='isisfish.common.add.short'/> - - </JPanel> -</JInternalFrame> \ No newline at end of file Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2009-12-02 09:41:41 UTC (rev 2788) @@ -1,130 +0,0 @@ - -<JPanel layout='{new BorderLayout()}'> - <script> - <![CDATA[ - import fr.ifremer.isisfish.ui.Common; - public ResultUI (ResultAction action){ - - setContextValue(action); - } - protected void open(){ - String name = (String)selSimulation.getSelectedItem(); - if (name != null){ - getContextValue(ResultAction.class).open(name); -// ResultEdit resEdit = new ResultEdit(getContextValue(ResultAction.class).getSimulationStorage()); -// JInternalFrame intFrame = -// new JInternalFrame(resEdit.getSimulation().getName(), -// true, //resizable -// true, //closable -// true, //maximizable -// true);//iconifiable -// intFrame.setContentPane(resEdit.getRootPane()); -// intFrame.setVisible(true); - // intFrame.pack(); -// intFrame.setSize(new Dimension(800,700)); - desktopPane.add(new ResultEdit(getContextValue(ResultAction.class).getSimulationStorage())); -// try{ -// intFrame.setSelected(true); -// } catch (PropertyVetoException eee) { -// log.warn("Error dans l internalFrame ", eee); -// } - } - } - ]]> - </script> - <Table constraints='BorderLayout.NORTH'> - <row> - <cell fill="horizontal" weightx="0.2"> - <JLabel text='isisfish.result.choose.simulation' toolTipText='isisfish.result.label'/> - </cell> - <cell fill="horizontal"> - <JComboBox id='selSimulation' editable='true' toolTipText='isisfish.result.simulation' model='{new DefaultComboBoxModel(Common.getOldSimulationItem())}'/> - - - </cell> - <cell fill="horizontal" weightx="0.2"> - <JButton id='filterSimulationButton' text='isisfish.filter' toolTipText='isisfish.filter.simulation'/> - - </cell> - <cell fill="horizontal" weightx="0.2"> - <JButton id='openWindowButton' text='isisfish.result.new.window' toolTipText='isisfish.result.openWindowButton' onActionPerformed='open()'/> - - </cell> - <cell fill="horizontal" weightx="0.2"> - <JButton id="supprimerSimulationButton" text='isisfish.result.remove.simulation' toolTipText='isisfish.result.removeSimulationButton'/> - - </cell> - <cell fill="horizontal" weightx="0.2"> - <JButton id='voirSimulationLogButton' text='isisfish.result.show.simulation.log' toolTipText='isisfish.result.tooltip.show.simulation.log'/> - - - </cell> - </row> - </Table> - <JDesktopPane id='desktopPane' constraints='BorderLayout.CENTER'/> -</JPanel> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java 2009-12-02 09:41:41 UTC (rev 2788) @@ -19,8 +19,6 @@ import java.awt.event.ItemListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; import java.util.HashMap; import java.util.Vector; @@ -91,7 +89,6 @@ for (Object child : childs) { result.add((Component) child); } - result.setToolTipText(_("isisfish.result.vbox")); __vbox1__ = result; } @@ -112,7 +109,6 @@ for (Object child : childs) { result.add((JMenuItem) child); } - result.setToolTipText(_("isisfish.result.menubar")); __menubar1__ = result; } @@ -133,7 +129,6 @@ for (Object child : childs) { result.add((Component) child); } - result.setToolTipText(_("isisfish.result.menuitem")); __menuitem1__ = result; } @@ -153,7 +148,6 @@ JMenuItem result = new JMenuItem(_("isisfish.result.quit"), icon); - result.setToolTipText(_("isisfish.result.menuitem")); result.addActionListener(new ActionListener(){ public void actionPerformed(ActionEvent e){ on_Resultat_destroy_event(); @@ -246,7 +240,6 @@ for(int i=0; i<childs.size(); i++) { result.add(childs.get(i), cs[i]); } - result.setToolTipText(_("isisfish.result.table")); __table33__ = result; } @@ -269,7 +262,6 @@ public JLabel getLabel9(){ if(__label9__ == null){ JLabel result = new JLabel(_("isisfish.result.choose.simulation")); - result.setToolTipText(_("isisfish.result.label")); __label9__ = result; } @@ -284,7 +276,6 @@ javax.swing.JDesktopPane result = new javax.swing.JDesktopPane (); - result.setToolTipText(_("isisfish.result.desktopPane")); __desktopPane__ = result; } @@ -296,7 +287,6 @@ if(__simulation__ == null){ JComboBox result = new JComboBox(); result.setEditable(true); - result.setToolTipText(_("isisfish.result.simulation")); result.addItemListener(new ItemListener(){ public void itemStateChanged(ItemEvent e){ on_simulation_selection_notify_event(e); @@ -314,7 +304,6 @@ ImageIcon icon = null; JButton result = new JButton(_("isisfish.result.new.window"), icon); - result.setToolTipText(_("isisfish.result.openWindowButton")); result.addMouseListener(new MouseAdapter(){ public void mouseClicked(MouseEvent e){ on_openWindowButton_clicked(); @@ -332,7 +321,6 @@ ImageIcon icon = null; JButton result = new JButton(_("isisfish.result.remove.simulation"), icon); - result.setToolTipText(_("isisfish.result.removeSimulationButton")); result.addMouseListener(new MouseAdapter(){ public void mouseClicked(MouseEvent e){ on_supprimerSimulationButton_clicked(); @@ -351,7 +339,6 @@ ImageIcon icon = null; JButton result = new JButton(_("isisfish.result.show.simulation.log"), icon); - result.setToolTipText(_("isisfish.result.tooltip.show.simulation.log")); result.addMouseListener(new MouseAdapter(){ public void mouseClicked(MouseEvent e){ on_voirSimulationLogButton_clicked(); @@ -371,7 +358,6 @@ JButton result = new JButton(_("isisfish.filter"), icon); - result.setToolTipText(_("isisfish.filter.simulation")); result.addMouseListener(new MouseAdapter(){ public void mouseClicked(MouseEvent e){ on_filterSimulationLogButton_clicked(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUI.java 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUI.java 2009-12-02 09:41:41 UTC (rev 2788) @@ -102,7 +102,6 @@ JPanel result = new JPanel(new GridBagLayout()); for(int i=0; i<childs.size(); i++) result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.resume.table")); __table1__ = result; } @@ -131,7 +130,6 @@ } else result = new JScrollPane(child); - result.setToolTipText(_("isisfish.resume.scrolledwindow")); __scrolledwindow2__ = result; } @@ -149,7 +147,6 @@ if(__resumeTextArea__ == null){ JTextArea result = new JTextArea(_("isisfish.common.blank")); result.setEditable(false); - result.setToolTipText(_("isisfish.resume.resumeTextArea")); __resumeTextArea__ = result; } @@ -166,7 +163,6 @@ JPanel result = new JPanel(new GridBagLayout()); for(int i=0; i<childs.size(); i++) result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.resume.matrixInfoGrid")); __matriceInfoGrid__ = result; } Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUIJAXX.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUIJAXX.jaxx 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUIJAXX.jaxx 2009-12-02 09:41:41 UTC (rev 2788) @@ -1,45 +0,0 @@ - -<JPanel layout='{new BorderLayout()}'> - <script> - <![CDATA[ - public ResumePanelUIJAXX (ResultAction action){ - - setContextValue(action); - } - ]]> - </script> - <JScrollPane> - <JTextArea id='resumeTextArea' text='isisfish.common.blank' editable='false'/> - </JScrollPane> -</JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUI.java 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUI.java 2009-12-02 09:41:41 UTC (rev 2788) @@ -121,7 +121,6 @@ JPanel result = new JPanel(new GridBagLayout()); for(int i=0; i<childs.size(); i++) result.add((Component)childs.get(i), cs[i]); - result.setToolTipText(_("isisfish.simpleResult.table")); __table12__ = result; } @@ -141,7 +140,6 @@ public fr.ifremer.isisfish.map.IsisMapBean getIsisMapBean(){ if(__resultatMap__ == null){ fr.ifremer.isisfish.map.IsisMapBean result = new fr.ifremer.isisfish.map.IsisMapBean(); - result.setToolTipText(_("isisfish.simpleResult.resultatMap")); // EC-20090706 : fix bug 1777 : no selection on result map result.setSelectionMode(CellSelectionLayer.NO_SELECTION); @@ -169,7 +167,6 @@ com.bbn.openmap.gui.ToolPanel result = new com.bbn.openmap.gui.ToolPanel (); - result.setToolTipText(_("isisfish.simpleResult.resultatMapToolBar")); __resultatMapToolBar__ = result; } @@ -180,7 +177,6 @@ public LegendPanel getLegendPanel(){ if(__legendPanel__ == null){ LegendPanel result = new LegendPanel(); - result.setToolTipText(_("isisfish.simpleResult.legendPanel")); __legendPanel__ = result; } Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUIJAXX.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUIJAXX.jaxx 2009-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUIJAXX.jaxx 2009-12-02 09:41:41 UTC (rev 2788) @@ -1,54 +0,0 @@ - -<JPanel id="simpleResultMapBean" layout='{new BorderLayout()}'> - <script> - <![CDATA[ - import fr.ifremer.isisfish.map.IsisMapBean; - import com.bbn.openmap.InformationDelegator; - import com.bbn.openmap.gui.ToolPanel; - init(); - public SimpleResultatMapBeanUIJAXX (ResultAction action){ - - setContextValue(action); - } - protected void init(){ - simpleResultMapBean.add(new InformationDelegator(), BorderLayout.NORTH); - simpleResultMapBean.add(new IsisMapBean(), BorderLayout.CENTER); - simpleResultMapBean.add(new ToolPanel(), BorderLayout.SOUTH); - } - ]]> - </script> -  -</JPanel> 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-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-12-02 09:41:41 UTC (rev 2788) @@ -203,13 +203,8 @@ isisfish.config.vcs.useSshConnexion.description= isisfish.config.vcs.userName.description= isisfish.config.vcs.userPassword.description= -isisfish.dataResult.descriptionLabel=defaultToolTip-fr.ifremer.resultat.DataResult.descriptionLabel isisfish.dataResult.export.csv=Export to CSV -isisfish.dataResult.exportButton=defaultToolTip-fr.ifremer.resultat.DataResult.exportButton -isisfish.dataResult.label=label9 -isisfish.dataResult.matriceTable=defaultToolTip-fr.ifremer.resultat.DataResult.matriceTable -isisfish.dataResult.scrolledwindow2=defaultToolTip-fr.ifremer.resultat.DataResult.scrolledwindow2 -isisfish.dataResult.table2=defaultToolTip-fr.ifremer.resultat.DataResult.table2 +isisfish.dataResult.label=Value isisfish.date.toString=%1$s %2$s isisfish.effortDescription.crewFoodCost=Crew food cost isisfish.effortDescription.crewShareRate=Crew share rate @@ -473,14 +468,6 @@ isisfish.gear.technicalParameter=Technical parameter isisfish.gear.title=Gear isisfish.graphBean.graph.render=Choose a graph render -isisfish.graphBean.graphPanel=defaultToolTip-fr.ifremer.graph.GraphBean.graphPanel -isisfish.graphBean.graphRendererCombo=defaultToolTip-fr.ifremer.graph.GraphBean.graphRendererCombo -isisfish.graphBean.graphSplitPane=defaultToolTip-fr.ifremer.graph.GraphBean.graphSplitPane -isisfish.graphBean.label=defaultToolTip-fr.ifremer.graph.GraphBean.label1 -isisfish.graphBean.palettePanel=defaultToolTip-fr.ifremer.graph.GraphBean.palettePanel -isisfish.graphBean.scrolledwindow=defaultToolTip-fr.ifremer.graph.GraphBean.scrolledwindow1 -isisfish.graphBean.table=defaultToolTip-fr.ifremer.graph.GraphBean.table2 -isisfish.graphBean.table3=defaultToolTip-fr.ifremer.graph.GraphBean.table3 isisfish.graphCombo.render.bar=Verticals bar rendering isisfish.graphCombo.render.bar.3d=3D verticals bars rendering isisfish.graphCombo.render.bar.stacked=Stacked verticals bars rendering @@ -489,13 +476,9 @@ isisfish.graphCombo.render.min.max=Min/max rendering isisfish.graphCombo.render.surface=Area rendering isisfish.graphCombo.render.surface.stacked=Stacked area rendering -isisfish.infoItem..table=defaultToolTip-fr.ifremer.resultat.InfoItem.table29 isisfish.infoItem.label=defaultToolTip-fr.ifremer.resultat.InfoItem.label -isisfish.infoItem.list=defaultToolTip-fr.ifremer.resultat.InfoItem.list -isisfish.infoItem.scrolledwindow=defaultToolTip-fr.ifremer.resultat.InfoItem.scrolledwindow1 -isisfish.infoItem.sum=defaultToolTip-fr.ifremer.resultat.InfoItemDate.sumButton +isisfish.infoItem.sum=Sum all elements isisfish.infoItem.sum.year=Sum elements per year -isisfish.infoItem.table=defaultToolTip-fr.ifremer.resultat.InfoItem.table30 isisfish.input.continueCells=Continue to cells isisfish.input.continueGears=Continue to gears isisfish.input.continueMetiers=Continue to metiers @@ -808,51 +791,26 @@ isisfish.result.capture.metier=Capture par metier isisfish.result.choose.simulation=Choose a Simulation isisfish.result.datas=Datas -isisfish.result.datasRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.donneeRadioButton -isisfish.result.desktopPane=defaultToolTip-fr.ifremer.resultat.ResultatView.desktopPane isisfish.result.dimension=Dimension isisfish.result.end.simulation=Simuation end \: isisfish.result.export=Export isisfish.result.export.file=Export text file isisfish.result.file=File isisfish.result.graph=Graph -isisfish.result.graphRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.graphRadioButton -isisfish.result.hpaned=defaultToolTip-fr.ifremer.resultat.ResultatEdit.hpaned2 -isisfish.result.infoPanel=defaultToolTip-fr.ifremer.resultat.ResultatEdit.infoPanel -isisfish.result.label=defaultToolTip-fr.ifremer.resultat.ResultatView.label9 isisfish.result.map=Map -isisfish.result.mapRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.mapRadioButton -isisfish.result.menuExport=defaultToolTip-fr.ifremer.resultat.ResultatEdit.menuExport -isisfish.result.menubar=defaultToolTip-fr.ifremer.resultat.ResultatView.menubar1 -isisfish.result.menuitem=defaultToolTip-fr.ifremer.resultat.ResultatView.menuitem2 isisfish.result.new.window=Open a new window -isisfish.result.openWindowButton=defaultToolTip-fr.ifremer.resultat.ResultatView.openWindowButton isisfish.result.quit=Quitter isisfish.result.reject.metier=Rejet par metier isisfish.result.remove.simulation=Remove simulation -isisfish.result.removeSimulationButton=defaultToolTip-fr.ifremer.resultat.ResultatView.supprimerSimulationButton -isisfish.result.resultat=defaultToolTip-fr.ifremer.resultat.ResultatEdit.resultat -isisfish.result.scroll=defaultToolTip-fr.ifremer.resultat.ResultatEdit.scroll isisfish.result.show.simulation.log=Show logs -isisfish.result.simulation=defaultToolTip-fr.ifremer.resultat.ResultatView.simulation -isisfish.result.statusBar=defaultToolTip-fr.ifremer.resultat.ResultatEdit.statusbar1 -isisfish.result.statusImage=defaultToolTip-fr.ifremer.resultat.ResultatEdit.statusImage +isisfish.result.statusBar=\ isisfish.result.stress.metier=Effort par metier isisfish.result.summary=Summary -isisfish.result.summaryRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.resumeRadioButton -isisfish.result.table=defaultToolTip-fr.ifremer.resultat.ResultatView.table33 isisfish.result.title=Results -isisfish.result.tooltip.show.simulation.log=Click to display the log console of the simulation isisfish.result.unload.metier=Debarquement par metier -isisfish.result.vbox=defaultToolTip-fr.ifremer.resultat.ResultatView.vbox1 -isisfish.result.viewPanel=defaultToolTip-fr.ifremer.resultat.ResultatEdit.viewPanel isisfish.resultChoice.save=Results to save isisfish.resultChoice.saved=Results saved isisfish.resultChoice.title=Result choice -isisfish.resume.matrixInfoGrid=defaultToolTip-fr.ifremer.resultat.ResumePanel.matriceInfoGrid -isisfish.resume.resumeTextArea=defaultToolTip-fr.ifremer.resultat.ResumePanel.resumeTextArea -isisfish.resume.scrolledwindow=defaultToolTip-fr.ifremer.resultat.ResumePanel.scrolledwindow2 -isisfish.resume.table=defaultToolTip-fr.ifremer.resultat.ResumePanel.table1 isisfish.script.check=Check isisfish.script.check.tooltip=Check syntax of the current script isisfish.script.commit=Commit @@ -955,11 +913,7 @@ isisfish.setOfVessels.technicalEfficiency=Technical efficiency isisfish.setOfVessels.title=Caracteristics isisfish.setOfVessels.vesselType=Vessel type -isisfish.simpleResult.legendPanel=defaultToolTip-fr.ifremer.isisfish.map.SimpleIsisMapBeanBean.legendPanel isisfish.simpleResult.more.information=Clic a cell for more information... -isisfish.simpleResult.resultatMap=defaultToolTip-fr.ifremer.isisfish.map.SimpleIsisMapBeanBean.resultatMap -isisfish.simpleResult.resultatMapToolBar=defaultToolTip-fr.ifremer.isisfish.map.SimpleIsisMapBeanBean.resultatMapToolBar -isisfish.simpleResult.table=defaultToolTip-fr.ifremer.isisfish.map.SimpleResultatMapBean.table12 isisfish.simulation.log.console.title=Log console for simulation '%1$s' isisfish.simulation.log.showConsole=display log console for simulation %1$s isisfish.simulation.menu.import=Restor simulation parameter 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-12-01 17:41:51 UTC (rev 2787) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-12-02 09:41:41 UTC (rev 2788) @@ -203,13 +203,8 @@ isisfish.config.vcs.useSshConnexion.description=pour indiquer si l'on utilise une connexion s\u00E9curis\u00E9e pour communiquer avec le serveur vcs (ssh2) isisfish.config.vcs.userName.description=le login de l'utilisateur sur le serveur vcs isisfish.config.vcs.userPassword.description= -isisfish.dataResult.descriptionLabel=defaultToolTip-fr.ifremer.resultat.DataResult.descriptionLabel isisfish.dataResult.export.csv=Exporter en CSV -isisfish.dataResult.exportButton=defaultToolTip-fr.ifremer.resultat.DataResult.exportButton -isisfish.dataResult.label=label9 -isisfish.dataResult.matriceTable=defaultToolTip-fr.ifremer.resultat.DataResult.matriceTable -isisfish.dataResult.scrolledwindow2=defaultToolTip-fr.ifremer.resultat.DataResult.scrolledwindow2 -isisfish.dataResult.table2=defaultToolTip-fr.ifremer.resultat.DataResult.table2 +isisfish.dataResult.label=Valeur isisfish.date.toString=%1$s %2$s isisfish.effortDescription.crewFoodCost=Co\u00FBt de l'alimentation pour l'\u00E9quipage isisfish.effortDescription.crewShareRate=Taux de partage de l'\u00E9quipage @@ -473,14 +468,6 @@ isisfish.gear.technicalParameter=Param\u00E8tre technique isisfish.gear.title=Engin isisfish.graphBean.graph.render=Choisir un rendu de graphe -isisfish.graphBean.graphPanel=defaultToolTip-fr.ifremer.graph.GraphBean.graphPanel -isisfish.graphBean.graphRendererCombo=defaultToolTip-fr.ifremer.graph.GraphBean.graphRendererCombo -isisfish.graphBean.graphSplitPane=defaultToolTip-fr.ifremer.graph.GraphBean.graphSplitPane -isisfish.graphBean.label=defaultToolTip-fr.ifremer.graph.GraphBean.label1 -isisfish.graphBean.palettePanel=defaultToolTip-fr.ifremer.graph.GraphBean.palettePanel -isisfish.graphBean.scrolledwindow=defaultToolTip-fr.ifremer.graph.GraphBean.scrolledwindow1 -isisfish.graphBean.table=defaultToolTip-fr.ifremer.graph.GraphBean.table2 -isisfish.graphBean.table3=defaultToolTip-fr.ifremer.graph.GraphBean.table3 isisfish.graphCombo.render.bar=Rendu en barres verticales isisfish.graphCombo.render.bar.3d=Rendu en barres verticales 3D isisfish.graphCombo.render.bar.stacked=Rendu en barres verticales empil\u00E9es @@ -489,13 +476,9 @@ isisfish.graphCombo.render.min.max=Rendu en MinMax isisfish.graphCombo.render.surface=Rendu en aire isisfish.graphCombo.render.surface.stacked=Rendu en aires empil\u00E9es -isisfish.infoItem..table=defaultToolTip-fr.ifremer.resultat.InfoItem.table29 isisfish.infoItem.label=defaultToolTip-fr.ifremer.resultat.InfoItem.label -isisfish.infoItem.list=defaultToolTip-fr.ifremer.resultat.InfoItem.list -isisfish.infoItem.scrolledwindow=defaultToolTip-fr.ifremer.resultat.InfoItem.scrolledwindow1 -isisfish.infoItem.sum=defaultToolTip-fr.ifremer.resultat.InfoItemDate.sumButton -isisfish.infoItem.sum.year=Somme de \u00E9l\u00E9ment par ann\u00E9e -isisfish.infoItem.table=defaultToolTip-fr.ifremer.resultat.InfoItem.table30 +isisfish.infoItem.sum=Somme de tous les \u00E9l\u00E9ments +isisfish.infoItem.sum.year=Somme des \u00E9l\u00E9ments par ann\u00E9e isisfish.input.continueCells=Continuer vers les mailles isisfish.input.continueGears=Continuer vers les engins isisfish.input.continueMetiers=Continuer vers les metiers @@ -808,51 +791,26 @@ isisfish.result.capture.metier=Capturer par m\u00E9tier isisfish.result.choose.simulation=Choisir une simulation isisfish.result.datas=Donn\u00E9es -isisfish.result.datasRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.donneeRadioButton -isisfish.result.desktopPane=defaultToolTip-fr.ifremer.resultat.ResultatView.desktopPane isisfish.result.dimension=Dimension isisfish.result.end.simulation=En fin de Simulation\: isisfish.result.export=Export isisfish.result.export.file=Exporter un fichier texte isisfish.result.file=Fichier isisfish.result.graph=Graphe -isisfish.result.graphRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.graphRadioButton -isisfish.result.hpaned=defaultToolTip-fr.ifremer.resultat.ResultatEdit.hpaned2 -isisfish.result.infoPanel=defaultToolTip-fr.ifremer.resultat.ResultatEdit.infoPanel -isisfish.result.label=defaultToolTip-fr.ifremer.resultat.ResultatView.label9 isisfish.result.map=Carte -isisfish.result.mapRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.mapRadioButton -isisfish.result.menuExport=defaultToolTip-fr.ifremer.resultat.ResultatEdit.menuExport -isisfish.result.menubar=defaultToolTip-fr.ifremer.resultat.ResultatView.menubar1 -isisfish.result.menuitem=defaultToolTip-fr.ifremer.resultat.ResultatView.menuitem2 isisfish.result.new.window=Ouvrir une nouvelle fen\u00EAtre -isisfish.result.openWindowButton=defaultToolTip-fr.ifremer.resultat.ResultatView.openWindowButton isisfish.result.quit=Quitter isisfish.result.reject.metier=Rejet par metier isisfish.result.remove.simulation=Supprimer Simulation -isisfish.result.removeSimulationButton=defaultToolTip-fr.ifremer.resultat.ResultatView.supprimerSimulationButton -isisfish.result.resultat=defaultToolTip-fr.ifremer.resultat.ResultatEdit.resultat -isisfish.result.scroll=defaultToolTip-fr.ifremer.resultat.ResultatEdit.scroll isisfish.result.show.simulation.log=Voir les logs -isisfish.result.simulation=defaultToolTip-fr.ifremer.resultat.ResultatView.simulation -isisfish.result.statusBar=defaultToolTip-fr.ifremer.resultat.ResultatEdit.statusbar1 -isisfish.result.statusImage=defaultToolTip-fr.ifremer.resultat.ResultatEdit.statusImage +isisfish.result.statusBar=\ isisfish.result.stress.metier=Effort par metier isisfish.result.summary=R\u00E9sum\u00E9 -isisfish.result.summaryRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.resumeRadioButton -isisfish.result.table=defaultToolTip-fr.ifremer.resultat.ResultatView.table33 isisfish.result.title=R\u00E9sultat -isisfish.result.tooltip.show.simulation.log=Cliquer pour afficher la console des logs de la simulation isisfish.result.unload.metier=Debarquement par metier -isisfish.result.vbox=defaultToolTip-fr.ifremer.resultat.ResultatView.vbox1 -isisfish.result.viewPanel=defaultToolTip-fr.ifremer.resultat.ResultatEdit.viewPanel isisfish.resultChoice.save=R\u00E9sultats \u00E0 sauvegarder isisfish.resultChoice.saved=R\u00E9sultats sauvegard\u00E9 isisfish.resultChoice.title=Choix de r\u00E9sultats -isisfish.resume.matrixInfoGrid=defaultToolTip-fr.ifremer.resultat.ResumePanel.matriceInfoGrid -isisfish.resume.resumeTextArea=defaultToolTip-fr.ifremer.resultat.ResumePanel.resumeTextArea -isisfish.resume.scrolledwindow=defaultToolTip-fr.ifremer.resultat.ResumePanel.scrolledwindow2 -isisfish.resume.table=defaultToolTip-fr.ifremer.resultat.ResumePanel.table1 isisfish.script.check=V\u00E9rifier isisfish.script.check.tooltip=V\u00E9rifie la synthaxe du script isisfish.script.commit=Commit @@ -955,11 +913,7 @@ isisfish.setOfVessels.technicalEfficiency=\u00C9fficacit\u00E9 technique isisfish.setOfVessels.title=Caract\u00E9ristiques isisfish.setOfVessels.vesselType=Type de navire -isisfish.simpleResult.legendPanel=defaultToolTip-fr.ifremer.isisfish.map.SimpleIsisMapBeanBean.legendPanel isisfish.simpleResult.more.information=Cliquer sur une cellule pour plus d'informations... -isisfish.simpleResult.resultatMap=defaultToolTip-fr.ifremer.isisfish.map.SimpleIsisMapBeanBean.resultatMap -isisfish.simpleResult.resultatMapToolBar=defaultToolTip-fr.ifremer.isisfish.map.SimpleIsisMapBeanBean.resultatMapToolBar -isisfish.simpleResult.table=defaultToolTip-fr.ifremer.isisfish.map.SimpleResultatMapBean.table12 isisfish.simulation.log.console.title=Console de log simulation '%1$s' isisfish.simulation.log.showConsole=affichage de la console de log pour la simulation %1$s isisfish.simulation.menu.import=Restaurer les param\u00E9tres d'une simulation

1 0

r2787 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/ui/result src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 01 Dec '09

01 Dec '09

Author: chatellier Date: 2009-12-01 17:41:51 +0000 (Tue, 01 Dec 2009) New Revision: 2787 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBean.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUIJAXX.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphComboRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphMatrixNDDataset.java 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: Update to jfreechart 1.0.12 Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-11-30 10:48:26 UTC (rev 2786) +++ isis-fish/trunk/changelog.txt 2009-12-01 17:41:51 UTC (rev 2787) @@ -1,5 +1,6 @@ isis-fish (3.3.0.0) stable; urgency=low + * Update to jfreechart 1.0.13 (major version) * #1585 : Analyze plans are now reloaded before each simulation * Editing sensitivity factors after simulation reload now works * Add confirmation message before launching groups creation wizard Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-11-30 10:48:26 UTC (rev 2786) +++ isis-fish/trunk/pom.xml 2009-12-01 17:41:51 UTC (rev 2787) @@ -100,7 +100,7 @@ <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.8.1</version> + <version>1.8.2</version> <scope>compile</scope> </dependency> @@ -139,21 +139,12 @@ <scope>compile</scope> </dependency> -  <dependency> - <groupId>jfreechart</groupId> - <artifactId>jfreechart</artifactId> - <version>0.9.3</version> - <scope>compile</scope> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + <version>1.0.12</version> </dependency> - <dependency> - <groupId>jcommon</groupId> - <artifactId>jcommon</artifactId> - <version>0.7.0</version> - <scope>compile</scope> - </dependency> -  <dependency> <groupId>org.apache.xmlrpc</groupId> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBean.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBean.java 2009-11-30 10:48:26 UTC (rev 2786) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBean.java 2009-12-01 17:41:51 UTC (rev 2787) @@ -3,19 +3,25 @@ import java.awt.event.ItemEvent; import javax.swing.DefaultComboBoxModel; +import javax.swing.JPanel; -import com.jrefinery.chart.AreaCategoryItemRenderer; -import com.jrefinery.chart.CategoryItemRenderer; -import com.jrefinery.chart.ChartPanel; -import com.jrefinery.chart.HorizontalBarRenderer; -import com.jrefinery.chart.JFreeChart; -import com.jrefinery.chart.LineAndShapeRenderer; -import com.jrefinery.chart.MinMaxCategoryRenderer; -import com.jrefinery.chart.StackedHorizontalBarRenderer; -import com.jrefinery.chart.StackedVerticalBarRenderer; -import com.jrefinery.chart.VerticalBarRenderer; -import com.jrefinery.chart.VerticalBarRenderer3D; -import com.jrefinery.chart.ui.ChartPropertyEditPanel; +import org.jfree.chart.ChartPanel; +import org.jfree.chart.JFreeChart; +import org.jfree.chart.editor.ChartEditor; +import org.jfree.chart.editor.ChartEditorManager; +import org.jfree.chart.labels.StandardCategoryToolTipGenerator; +import org.jfree.chart.renderer.category.AreaRenderer; +import org.jfree.chart.renderer.category.BarRenderer; +import org.jfree.chart.renderer.category.BarRenderer3D; +import org.jfree.chart.renderer.category.CategoryItemRenderer; +import org.jfree.chart.renderer.category.IntervalBarRenderer; +import org.jfree.chart.renderer.category.LayeredBarRenderer; +import org.jfree.chart.renderer.category.LineAndShapeRenderer; +import org.jfree.chart.renderer.category.LineRenderer3D; +import org.jfree.chart.renderer.category.MinMaxCategoryRenderer; +import org.jfree.chart.renderer.category.StackedAreaRenderer; +import org.jfree.chart.renderer.category.StackedBarRenderer; +import org.jfree.chart.renderer.category.StackedBarRenderer3D; /** * GraphBean. @@ -25,155 +31,178 @@ * @author <a href="mailto:seb.regnier at free.fr"></a> * @version $Revision$ */ -public class GraphBean extends GraphBeanUI implements GraphBeanUICallback,GraphListener { +public class GraphBean extends GraphBeanUI implements GraphBeanUICallback, + GraphListener { /** serialVersionUID */ private static final long serialVersionUID = -4474836708965453250L; - + protected GraphBeanModel model; - protected ChartPropertyEditPanel graphPalette; + protected JPanel graphPalette; protected ChartPanel chartPanel; protected JFreeChart chart; - public GraphBean (){ - super(); - init(); - getGraphRendererCombo().setEditable(false); - getGraphRendererCombo().setRenderer(new GraphComboRenderer()); - loadGraphRendererCombo(); - //getGraphSplitPane().setDividerLocation(1.0); + public GraphBean() { + super(); + init(); + getGraphRendererCombo().setEditable(false); + getGraphRendererCombo().setRenderer(new GraphComboRenderer()); + loadGraphRendererCombo(); } - protected void loadGraphRendererCombo(){ - DefaultComboBoxModel model = new DefaultComboBoxModel(); - model.addElement(new VerticalBarRenderer()); - model.addElement(new VerticalBarRenderer3D()); - model.addElement(new StackedVerticalBarRenderer()); - // model.addElement(new VerticalIntervalBarRenderer()); - //model.addElement(new VerticalStatisticalBarRenderer()); - model.addElement(new HorizontalBarRenderer()); - // model.addElement(new HorizontalBarRenderer3D()); - model.addElement(new StackedHorizontalBarRenderer()); - // model.addElement(new HorizontalIntervalBarRenderer()); - //model.addElement(new HorizontalShapeRenderer()); - model.addElement(new AreaCategoryItemRenderer()); - model.addElement(new LineAndShapeRenderer()); - model.addElement(new MinMaxCategoryRenderer()); - model.setSelectedItem(null); - getGraphRendererCombo().setModel(model); + protected void loadGraphRendererCombo() { + DefaultComboBoxModel model = new DefaultComboBoxModel(); + + // rendu : vertical bar + BarRenderer barRenderer = new BarRenderer(); + barRenderer.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator()); + model.addElement(barRenderer); + + // rendu : vertical bar 3d + BarRenderer3D barRenderer3D = new BarRenderer3D(); + barRenderer3D.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator()); + model.addElement(barRenderer3D); + + // rendu stacked bar + StackedBarRenderer stackedBarRenderer = new StackedBarRenderer(); + stackedBarRenderer.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator()); + model.addElement(stackedBarRenderer); + + // rendu aire + AreaRenderer areaRenderer = new AreaRenderer(); + areaRenderer.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator()); + model.addElement(areaRenderer); + + // rendu aire empilée + StackedAreaRenderer stackedAreaRenderer = new StackedAreaRenderer(); + stackedAreaRenderer.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator()); + model.addElement(stackedAreaRenderer); + + // rendu line aire + LineAndShapeRenderer lineAndShapeRenderer = new LineAndShapeRenderer(); + lineAndShapeRenderer.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator()); + model.addElement(lineAndShapeRenderer); + + // rendu ligne 3d + LineRenderer3D lineRenderer3D = new LineRenderer3D(); + lineRenderer3D.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator()); + model.addElement(lineRenderer3D); + + // rendu mix/max + MinMaxCategoryRenderer minMaxCategoryRenderer = new MinMaxCategoryRenderer(); + minMaxCategoryRenderer.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator()); + model.addElement(minMaxCategoryRenderer); + + model.setSelectedItem(null); + getGraphRendererCombo().setModel(model); } - + /** * Get the value of model. * @return value of model. */ public GraphBeanModel getModel() { - return model; + return model; } - + /** * Set the value of model. * @param v Value to assign to model. */ - public void setModel(GraphBeanModel v) { - this.model = v; - model.addGraphListener(this); - //getGraphSplitPane().setDividerLocation(1.0); - // displayGraph(); + public void setModel(GraphBeanModel v) { + this.model = v; + model.addGraphListener(this); + // displayGraph(); } - public void graphChanged(GraphEvent e){ - displayGraph(); + public void graphChanged(GraphEvent e) { + displayGraph(); } - + /** * Get the value of chartPanel. * @return value of chartPanel. */ public ChartPanel getChartPanel() { - return chartPanel; + return chartPanel; } - + /** * Set the value of chartPanel. * @param v Value to assign to chartPanel. */ - public void setChartPanel(ChartPanel v) { - this.chartPanel = v; + public void setChartPanel(ChartPanel v) { + this.chartPanel = v; } - + /** * Get the value of graphPalette. * @return value of graphPalette. */ - public ChartPropertyEditPanel getGraphPalette() { - return graphPalette; + public JPanel getGraphPalette() { + return graphPalette; } - + /** * Set the value of graphPalette. * @param v Value to assign to graphPalette. */ - public void setGraphPalette(ChartPropertyEditPanel v) { - this.graphPalette = v; + public void setGraphPalette(JPanel v) { + this.graphPalette = v; } - + /** * Get the value of chart. * @return value of chart. */ public JFreeChart getChart() { - return chart; + return chart; } - + /** * Set the value of chart. * @param v Value to assign to chart. */ - public void setChart(JFreeChart v) { - this.chart = v; + public void setChart(JFreeChart v) { + this.chart = v; } - - public void displayGraph(){ + public void displayGraph() { -// JFreeChart chart = new JFreeChart(getModel().getCategoryDataset(), -// getModel().getCategoryPlot(), -// getModel().getTitle(), -// JFreeChart.DEFAULT_TITLE_FONT, -// true); - JFreeChart chart = new JFreeChart(getModel().getTitle(), - JFreeChart.DEFAULT_TITLE_FONT, - getModel().getCategoryPlot(), - true); - + JFreeChart chart = new JFreeChart(getModel().getTitle(), + JFreeChart.DEFAULT_TITLE_FONT, getModel().getCategoryPlot(), true); - setChart(chart); - setChartPanel(new ChartPanel(chart,true,true,true,true,true)); - setGraphPalette(new ChartPropertyEditPanel(chart)); - - //getGraphSplitPane().setDividerLocation(1.0); + setChart(chart); + setChartPanel(new ChartPanel(chart)); - getGraphPanel().removeAll(); - getPalettePanel().removeAll(); - getGraphPanel().add(getChartPanel()); - getPalettePanel().add(getGraphPalette()); - getGraphPanel().invalidate(); - getPalettePanel().invalidate(); - getGraphPanel().validate(); - getPalettePanel().validate(); - getGraphPanel().repaint(); - getPalettePanel().repaint(); + // C'est un DefaultChartEditor (mais en visibilite package) + // qui etend JPanel et ChartEditor (en version 1.0.13 du moins) + setGraphPalette((JPanel) ChartEditorManager.getChartEditor(this.chart)); + + //getGraphSplitPane().setDividerLocation(1.0); + + getGraphPanel().removeAll(); + getPalettePanel().removeAll(); + getGraphPanel().add(getChartPanel()); + getPalettePanel().add(getGraphPalette()); + getGraphPanel().invalidate(); + getPalettePanel().invalidate(); + getGraphPanel().validate(); + getPalettePanel().validate(); + getGraphPanel().repaint(); + getPalettePanel().repaint(); } - public void on_appliquer_clicked(){ - getGraphPalette().updateChartProperties(getChart()); + public void on_appliquer_clicked() { + ((ChartEditor) getGraphPalette()).updateChart(getChart()); } - public void on_graphRendererCombo_selectionChanged(ItemEvent e){ - if (e.getStateChange() == ItemEvent.SELECTED){ - getModel().setRenderer((CategoryItemRenderer)getGraphRendererCombo().getSelectedItem()); - } + public void on_graphRendererCombo_selectionChanged(ItemEvent e) { + if (e.getStateChange() == ItemEvent.SELECTED) { + getModel().setRenderer( + (CategoryItemRenderer) getGraphRendererCombo() + .getSelectedItem()); + } } }// GraphBean Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanModel.java 2009-11-30 10:48:26 UTC (rev 2786) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanModel.java 2009-12-01 17:41:51 UTC (rev 2787) @@ -3,17 +3,17 @@ import java.util.HashSet; import java.util.Iterator; +import org.jfree.chart.axis.CategoryAxis; +import org.jfree.chart.axis.CategoryLabelPositions; +import org.jfree.chart.axis.NumberAxis3D; +import org.jfree.chart.axis.ValueAxis; +import org.jfree.chart.labels.StandardCategoryToolTipGenerator; +import org.jfree.chart.plot.CategoryPlot; +import org.jfree.chart.renderer.category.BarRenderer3D; +import org.jfree.chart.renderer.category.CategoryItemRenderer; +import org.jfree.data.category.CategoryDataset; import org.nuiton.math.matrix.MatrixND; -import com.jrefinery.chart.CategoryItemRenderer; -import com.jrefinery.chart.CategoryPlot; -import com.jrefinery.chart.HorizontalCategoryAxis; -import com.jrefinery.chart.ValueAxis; -import com.jrefinery.chart.VerticalBarRenderer3D; -import com.jrefinery.chart.VerticalCategoryPlot; -import com.jrefinery.chart.VerticalNumberAxis3D; -import com.jrefinery.data.CategoryDataset; - /** * GraphBeanModel. * @@ -24,9 +24,9 @@ */ public class GraphBeanModel { - // protected VerticalCategoryPlot verticalCategoryPlot; + // protected VerticalCategoryPlot verticalCategoryPlot; protected CategoryDataset categoryDataset; - protected HorizontalCategoryAxis horizontalAxis; + protected CategoryAxis horizontalAxis; protected ValueAxis verticalAxis; protected CategoryItemRenderer renderer; protected MatrixND matrix; @@ -34,28 +34,27 @@ // table de toutes les vues du modèle private HashSet listeners = new HashSet(); - - public GraphBeanModel (){ - horizontalAxis = new HorizontalCategoryAxis(); - horizontalAxis.setVerticalCategoryLabels(true); - renderer = new VerticalBarRenderer3D(); - verticalAxis = new VerticalNumberAxis3D(); + public GraphBeanModel() { + horizontalAxis = new CategoryAxis(); + horizontalAxis.setCategoryLabelPositions(CategoryLabelPositions.UP_90); + renderer = new BarRenderer3D(); + renderer.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator()); + verticalAxis = new NumberAxis3D(); } /** * Méthode qui permet d'ajouter une vue au modèle * @param view la nouvelle vue */ - public void addGraphListener(GraphListener view){ + public void addGraphListener(GraphListener view) { listeners.add(view); } - /** * Méthode qui retire une vue du modèle * @param view la vue à retirer */ - public void removeGraphListener(GraphListener view){ + public void removeGraphListener(GraphListener view) { listeners.remove(view); } @@ -63,7 +62,7 @@ * Accesseur sur la table des listeners du modèle * @return la collection des listeners */ - public HashSet getGraphListeners(){ + public HashSet getGraphListeners() { return listeners; } @@ -71,7 +70,7 @@ * Accesseur en écriture sur la table des listeners du modèle * @param obs la collection des listeners */ - public void setGraphListeners(HashSet obs){ + public void setGraphListeners(HashSet obs) { listeners = obs; } @@ -79,12 +78,12 @@ * Previent les vues que le model a change * */ - protected void fireGraphChanged(){ + protected void fireGraphChanged() { // Iterateur pour parcourir les vues Iterator listenersIterator = listeners.iterator(); GraphEvent ge = new GraphEvent(this); - while(listenersIterator.hasNext()){ + while (listenersIterator.hasNext()) { GraphListener listener = ((GraphListener) listenersIterator.next()); listener.graphChanged(ge); } @@ -110,25 +109,26 @@ * Set the value of categoryDataset. * @param v Value to assign to categoryDataset. */ - public void setCategoryDataset(CategoryDataset v) { + public void setCategoryDataset(CategoryDataset v) { this.categoryDataset = v; fireGraphChanged(); } - public void setMatrix(MatrixND mi){ + public void setMatrix(MatrixND mi) { matrix = mi; setCategoryDataset(new GraphMatrixNDDataset(mi)); } public CategoryPlot getCategoryPlot() { - return new VerticalCategoryPlot(getCategoryDataset(),getHorizontalAxis(),getVerticalAxis(),getRenderer()); + return new CategoryPlot(getCategoryDataset(), getHorizontalAxis(), + getVerticalAxis(), getRenderer()); } /** * Get the value of horizontalAxis. * @return value of horizontalAxis. */ - public HorizontalCategoryAxis getHorizontalAxis() { + public CategoryAxis getHorizontalAxis() { horizontalAxis.setLabel(matrix.getDimensionName(0)); return horizontalAxis; } @@ -145,7 +145,7 @@ * Set the value of renderer. * @param v Value to assign to renderer. */ - public void setRenderer(CategoryItemRenderer v) { + public void setRenderer(CategoryItemRenderer v) { this.renderer = v; fireGraphChanged(); } @@ -162,7 +162,7 @@ * Set the value of verticalAxis. * @param v Value to assign to verticalAxis. */ - public void setVerticalAxis(ValueAxis v) { + public void setVerticalAxis(ValueAxis v) { this.verticalAxis = v; fireGraphChanged(); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUIJAXX.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUIJAXX.jaxx 2009-11-30 10:48:26 UTC (rev 2786) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUIJAXX.jaxx 2009-12-01 17:41:51 UTC (rev 2787) @@ -33,12 +33,12 @@ <Table> <script> <![CDATA[ - import com.jrefinery.chart.*; - import com.jrefinery.chart.ui.ChartPropertyEditPanel; + import org.jfree.chart.*; + import org.jfree.chart.PolarChartPanel; protected GraphBeanModel model; protected JFreeChart chart; - protected ChartPropertyEditPanel graphPalette; + protected PolarChartPanel graphPalette; protected ChartPanel chartPanel; init(); @@ -52,7 +52,7 @@ JFreeChart.DEFAULT_TITLE_FONT, model.getCategoryPlot(), true); - graphPalette = new ChartPropertyEditPanel(chart); + graphPalette = new PolarChartPanel(chart); jpanel1.add(graphPalette); chartPanel = new ChartPanel(chart,true,true,true,true,true); jpanel2.add(chartPanel); @@ -64,7 +64,7 @@ } public void on_graphRendererCombo_selectionChanged(ItemEvent e){ if (e.getStateChange() == ItemEvent.SELECTED){ - model.setRenderer((CategoryItemRenderer)graphRenderer.getSelectedItem()); + //compile pas model.setRenderer((CategoryItemRenderer)graphRenderer.getSelectedItem()); } } @@ -72,29 +72,29 @@ } protected DefaultComboBoxModel loadGraphRendererCombo(){ DefaultComboBoxModel model = new DefaultComboBoxModel(); - model.addElement(new VerticalBarRenderer()); - model.addElement(new VerticalBarRenderer3D()); - model.addElement(new StackedVerticalBarRenderer()); - // model.addElement(new VerticalIntervalBarRenderer()); + //model.addElement(new VerticalBarRenderer()); + //model.addElement(new VerticalBarRenderer3D()); + //model.addElement(new StackedVerticalBarRenderer()); + //model.addElement(new VerticalIntervalBarRenderer()); //model.addElement(new VerticalStatisticalBarRenderer()); - model.addElement(new HorizontalBarRenderer()); - // model.addElement(new HorizontalBarRenderer3D()); - model.addElement(new StackedHorizontalBarRenderer()); - // model.addElement(new HorizontalIntervalBarRenderer()); + //model.addElement(new HorizontalBarRenderer()); + //model.addElement(new HorizontalBarRenderer3D()); + //model.addElement(new StackedHorizontalBarRenderer()); + //model.addElement(new HorizontalIntervalBarRenderer()); //model.addElement(new HorizontalShapeRenderer()); - model.addElement(new AreaCategoryItemRenderer()); - model.addElement(new LineAndShapeRenderer()); - model.addElement(new MinMaxCategoryRenderer()); - model.setSelectedItem(null); + //model.addElement(new AreaCategoryItemRenderer()); + //model.addElement(new LineAndShapeRenderer()); + //model.addElement(new MinMaxCategoryRenderer()); + //model.setSelectedItem(null); return model; } protected void displayGraph(){ - jaxx.runtime.SwingUtil.assignment(chart = new JFreeChart(model.getTitle(), JFreeChart.DEFAULT_TITLE_FONT, model.getCategoryPlot(), true), "chart", fr.ifremer.isisfish.ui.result.GraphBeanUIJAXX.this); + //compile pas jaxx.runtime.SwingUtil.assignment(chart = new JFreeChart(model.getTitle(), JFreeChart.DEFAULT_TITLE_FONT, model.getCategoryPlot(), true), "chart", fr.ifremer.isisfish.ui.result.GraphBeanUIJAXX.this); - jaxx.runtime.SwingUtil.assignment(chartPanel = new ChartPanel(chart,true,true,true,true,true), "chartPanel", fr.ifremer.isisfish.ui.result.GraphBeanUIJAXX.this); - jaxx.runtime.SwingUtil.assignment(graphPalette = new ChartPropertyEditPanel(chart), "graphPalette", fr.ifremer.isisfish.ui.result.GraphBeanUIJAXX.this); + //compile pas jaxx.runtime.SwingUtil.assignment(chartPanel = new ChartPanel(chart,true,true,true,true,true), "chartPanel", fr.ifremer.isisfish.ui.result.GraphBeanUIJAXX.this); + //compile pas jaxx.runtime.SwingUtil.assignment(graphPalette = new ChartPropertyEditPanel(chart), "graphPalette", fr.ifremer.isisfish.ui.result.GraphBeanUIJAXX.this); //getGraphSplitPane().setDividerLocation(1.0); @@ -110,11 +110,11 @@ palettePanel.repaint(); } protected void graphRenderChanged(){ - model.setRenderer((CategoryItemRenderer)graphRenderer.getSelectedItem()); - displayGraph(); + //compile pas model.setRenderer((CategoryItemRenderer)graphRenderer.getSelectedItem()); + displayGraph(); } public void appliquer(){ - graphPalette.updateChartProperties(chart); + //compile pas graphPalette.updateChartProperties(chart); } ]]> </script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphComboRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphComboRenderer.java 2009-11-30 10:48:26 UTC (rev 2786) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphComboRenderer.java 2009-12-01 17:41:51 UTC (rev 2787) @@ -7,14 +7,16 @@ import javax.swing.DefaultListCellRenderer; import javax.swing.JList; -import com.jrefinery.chart.AreaCategoryItemRenderer; -import com.jrefinery.chart.HorizontalBarRenderer; -import com.jrefinery.chart.LineAndShapeRenderer; -import com.jrefinery.chart.MinMaxCategoryRenderer; -import com.jrefinery.chart.StackedHorizontalBarRenderer; -import com.jrefinery.chart.StackedVerticalBarRenderer; -import com.jrefinery.chart.VerticalBarRenderer; -import com.jrefinery.chart.VerticalBarRenderer3D; +import org.jfree.chart.renderer.category.AreaRenderer; +import org.jfree.chart.renderer.category.BarRenderer; +import org.jfree.chart.renderer.category.BarRenderer3D; +import org.jfree.chart.renderer.category.IntervalBarRenderer; +import org.jfree.chart.renderer.category.LayeredBarRenderer; +import org.jfree.chart.renderer.category.LineAndShapeRenderer; +import org.jfree.chart.renderer.category.LineRenderer3D; +import org.jfree.chart.renderer.category.MinMaxCategoryRenderer; +import org.jfree.chart.renderer.category.StackedAreaRenderer; +import org.jfree.chart.renderer.category.StackedBarRenderer; /** * GraphComboRenderer. @@ -29,32 +31,33 @@ /** serialVersionUID */ private static final long serialVersionUID = 5439698068065934760L; - public GraphComboRenderer (){ + public GraphComboRenderer() { super(); } - public Component getListCellRendererComponent(JList liste,Object o, - int attributeIndex,boolean isSelected,boolean hasFocus){ + public Component getListCellRendererComponent(JList liste, Object o, + int attributeIndex, boolean isSelected, boolean hasFocus) { super.getListCellRendererComponent(liste, o, attributeIndex, isSelected, hasFocus); - if (o instanceof StackedVerticalBarRenderer) - setText(_("isisfish.graphCombo.render.bar.vertical.stacked")); - else if (o instanceof VerticalBarRenderer3D) - setText(_("isisfish.graphCombo.render.bar.vertical.3d")); - else if (o instanceof VerticalBarRenderer) - setText(_("isisfish.graphCombo.render.bar.vertical")); - else if (o instanceof StackedHorizontalBarRenderer) - setText(_("isisfish.graphCombo.render.bar.horizontal.stacked")); - else if (o instanceof HorizontalBarRenderer) - setText(_("isisfish.graphCombo.render.bar.horizontal")); - else if (o instanceof AreaCategoryItemRenderer) + if (o instanceof StackedBarRenderer) { + setText(_("isisfish.graphCombo.render.bar.stacked")); + } else if (o instanceof BarRenderer3D) { + setText(_("isisfish.graphCombo.render.bar.3d")); + } else if (o instanceof BarRenderer) { + setText(_("isisfish.graphCombo.render.bar")); + } else if (o instanceof StackedAreaRenderer) { + setText(_("isisfish.graphCombo.render.surface.stacked")); + } else if (o instanceof AreaRenderer) { setText(_("isisfish.graphCombo.render.surface")); - else if (o instanceof LineAndShapeRenderer) + } else if (o instanceof LineRenderer3D) { + setText(_("isisfish.graphCombo.render.line.3d")); + } else if (o instanceof LineAndShapeRenderer) { setText(_("isisfish.graphCombo.render.line")); - else if (o instanceof MinMaxCategoryRenderer) + } else if (o instanceof MinMaxCategoryRenderer) { setText(_("isisfish.graphCombo.render.min.max")); - else + } else { setText((o == null) ? "" : o.toString()); - return this; + } + return this; } }// GraphComboRenderer Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphMatrixNDDataset.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphMatrixNDDataset.java 2009-11-30 10:48:26 UTC (rev 2786) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphMatrixNDDataset.java 2009-12-01 17:41:51 UTC (rev 2787) @@ -5,11 +5,11 @@ import java.util.List; import java.util.ResourceBundle; +import org.jfree.data.category.CategoryDataset; +import org.jfree.data.general.AbstractSeriesDataset; +import org.jfree.data.resources.DataPackageResources; import org.nuiton.math.matrix.MatrixND; -import com.jrefinery.data.AbstractSeriesDataset; -import com.jrefinery.data.CategoryDataset; - /** * GraphMatrixNDDataset. * @@ -18,282 +18,214 @@ * @author <a href="mailto:seb.regnier at free.fr"></a> * @version $Revision$ */ -public class GraphMatrixNDDataset extends AbstractSeriesDataset implements CategoryDataset {//,XYDataset { +public class GraphMatrixNDDataset extends AbstractSeriesDataset implements + CategoryDataset { //XYDataset { - /** The series names. */ - protected List seriesNames; + /** serialVersionUID. */ + private static final long serialVersionUID = -891382923646394164L; - /** The categories. */ - protected List categories; + /** The series names. */ + protected List seriesNames; - /** Storage for the data. */ - protected MatrixND mat; + /** The categories. */ + protected List categories; - public GraphMatrixNDDataset(MatrixND mat){ - this(mat.getSemantics(1), mat.getSemantics(0), mat); - } + /** Storage for the data. */ + protected MatrixND mat; + public GraphMatrixNDDataset(MatrixND mat) { + this(mat.getSemantic(1), mat.getSemantic(0), mat); + } - /** - * Constructs a GraphMatrixNDDataset, populates it with data from the matrice, and uses the - * supplied names for the series. - * <p> - * Category names are generated automatically ("Category 1", "Category 2", etc). - * - * @param seriesNames The series names. - * @param mat The matrice. - */ - public GraphMatrixNDDataset(List seriesNames, MatrixND mat) { - this(seriesNames, mat.getSemantics(0), mat); - } + /** + * Constructs a GraphMatrixNDDataset, populates it with the matrix, and uses the + * supplied names for the series and the supplied objects for the categories. + * + * @param seriesNames The series names. + * @param categories The categories. + * @param mat The matrix. + */ + public GraphMatrixNDDataset(List seriesNames, List categories, MatrixND mat) { - /** - * Constructs a GraphMatrixNDDataset, populates it with the matrice, and uses the - * supplied names for the series and the supplied objects for the categories. - * - * @param seriesNames The series names. - * @param categories The categories. - * @param mat The matrice. - */ - public GraphMatrixNDDataset(List seriesNames, List categories, MatrixND mat) { + this.mat = mat; - this.mat = mat; + if (mat != null && mat.getDimCount() > 1) { - if ( mat!=null && mat.getNbDim() > 1) { + String baseName = DataPackageResources.class.getCanonicalName(); + ResourceBundle resources = ResourceBundle.getBundle(baseName); - String baseName = "com.jrefinery.data.resources.DataPackageResources"; - ResourceBundle resources = ResourceBundle.getBundle(baseName); + int series_count = mat.getDim(1); + if (series_count > 0) { - int series_count = mat.getDim(1); - if (series_count>0) { + // set up the series names... + if (seriesNames != null) { - // set up the series names... - if (seriesNames!=null) { - - if (seriesNames.size()!=series_count) { - throw new IllegalArgumentException("DefaultCategoryDataset: the number of " - +"series names does not match the number of series in the data."); - } - - this.seriesNames=seriesNames; + if (seriesNames.size() != series_count) { + throw new IllegalArgumentException( + "DefaultCategoryDataset: the number of " + + "series names does not match the number of series in the data."); } - else { - String prefix = resources.getString("series.default-prefix")+" "; - this.seriesNames = this.generateNames(series_count, prefix); - } - if (mat.getNbDim() > 1) { - // set up the category names... - int category_count = mat.getDim(0); - if (categories!=null) { - if (categories.size()!=category_count) { - throw new IllegalArgumentException("DefaultCategoryDataset: the number of " - +"categories does not match the number of categories in the data."); - } - this.categories = categories; + this.seriesNames = seriesNames; + } else { + String prefix = resources + .getString("series.default-prefix") + + " "; + this.seriesNames = this.generateNames(series_count, prefix); + } + + if (mat.getDimCount() > 1) { + // set up the category names... + int categoryCount = mat.getDim(0); + if (categories != null) { + if (categories.size() != categoryCount) { + throw new IllegalArgumentException( + "DefaultCategoryDataset: the number of " + + "categories does not match the number of categories in the data."); } - else { - String prefix = resources.getString("categories.default-prefix")+" "; - this.categories = this.generateNames(category_count, prefix); - } + this.categories = categories; + } else { + String prefix = resources + .getString("categories.default-prefix") + + " "; + this.categories = this.generateNames(categoryCount, + prefix); } - else { - this.categories = null; - } - } - else { - this.seriesNames = null; + } else { this.categories = null; } - } - else { + } else { this.seriesNames = null; this.categories = null; } + } else { + this.seriesNames = null; + this.categories = null; } + } - /** - * Returns the number of series in the dataset (possibly zero). - * - * @return The number of series in the dataset. - */ - public int getSeriesCount() { - int result = 0; - if ( mat != null && mat.getNbDim() > 1) { - result = mat.getDim(1); - } - return result; - } + /** + * Generates an array of names, by appending a space plus an integer (starting with 1) + * to the supplied prefix string. + * @param count The number of names required. + * @param prefix The name prefix. + */ + private List generateNames(int count, String prefix) { - /** - * Returns the name of the specified series. - * - * @param series The index of the required series (zero-based). - */ - public String getSeriesName(int series) { - - // check argument... - if ((series>=this.getSeriesCount()) || (series<0)) { - - throw new IllegalArgumentException("DefaultCategoryDataset.getSeriesName(int): no such series."); - } - - // return the value... - return seriesNames.get(series).toString(); - + List result = new ArrayList(); + String name; + for (int i = 0; i < count; i++) { + name = prefix + (i + 1); + result.add(name); } + return result; + } - /** - * Sets the names of the series in the dataset. - * @param seriesNames The names of the series in the dataset. - */ - public void setSeriesNames(List seriesNames) { - - // check argument... - if (seriesNames==null) { - throw new IllegalArgumentException("DefaultCategoryDataset.setSeriesNames(): null not " - +"permitted."); - } - - if (seriesNames.size() != this.getSeriesCount()) { - throw new IllegalArgumentException("DefaultCategoryDataset.setSeriesNames(): the " - +"number of series names does not match the data."); - } - - // make the change... - this.seriesNames = seriesNames; - fireDatasetChanged(); - + /* + * @see org.jfree.data.general.AbstractSeriesDataset#getSeriesCount() + */ + @Override + public int getSeriesCount() { + int result = 0; + if (mat != null && mat.getNbDim() > 1) { + result = mat.getDim(1); } + return result; + } - /** - * Returns the number of categories in the dataset. - * <P> - * This method is part of the CategoryDataset interface. - * @return The number of categories in the dataset. - */ - public int getCategoryCount() { - int result = 0; - if (mat != null && mat.getNbDim() > 1) { - if (this.getSeriesCount()>0) { - result = mat.getDim(0); - } - } - return result; - } + /* + * @see org.jfree.data.general.AbstractSeriesDataset#getSeriesKey(int) + */ + @Override + public Comparable getSeriesKey(int series) { + return seriesNames.get(series).toString(); + } - /** - * Returns a list of the categories in the dataset. - * <P> - * Supports the CategoryDataset interface. - * @return A list of the categories in the dataset. - */ - public List getCategories() { + /* + * @see org.jfree.data.KeyedValues2D#getColumnIndex(java.lang.Comparable) + */ + @Override + public int getColumnIndex(Comparable key) { + return categories.indexOf(key); + } - // the CategoryDataset interface expects a list of categories, but we've stored them in - // an array... - if (categories==null) { - return new ArrayList(); - } - else { - return Collections.unmodifiableList(categories); - } + /* + * @see org.jfree.data.KeyedValues2D#getColumnKey(int) + */ + @Override + public Comparable getColumnKey(int column) { + return categories.get(column).toString(); + } - } + /* + * @see org.jfree.data.KeyedValues2D#getColumnKeys() + */ + @Override + public List getColumnKeys() { - /** - * Sets the categories for the dataset. - * @param categories An array of objects representing the categories in the dataset. - */ - public void setCategories(List categories) { - - // check arguments... - if (categories==null) { - throw new IllegalArgumentException("DefaultCategoryDataset.setCategories(...): " - +"null not permitted."); - } - - if (categories.size() != getCategoryCount()) { - throw new IllegalArgumentException("DefaultCategoryDataset.setCategories(...): " - +"the number of categories does not match the data."); - } - - for (int i=0; i<categories.size(); i++) { - if (categories.get(i)==null) { - throw new IllegalArgumentException("DefaultCategoryDataset.setCategories(...): " - +"null category not permitted."); - } - } - - // make the change... - this.categories = categories; - fireDatasetChanged(); - + // the CategoryDataset interface expects a list of categories, but we've stored them in + // an array... + if (categories == null) { + return new ArrayList(); + } else { + return Collections.unmodifiableList(categories); } + } - /** - * Returns the data value for one category in a series. - * <P> - * This method is part of the CategoryDataset interface. - * @param series The required series (zero based index). - * @param category The required category. - * @return The data value for one category in a series (null possible). - */ - public Number getValue(int series, Object category) { + /* + * @see org.jfree.data.KeyedValues2D#getRowIndex(java.lang.Comparable) + */ + @Override + public int getRowIndex(Comparable key) { + return seriesNames.indexOf(key); + } - // check arguments... - if ((series<0) || (series>=this.getSeriesCount())) { - throw new IllegalArgumentException("DefaultCategoryDataset.getValue(...): " - +"series index out of range."); - } + /* + * @see org.jfree.data.KeyedValues2D#getRowKey(int) + */ + @Override + public Comparable getRowKey(int row) { + return seriesNames.get(row).toString(); + } - if (category==null) { - throw new IllegalArgumentException("DefaultCategoryDataset.getValue(...): " - +"null category not allowed."); - } + /* + * @see org.jfree.data.KeyedValues2D#getRowKeys() + */ + @Override + public List getRowKeys() { + return seriesNames; + } - int categoryIndex = this.getCategoryIndex(category); + /* + * @see org.jfree.data.KeyedValues2D#getValue(java.lang.Comparable, java.lang.Comparable) + */ + @Override + public Number getValue(Comparable rowKey, Comparable columnKey) { + return new Double(mat.getValue(columnKey, rowKey)); + } - if (categoryIndex<0) { - throw new IllegalArgumentException("DefaultCategoryDataset.getValue(...): " - +"unknown category."); - } + /* + * @see org.jfree.data.Values2D#getColumnCount() + */ + @Override + public int getColumnCount() { + return categories.size(); + } - // fetch the value... - // return new Double(mat.getValue(series,categoryIndex)); - return new Double(mat.getValue(categoryIndex,series)); - } + /* + * @see org.jfree.data.Values2D#getRowCount() + */ + @Override + public int getRowCount() { + return seriesNames.size(); + } - /** - * Cette methode ne fait rien. - * @param series The series (zero-based index). - * @param category The category. - * @param value The value. - */ - public void setValue(int series, Object category, Number value) { - // on ne doit pas changer des valeurs dans la matrice(Read Only) - } - - private int getCategoryIndex(Object category) { - return categories.indexOf(category); - } - - /** - * Generates an array of names, by appending a space plus an integer (starting with 1) - * to the supplied prefix string. - * @param count The number of names required. - * @param prefix The name prefix. - */ - private List generateNames(int count, String prefix) { - - List result = new ArrayList(); - String name; - for (int i=0; i<count; i++) { - name = prefix+(i+1); - result.add(name); - } - return result; - - } -}// GraphMatrixNDDataset + /* + * @see org.jfree.data.Values2D#getValue(int, int) + */ + @Override + public Number getValue(int row, int column) { + return new Double(mat.getValue(column, row)); + } +} // GraphMatrixNDDataset 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-11-30 10:48:26 UTC (rev 2786) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-12-01 17:41:51 UTC (rev 2787) @@ -1,4 +1,3 @@ -Add\ to\ %s\ queue= Add\ to\ default\ queue= Analyse\ plan\ error,\ too\ many\ simulation\ for\ %s\ \:\ %s= Can't\ add\ result\ '%1$s'\ at\ date\ %2$s=Can't add result '%1$s' at date %2$s @@ -307,7 +306,6 @@ isisfish.error.load.class=Can't load class\: %1$s isisfish.error.load.classloader=Can't create ClassLoader for script, bad directory\: %1$s for reason %2$s isisfish.error.load.file=could not load file %1$s -isisfish.error.load.map=Can't load map file\: %1$s isisfish.error.log.closeAppender=could not close appender %1$s for category %2$s isisfish.error.log.console.dispose=Une erreur est survenue pendant la fermeture de la console %1$s de log, raison %2$s isisfish.error.log.createAppender=could not create appender [%1$s] \: %2$s for reason %3$s @@ -483,14 +481,14 @@ isisfish.graphBean.scrolledwindow=defaultToolTip-fr.ifremer.graph.GraphBean.scrolledwindow1 isisfish.graphBean.table=defaultToolTip-fr.ifremer.graph.GraphBean.table2 isisfish.graphBean.table3=defaultToolTip-fr.ifremer.graph.GraphBean.table3 -isisfish.graphCombo.render.bar.horizontal=Rendu en barre horizontale -isisfish.graphCombo.render.bar.horizontal.stacked=Rendu en barre horizontale empilee -isisfish.graphCombo.render.bar.vertical=Rendu en barre verticale -isisfish.graphCombo.render.bar.vertical.3d=Rendu en barre verticale 3D -isisfish.graphCombo.render.bar.vertical.stacked=Rendu en barre verticale empilee -isisfish.graphCombo.render.line=Rendu en ligne -isisfish.graphCombo.render.min.max=Rendu en MinMax -isisfish.graphCombo.render.surface=Rendu en Aire +isisfish.graphCombo.render.bar=Verticals bar rendering +isisfish.graphCombo.render.bar.3d=3D verticals bars rendering +isisfish.graphCombo.render.bar.stacked=Stacked verticals bars rendering +isisfish.graphCombo.render.line=Line rendering +isisfish.graphCombo.render.line.3d=3D line rendering +isisfish.graphCombo.render.min.max=Min/max rendering +isisfish.graphCombo.render.surface=Area rendering +isisfish.graphCombo.render.surface.stacked=Stacked area rendering isisfish.infoItem..table=defaultToolTip-fr.ifremer.resultat.InfoItem.table29 isisfish.infoItem.label=defaultToolTip-fr.ifremer.resultat.InfoItem.label isisfish.infoItem.list=defaultToolTip-fr.ifremer.resultat.InfoItem.list 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-11-30 10:48:26 UTC (rev 2786) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-12-01 17:41:51 UTC (rev 2787) @@ -1,4 +1,3 @@ -Add\ to\ %s\ queue= Add\ to\ default\ queue= Analyse\ plan\ error,\ too\ many\ simulation\ for\ %s\ \:\ %s= Can't\ add\ result\ '%1$s'\ at\ date\ %2$s=Can't add result '%1$s' at date %2$s @@ -307,7 +306,6 @@ isisfish.error.load.class=Can't load class\: %1$s isisfish.error.load.classloader=Can't create ClassLoader for script, bad directory\: %1$s for reason %2$s isisfish.error.load.file=could not load file %1$s -isisfish.error.load.map=Can't load map file\: %1$s isisfish.error.log.closeAppender=n'a pas pu ferme l'appender %1$s et la categorie %2$s isisfish.error.log.console.dispose=Une erreur est survenue pendant la fermeture de la console %1$s de log, raison %2$s isisfish.error.log.createAppender=n'a pas pu creer l'appender [%1$s] \: %2$s pour la raison %3$s @@ -483,14 +481,14 @@ isisfish.graphBean.scrolledwindow=defaultToolTip-fr.ifremer.graph.GraphBean.scrolledwindow1 isisfish.graphBean.table=defaultToolTip-fr.ifremer.graph.GraphBean.table2 isisfish.graphBean.table3=defaultToolTip-fr.ifremer.graph.GraphBean.table3 -isisfish.graphCombo.render.bar.horizontal=Rendu en barre horizontale -isisfish.graphCombo.render.bar.horizontal.stacked=Rendu en barre horizontale empil\u00E9e -isisfish.graphCombo.render.bar.vertical=Rendu en barre verticale -isisfish.graphCombo.render.bar.vertical.3d=Rendu en barre verticale 3D -isisfish.graphCombo.render.bar.vertical.stacked=Rendu en barre verticale empil\u00E9e +isisfish.graphCombo.render.bar=Rendu en barres verticales +isisfish.graphCombo.render.bar.3d=Rendu en barres verticales 3D +isisfish.graphCombo.render.bar.stacked=Rendu en barres verticales empil\u00E9es isisfish.graphCombo.render.line=Rendu en ligne +isisfish.graphCombo.render.line.3d=Rendu en ligne 3D isisfish.graphCombo.render.min.max=Rendu en MinMax -isisfish.graphCombo.render.surface=Rendu en Aire +isisfish.graphCombo.render.surface=Rendu en aire +isisfish.graphCombo.render.surface.stacked=Rendu en aires empil\u00E9es isisfish.infoItem..table=defaultToolTip-fr.ifremer.resultat.InfoItem.table29 isisfish.infoItem.label=defaultToolTip-fr.ifremer.resultat.InfoItem.label isisfish.infoItem.list=defaultToolTip-fr.ifremer.resultat.InfoItem.list

1 0