[Jaxx-commits] r1557 - trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing

4 Oct 2009

Author: tchemit
Date: 2009-10-04 13:37:17 +0200 (Sun, 04 Oct 2009)
New Revision: 1557

Modified:
   trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXComboBox.java
Log:
[Anomalie #73] fix NPE

Modified: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXComboBox.java
===================================================================

--- trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXComboBox.java	2009-10-04 10:12:06 UTC (rev 1556)
+++ trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXComboBox.java	2009-10-04 11:37:17 UTC (rev 1557)
@@ -68,7 +68,7 @@
                             System.arraycopy(oldSelection, 0, newSelection, 0, index);
                             System.arraycopy(oldSelection, index + 1, newSelection, index, oldSelection.length - 1 - index);
                         }
-                        if (newSelection.length > 0){
+                        if (newSelection.length > 0) {
                             setSelectedIndex(newSelection[0]);
                         }
                     } else {
@@ -90,10 +90,10 @@
             }
         }
 
-        public List<Item> getItems(){
+        public List<Item> getItems() {
             return items;
         }
-        
+
         @Override
         public Object getElementAt(int i) {
             return items.get(i).getValue();
@@ -228,27 +228,29 @@
         }
     }
 
-    public List<Item> getItems(){
-        if (getModel() instanceof JAXXComboBoxModel){
-            return ((JAXXComboBoxModel)getModel()).getItems();
+    public List<Item> getItems() {
+        if (getModel() instanceof JAXXComboBoxModel) {
+            return ((JAXXComboBoxModel) getModel()).getItems();
         }
         return null;
     }
 
     public void setSelectedItem(Item item) {
-        super.setSelectedItem(item.getValue());
+        //TC-20092004 Anomalie #73 fix npe when want to call with a null
+        // value 
+        super.setSelectedItem(item == null ? null : item.getValue());
     }
 
-    public Item getSelectedJaxxItem(){
+    public Item getSelectedJaxxItem() {
         Object selected = super.getSelectedItem();
         return findItem(selected);
     }
 
-    public Item findItem(Object value){
+    public Item findItem(Object value) {
         List<Item> items = getItems();
-        if (items != null){
-            for (Item i : items){
-                if (i.getValue().equals(value)){
+        if (items != null) {
+            for (Item i : items) {
+                if (i.getValue().equals(value)) {
                     return i;
                 }
             }
@@ -256,33 +258,33 @@
         return null;
     }
 
-    public void addItem(Item item){
+    public void addItem(Item item) {
         List<Item> items = getItems();
-        if (items != null){
+        if (items != null) {
             items.add(item);
             setItems(items);
         }
     }
 
-    public void addAllItems(Collection<Item> itemsToAdd){
+    public void addAllItems(Collection<Item> itemsToAdd) {
         List<Item> items = getItems();
-        if (items != null){
+        if (items != null) {
             items.addAll(itemsToAdd);
             setItems(items);
         }
     }
 
-    public void removeItem(Item item){
+    public void removeItem(Item item) {
         List<Item> items = getItems();
-        if (items != null){
+        if (items != null) {
             items.remove(item);
             setItems(items);
         }
     }
 
-    public void removeAllItems(Collection<Item> itemsToRemove){
+    public void removeAllItems(Collection<Item> itemsToRemove) {
         List<Item> items = getItems();
-        if (items != null){
+        if (items != null) {
             items.removeAll(itemsToRemove);
             setItems(items);
         }

    

[Jaxx-commits] r1557 - trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing

tchemit＠users.nuiton.org