Author: kmorin Date: 2012-12-13 10:20:39 +0100 (Thu, 13 Dec 2012) New Revision: 2534 Url: http://nuiton.org/projects/jaxx/repository/revisions/2534 Log: refs #2474 Create a double list widget Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java 2012-12-12 23:04:11 UTC (rev 2533) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java 2012-12-13 09:20:39 UTC (rev 2534) @@ -1,11 +1,10 @@ package jaxx.runtime.swing.editor.bean; +import com.google.common.collect.Lists; import java.util.ArrayList; import java.util.List; import javax.swing.DefaultListModel; import javax.swing.ListModel; -import javax.swing.event.ListDataEvent; -import javax.swing.event.ListDataListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -47,15 +46,15 @@ * @param selected a list of O */ public void setSelected(List<O> selected) { + //reset all the universe in the universe list + resetUniverse(); + if (selected == null) { - selected = new ArrayList<O>(); + selected = Lists.newArrayList(); } - this.selected = selected; + this.selected.clear(); ((DefaultListModel)selectedModel).clear(); - for (O item : selected) { - ((DefaultListModel)selectedModel).addElement(item); - ((DefaultListModel)universeModel).removeElement(item); - } + addToSelected(selected); } /** @@ -73,9 +72,13 @@ */ public void setUniverse(List<O> universe) { if (universe == null) { - universe = new ArrayList<O>(); + universe = Lists.newArrayList(); } - this.universe = new ArrayList<O>(universe); + this.universe = Lists.newArrayList(universe); + resetUniverse(); + } + + protected void resetUniverse() { ((DefaultListModel)universeModel).clear(); for (O item : universe) { ((DefaultListModel)universeModel).addElement(item); Modified: trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties =================================================================== --- trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties 2012-12-12 23:04:11 UTC (rev 2533) +++ trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties 2012-12-13 09:20:39 UTC (rev 2534) @@ -13,11 +13,11 @@ bean.sort.up.tip=Clasificación creciente actualmente utilizada bean.sort.up.toSelect.tip=Clic para clasificar según orden creciente bean.unknown.type=Objeto de tipo desconocido -beandoublelist.button.add=Add -beandoublelist.button.remove=Remove beancombobox.action.reset.tip=Reiniciar el valor de la lista desplegable beancombobox.action.sort.tip=Modificar la clasificación de la lista desplegable beancombobox.popup.title=Modificar la clasificación +beandoublelist.button.add=Add +beandoublelist.button.remove=Remove beanlist.action.reset.tip=Eliminar la selección beanlist.action.sort.tip=Modificar la clasificación de la lista despleglable beanlist.popup.title=Modificar la clasificación Modified: trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties =================================================================== --- trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties 2012-12-12 23:04:11 UTC (rev 2533) +++ trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties 2012-12-13 09:20:39 UTC (rev 2534) @@ -12,12 +12,12 @@ bean.sort.up=Tri croissant bean.sort.up.tip=Tri croissant actuellement utilisé bean.sort.up.toSelect.tip=Cliquer pour trier selon l'ordre croissant -beandoublelist.button.add=Add -beandoublelist.button.remove=Remove bean.unknown.type=Objet de type inconnu beancombobox.action.reset.tip=Réinitialiser la valeur de la liste déroulante beancombobox.action.sort.tip=Modifier le tri de la liste déroulante beancombobox.popup.title=Modifier le tri +beandoublelist.button.add=Add +beandoublelist.button.remove=Remove beanlist.action.reset.tip=Supprimer la sélection beanlist.action.sort.tip=Modifier le tri de la liste déroulante beanlist.popup.title=Modifier le tri