Author: chatellier Date: 2009-05-26 11:48:34 +0000 (Tue, 26 May 2009) New Revision: 2280 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx Log: Fix equation refresh problem Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-05-26 11:48:09 UTC (rev 2279) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-05-26 11:48:34 UTC (rev 2280) @@ -69,7 +69,10 @@ if (evt.getNewValue() != null) { // add binding on getBean() //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); - setComboModel(); + //setComboModel(); + + // chatellier 20090526 : force refresh in bean change ? + refresh(); } } }); @@ -132,10 +135,11 @@ } } if (nameEquation != null){ + // chatellier 20090526 (change to get combo selected on this equation) + selectedEquation = getEquation(); setComboModel(); setFormule((Formule)formuleComboBox.getSelectedItem()); setEditorText(); - selectedEquation = getEquation(); } editor.getCurrentEditor().addDocumentListener(listener); } @@ -150,6 +154,13 @@ java.util.List<Item> items = new ArrayList<Item>(); items.add(new Item("null", " ", null, false)); for (Formule f : formules) { + // chatellier 20090526 equals seams to not work + //boolean selected = f.equals(selectedEquation); + /*if (log.isDebugEnabled()) { + log.debug("Compare formula"); + log.debug(" first : name=" + f.getName() + ", category=" + f.getCategory()); + log.debug(" second : name=" + selectedEquation.getName() + ", category=" + selectedEquation.getCategory()); + }*/ boolean selected = f.equals(selectedEquation); items.add(new Item(f.getName(), f.getName(), f, selected)); }