Revision f140f6e5
Added by Andreas Kohlbecker about 7 years ago
pom.xml | ||
---|---|---|
451 | 451 |
<version>4.5</version> |
452 | 452 |
</dependency> |
453 | 453 |
<dependency> |
454 |
<!-- only in the edit repo --> |
|
454 |
<groupId>org.vaadin.addons</groupId> |
|
455 |
<artifactId>tuning-datefield</artifactId> |
|
456 |
<version>0.18.0</version> |
|
457 |
</dependency> |
|
458 |
<!-- <dependency> |
|
459 |
only in the edit repo |
|
455 | 460 |
<groupId>org.vaadin.addons</groupId> |
456 | 461 |
<artifactId>lazyloadwrapper</artifactId> |
457 | 462 |
<version>0.1-alpha</version> |
458 |
</dependency> |
|
463 |
</dependency> -->
|
|
459 | 464 |
<!-- ============ cdmlib ============ --> |
460 | 465 |
<dependency> |
461 | 466 |
<groupId>eu.etaxonomy</groupId> |
src/main/java/eu/etaxonomy/cdm/vaadin/AppWidgetSet.gwt.xml | ||
---|---|---|
35 | 35 |
|
36 | 36 |
<inherits name="eu.etaxonomy.vaadin.ui.DevDayWidgetset" /> |
37 | 37 |
|
38 |
<inherits name="com.vaadin.lazyloadwrapper.widgetset.LazyLoadWrapperWidgetset" /> |
|
38 |
|
|
39 |
|
|
40 |
|
|
41 |
|
|
42 |
<inherits name="org.vaadin.addons.tuningdatefield.widgetset.TuningDateFieldWidgetset" /> |
|
39 | 43 |
</module> |
src/main/java/eu/etaxonomy/cdm/vaadin/component/TimePeriodField.java | ||
---|---|---|
60 | 60 |
super.setPrimaryStyleName(PRIMARY_STYLE); |
61 | 61 |
|
62 | 62 |
// better use https://vaadin.com/directory#!addon/tuning-datefield ??? |
63 |
TuningDateField startDateField = new TuningDateField(); |
|
63 | 64 |
PopupDateField startDate = new PopupDateField("Start"); |
64 | 65 |
startDate.setConverter(new JodaDateTimeConverter()); |
65 | 66 |
PopupDateField endDate = new PopupDateField("End"); |
src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/ReferencePopupEditor.java | ||
---|---|---|
20 | 20 |
|
21 | 21 |
import eu.etaxonomy.cdm.model.reference.Reference; |
22 | 22 |
import eu.etaxonomy.cdm.model.reference.ReferenceType; |
23 |
import eu.etaxonomy.cdm.vaadin.component.SelectFieldFactory; |
|
24 | 23 |
import eu.etaxonomy.cdm.vaadin.component.TimePeriodField; |
25 | 24 |
import eu.etaxonomy.vaadin.mvp.AbstractPopupEditor; |
26 | 25 |
|
... | ... | |
42 | 41 |
|
43 | 42 |
private final static int GRID_ROWS = 9; |
44 | 43 |
|
45 |
@Autowired |
|
46 |
private SelectFieldFactory selectFactory; |
|
47 |
|
|
48 | 44 |
/** |
49 | 45 |
* @param layout |
50 | 46 |
* @param dtoType |
src/main/java/eu/etaxonomy/vaadin/ui/DevDayWidgetset.gwt.xml | ||
---|---|---|
9 | 9 |
|
10 | 10 |
<inherits name="com.vaadin.DefaultWidgetSet" /> |
11 | 11 |
|
12 |
<inherits name="com.vaadin.lazyloadwrapper.widgetset.LazyLoadWrapperWidgetset" /> |
|
12 |
|
|
13 |
|
|
14 |
|
|
15 |
|
|
16 |
<inherits name="org.vaadin.addons.tuningdatefield.widgetset.TuningDateFieldWidgetset" /> |
|
13 | 17 |
</module> |
Also available in: Unified diff
ref #6169 removing usued bean reference