Author: tchemit Date: 2013-09-30 17:38:09 +0200 (Mon, 30 Sep 2013) New Revision: 2727 Url: http://nuiton.org/projects/jaxx/repository/revisions/2727 Log: - make possible to change the model in BeanDoubleList - make possible to referesh a model Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java 2013-09-29 09:42:27 UTC (rev 2726) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java 2013-09-30 15:38:09 UTC (rev 2727) @@ -547,7 +547,12 @@ fireIntervalRemoved(this, fromIndex, toIndex); } + public void refresh() { + if (!isEmpty()) { + fireContentsChanged(this, 0, getSize() - 1); + } + } /* public void addAll(Collection c) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java 2013-09-29 09:42:27 UTC (rev 2726) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java 2013-09-30 15:38:09 UTC (rev 2727) @@ -62,12 +62,7 @@ int index, boolean isSelected, boolean cellHasFocus) { - if (value == null) { - value = " "; - } - if (!(value instanceof String) && decorator != null) { - value = decorator.toString(value); - } + value = decorateValue(value, index); return delegate.getListCellRendererComponent(list, value, index, @@ -75,4 +70,14 @@ cellHasFocus ); } + + protected Object decorateValue(Object value,int index) { + if (value == null) { + value = " "; + } + if (!(value instanceof String) && decorator != null) { + value = decorator.toString(value); + } + return value; + } } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css 2013-09-29 09:42:27 UTC (rev 2726) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css 2013-09-30 15:38:09 UTC (rev 2727) @@ -31,24 +31,24 @@ } #universeList { - model:{model.getUniverseModel()}; + model:{getModel().getUniverseModel()}; } #addButton { toolTipText:"beandoublelist.button.add"; actionIcon:"bean-doublelist-select"; - enabled:{model.isAddEnabled()}; + enabled:{getModel().isAddEnabled()}; } #selectedList { - model:{model.getSelectedModel()}; + model:{getModel().getSelectedModel()}; componentPopupMenu:{handler.getSelectedListPopup(isShowSelectPopupEnabled())}; } #removeButton { toolTipText:"beandoublelist.button.remove"; actionIcon:"bean-doublelist-unselect"; - enabled:{model.isRemoveEnabled()}; + enabled:{getModel().isRemoveEnabled()}; } #popup { @@ -80,21 +80,21 @@ actionIcon: "bean-doublelist-up"; text: "bean.action.selected.move.up"; toolTipText: "bean.action.selected.move.up.tip"; - enabled:{model.isSelectedUpEnabled()}; + enabled:{getModel().isSelectedUpEnabled()}; } #selectedListMoveDownAction { actionIcon: "bean-doublelist-down"; text: "bean.action.selected.move.down"; toolTipText: "bean.action.selected.move.down.tip"; - enabled:{model.isSelectedDownEnabled()}; + enabled:{getModel().isSelectedDownEnabled()}; } #selectedListRemoveAction { actionIcon: "bean-doublelist-unselect"; text: "bean.action.selected.remove"; toolTipText: "bean.action.selected.remove.tip"; - enabled:{model.isRemoveEnabled()}; + enabled:{getModel().isRemoveEnabled()}; } #toolbarLeft { Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2013-09-29 09:42:27 UTC (rev 2726) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2013-09-30 15:38:09 UTC (rev 2727) @@ -60,7 +60,7 @@ <String id='i18nPrefix' javaBean='"beanlist.common."'/> <!-- model --> - <BeanDoubleListModel id='model' genericType='O'/> + <BeanDoubleListModel id='model' genericType='O' javaBean='new BeanDoubleListModel<O>()'/> <!-- handler --> <BeanDoubleListHandler id='handler' genericType='O' constructorParams='this'/> 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 2013-09-29 09:42:27 UTC (rev 2726) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java 2013-09-30 15:38:09 UTC (rev 2727) @@ -55,7 +55,7 @@ public static final String PROPERTY_SELECTED_DOWN_ENABLED = "selectedDownEnabled"; - public static final String PROPERTY_USE_MULTI_SELECT= "useMultiSelect"; + public static final String PROPERTY_USE_MULTI_SELECT = "useMultiSelect"; private static final long serialVersionUID = 1L; @@ -209,8 +209,8 @@ public void moveUpSelected(O item) { int i = selected.indexOf(item); selected.remove(item); + selectedModel.removeElement(item); selected.add(i - 1, item); - selectedModel.removeElement(item); selectedModel.insertElementAt(item, i - 1); } @@ -223,8 +223,8 @@ public void moveDownSelected(O item) { int i = selected.indexOf(item); selected.remove(item); + selectedModel.removeElement(item); selected.add(i + 1, item); - selectedModel.removeElement(item); selectedModel.insertElementAt(item, i + 1); }