Author: echatellier Date: 2012-01-24 16:23:44 +0100 (Tue, 24 Jan 2012) New Revision: 3600 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3600 Log: #783 : NonUniqueObjectException when saving metier's target factors Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2012-01-24 15:22:48 UTC (rev 3599) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2012-01-24 15:23:44 UTC (rev 3600) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 2009 - 2012 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -294,6 +294,10 @@ InputUI inputUI = inputContentUI.getParentContainer(InputUI.class); inputUI.getHandler().updateTreeNode(inputUI, topiaEntity.getTopiaId()); + // FIXME echatellier 20111201 small fix because save + // button has to reset internal ui change model state + inputContentUI.resetChangeModel(); + // refresh all registered panel // to discard modification in UI //refreshAll(); @@ -372,6 +376,15 @@ } /** + * Remove monitored entities. + * + * @param key entity key to remove + */ + public void removeCurrentEntity(String key) { + currentEntities.remove(key); + } + + /** * Reset state. */ public void reset() { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2012-01-24 15:22:48 UTC (rev 3599) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2012-01-24 15:23:44 UTC (rev 3600) @@ -156,6 +156,7 @@ if (o != null) { TargetSpecies ts = (TargetSpecies)o; getAction().removeTargetSpecies(getMetierSeasonInfo(), ts); + getSaveVerifier().removeCurrentEntity(ts.getTopiaId()); setTableTargetSpeciesModel(); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2012-01-24 15:22:48 UTC (rev 3599) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2012-01-24 15:23:44 UTC (rev 3600) @@ -125,6 +125,7 @@ GearPopulationSelectivityModel model = (GearPopulationSelectivityModel)selectivityTable.getModel(); Selectivity selectedSelectivity = model.getSelectivities().get(selectivityTable.getSelectedRow()); getAction().removeSelectivity(getBean(), selectedSelectivity); + getSaveVerifier().removeCurrentEntity(selectedSelectivity.getTopiaId()); setSelectivityTableModel(); removeSelectivityButton.setEnabled(false); }