Revision 1762

View differences:

org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.swing/org.gvsig.tools.swing.api/src/main/java/org/gvsig/tools/swing/api/ListElement.java
22 22
 */
23 23
package org.gvsig.tools.swing.api;
24 24

  
25
import java.util.Objects;
25 26
import javax.swing.ComboBoxModel;
26 27
import javax.swing.JComboBox;
27 28
import javax.swing.JList;
......
89 90

  
90 91

  
91 92
    public static void setSelectedItem(JComboBox combo, Object anObject) {
93
        if( anObject == null ) {
94
            combo.setSelectedIndex(-1);
95
            return;
96
        }
92 97
        ComboBoxModel dataModel = combo.getModel();
93 98
        for (int i = 0; i < dataModel.getSize(); i++) {
94 99
            Object element = dataModel.getElementAt(i);
95 100
            if( element instanceof ListElement ) {
96 101
                element = ((ListElement)element).getValue();
97 102
            }
98
            if( anObject.equals(element) ) {
103
            if( Objects.equals(anObject,element) ) {
99 104
                combo.setSelectedIndex(i);
100 105
                return;
101 106
            }

Also available in: Unified diff