[Isis-fish-commits] r1668 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/ui/input src/main/java/fr/ifremer/isisfish/ui/result

Author: tchemit Date: 2008-12-13 09:35:22 +0000 (Sat, 13 Dec 2008) New Revision: 1668 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContent.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java Log: remove deprecated code, javadoc, lissage code pas de System.out.println InputContent est un JAXXObject passage de log en trace refactor du builder de node :) utilisation de r?\195?\169pertoires absolues pour les plugins maven Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2008-12-12 20:41:08 UTC (rev 1667) +++ isis-fish/trunk/pom.xml 2008-12-13 09:35:22 UTC (rev 1668) @@ -341,17 +341,17 @@ <id>Generator</id> <phase>process-sources</phase> <configuration> - <srcDirUml>src/main/xmi</srcDirUml> - <srcXmiDest>target/generated-sources/xmi/</srcXmiDest> + <srcDirUml>${project.basedir}/src/main/xmi</srcDirUml> + <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> <fullPackagePath>fr.ifremer.isisfish</fullPackagePath> <extractedPackages>fr.ifremer.isisfish</extractedPackages> <!--Config generator--> - <srcGenDest>target/generated-sources/objectmodel/</srcGenDest> + <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest> <includes>**/*.objectmodel</includes> <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> - <destDirGen>target/generated-sources/java</destDirGen> + <destDirGen>${maven.gen.dir}/java</destDirGen> <defaultPackage>fr.ifremer.isisfish</defaultPackage> - <copyVersionDir>src/main/resources/oldmappings/%MODELNAME%</copyVersionDir> + <copyVersionDir>${project.basedir}/src/main/resources/oldmappings/%MODELNAME%</copyVersionDir> <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> <copyOverwrite>true</copyOverwrite> </configuration> @@ -383,7 +383,7 @@ <goal>generate</goal> </goals> <configuration> - <src>src/main/java</src> + <src>${project.basedir}/src/main/java</src> </configuration> </execution> </executions> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2008-12-12 20:41:08 UTC (rev 1667) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2008-12-13 09:35:22 UTC (rev 1668) @@ -53,7 +53,7 @@ doc.setPage(e.getURL()); } } catch (Exception eee) { - System.out.println("Error for : " + e.getURL()); + log.error("Error for : " + e.getURL(),eee); eee.printStackTrace(); } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2008-12-12 20:41:08 UTC (rev 1667) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2008-12-13 09:35:22 UTC (rev 1668) @@ -128,7 +128,9 @@ protected boolean isNull = true; public InputAction() { - log.info("new instance"); + if (log.isDebugEnabled()) { + log.debug("new instance"); + } } protected void showMsgBox(Exception eee){ ErrorDialogUI.showError(eee); @@ -290,9 +292,7 @@ //TODO Should use a shared model ? simulationName = selectSimulation(SimulationStorage.getSimulationNames()); if (simulationName == null) { - { - return null; - } + return null; } } catch (Exception e) { @@ -303,7 +303,9 @@ return null; } - log.info("simulation used " + simulationName); + if (log.isInfoEnabled()) { + log.info("simulation used " + simulationName); + } // ask new region name String regionName = showInputDialog(_("isisfish.message.import.region.name"),"region from "+simulationName); @@ -315,7 +317,9 @@ } - log.info("new region name " + regionName); + if (log.isInfoEnabled()) { + log.info("new region name " + regionName); + } try { SimulationStorage.getSimulation(simulationName).extractRegion(regionName); @@ -440,7 +444,9 @@ * @return if ok return null else OutView error */ public void loadRegion(String name) { - log.debug("loadRegion called"); + if (log.isTraceEnabled()) { + log.trace("loadRegion called"); + } try { regionStorage = null; fisheryRegion = null; @@ -465,8 +471,10 @@ * @return if ok return null else OutView error */ public void newRegion(String name) { - try { - log.debug("newRegion called"); + if (log.isTraceEnabled()) { + log.trace("newRegion called"); + } + try { if ("".equals(name)) { // showMsgBox("error " + _("isisfish.error.region.name.empty")); } @@ -508,7 +516,9 @@ */ @SuppressWarnings("unchecked") public TopiaEntity create(String type) { - log.debug("create called for " + type); + if (log.isTraceEnabled()) { + log.trace("create called for " + type); + } try { String name = type + "_new"; @@ -532,12 +542,12 @@ /** * Save entity passed in argument, and commit * - * @param idToRefresh - * id to refresh after commit - * @return if ok return null else OutView error + * @return the saved entity */ public TopiaEntity save() { - log.debug("save called"); + if (log.isTraceEnabled()) { + log.trace("save called"); + } try { if (selected == null) { log.warn("Try to save null entity"); @@ -559,13 +569,12 @@ * Cancel all modification on entity (rollback), and force reload it and * refresh all ui component that name match 'type'Tab * - * @param type - * entity type (Zone, Gear, Population, ...), prefix of user - * interface Tab to refresh after rollback and reload - * @return if ok return null else OutView error + * @return the roolbacked entity */ public TopiaEntity cancel() { - log.debug("cancel called"); + if (log.isTraceEnabled()) { + log.trace("cancel called"); + } try { isisContext.rollbackTransaction(); @@ -591,7 +600,9 @@ * @return if ok return null else OutView error */ public String remove() { - log.debug("remove called"); + if (log.isTraceEnabled()) { + log.trace("remove called"); + } String msg = ""; try { boolean doDelete = true; @@ -684,7 +695,9 @@ } public Object openEditor(String category, String name, Class javaInterface, String content, Editor editor) { - log.debug("openEditor"); + if (log.isTraceEnabled()) { + log.trace("openEditor"); + } try { EquationEditorPaneUI pane = new EquationEditorPaneUI(); pane.setEquation(category, name, javaInterface, content); @@ -785,7 +798,9 @@ } public Object removeSelectivity(Selectivity selectivity){ - log.debug("removeTargetSpecies called: " + selectivity); + if (log.isTraceEnabled()) { + log.trace("removeTargetSpecies called: " + selectivity); + } try { if (gear != null && selectivity != null) { gear.removePopulationSelectivity(selectivity); @@ -800,7 +815,9 @@ // InputMetier public Object createSeasonInfo(){ - log.debug("createSeasonInfo called"); + if (log.isTraceEnabled()) { + log.trace("createSeasonInfo called"); + } try { MetierSeasonInfoDAO metierSeasonInfoPS = IsisFishDAOHelper.getMetierSeasonInfoDAO(isisContext); MetierSeasonInfo metierSeasonInfo = metierSeasonInfoPS.create(); @@ -819,7 +836,9 @@ } public Object removeSeasonInfo(MetierSeasonInfo info){ - log.debug("createSeasonInfo called"); + if (log.isTraceEnabled()) { + log.trace("createSeasonInfo called"); + } try { metier.removeMetierSeasonInfo(info); metier.update(); @@ -832,7 +851,9 @@ } public Object addTargetSpecies(MetierSeasonInfo m, Species species, String targetFactorEquation, boolean primaryCatch){ - log.debug("addTargetSpecies called: " + metier + " " + species + " " + primaryCatch + " " + targetFactorEquation); + if (log.isTraceEnabled()) { + log.trace("addTargetSpecies called: " + metier + " " + species + " " + primaryCatch + " " + targetFactorEquation); + } try { TargetSpeciesDAO dao = IsisFishDAOHelper.getTargetSpeciesDAO(isisContext); TargetSpecies targetSpecies = dao.create(); @@ -849,7 +870,9 @@ } public Object removeTargetSpecies(MetierSeasonInfo m, TargetSpecies targetSpecies){ - log.debug("removeTargetSpecies called: " + targetSpecies); + if (log.isTraceEnabled()) { + log.trace("removeTargetSpecies called: " + targetSpecies); + } try { if (targetSpecies != null) { m.removeSpeciesTargetSpecies(targetSpecies); @@ -864,7 +887,9 @@ // SetOfVessels public void addEffortDescription(SetOfVessels setOfVessels, Metier metier) { - log.debug("addEffortDescription called: " + setOfVessels + " metier: " + metier); + if (log.isTraceEnabled()) { + log.trace("addEffortDescription called: " + setOfVessels + " metier: " + metier); + } try { EffortDescriptionDAO effortDescriptionPS = IsisFishDAOHelper.getEffortDescriptionDAO(isisContext); EffortDescription effortDescription = effortDescriptionPS.create(); @@ -879,7 +904,9 @@ } public Object removeEffortDescription(SetOfVessels sov, EffortDescription effort) { - log.debug("remove called"); + if (log.isTraceEnabled()) { + log.trace("remove called"); + } try { sov.removePossibleMetiers(effort); isisContext.commitTransaction(); @@ -893,7 +920,9 @@ // Population public Population createPopulation() { - log.debug("create called"); + if (log.isTraceEnabled()) { + log.trace("create called"); +} try { String name = "Population_new"; @@ -918,7 +947,9 @@ } public Object createRecruitmentDistribution() { - log.debug("createRecruitmentDistributionontext called: " + population); + if (log.isTraceEnabled()) { + log.trace("createRecruitmentDistributionontext called: " + population); + } try { String val = JOptionPane.showInputDialog(_("isisfish.message.recruitment.number.month")); int num = -1; @@ -956,7 +987,9 @@ // Migration public Object addMigration(PopulationSeasonInfo info, PopulationGroup group, Zone departure, Zone arrival, double coeff) { - log.debug("addMigration called"); + if (log.isTraceEnabled()) { + log.trace("addMigration called"); + } try { MatrixND mat = info.getMigrationMatrix().copy(); mat.setValue(group, departure, arrival, coeff); @@ -971,7 +1004,9 @@ public Object addEmigration(PopulationSeasonInfo info, PopulationGroup group, Zone departure, double coeff) { - log.debug("addEmigration called"); + if (log.isTraceEnabled()) { + log.trace("addEmigration called"); + } try { MatrixND mat = info.getEmigrationMatrix().copy(); mat.setValue(group, departure, coeff); @@ -985,7 +1020,9 @@ } public Object addImmigration(PopulationSeasonInfo info, PopulationGroup group, Zone arrival, double coeff) { - log.debug("addImmigration called"); + if (log.isTraceEnabled()) { + log.trace("addImmigration called"); + } try { MatrixND mat = info.getImmigrationMatrix().copy(); mat.setValue(group, arrival, coeff); @@ -998,11 +1035,14 @@ return null; } // FisheryRegion - /** - * @param list la list dans lequel il faut ajouter la carte - */ + /** + * + * @return TODO + */ public Object addMap(){ - log.debug("AddMap called"); + if (log.isTraceEnabled()) { + log.trace("AddMap called"); + } File shp = FileUtil.getFile(".*\\.shp", "shp file"); try { @@ -1041,10 +1081,13 @@ } /** - * @param list la list dans lequel il faut retirer la carte + * @param selectedMaps la list dans lequel il faut retirer la carte + * @return TODO */ public Object removeMap(Object[] selectedMaps){ - log.debug("removeMap called"); + if (log.isTraceEnabled()) { + log.trace("removeMap called"); + } try { List<String> maps = fisheryRegion.getMapFileList(); @@ -1074,14 +1117,19 @@ * Affiche une boite de dialogue demandant a l'utilisateur de rentrer * un nom de fichier, et met ce nom dans la textField. * Passe le saveButton en enabled pour marque que la region a ete modifié + * @param cellFile file of cells */ public void loadCellFile(String cellFile){ - log.debug("loadCell called"); + if (log.isTraceEnabled()) { + log.trace("loadCell called"); + } // FIXME todo loadCellFile } public Object saveFisheryRegion(String type){ - log.debug("save called"); + if (log.isTraceEnabled()) { + log.trace("save called"); + } try{ TopiaContext isisContext = fisheryRegion.getTopiaContext(); @@ -1156,7 +1204,9 @@ public Object checkFisheryRegion(){ try { - log.debug("check called: "); + if (log.isTraceEnabled()) { + log.trace("check called: "); + } // frame.setInfoText(_("isisfish.message.check.region")); CheckResult result = new CheckResult(); CheckRegion.check(fisheryRegion, result); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContent.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContent.java 2008-12-12 20:41:08 UTC (rev 1667) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContent.java 2008-12-13 09:35:22 UTC (rev 1668) @@ -5,11 +5,13 @@ package fr.ifremer.isisfish.ui.input; +import jaxx.runtime.JAXXObject; + /** * * @author letellier */ -public interface InputContent { +public interface InputContent extends JAXXObject { void refresh(); @@ -20,4 +22,6 @@ void setActif(java.lang.Boolean b); void setChanged(java.lang.Boolean b); + + String getName(); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2008-12-12 20:41:08 UTC (rev 1667) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2008-12-13 09:35:22 UTC (rev 1668) @@ -5,20 +5,36 @@ package fr.ifremer.isisfish.ui.input; +import fr.ifremer.isisfish.entities.Cell; +import fr.ifremer.isisfish.entities.FisheryRegion; +import fr.ifremer.isisfish.entities.Gear; +import fr.ifremer.isisfish.entities.Metier; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.entities.Port; +import fr.ifremer.isisfish.entities.SetOfVessels; +import fr.ifremer.isisfish.entities.Species; +import fr.ifremer.isisfish.entities.TripType; +import fr.ifremer.isisfish.entities.VesselType; +import fr.ifremer.isisfish.entities.Zone; +import jaxx.runtime.Decorator; +import jaxx.runtime.JAXXContextEntryDef; import jaxx.runtime.swing.CardLayout2; import jaxx.runtime.swing.JAXXTree; import jaxx.runtime.swing.navigation.NavigationTreeModel; import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode; +import jaxx.runtime.swing.navigation.NavigationTreeModelBuilder; +import jaxx.runtime.swing.navigation.NavigationTreeModelBuilder.ChildBuilder; import jaxx.runtime.swing.navigation.NavigationTreeSelectionAdapterWithCardLayout; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import static org.codelutin.i18n.I18n._; +import org.codelutin.topia.persistence.TopiaEntity; +import javax.swing.JOptionPane; import javax.swing.JPanel; +import javax.swing.JTree; import javax.swing.event.TreeSelectionEvent; import java.awt.Component; -import javax.swing.JOptionPane; -import javax.swing.JTree; -import static org.codelutin.i18n.I18n._; /** @author letellier */ public class InputNavigationTreeSelectionAdapter extends NavigationTreeSelectionAdapterWithCardLayout { @@ -27,6 +43,7 @@ static private final Log log = LogFactory.getLog(InputNavigationTreeSelectionAdapter.class); protected NavigationTreeNode currentNode = null; + public InputNavigationTreeSelectionAdapter(InputUI context, boolean register) { super(InputUI.class, null, context, Strategy.PER_UI_TYPE); @@ -77,7 +94,9 @@ try { InputContent ui = (InputContent) newUI; boolean parameter = !context.getContextValue(InputAction.class).isNull(); - log.debug(parameter); + if (log.isDebugEnabled()) { + log.debug(parameter); + } // Method setActif = newUI.getClass().getDeclaredMethod("setActif", Boolean.class); // setActif.setAccessible(true); // setActif.invoke(newUI, parameter); @@ -100,9 +119,11 @@ } public boolean checkEdit(TreeSelectionEvent event, Component content) { boolean exit = true; - if (content != null){ + if (content != null) { InputContent ui = (InputContent) content; - System.out.println(ui + " " + ui.isChanged() + " " + ui.isActif()); + if (log.isDebugEnabled()) { + log.debug(ui.getClass()+"["+ui.getName() + "] <changed:" + ui.isChanged() + ", actif: " + ui.isActif()+">"); + } if (ui.isActif()) { if (ui.isChanged()) { // ask user to close edition @@ -111,18 +132,16 @@ if (responce == JOptionPane.NO_OPTION) { context.getContextValue(InputAction.class).cancel(); exit = true; - } - else if (responce == JOptionPane.OK_OPTION){ + } else if (responce == JOptionPane.OK_OPTION) { context.getContextValue(InputAction.class).save(); ui.setChanged(false); - JTree tree = (JTree)event.getSource(); - NavigationTreeModel model = (NavigationTreeModel)tree.getModel(); - if (currentNode != null){ + JTree tree = (JTree) event.getSource(); + NavigationTreeModel model = (NavigationTreeModel) tree.getModel(); + if (currentNode != null) { model.nodeChanged(currentNode); } exit = true; - } - else{ + } else { exit = false; } } @@ -148,4 +167,81 @@ } action.setPath(node.getContextPath()); } + + public static NavigationTreeModel getTreeModel(String regionName, FisheryRegion fisheryRegion) { + + //String regionName = context.getContextValue(InputAction.class).getFisheryRegionName(); + NavigationTreeModelBuilder builder = new NavigationTreeModelBuilder("/"); + + if (regionName == null) { + return null; + } + + ChildBuilder<TopiaEntity> childBuilder = new ChildBuilder<TopiaEntity>(builder) { + + Decorator<? extends TopiaEntity> decorator; + + public void init(Class<? extends TopiaEntity> klass) { + decorator = jaxx.runtime.PropertyDecorator.newDecorator(klass, "name"); + } + + public Decorator<? extends TopiaEntity> getDecorator(TopiaEntity child) { + return decorator; + } + + public String getJXPath(TopiaEntity child) { + return "..[@topiaId=\"" + child.getTopiaId() + "\"]"; + } + + public String getNavigationPath(TopiaEntity child) { + return child.getTopiaId(); + } + }; + + try { + + NavigationTreeNode root = builder.build(null, regionName, JAXXContextEntryDef.newDef(FisheryRegion.class), "$root", FisheryRegionUI.class, null); + + childBuilder.build(builder.build(root, "Cells", "../cell", "$cells", CellUI.class, null), + true, Cell.class, fisheryRegion.getCell(), CellUI.class, null); + + childBuilder.build(builder.build(root, "Zones", "../zone", "$zones", ZoneUI.class, null), + true, Zone.class, fisheryRegion.getZone(), ZoneUI.class, null); + + childBuilder.build(builder.build(root, "Ports", "../port", "$ports", PortUI.class, null), + true, Port.class, fisheryRegion.getPort(), PortUI.class, null + ); + + NavigationTreeNode species = builder.build(root, "Species", "../species", "$species", SpeciesUI.class, null); + + for (Species specie : fisheryRegion.getSpecies()) { + NavigationTreeNode speciesChild = builder.build(species, specie.toString(), "..[@topiaId=\"" + specie.getTopiaId() + "\"]", specie.getTopiaId(), SpeciesUI.class, null); + NavigationTreeNode populations = builder.build(speciesChild, "Populations", "../population", "$populations", PopulationUI.class, null); + childBuilder.build(populations, true, Population.class, specie.getPopulation(), PopulationUI.class, null); + } + + childBuilder.build(builder.build(root, "Gears", "../gear", "$gears", GearUI.class, null), + true, Gear.class, fisheryRegion.getGear(), GearUI.class, null); + + childBuilder.build(builder.build(root, "Metiers", "../metier", "$metiers", MetierUI.class, null), + true, Metier.class, fisheryRegion.getMetier(), MetierUI.class, null); + + childBuilder.build(builder.build(root, "TripTypes", "../tripType", "$tripTypes", TripTypeUI.class, null), + true, TripType.class, fisheryRegion.getTripType(), TripTypeUI.class, null); + + childBuilder.build(builder.build(root, "VesselTypes", "../vesselType", "$vesselTypes", VesselTypeUI.class, null), + true, VesselType.class, fisheryRegion.getVesselType(), VesselTypeUI.class, null); + + childBuilder.build(builder.build(root, "SetOfVessels", "../setOfVessels", "$setOfVessels", SetOfVesselsUI.class, null), + true, SetOfVessels.class, fisheryRegion.getSetOfVessels(), SetOfVesselsUI.class, null); + + childBuilder.build(builder.build(root, "Strategies", "../strategy", "$strategies", StrategyUI.class, null), + true, fr.ifremer.isisfish.entities.Strategy.class, fisheryRegion.getStrategy(), StrategyUI.class, null); + + } catch (Exception ex) { + log.error(ex.getMessage(), ex); + } + return builder.getModel(); + } + } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2008-12-12 20:41:08 UTC (rev 1667) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2008-12-13 09:35:22 UTC (rev 1668) @@ -231,63 +231,19 @@ return result; } */ protected void setTreeModel(){ - String regionName = getContextValue(InputAction.class).getFisheryRegionName(); - if (regionName != null){ - try { - NavigationTreeModelBuilder builder = new NavigationTreeModelBuilder("/"); - FisheryRegion fisheryRegion = getContextValue(InputAction.class).getFisheryRegion(); - setContextValue(fisheryRegion); - NavigationTreeNode root = builder.build(null, regionName, JAXXContextEntryDef.newDef(FisheryRegion.class), "$root", FisheryRegionUI.class, null); - NavigationTreeNode cells = builder.build(root, "Cells", "../cell", "$cells", CellUI.class, null); - NavigationTreeNode zones = builder.build(root, "Zones", "../zone", "$zones", ZoneUI.class, null); - NavigationTreeNode ports = builder.build(root, "Ports", "../port", "$ports", PortUI.class, null); - NavigationTreeNode species = builder.build(root, "Species", "../species", "$species", SpeciesUI.class, null); - NavigationTreeNode gears = builder.build(root, "Gears", "../gear", "$gears", GearUI.class, null); - NavigationTreeNode metiers = builder.build(root, "Metiers", "../metier", "$metiers", MetierUI.class, null); - NavigationTreeNode tripTypes = builder.build(root, "TripTypes", "../tripType", "$tripTypes", TripTypeUI.class, null); - NavigationTreeNode vesselTypes = builder.build(root, "VesselTypes", "../vesselType", "$vesselTypes", VesselTypeUI.class, null); - NavigationTreeNode setOfVessels = builder.build(root, "SetOfVessels", "../setOfVessels", "$setOfVessels", SetOfVesselsUI.class, null); - NavigationTreeNode strategies = builder.build(root, "Strategies", "../strategy", "$strategies", StrategyUI.class, null); + FisheryRegion fisheryRegion = getContextValue(InputAction.class).getFisheryRegion(); + setContextValue(fisheryRegion); + NavigationTreeModel model = InputNavigationTreeSelectionAdapter.getTreeModel(regionName, fisheryRegion); + navigation.setSelectionModel(navigationSelectionModel); + navigation.setCellRenderer(new NavigationTreeCellRenderer(this)); - setNode(builder, cells, fisheryRegion.getCell().toArray(), CellUI.class, Cell.class); - setNode(builder, zones, fisheryRegion.getZone().toArray(), ZoneUI.class, Zone.class); - setNode(builder, ports, fisheryRegion.getPort().toArray(), PortUI.class, Port.class); - setNode(builder, gears, fisheryRegion.getGear().toArray(), GearUI.class, Gear.class); - setNode(builder, metiers, fisheryRegion.getMetier().toArray(), MetierUI.class, Metier.class); - setNode(builder, tripTypes, fisheryRegion.getTripType().toArray(), TripTypeUI.class, TripType.class); - setNode(builder, vesselTypes, fisheryRegion.getVesselType().toArray(), VesselTypeUI.class, VesselType.class); - setNode(builder, setOfVessels, fisheryRegion.getSetOfVessels().toArray(), SetOfVesselsUI.class, SetOfVessels.class); - setNode(builder, strategies, fisheryRegion.getStrategy().toArray(), StrategyUI.class, Strategy.class); - - for (Species specie : fisheryRegion.getSpecies()){ - TopiaEntity topiaEntity = (TopiaEntity)specie; - NavigationTreeNode speciesChild = builder.build(species, specie.toString() , "..[@topiaId=\"" + topiaEntity.getTopiaId() + "\"]", topiaEntity.getTopiaId(), SpeciesUI.class, null); - NavigationTreeNode populations = builder.build(speciesChild, "Populations", "../population", "$populations", PopulationUI.class, null); - if (specie.getPopulation() != null){ - setNode(builder, populations, specie.getPopulation().toArray(), PopulationUI.class, Population.class); - } - } - - navigation.setSelectionModel(navigationSelectionModel); - navigation.setCellRenderer(new NavigationTreeCellRenderer(this)); - NavigationTreeModel model = builder.getModel(); - setContextValue(model); - navigation.setModel(model); - new InputNavigationTreeSelectionAdapter(this, true); - setTreeSelection("$root"); - } catch (Exception ex) { - Logger.getLogger(InputUI.class.getName()).log(Level.SEVERE, null, ex); - } - } + setContextValue(model); + navigation.setModel(model); + new InputNavigationTreeSelectionAdapter(this, true); + setTreeSelection("$root"); } - protected void setNode(NavigationTreeModelBuilder builder, NavigationTreeNode parent, Object[] values, Class ui, Class<?> type){ - Decorator deco = jaxx.runtime.PropertyDecorator.newDecorator(type, "name"); - for (Object o : values){ - TopiaEntity topiaEntity = (TopiaEntity)o; - builder.build(parent, deco , "..[@topiaId=\"" + topiaEntity.getTopiaId() + "\"]", topiaEntity.getTopiaId(), ui, null); - } - } + public void repaintNode(String path){ NavigationTreeModel model = getContextValue(NavigationTreeModel.class); NavigationTreeNode currentNode = model.findNode(path); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2008-12-12 20:41:08 UTC (rev 1667) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2008-12-13 09:35:22 UTC (rev 1668) @@ -116,7 +116,9 @@ int i = 0; for (Cell c : cellsSelected){ indexs[i] = zoneCellsModel.indexOf(c); - System.out.println("refresh " + c + " " + i); + if (log.isDebugEnabled()) { + log.debug("refresh " + c + " " + i); + } i++; } zoneCells.setSelectedIndices(indexs); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java 2008-12-12 20:41:08 UTC (rev 1667) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java 2008-12-13 09:35:22 UTC (rev 1668) @@ -91,11 +91,9 @@ setStatusOK(true); } - /* (non-Javadoc) - * @see java.lang.Object#finalize() - */ @Override protected void finalize() throws Throwable { + super.finalize(); if (this.tx != null) { this.tx.closeContext(); } @@ -139,6 +137,7 @@ * infoItemTab. Le 0 contient les dates. * * @param group le group utilise pour mettre a jour le infoItemTab + * @return todo */ protected InfoPanelable [] createInfoPanel(MatrixND group) { if (group == null){ @@ -177,7 +176,7 @@ getInfoPanel().setLayout(new GridBagLayout()); GridBagConstraints c = new GridBagConstraints(); c.gridx = 0; - c.gridy = 0000; + c.gridy = 0; c.weightx = 1; c.weighty = 1; c.gridwidth = 1; @@ -204,7 +203,7 @@ /** * Set the value of simulation. - * @param v Value to assign to simulation. + * @param simulation Value to assign to simulation. */ public void setSimulation(SimulationStorage simulation) { try { @@ -213,8 +212,9 @@ this.tx.closeContext(); } this.tx = simulation.getStorage().beginTransaction(); - FisheryRegion region = simulation.getFisheryRegion(); - + FisheryRegion region = SimulationStorage.getFisheryRegion(this.tx); + //FisheryRegion region = simulation.getFisheryRegion(); + mapBean.setRegion(region); resultManager = simulation.getResultStorage(); @@ -264,13 +264,13 @@ mat1 = mat1.sumOverDim(0); mat1 = mat1.sumOverDim(1); mat1 = mat1.reduce(); - resume.append(_("isisfish.result.begin.simulation")+mat1.getName()+": "+mat1.getValue(0)+"\n"); + resume.append(_("isisfish.result.begin.simulation")).append(mat1.getName()).append(": ").append(mat1.getValue(0)).append("\n"); mat1 = resultManager.getMatrix(resultManager.getLastDate(), name, tx); mat1 = mat1.sumOverDim(0); mat1 = mat1.sumOverDim(1); mat1 = mat1.reduce(); - resume.append(_("isisfish.result.end.simulation")+mat1.getName()+": "+mat1.getValue(0)+"\n"); + resume.append(_("isisfish.result.end.simulation")).append(mat1.getName()).append(": ").append(mat1.getValue(0)).append("\n"); } else if(name.startsWith(REJETPARMETIER_STRING)){ MatrixND mat1 = resultManager.getMatrix(name, tx); @@ -280,7 +280,7 @@ mat1 = mat1.sumOverDim(3); mat1 = mat1.reduce(); - resume.append(_("isisfish.common.sum")+mat1.getName()+": "+mat1.getValue(0)+"\n"); + resume.append(_("isisfish.common.sum")).append(mat1.getName()).append(": ").append(mat1.getValue(0)).append("\n"); } else if (!name.startsWith(CAPTUREPARMETIER_STRING) && name.startsWith(CAPTURE_STRING)){ MatrixND mat1 = resultManager.getMatrix(name, tx); @@ -289,7 +289,7 @@ mat1 = mat1.sumOverDim(2); mat1 = mat1.reduce(); - resume.append(_("isisfish.common.sum")+mat1.getName()+": "+mat1.getValue(0)+"\n"); + resume.append(_("isisfish.common.sum")).append(mat1.getName()).append(": ").append(mat1.getValue(0)).append("\n"); } } catch (Exception eee) { resume.append(_("isisfish.error.no.matrix" + name)); @@ -334,8 +334,11 @@ * Method reduction permet de reduire la matrice en fonction des * selections de l'utilisateur dans l'interface. * - * @param group - */ + * @param matrix todo + * + * @param infoItems todo + * @return todo + */ protected MatrixND createAndReduce(MatrixND matrix, InfoPanelable [] infoItems){ // Reduit la matrice en fonction des choix de l utilisateur @@ -525,7 +528,7 @@ * les methods que l'on trouve dans les scripts de l'objet Export. */ public Vector getMenuExport_menuChilds(){ - Vector result = new Vector(); + Vector<JMenuItem> result = new Vector<JMenuItem>(); for (String name : ExportStorage.getExportNames()) { JMenuItem item = getExportMenu(name); result.add(item); @@ -536,7 +539,9 @@ /** * Retourne l'item de menu qui permet l'appelle de la method du code * ECMAScript d'export. - */ + * @param methodName todo + * @return todo + */ protected JMenuItem getExportMenu(String methodName){ JMenuItem result = new JMenuItem(_(methodName)); result.addActionListener(new ExportActionListener(methodName));