Author: sletellier Date: 2009-01-19 12:21:11 +0000 (Mon, 19 Jan 2009) New Revision: 1743 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/InputSaveVerifier.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Log: Debug 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 2009-01-16 17:52:40 UTC (rev 1742) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-01-19 12:21:11 UTC (rev 1743) @@ -136,6 +136,9 @@ if (TopiaEntity.class.isInstance(data)){ verif.addCurrentEntity((TopiaEntity) data); } + else{ + verif.addCurrentEntity(null); + } verif.refreshAll(); verif.setCurrentNode(node); } @@ -148,6 +151,27 @@ return null; } + ChildBuilder<TopiaEntity> childParentBuilder = 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(); + } + }; + ChildBuilder<TopiaEntity> childBuilder = new ChildBuilder<TopiaEntity>(builder) { Decorator<? extends TopiaEntity> decorator; @@ -180,8 +204,7 @@ 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 - ); + true, Port.class, fisheryRegion.getPort(), PortUI.class, null); NavigationTreeNode species = builder.build(root, "Species", "../species", "$species", SpeciesUI.class, null); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-01-16 17:52:40 UTC (rev 1742) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-01-19 12:21:11 UTC (rev 1743) @@ -303,6 +303,10 @@ this.currentEntities.add(currentEntity); setPanelsActifs(); } + else{ + editable = false; + setPanelsActifs(); + } } public void removeAllEntity(){ currentEntities.clear(); 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 2009-01-16 17:52:40 UTC (rev 1742) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-01-19 12:21:11 UTC (rev 1743) @@ -61,6 +61,7 @@ //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); fieldZoneName.setText(""); fieldZoneComment.setText(""); + jaxx.runtime.swing.Utils.fillList(zoneCells, getRegion().getCell(), null); } if (evt.getNewValue() != null) { // add binding on getBean() @@ -74,7 +75,6 @@ getVerifier().setCancelButton(cancel); getVerifier().setNewButton(create, "Zone"); getVerifier().setDeleteButton(remove); - setBean(null); Zone zone = (Zone)getVerifier().getEntity(Zone.class); setBean((ZoneImpl) zone); jaxx.runtime.swing.Utils.fillList(zoneCells, getRegion().getCell(), getBean().getCell()); @@ -85,8 +85,8 @@ toolSet.setupListeners(zoneMap); toolMap.add((Component)toolSet); setMapListener(); - refreshMap(); } + refreshMap(); } protected void setMapListener(){ if (mapListener == null){