Revision 2553 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
ListElement.java | ||
---|---|---|
27 | 27 |
import javax.swing.JComboBox; |
28 | 28 |
import javax.swing.JList; |
29 | 29 |
import javax.swing.ListModel; |
30 |
import org.gvsig.tools.util.LabeledValue; |
|
30 | 31 |
import org.gvsig.tools.util.LabeledValueImpl; |
31 | 32 |
|
32 | 33 |
public class ListElement<T> extends LabeledValueImpl<T>{ |
... | ... | |
59 | 60 |
ListModel dataModel = list.getModel(); |
60 | 61 |
for (int i = 0; i < dataModel.getSize(); i++) { |
61 | 62 |
Object element = dataModel.getElementAt(i); |
62 |
if( element instanceof ListElement ) {
|
|
63 |
element = ((ListElement)element).getValue();
|
|
63 |
if( element instanceof LabeledValue ) {
|
|
64 |
element = ((LabeledValue)element).getValue();
|
|
64 | 65 |
} |
65 | 66 |
if( anObject.equals(element) ) { |
66 | 67 |
list.setSelectedIndex(i); |
... | ... | |
75 | 76 |
if( element == null ) { |
76 | 77 |
return null; |
77 | 78 |
} |
78 |
if( element instanceof ListElement ) {
|
|
79 |
return ((ListElement)element).getValue();
|
|
79 |
if( element instanceof LabeledValue ) {
|
|
80 |
return ((LabeledValue)element).getValue();
|
|
80 | 81 |
} |
81 | 82 |
return element; |
82 | 83 |
} |
... | ... | |
90 | 91 |
ComboBoxModel dataModel = combo.getModel(); |
91 | 92 |
for (int i = 0; i < dataModel.getSize(); i++) { |
92 | 93 |
Object element = dataModel.getElementAt(i); |
93 |
if( element instanceof ListElement ) {
|
|
94 |
element = ((ListElement)element).getValue();
|
|
95 |
} |
|
94 |
if( element instanceof LabeledValue ) {
|
|
95 |
element = ((LabeledValue)element).getValue();
|
|
96 |
}
|
|
96 | 97 |
if( Objects.equals(anObject,element) ) { |
97 | 98 |
combo.setSelectedIndex(i); |
98 | 99 |
return; |
... | ... | |
109 | 110 |
if( element == null ) { |
110 | 111 |
return null; |
111 | 112 |
} |
112 |
if( element instanceof ListElement ) {
|
|
113 |
return ((ListElement)element).getValue();
|
|
113 |
if( element instanceof LabeledValue ) {
|
|
114 |
return ((LabeledValue)element).getValue();
|
|
114 | 115 |
} |
115 | 116 |
return element; |
116 | 117 |
} |
Also available in: Unified diff