Author: tchemit Date: 2010-06-23 10:59:55 +0200 (Wed, 23 Jun 2010) New Revision: 1988 Url: http://nuiton.org/repositories/revision/jaxx/1988 Log: remove deprecated method from 1.7.2 Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXComboBox.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXComboBox.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXComboBox.java 2010-06-23 08:58:57 UTC (rev 1987) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXComboBox.java 2010-06-23 08:59:55 UTC (rev 1988) @@ -126,7 +126,7 @@ @Override public void setSelectedItem(Object selectedItem) { - if ((this.selectedItem != null && !this.selectedItem.equals(selectedItem)) || + if (this.selectedItem != null && !this.selectedItem.equals(selectedItem) || this.selectedItem == null && selectedItem != null) { this.selectedItem = selectedItem; fireContentsChanged(this, -1, -1); @@ -219,27 +219,6 @@ } setItems(items); } - - /** - * Fill the model with some datas, and select after all the given object - * - * @param data data ot inject in combo - * @param select the object to select in combo after reflling his model - * @param firstNull add a first null element - * @deprecated since 1.7.XXX this code is moved to JAXXComboBox - */ - public void fillComboBox(Collection<?> data, Object select, boolean firstNull) { - List<Item> items = new ArrayList<Item>(); - if (firstNull) { - items.add(new Item("null", " ", null, false)); - } - if (data != null) { - for (Object d : data) { - items.add(new Item(d.toString(), d.toString(), d, d.equals(select))); - } - } - this.setItems(items); - } // this way we can keep it marked protected and still allow code in this file to call it @Override