Author: tchemit Date: 2008-12-12 19:51:39 +0000 (Fri, 12 Dec 2008) New Revision: 1666 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx Log: chargement des regions sans frezzer l'ordinateur :) 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 16:35:44 UTC (rev 1665) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2008-12-12 19:51:39 UTC (rev 1666) @@ -100,11 +100,15 @@ return new DefaultComboBoxModel(Common.getRegionItem()); } protected void regionChange(){ - String name = fieldCurrentRegion.getSelectedItem().toString(); + final String name = fieldCurrentRegion.getSelectedItem().toString(); setInfoText(_("isisfish.message.loading.region", name)); - getContextValue(InputAction.class).loadRegion(name); - setInfoText(_("isisfish.message.load.finished")); - setTreeModel(); + SwingUtilities.invokeLater(new Runnable() { + public void run() { + getContextValue(InputAction.class).loadRegion(name); + setInfoText(_("isisfish.message.load.finished")); + setTreeModel(); + } + }); } /* protected void setTreeModel(){ tree.setModel(getTreeModel()); @@ -277,10 +281,10 @@ } } } - protected void setNode(NavigationTreeModelBuilder builder, NavigationTreeNode parent, Object[] values, Class ui, Class type){ + 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; - Decorator deco = JXPathDecorator.newDecorator(type, "${name}$s"); + TopiaEntity topiaEntity = (TopiaEntity)o; builder.build(parent, deco , "..[@topiaId=\"" + topiaEntity.getTopiaId() + "\"]", topiaEntity.getTopiaId(), ui, null); } }