Revision 45203
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/searchpanel/SearchConditionFieldController.java | ||
---|---|---|
6 | 6 |
import java.awt.event.ItemListener; |
7 | 7 |
import java.awt.event.MouseAdapter; |
8 | 8 |
import java.awt.event.MouseEvent; |
9 |
import java.text.DateFormat; |
|
9 | 10 |
import java.util.ArrayList; |
10 | 11 |
import java.util.Arrays; |
12 |
import java.util.Date; |
|
11 | 13 |
import java.util.HashMap; |
12 | 14 |
import java.util.List; |
15 |
import java.util.Locale; |
|
13 | 16 |
import java.util.Map; |
14 | 17 |
import java.util.Objects; |
15 | 18 |
import javax.json.Json; |
... | ... | |
453 | 456 |
} |
454 | 457 |
elements.add(new LabeledValueImpl("", null)); |
455 | 458 |
for (Object value : values) { |
456 |
String key = Objects.toString(value); |
|
459 |
String key; |
|
460 |
if (value instanceof Date) { |
|
461 |
DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault()); |
|
462 |
df.setLenient(false); |
|
463 |
key = df.format(value); |
|
464 |
} else { |
|
465 |
key = Objects.toString(value); |
|
466 |
} |
|
457 | 467 |
String label = availableValuesMap.getOrDefault(key, key); |
458 | 468 |
elements.add(new LabeledValueImpl(label, value)); |
459 | 469 |
} |
... | ... | |
705 | 715 |
} |
706 | 716 |
|
707 | 717 |
public boolean isValid(StringBuilder message) { |
718 |
try { |
|
708 | 719 |
Object value = this.getValue(); |
709 | 720 |
if (value == null) { |
710 | 721 |
return true; |
... | ... | |
745 | 756 |
break; |
746 | 757 |
} |
747 | 758 |
return true; |
759 |
} catch (Exception ex) { |
|
760 |
message.append("Invalid values '").append(ex.toString()); |
|
761 |
return false; |
|
762 |
} |
|
748 | 763 |
} |
749 | 764 |
|
750 | 765 |
public ExpressionBuilder.Value getFilter() { |
Also available in: Unified diff