1
=== modified file 'dhis-2/dhis-api/pom.xml'
2
--- dhis-2/dhis-api/pom.xml	2014-04-25 10:44:39 +0000
3
+++ dhis-2/dhis-api/pom.xml	2014-06-05 17:39:07 +0000
4
@@ -83,6 +83,10 @@
5
83
      <groupId>org.hibernate</groupId>
83
      <groupId>org.hibernate</groupId>
6
84
      <artifactId>hibernate-validator</artifactId>
84
      <artifactId>hibernate-validator</artifactId>
7
85
    </dependency>
85
    </dependency>
8
86
    <dependency>
9
87
      <groupId>org.javassist</groupId>
10
88
      <artifactId>javassist</artifactId>
11
89
    </dependency>
12
86
90
13
87
  </dependencies>
91
  </dependencies>
14
88
92
15
89
93
16
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/App.java'
17
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/App.java	2014-03-18 08:10:10 +0000
18
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/App.java	2014-06-05 17:39:07 +0000
19
@@ -78,9 +78,6 @@
20
78
    private String locales;
78
    private String locales;
21
79
79
22
80
    @JsonProperty
80
    @JsonProperty
23
81
    private String permissions;
24
82
25
83
    @JsonProperty
26
84
    private AppActivities activities;
81
    private AppActivities activities;
27
85
    
82
    
28
86
    @JsonProperty
83
    @JsonProperty
29
@@ -194,16 +191,6 @@
30
194
        this.locales = locales;
191
        this.locales = locales;
31
195
    }
192
    }
32
196
193
33
197
    public String getPermissions()
34
198
    {
35
199
        return permissions;
36
200
    }
37
201
38
202
    public void setPermissions( String permissions )
39
203
    {
40
204
        this.permissions = permissions;
41
205
    }
42
206
43
207
    public AppActivities getActivities()
194
    public AppActivities getActivities()
44
208
    {
195
    {
45
209
        return activities;
196
        return activities;
46
210
197
47
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/AbstractCalendar.java'
48
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/AbstractCalendar.java	2014-05-13 16:00:50 +0000
49
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/AbstractCalendar.java	2014-06-05 17:39:07 +0000
50
@@ -143,7 +143,7 @@
51
143
    @Override
143
    @Override
52
144
    public DateUnit fromIso( int year, int month, int day )
144
    public DateUnit fromIso( int year, int month, int day )
53
145
    {
145
    {
55
146
        return fromIso( new DateUnit( year, month, day ) );
146
        return fromIso( new DateUnit( year, month, day, true ) );
56
147
    }
147
    }
57
148
148
58
149
    @Override
149
    @Override
59
150
150
60
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/Calendar.java'
61
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/Calendar.java	2014-05-13 16:00:50 +0000
62
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/Calendar.java	2014-06-05 17:39:07 +0000
63
@@ -32,6 +32,7 @@
64
32
32
65
33
/**
33
/**
66
34
 * Generic interface for representing a Calendar.
34
 * Generic interface for representing a Calendar.
67
35
 *
68
35
 * @author Morten Olav Hansen <mortenoh@gmail.com>
36
 * @author Morten Olav Hansen <mortenoh@gmail.com>
69
36
 * @see DateUnit
37
 * @see DateUnit
70
37
 * @see DateInterval
38
 * @see DateInterval
71
@@ -41,24 +42,28 @@
72
41
{
42
{
73
42
    /**
43
    /**
74
43
     * Name of this calendar.
44
     * Name of this calendar.
75
45
     *
76
44
     * @return Name of calendar.
46
     * @return Name of calendar.
77
45
     */
47
     */
78
46
    String name();
48
    String name();
79
47
49
80
48
    /**
50
    /**
81
49
     * Date format for this calendar
51
     * Date format for this calendar
82
52
     *
83
50
     * @return Default date format
53
     * @return Default date format
84
51
     */
54
     */
85
52
    String getDateFormat();
55
    String getDateFormat();
86
53
56
87
54
    /**
57
    /**
88
55
     * Set date format for this calendar
58
     * Set date format for this calendar
89
59
     *
90
56
     * @param dateFormat Date format to use for this calendar
60
     * @param dateFormat Date format to use for this calendar
91
57
     */
61
     */
92
58
    void setDateFormat( String dateFormat );
62
    void setDateFormat( String dateFormat );
93
59
63
94
60
    /**
64
    /**
95
61
     * Formats dateUnit using dateFormat
65
     * Formats dateUnit using dateFormat
96
66
     *
97
62
     * @param dateUnit DateUnit representing local year, month, day
67
     * @param dateUnit DateUnit representing local year, month, day
98
63
     * @return Default date format
68
     * @return Default date format
99
64
     * @see #getDateFormat()
69
     * @see #getDateFormat()
100
@@ -67,6 +72,7 @@
101
67
72
102
68
    /**
73
    /**
103
69
     * Formats dateUnit using dateFormat and ISO 8601
74
     * Formats dateUnit using dateFormat and ISO 8601
104
75
     *
105
70
     * @param dateUnit DateUnit representing local year, month, day
76
     * @param dateUnit DateUnit representing local year, month, day
106
71
     * @return Default date format
77
     * @return Default date format
107
72
     * @see #getDateFormat()
78
     * @see #getDateFormat()
108
@@ -75,6 +81,7 @@
109
75
81
110
76
    /**
82
    /**
111
77
     * Convert local calendar to an ISO 8601 DateUnit.
83
     * Convert local calendar to an ISO 8601 DateUnit.
112
84
     *
113
78
     * @param year  Local year
85
     * @param year  Local year
114
79
     * @param month Local month
86
     * @param month Local month
115
80
     * @param day   Local day
87
     * @param day   Local day
116
@@ -85,6 +92,7 @@
117
85
92
118
86
    /**
93
    /**
119
87
     * Convert local calendar to an ISO 8601 DateUnit.
94
     * Convert local calendar to an ISO 8601 DateUnit.
120
95
     *
121
88
     * @param date Date formatted using default date format
96
     * @param date Date formatted using default date format
122
89
     * @return DateUnit representing local date in ISO 8601
97
     * @return DateUnit representing local date in ISO 8601
123
90
     * @see <a href="http://en.wikipedia.org/wiki/ISO_8601">http://en.wikipedia.org/wiki/ISO_8601</a>
98
     * @see <a href="http://en.wikipedia.org/wiki/ISO_8601">http://en.wikipedia.org/wiki/ISO_8601</a>
124
@@ -93,6 +101,7 @@
125
93
101
126
94
    /**
102
    /**
127
95
     * Convert local calendar to an ISO 8601 DateUnit.
103
     * Convert local calendar to an ISO 8601 DateUnit.
128
104
     *
129
96
     * @param dateUnit DateUnit representing local year, month, day
105
     * @param dateUnit DateUnit representing local year, month, day
130
97
     * @return DateUnit representing local date in ISO 8601
106
     * @return DateUnit representing local date in ISO 8601
131
98
     * @see <a href="http://en.wikipedia.org/wiki/ISO_8601">http://en.wikipedia.org/wiki/ISO_8601</a>
107
     * @see <a href="http://en.wikipedia.org/wiki/ISO_8601">http://en.wikipedia.org/wiki/ISO_8601</a>
132
@@ -101,6 +110,7 @@
133
101
110
134
102
    /**
111
    /**
135
103
     * Convert from local to ISO 8601 DateUnit.
112
     * Convert from local to ISO 8601 DateUnit.
136
113
     *
137
104
     * @param year  ISO 8601 year
114
     * @param year  ISO 8601 year
138
105
     * @param month ISO 8601 month
115
     * @param month ISO 8601 month
139
106
     * @param day   ISO 8601 day
116
     * @param day   ISO 8601 day
140
@@ -111,6 +121,7 @@
141
111
121
142
112
    /**
122
    /**
143
113
     * Convert from local to ISO 8601 DateUnit.
123
     * Convert from local to ISO 8601 DateUnit.
144
124
     *
145
114
     * @param dateUnit DateUnit representing ISO 8601 year, month, day
125
     * @param dateUnit DateUnit representing ISO 8601 year, month, day
146
115
     * @return DateUnit representing ISO 8601 in local
126
     * @return DateUnit representing ISO 8601 in local
147
116
     * @see <a href="http://en.wikipedia.org/wiki/ISO_8601">http://en.wikipedia.org/wiki/ISO_8601</a>
127
     * @see <a href="http://en.wikipedia.org/wiki/ISO_8601">http://en.wikipedia.org/wiki/ISO_8601</a>
148
@@ -119,6 +130,7 @@
149
119
130
150
120
    /**
131
    /**
151
121
     * Gets interval of type based on DateUnit
132
     * Gets interval of type based on DateUnit
152
133
     *
153
122
     * @param dateUnit DateUnit representing local year, month, day
134
     * @param dateUnit DateUnit representing local year, month, day
154
123
     * @param type     Interval type to get
135
     * @param type     Interval type to get
155
124
     * @param offset   Offset to start at, can be negative of positive
136
     * @param offset   Offset to start at, can be negative of positive
156
@@ -130,6 +142,7 @@
157
130
142
158
131
    /**
143
    /**
159
132
     * Gets interval of type based on DateUnit using default options, 0 for offset, 1 for length
144
     * Gets interval of type based on DateUnit using default options, 0 for offset, 1 for length
160
145
     *
161
133
     * @param dateUnit DateUnit representing local year, month, day
146
     * @param dateUnit DateUnit representing local year, month, day
162
134
     * @param type     Interval type to get
147
     * @param type     Interval type to get
163
135
     * @return Interval for interval type based on dateUnit
148
     * @return Interval for interval type based on dateUnit
164
@@ -139,6 +152,7 @@
165
139
152
166
140
    /**
153
    /**
167
141
     * Gets interval of type based on today's date
154
     * Gets interval of type based on today's date
168
155
     *
169
142
     * @param type Interval type to get
156
     * @param type Interval type to get
170
143
     * @return Interval for interval type based on dateUnit
157
     * @return Interval for interval type based on dateUnit
171
144
     * @see DateIntervalType
158
     * @see DateIntervalType
172
@@ -147,6 +161,7 @@
173
147
161
174
148
    /**
162
    /**
175
149
     * Gets interval of type based on today's date
163
     * Gets interval of type based on today's date
176
164
     *
177
150
     * @param type   Interval type to get
165
     * @param type   Interval type to get
178
151
     * @param offset Offset to start at, can be negative of positive
166
     * @param offset Offset to start at, can be negative of positive
179
152
     * @param length How many periods to asks for, i.e. type = MONTH, length = 2, two months
167
     * @param length How many periods to asks for, i.e. type = MONTH, length = 2, two months
180
@@ -157,6 +172,7 @@
181
157
172
182
158
    /**
173
    /**
183
159
     * Gets interval of type based on DateUnit
174
     * Gets interval of type based on DateUnit
184
175
     *
185
160
     * @param dateUnit DateUnit representing local year, month, day
176
     * @param dateUnit DateUnit representing local year, month, day
186
161
     * @param type     Interval type to get
177
     * @param type     Interval type to get
187
162
     * @param offset   Offset to start at, can be negative of positive
178
     * @param offset   Offset to start at, can be negative of positive
188
@@ -169,37 +185,50 @@
189
169
185
190
170
    /**
186
    /**
191
171
     * Gets current date as local DateUnit
187
     * Gets current date as local DateUnit
192
188
     *
193
172
     * @return Today date as local DateUnit
189
     * @return Today date as local DateUnit
194
173
     */
190
     */
195
174
    DateUnit today();
191
    DateUnit today();
196
175
192
197
176
    /**
193
    /**
198
177
     * Gets the number of months in a calendar year.
194
     * Gets the number of months in a calendar year.
199
195
     *
200
178
     * @return Number of months in a year
196
     * @return Number of months in a year
201
179
     */
197
     */
202
180
    int monthsInYear();
198
    int monthsInYear();
203
181
199
204
182
    /**
200
    /**
205
183
     * Gets the number of days in a calendar week.
201
     * Gets the number of days in a calendar week.
206
202
     *
207
184
     * @return Number of days in a week
203
     * @return Number of days in a week
208
185
     */
204
     */
209
186
    int daysInWeek();
205
    int daysInWeek();
210
187
206
211
188
    /**
207
    /**
212
189
     * Gets the number of days in a calendar year.
208
     * Gets the number of days in a calendar year.
213
209
     *
214
190
     * @return Number of days in this calendar year
210
     * @return Number of days in this calendar year
215
191
     */
211
     */
216
192
    int daysInYear( int year );
212
    int daysInYear( int year );
217
193
213
218
194
    /**
214
    /**
219
195
     * Gets the number of days in a calendar year/month.
215
     * Gets the number of days in a calendar year/month.
220
216
     *
221
196
     * @return Number of days in this calendar year/month
217
     * @return Number of days in this calendar year/month
222
197
     */
218
     */
223
198
    int daysInMonth( int year, int month );
219
    int daysInMonth( int year, int month );
224
199
220
225
200
    /**
221
    /**
226
222
     * Gets the number of weeks in a calendar year.
227
223
     *
228
224
     * @return Number of weeks in this calendar year
229
225
     */
230
226
    int weeksInYear( int year );
231
227
232
228
    /**
233
201
     * Gets week number using local DateUnit, week number is calculated based on
229
     * Gets week number using local DateUnit, week number is calculated based on
234
202
     * ISO 8601 week numbers
230
     * ISO 8601 week numbers
235
231
     *
236
203
     * @param dateUnit DateUnit representing local year, month, day
232
     * @param dateUnit DateUnit representing local year, month, day
237
204
     * @return Week number
233
     * @return Week number
238
205
     * @see <a href="http://en.wikipedia.org/wiki/ISO_8601">http://en.wikipedia.org/wiki/ISO_8601</a>
234
     * @see <a href="http://en.wikipedia.org/wiki/ISO_8601">http://en.wikipedia.org/wiki/ISO_8601</a>
239
@@ -209,6 +238,7 @@
240
209
238
241
210
    /**
239
    /**
242
211
     * Returns week number using local DateUnit, week number is calculated based on local calendar.
240
     * Returns week number using local DateUnit, week number is calculated based on local calendar.
243
241
     *
244
212
     * @param dateUnit DateUnit representing local year, month, day
242
     * @param dateUnit DateUnit representing local year, month, day
245
213
     * @return Week number
243
     * @return Week number
246
214
     */
244
     */
247
@@ -217,6 +247,7 @@
248
217
    /**
247
    /**
249
218
     * Gets the ISO 8601 weekday for this local DateUnit, using ISO 8601 day numbering,
248
     * Gets the ISO 8601 weekday for this local DateUnit, using ISO 8601 day numbering,
250
219
     * 1=Monday => 7=Sunday.
249
     * 1=Monday => 7=Sunday.
251
250
     *
252
220
     * @param dateUnit DateUnit representing local year, month, day
251
     * @param dateUnit DateUnit representing local year, month, day
253
221
     * @return Weekday number
252
     * @return Weekday number
254
222
     * @see <a href="http://en.wikipedia.org/wiki/ISO_8601">http://en.wikipedia.org/wiki/ISO_8601</a>
253
     * @see <a href="http://en.wikipedia.org/wiki/ISO_8601">http://en.wikipedia.org/wiki/ISO_8601</a>
255
@@ -227,6 +258,7 @@
256
227
    /**
258
    /**
257
228
     * Gets the local weekday for this local DateUnit, using ISO 8601 day numbering,
259
     * Gets the local weekday for this local DateUnit, using ISO 8601 day numbering,
258
229
     * 1=Monday => 7=Sunday.
260
     * 1=Monday => 7=Sunday.
259
261
     *
260
230
     * @param dateUnit DateUnit representing local year, month, day
262
     * @param dateUnit DateUnit representing local year, month, day
261
231
     * @return Weekday number
263
     * @return Weekday number
262
232
     * @see <a href="http://en.wikipedia.org/wiki/ISO_8601">http://en.wikipedia.org/wiki/ISO_8601</a>
264
     * @see <a href="http://en.wikipedia.org/wiki/ISO_8601">http://en.wikipedia.org/wiki/ISO_8601</a>
263
@@ -236,6 +268,7 @@
264
236
268
265
237
    /**
269
    /**
266
238
     * Gets the (untranslated) I18n key for local month
270
     * Gets the (untranslated) I18n key for local month
267
271
     *
268
239
     * @param month Month to fetch key for
272
     * @param month Month to fetch key for
269
240
     * @return I18n Key for this month
273
     * @return I18n Key for this month
270
241
     * @see <a href="http://en.wikipedia.org/wiki/Internationalization_and_localization">http://en.wikipedia.org/wiki/Internationalization_and_localization</a>
274
     * @see <a href="http://en.wikipedia.org/wiki/Internationalization_and_localization">http://en.wikipedia.org/wiki/Internationalization_and_localization</a>
271
@@ -244,6 +277,7 @@
272
244
277
273
245
    /**
278
    /**
274
246
     * Gets the (untranslated) I18n short key for local month
279
     * Gets the (untranslated) I18n short key for local month
275
280
     *
276
247
     * @param month Month to fetch key for
281
     * @param month Month to fetch key for
277
248
     * @return I18n Key for this month
282
     * @return I18n Key for this month
278
249
     * @see <a href="http://en.wikipedia.org/wiki/Internationalization_and_localization">http://en.wikipedia.org/wiki/Internationalization_and_localization</a>
283
     * @see <a href="http://en.wikipedia.org/wiki/Internationalization_and_localization">http://en.wikipedia.org/wiki/Internationalization_and_localization</a>
279
@@ -252,6 +286,7 @@
280
252
286
281
253
    /**
287
    /**
282
254
     * Gets the (untranslated) I18n key for local day
288
     * Gets the (untranslated) I18n key for local day
283
289
     *
284
255
     * @param day Day to fetch key for
290
     * @param day Day to fetch key for
285
256
     * @return I18n Key for this day
291
     * @return I18n Key for this day
286
257
     * @see <a href="http://en.wikipedia.org/wiki/Internationalization_and_localization">http://en.wikipedia.org/wiki/Internationalization_and_localization</a>
292
     * @see <a href="http://en.wikipedia.org/wiki/Internationalization_and_localization">http://en.wikipedia.org/wiki/Internationalization_and_localization</a>
287
@@ -260,6 +295,7 @@
288
260
295
289
261
    /**
296
    /**
290
262
     * Gets the (untranslated) I18n short key for local day
297
     * Gets the (untranslated) I18n short key for local day
291
298
     *
292
263
     * @param day Day to fetch key for
299
     * @param day Day to fetch key for
293
264
     * @return I18n Key for this day
300
     * @return I18n Key for this day
294
265
     * @see <a href="http://en.wikipedia.org/wiki/Internationalization_and_localization">http://en.wikipedia.org/wiki/Internationalization_and_localization</a>
301
     * @see <a href="http://en.wikipedia.org/wiki/Internationalization_and_localization">http://en.wikipedia.org/wiki/Internationalization_and_localization</a>
295
@@ -268,6 +304,7 @@
296
268
304
297
269
    /**
305
    /**
298
270
     * Returns a new dateUnit with specified number of days added
306
     * Returns a new dateUnit with specified number of days added
299
307
     *
300
271
     * @param dateUnit DateUnit representing local year, month, day
308
     * @param dateUnit DateUnit representing local year, month, day
301
272
     * @param days     Days to add
309
     * @param days     Days to add
302
273
     * @return dateUnit + days
310
     * @return dateUnit + days
303
@@ -276,6 +313,7 @@
304
276
313
305
277
    /**
314
    /**
306
278
     * Returns a new dateUnit with specified number of days subtracted
315
     * Returns a new dateUnit with specified number of days subtracted
307
316
     *
308
279
     * @param dateUnit DateUnit representing local year, month, day
317
     * @param dateUnit DateUnit representing local year, month, day
309
280
     * @param days     Days to subtract
318
     * @param days     Days to subtract
310
281
     * @return dateUnit - days
319
     * @return dateUnit - days
311
@@ -284,6 +322,7 @@
312
284
322
313
285
    /**
323
    /**
314
286
     * Returns a new dateUnit with specified number of weeks added
324
     * Returns a new dateUnit with specified number of weeks added
315
325
     *
316
287
     * @param dateUnit DateUnit representing local year, month, day
326
     * @param dateUnit DateUnit representing local year, month, day
317
288
     * @param weeks    Weeks to add
327
     * @param weeks    Weeks to add
318
289
     * @return dateUnit + weeks
328
     * @return dateUnit + weeks
319
@@ -292,6 +331,7 @@
320
292
331
321
293
    /**
332
    /**
322
294
     * Returns a new dateUnit with specified number of weeks subtracted
333
     * Returns a new dateUnit with specified number of weeks subtracted
323
334
     *
324
295
     * @param dateUnit DateUnit representing local year, month, day
335
     * @param dateUnit DateUnit representing local year, month, day
325
296
     * @param weeks    Weeks to subtract
336
     * @param weeks    Weeks to subtract
326
297
     * @return dateUnit - weeks
337
     * @return dateUnit - weeks
327
@@ -300,6 +340,7 @@
328
300
340
329
301
    /**
341
    /**
330
302
     * Returns a new dateUnit with specified number of months added
342
     * Returns a new dateUnit with specified number of months added
331
343
     *
332
303
     * @param dateUnit DateUnit representing local year, month, day
344
     * @param dateUnit DateUnit representing local year, month, day
333
304
     * @param months   Months to add
345
     * @param months   Months to add
334
305
     * @return dateUnit + months
346
     * @return dateUnit + months
335
@@ -308,6 +349,7 @@
336
308
349
337
309
    /**
350
    /**
338
310
     * Returns a new dateUnit with specified number of months subtracted
351
     * Returns a new dateUnit with specified number of months subtracted
339
352
     *
340
311
     * @param dateUnit DateUnit representing local year, month, day
353
     * @param dateUnit DateUnit representing local year, month, day
341
312
     * @param months   Months to subtract
354
     * @param months   Months to subtract
342
313
     * @return dateUnit - months
355
     * @return dateUnit - months
343
@@ -316,6 +358,7 @@
344
316
358
345
317
    /**
359
    /**
346
318
     * Returns a new dateUnit with specified number of years added
360
     * Returns a new dateUnit with specified number of years added
347
361
     *
348
319
     * @param dateUnit DateUnit representing local year, month, day
362
     * @param dateUnit DateUnit representing local year, month, day
349
320
     * @param years    Years to add
363
     * @param years    Years to add
350
321
     * @return dateUnit + years
364
     * @return dateUnit + years
351
@@ -324,6 +367,7 @@
352
324
367
353
325
    /**
368
    /**
354
326
     * Returns a new dateUnit with specified number of years subtracted
369
     * Returns a new dateUnit with specified number of years subtracted
355
370
     *
356
327
     * @param dateUnit DateUnit representing local year, month, day
371
     * @param dateUnit DateUnit representing local year, month, day
357
328
     * @param years    Years to subtract
372
     * @param years    Years to subtract
358
329
     * @return dateUnit - years
373
     * @return dateUnit - years
359
330
374
360
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/ChronologyBasedCalendar.java'
361
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/ChronologyBasedCalendar.java	2014-05-12 07:52:08 +0000
362
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/ChronologyBasedCalendar.java	2014-06-05 17:39:07 +0000
363
@@ -47,15 +47,25 @@
364
47
    @Override
47
    @Override
365
48
    public DateUnit toIso( DateUnit dateUnit )
48
    public DateUnit toIso( DateUnit dateUnit )
366
49
    {
49
    {
367
50
        if ( dateUnit.isIso8601() )
368
51
        {
369
52
            return dateUnit;
370
53
        }
371
54
372
50
        DateTime dateTime = dateUnit.toDateTime( chronology );
55
        DateTime dateTime = dateUnit.toDateTime( chronology );
373
51
        dateTime = dateTime.withChronology( ISOChronology.getInstance() );
56
        dateTime = dateTime.withChronology( ISOChronology.getInstance() );
374
52
57
376
53
        return DateUnit.fromDateTime( dateTime );
58
        return new DateUnit( DateUnit.fromDateTime( dateTime ), true );
377
54
    }
59
    }
378
55
60
379
56
    @Override
61
    @Override
380
57
    public DateUnit fromIso( DateUnit dateUnit )
62
    public DateUnit fromIso( DateUnit dateUnit )
381
58
    {
63
    {
382
64
        if ( !dateUnit.isIso8601() )
383
65
        {
384
66
            return dateUnit;
385
67
        }
386
68
387
59
        DateTime dateTime = dateUnit.toDateTime( ISOChronology.getInstance() );
69
        DateTime dateTime = dateUnit.toDateTime( ISOChronology.getInstance() );
388
60
        dateTime = dateTime.withChronology( chronology );
70
        dateTime = dateTime.withChronology( chronology );
389
61
        return DateUnit.fromDateTime( dateTime );
71
        return DateUnit.fromDateTime( dateTime );
390
@@ -204,7 +214,14 @@
391
204
    public int daysInMonth( int year, int month )
214
    public int daysInMonth( int year, int month )
392
205
    {
215
    {
393
206
        DateTime dateTime = new DateTime( year, month, 1, 0, 0, chronology );
216
        DateTime dateTime = new DateTime( year, month, 1, 0, 0, chronology );
395
207
        return (int) dateTime.monthOfYear().toInterval().toDuration().getStandardDays();
217
        return dateTime.dayOfMonth().getMaximumValue();
396
218
    }
397
219
398
220
    @Override
399
221
    public int weeksInYear( int year )
400
222
    {
401
223
        DateTime dateTime = new DateTime( year, 1, 1, 0, 0, chronology );
402
224
        return dateTime.weekOfWeekyear().getMaximumValue();
403
208
    }
225
    }
404
209
226
405
210
    @Override
227
    @Override
406
211
228
407
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateInterval.java'
408
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateInterval.java	2014-04-27 02:45:02 +0000
409
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateInterval.java	2014-06-05 17:39:07 +0000
410
@@ -84,6 +84,30 @@
411
84
    }
84
    }
412
85
85
413
86
    @Override
86
    @Override
414
87
    public boolean equals( Object o )
415
88
    {
416
89
        if ( this == o ) return true;
417
90
        if ( o == null || getClass() != o.getClass() ) return false;
418
91
419
92
        DateInterval that = (DateInterval) o;
420
93
421
94
        if ( from != null ? !from.equals( that.from ) : that.from != null ) return false;
422
95
        if ( to != null ? !to.equals( that.to ) : that.to != null ) return false;
423
96
        if ( type != that.type ) return false;
424
97
425
98
        return true;
426
99
    }
427
100
428
101
    @Override
429
102
    public int hashCode()
430
103
    {
431
104
        int result = from != null ? from.hashCode() : 0;
432
105
        result = 31 * result + (to != null ? to.hashCode() : 0);
433
106
        result = 31 * result + (type != null ? type.hashCode() : 0);
434
107
        return result;
435
108
    }
436
109
437
110
    @Override
438
87
    public String toString()
111
    public String toString()
439
88
    {
112
    {
440
89
        return "DateInterval{" +
113
        return "DateInterval{" +
441
90
114
442
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateTimeUnit.java'
443
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateTimeUnit.java	1970-01-01 00:00:00 +0000
444
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateTimeUnit.java	2014-06-05 17:39:07 +0000
445
@@ -0,0 +1,134 @@
446
1
package org.hisp.dhis.calendar;
447
2
448
3
/*
449
4
 * Copyright (c) 2004-2014, University of Oslo
450
5
 * All rights reserved.
451
6
 *
452
7
 * Redistribution and use in source and binary forms, with or without
453
8
 * modification, are permitted provided that the following conditions are met:
454
9
 * Redistributions of source code must retain the above copyright notice, this
455
10
 * list of conditions and the following disclaimer.
456
11
 *
457
12
 * Redistributions in binary form must reproduce the above copyright notice,
458
13
 * this list of conditions and the following disclaimer in the documentation
459
14
 * and/or other materials provided with the distribution.
460
15
 * Neither the name of the HISP project nor the names of its contributors may
461
16
 * be used to endorse or promote products derived from this software without
462
17
 * specific prior written permission.
463
18
 *
464
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
465
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
466
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
467
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
468
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
469
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
470
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
471
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
472
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
473
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
474
29
 */
475
30
476
31
import org.joda.time.DateTime;
477
32
478
33
import java.util.Date;
479
34
480
35
/**
481
36
 * Simple class that can hold both a TimeUnit and DateUnit which is useful in cases
482
37
 * where we are converting from a DateTime, Jdk Calendar or Jdk Date and don't want to
483
38
 * loose either date or time dimension.
484
39
 *
485
40
 * @author Morten Olav Hansen <mortenoh@gmail.com>
486
41
 * @see DateUnit
487
42
 * @see TimeUnit
488
43
 * @see org.joda.time.DateTime
489
44
 * @see java.util.Calendar
490
45
 * @see java.util.Date
491
46
 */
492
47
public class DateTimeUnit
493
48
{
494
49
    private DateUnit dateUnit;
495
50
496
51
    private TimeUnit timeUnit;
497
52
498
53
    public DateTimeUnit()
499
54
    {
500
55
    }
501
56
502
57
    public DateTimeUnit( DateUnit dateUnit, TimeUnit timeUnit )
503
58
    {
504
59
        this.dateUnit = dateUnit;
505
60
        this.timeUnit = timeUnit;
506
61
    }
507
62
508
63
    public DateUnit getDateUnit()
509
64
    {
510
65
        return dateUnit;
511
66
    }
512
67
513
68
    public void setDateUnit( DateUnit dateUnit )
514
69
    {
515
70
        this.dateUnit = dateUnit;
516
71
    }
517
72
518
73
    public TimeUnit getTimeUnit()
519
74
    {
520
75
        return timeUnit;
521
76
    }
522
77
523
78
    public void setTimeUnit( TimeUnit timeUnit )
524
79
    {
525
80
        this.timeUnit = timeUnit;
526
81
    }
527
82
528
83
    public static DateTimeUnit fromDateTime( DateTime dateTime )
529
84
    {
530
85
        DateUnit dateUnit = DateUnit.fromDateTime( dateTime );
531
86
        TimeUnit timeUnit = TimeUnit.fromDateTime( dateTime );
532
87
533
88
        return new DateTimeUnit( dateUnit, timeUnit );
534
89
    }
535
90
536
91
    public static DateTimeUnit fromJdkCalendar( java.util.Calendar calendar )
537
92
    {
538
93
        DateUnit dateUnit = DateUnit.fromJdkCalendar( calendar );
539
94
        TimeUnit timeUnit = TimeUnit.fromJdkCalendar( calendar );
540
95
541
96
        return new DateTimeUnit( dateUnit, timeUnit );
542
97
    }
543
98
544
99
    public static DateTimeUnit fromJdkDate( Date date )
545
100
    {
546
101
        return fromDateTime( new DateTime( date.getTime() ) );
547
102
    }
548
103
549
104
    @Override
550
105
    public boolean equals( Object o )
551
106
    {
552
107
        if ( this == o ) return true;
553
108
        if ( o == null || getClass() != o.getClass() ) return false;
554
109
555
110
        DateTimeUnit that = (DateTimeUnit) o;
556
111
557
112
        if ( dateUnit != null ? !dateUnit.equals( that.dateUnit ) : that.dateUnit != null ) return false;
558
113
        if ( timeUnit != null ? !timeUnit.equals( that.timeUnit ) : that.timeUnit != null ) return false;
559
114
560
115
        return true;
561
116
    }
562
117
563
118
    @Override
564
119
    public int hashCode()
565
120
    {
566
121
        int result = dateUnit != null ? dateUnit.hashCode() : 0;
567
122
        result = 31 * result + (timeUnit != null ? timeUnit.hashCode() : 0);
568
123
        return result;
569
124
    }
570
125
571
126
    @Override
572
127
    public String toString()
573
128
    {
574
129
        return "DateTimeUnit{" +
575
130
            "dateUnit=" + dateUnit +
576
131
            ", timeUnit=" + timeUnit +
577
132
            '}';
578
133
    }
579
134
}
580
0
135
581
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateUnit.java'
582
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateUnit.java	2014-05-12 16:57:48 +0000
583
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateUnit.java	2014-06-05 17:39:07 +0000
584
@@ -38,9 +38,12 @@
585
38
38
586
39
/**
39
/**
587
40
 * Class representing a specific calendar date.
40
 * Class representing a specific calendar date.
588
41
 *
589
41
 * @author Morten Olav Hansen <mortenoh@gmail.com>
42
 * @author Morten Olav Hansen <mortenoh@gmail.com>
590
42
 * @see DateInterval
43
 * @see DateInterval
591
43
 * @see Calendar
44
 * @see Calendar
592
45
 * @see TimeUnit
593
46
 * @see DateTimeUnit
594
44
 */
47
 */
595
45
public class DateUnit
48
public class DateUnit
596
46
{
49
{
597
@@ -67,29 +70,61 @@
598
67
     */
70
     */
599
68
    int dayOfWeek;
71
    int dayOfWeek;
600
69
72
601
73
    /**
602
74
     * Does dateUnit represent ISO 8601.
603
75
     */
604
76
    final boolean iso8601;
605
77
606
78
    public DateUnit( boolean iso8601 )
607
79
    {
608
80
        this.iso8601 = iso8601;
609
81
    }
610
82
611
70
    public DateUnit()
83
    public DateUnit()
612
71
    {
84
    {
613
85
        this( false );
614
72
    }
86
    }
615
73
87
616
74
    public DateUnit( DateUnit dateUnit )
88
    public DateUnit( DateUnit dateUnit )
617
75
    {
89
    {
622
76
        this.year = dateUnit.getYear();
90
        this( dateUnit.isIso8601() );
623
77
        this.month = dateUnit.getMonth();
91
        this.year = dateUnit.getYear();
624
78
        this.day = dateUnit.getDay();
92
        this.month = dateUnit.getMonth();
625
79
        this.dayOfWeek = dateUnit.getDayOfWeek();
93
        this.day = dateUnit.getDay();
626
94
        this.dayOfWeek = dateUnit.getDayOfWeek();
627
95
    }
628
96
629
97
    public DateUnit( DateUnit dateUnit, boolean iso8601 )
630
98
    {
631
99
        this( iso8601 );
632
100
        this.year = dateUnit.getYear();
633
101
        this.month = dateUnit.getMonth();
634
102
        this.day = dateUnit.getDay();
635
103
        this.dayOfWeek = dateUnit.getDayOfWeek();
636
104
    }
637
105
638
106
    public DateUnit( int year, int month, int day, boolean iso8601 )
639
107
    {
640
108
        this.year = year;
641
109
        this.month = month;
642
110
        this.day = day;
643
111
        this.iso8601 = iso8601;
644
80
    }
112
    }
645
81
113
646
82
    public DateUnit( int year, int month, int day )
114
    public DateUnit( int year, int month, int day )
647
83
    {
115
    {
651
84
        this.year = year;
116
        this( year, month, day, false );
652
85
        this.month = month;
117
    }
653
86
        this.day = day;
118
654
119
    public DateUnit( int year, int month, int day, int dayOfWeek, boolean iso8601 )
655
120
    {
656
121
        this( year, month, day, iso8601 );
657
122
        this.dayOfWeek = dayOfWeek;
658
87
    }
123
    }
659
88
124
660
89
    public DateUnit( int year, int month, int day, int dayOfWeek )
125
    public DateUnit( int year, int month, int day, int dayOfWeek )
661
90
    {
126
    {
664
91
        this( year, month, day );
127
        this( year, month, day, dayOfWeek, false );
663
92
        this.dayOfWeek = dayOfWeek;
665
93
    }
128
    }
666
94
129
667
95
    public int getYear()
130
    public int getYear()
668
@@ -132,8 +167,18 @@
669
132
        this.dayOfWeek = dayOfWeek;
167
        this.dayOfWeek = dayOfWeek;
670
133
    }
168
    }
671
134
169
672
170
    public boolean isIso8601()
673
171
    {
674
172
        return iso8601;
675
173
    }
676
174
677
135
    public DateTime toDateTime()
175
    public DateTime toDateTime()
678
136
    {
176
    {
679
177
        if ( !iso8601 )
680
178
        {
681
179
            throw new RuntimeException( "Cannot convert non-ISO8601 DateUnit to DateTime." );
682
180
        }
683
181
684
137
        return new DateTime( year, month, day, 0, 0, ISOChronology.getInstance() );
182
        return new DateTime( year, month, day, 0, 0, ISOChronology.getInstance() );
685
138
    }
183
    }
686
139
184
687
@@ -144,7 +189,15 @@
688
144
189
689
145
    public java.util.Calendar toJdkCalendar()
190
    public java.util.Calendar toJdkCalendar()
690
146
    {
191
    {
692
147
        return new GregorianCalendar( year, month - 1, day );
192
        if ( !iso8601 )
693
193
        {
694
194
            throw new RuntimeException( "Cannot convert non-ISO8601 DateUnit to JDK Calendar." );
695
195
        }
696
196
697
197
        java.util.Calendar calendar = new GregorianCalendar( year, month - 1, day );
698
198
        calendar.setTime( calendar.getTime() );
699
199
700
200
        return calendar;
701
148
    }
201
    }
702
149
202
703
150
    public Date toJdkDate()
203
    public Date toJdkDate()
704
@@ -160,12 +213,39 @@
705
160
    public static DateUnit fromJdkCalendar( java.util.Calendar calendar )
213
    public static DateUnit fromJdkCalendar( java.util.Calendar calendar )
706
161
    {
214
    {
707
162
        return new DateUnit( calendar.get( java.util.Calendar.YEAR ), calendar.get( java.util.Calendar.MONTH ) + 1,
215
        return new DateUnit( calendar.get( java.util.Calendar.YEAR ), calendar.get( java.util.Calendar.MONTH ) + 1,
709
163
            calendar.get( java.util.Calendar.DAY_OF_MONTH ), calendar.get( java.util.Calendar.DAY_OF_WEEK ) );
216
            calendar.get( java.util.Calendar.DAY_OF_MONTH ), calendar.get( java.util.Calendar.DAY_OF_WEEK ), true );
710
164
    }
217
    }
711
165
218
712
166
    public static DateUnit fromJdkDate( Date date )
219
    public static DateUnit fromJdkDate( Date date )
713
167
    {
220
    {
715
168
        return fromDateTime( new DateTime( date.getTime() ) );
221
        DateUnit dateUnit = fromDateTime( new DateTime( date.getTime() ) );
716
222
        return new DateUnit( dateUnit, true );
717
223
    }
718
224
719
225
    @Override
720
226
    public boolean equals( Object o )
721
227
    {
722
228
        if ( this == o ) return true;
723
229
        if ( o == null || getClass() != o.getClass() ) return false;
724
230
725
231
        DateUnit dateUnit = (DateUnit) o;
726
232
727
233
        if ( day != dateUnit.day ) return false;
728
234
        if ( iso8601 != dateUnit.iso8601 ) return false;
729
235
        if ( month != dateUnit.month ) return false;
730
236
        if ( year != dateUnit.year ) return false;
731
237
732
238
        return true;
733
239
    }
734
240
735
241
    @Override
736
242
    public int hashCode()
737
243
    {
738
244
        int result = year;
739
245
        result = 31 * result + month;
740
246
        result = 31 * result + day;
741
247
        result = 31 * result + (iso8601 ? 1 : 0);
742
248
        return result;
743
169
    }
249
    }
744
170
250
745
171
    @Override
251
    @Override
746
@@ -175,7 +255,7 @@
747
175
            "year=" + year +
255
            "year=" + year +
748
176
            ", month=" + month +
256
            ", month=" + month +
749
177
            ", day=" + day +
257
            ", day=" + day +
751
178
            ", dayOfWeek=" + dayOfWeek +
258
            ", iso8601=" + iso8601 +
752
179
            '}';
259
            '}';
753
180
    }
260
    }
754
181
}
261
}
755
182
262
756
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateUnitPeriodTypeParser.java'
757
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateUnitPeriodTypeParser.java	1970-01-01 00:00:00 +0000
758
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateUnitPeriodTypeParser.java	2014-06-05 17:39:07 +0000
759
@@ -0,0 +1,289 @@
760
1
package org.hisp.dhis.calendar;
761
2
762
3
/*
763
4
 * Copyright (c) 2004-2014, University of Oslo
764
5
 * All rights reserved.
765
6
 *
766
7
 * Redistribution and use in source and binary forms, with or without
767
8
 * modification, are permitted provided that the following conditions are met:
768
9
 * Redistributions of source code must retain the above copyright notice, this
769
10
 * list of conditions and the following disclaimer.
770
11
 *
771
12
 * Redistributions in binary form must reproduce the above copyright notice,
772
13
 * this list of conditions and the following disclaimer in the documentation
773
14
 * and/or other materials provided with the distribution.
774
15
 * Neither the name of the HISP project nor the names of its contributors may
775
16
 * be used to endorse or promote products derived from this software without
776
17
 * specific prior written permission.
777
18
 *
778
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
779
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
780
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
781
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
782
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
783
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
784
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
785
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
786
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
787
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
788
29
 */
789
30
790
31
import com.google.common.collect.Maps;
791
32
import org.hisp.dhis.calendar.impl.Iso8601Calendar;
792
33
793
34
import java.util.Map;
794
35
import java.util.regex.Matcher;
795
36
import java.util.regex.Pattern;
796
37
import java.util.regex.PatternSyntaxException;
797
38
798
39
/**
799
40
 * @author Morten Olav Hansen <mortenoh@gmail.com>
800
41
 */
801
42
public class DateUnitPeriodTypeParser implements PeriodTypeParser
802
43
{
803
44
    private final Map<String, Pattern> compileCache = Maps.newHashMap();
804
45
805
46
    private static CalendarService calendarService;
806
47
807
48
    public static void setCalendarService( CalendarService calendarService )
808
49
    {
809
50
        DateUnitPeriodTypeParser.calendarService = calendarService;
810
51
    }
811
52
812
53
    public static CalendarService getCalendarService()
813
54
    {
814
55
        return calendarService;
815
56
    }
816
57
817
58
    public static org.hisp.dhis.calendar.Calendar getCalendar()
818
59
    {
819
60
        if ( calendarService != null )
820
61
        {
821
62
            return calendarService.getSystemCalendar();
822
63
        }
823
64
824
65
        return Iso8601Calendar.getInstance();
825
66
    }
826
67
827
68
    @Override
828
69
    public DateInterval parse( String period )
829
70
    {
830
71
        DateUnitType type = DateUnitType.find( period );
831
72
832
73
        if ( type == null )
833
74
        {
834
75
            return null;
835
76
        }
836
77
837
78
        if ( compileCache.get( type.getType() ) == null )
838
79
        {
839
80
            try
840
81
            {
841
82
                Pattern pattern = Pattern.compile( type.getFormat() );
842
83
                compileCache.put( type.getType(), pattern );
843
84
            }
844
85
            catch ( PatternSyntaxException ex )
845
86
            {
846
87
                return null;
847
88
            }
848
89
        }
849
90
850
91
        Pattern pattern = compileCache.get( type.getType() );
851
92
        Matcher matcher = pattern.matcher( period );
852
93
        boolean match = matcher.find();
853
94
854
95
        if ( !match )
855
96
        {
856
97
            return null;
857
98
        }
858
99
859
100
        if ( DateUnitType.DAILY.equals( type ) )
860
101
        {
861
102
            int year = Integer.parseInt( matcher.group( 1 ) );
862
103
            int month = Integer.parseInt( matcher.group( 2 ) );
863
104
            int day = Integer.parseInt( matcher.group( 3 ) );
864
105
865
106
            DateUnit dateUnit = new DateUnit( year, month, day );
866
107
            dateUnit.setDayOfWeek( getCalendar().weekday( dateUnit ) );
867
108
868
109
            return new DateInterval( dateUnit, dateUnit );
869
110
        }
870
111
        else if ( DateUnitType.WEEKLY.equals( type ) )
871
112
        {
872
113
            int year = Integer.parseInt( matcher.group( 1 ) );
873
114
            int week = Integer.parseInt( matcher.group( 2 ) );
874
115
875
116
            if ( week < 1 || week > getCalendar().weeksInYear( year ) )
876
117
            {
877
118
                return null;
878
119
            }
879
120
880
121
            DateUnit start = new DateUnit( year, 1, 1 );
881
122
            start = getCalendar().minusDays( start, getCalendar().weekday( start ) - 1 ); // rewind to start of week
882
123
883
124
            // since we rewind to start of week, we might end up in the previous years weeks, so we check and forward if needed
884
125
            if ( getCalendar().isoWeek( start ) == getCalendar().weeksInYear( year ) )
885
126
            {
886
127
                start = getCalendar().plusWeeks( start, 1 );
887
128
            }
888
129
889
130
            start = getCalendar().plusWeeks( start, week - 1 );
890
131
            DateUnit end = new DateUnit( start );
891
132
            end = getCalendar().plusWeeks( end, 1 );
892
133
            end = getCalendar().minusDays( end, 1 );
893
134
894
135
            start.setDayOfWeek( getCalendar().weekday( start ) );
895
136
            end.setDayOfWeek( getCalendar().weekday( end ) );
896
137
897
138
            return new DateInterval( start, end );
898
139
        }
899
140
        else if ( DateUnitType.MONTHLY.equals( type ) )
900
141
        {
901
142
            int year = Integer.parseInt( matcher.group( 1 ) );
902
143
            int month = Integer.parseInt( matcher.group( 2 ) );
903
144
904
145
            DateUnit start = new DateUnit( year, month, 1 );
905
146
            DateUnit end = new DateUnit( year, month, getCalendar().daysInMonth( start.getYear(), start.getMonth() ) );
906
147
907
148
            start.setDayOfWeek( getCalendar().weekday( start ) );
908
149
            end.setDayOfWeek( getCalendar().weekday( end ) );
909
150
910
151
            return new DateInterval( start, end );
911
152
        }
912
153
        else if ( DateUnitType.BI_MONTHLY.equals( type ) )
913
154
        {
914
155
            int year = Integer.parseInt( matcher.group( 1 ) );
915
156
            int month = Integer.parseInt( matcher.group( 2 ) );
916
157
917
158
            DateUnit start = new DateUnit( year, month, 1 );
918
159
            DateUnit end = new DateUnit( start );
919
160
            end = getCalendar().plusMonths( end, 2 );
920
161
            end = getCalendar().minusDays( end, 1 );
921
162
922
163
            start.setDayOfWeek( getCalendar().weekday( start ) );
923
164
            end.setDayOfWeek( getCalendar().weekday( end ) );
924
165
925
166
            return new DateInterval( start, end );
926
167
        }
927
168
        else if ( DateUnitType.QUARTERLY.equals( type ) )
928
169
        {
929
170
            int year = Integer.parseInt( matcher.group( 1 ) );
930
171
            int quarter = Integer.parseInt( matcher.group( 2 ) );
931
172
932
173
            // valid quarters are from 1 - 4
933
174
            if ( quarter < 1 || quarter > 4 )
934
175
            {
935
176
                return null;
936
177
            }
937
178
938
179
            DateUnit start = new DateUnit( year, ((quarter - 1) * 3) + 1, 1 );
939
180
            DateUnit end = new DateUnit( start );
940
181
            end = getCalendar().plusMonths( end, 3 );
941
182
            end = getCalendar().minusDays( end, 1 );
942
183
943
184
            start.setDayOfWeek( getCalendar().weekday( start ) );
944
185
            end.setDayOfWeek( getCalendar().weekday( end ) );
945
186
946
187
            return new DateInterval( start, end );
947
188
        }
948
189
        else if ( DateUnitType.SIX_MONTHLY.equals( type ) )
949
190
        {
950
191
            int year = Integer.parseInt( matcher.group( 1 ) );
951
192
            int semester = Integer.parseInt( matcher.group( 2 ) );
952
193
953
194
            // valid six-monthly are from 1 - 2
954
195
            if ( semester < 1 || semester > 2 )
955
196
            {
956
197
                return null;
957
198
            }
958
199
959
200
            DateUnit start = new DateUnit( year, semester == 1 ? 1 : 7, 1 );
960
201
            DateUnit end = new DateUnit( start );
961
202
            end = getCalendar().plusMonths( end, 6 );
962
203
            end = getCalendar().minusDays( end, 1 );
963
204
964
205
            start.setDayOfWeek( getCalendar().weekday( start ) );
965
206
            end.setDayOfWeek( getCalendar().weekday( end ) );
966
207
967
208
            return new DateInterval( start, end );
968
209
        }
969
210
        else if ( DateUnitType.SIX_MONTHLY_APRIL.equals( type ) )
970
211
        {
971
212
            int year = Integer.parseInt( matcher.group( 1 ) );
972
213
            int semester = Integer.parseInt( matcher.group( 2 ) );
973
214
974
215
            // valid six-monthly are from 1 - 2
975
216
            if ( semester < 1 || semester > 2 )
976
217
            {
977
218
                return null;
978
219
            }
979
220
980
221
            DateUnit start = new DateUnit( year, semester == 1 ? 4 : 10, 1 );
981
222
            DateUnit end = new DateUnit( start );
982
223
            end = getCalendar().plusMonths( end, 6 );
983
224
            end = getCalendar().minusDays( end, 1 );
984
225
985
226
            start.setDayOfWeek( getCalendar().weekday( start ) );
986
227
            end.setDayOfWeek( getCalendar().weekday( end ) );
987
228
988
229
            return new DateInterval( start, end );
989
230
        }
990
231
        else if ( DateUnitType.YEARLY.equals( type ) )
991
232
        {
992
233
            int year = Integer.parseInt( matcher.group( 1 ) );
993
234
994
235
            DateUnit start = new DateUnit( year, 1, 1 );
995
236
            DateUnit end = new DateUnit( year, getCalendar().monthsInYear(),
996
237
                getCalendar().daysInMonth( start.getYear(), getCalendar().monthsInYear() ) );
997
238
998
239
            start.setDayOfWeek( getCalendar().weekday( start ) );
999
240
            end.setDayOfWeek( getCalendar().weekday( end ) );
1000
241
1001
242
            return new DateInterval( start, end );
1002
243
        }
1003
244
        else if ( DateUnitType.FINANCIAL_APRIL.equals( type ) )
1004
245
        {
1005
246
            int year = Integer.parseInt( matcher.group( 1 ) );
1006
247
1007
248
            DateUnit start = new DateUnit( year, 4, 1 );
1008
249
            DateUnit end = new DateUnit( start );
1009
250
            end = getCalendar().plusYears( end, 1 );
1010
251
            end = getCalendar().minusDays( end, 1 );
1011
252
1012
253
            start.setDayOfWeek( getCalendar().weekday( start ) );
1013
254
            end.setDayOfWeek( getCalendar().weekday( end ) );
1014
255
1015
256
            return new DateInterval( start, end );
1016
257
        }
1017
258
        else if ( DateUnitType.FINANCIAL_JULY.equals( type ) )
1018
259
        {
1019
260
            int year = Integer.parseInt( matcher.group( 1 ) );
1020
261
1021
262
            DateUnit start = new DateUnit( year, 7, 1 );
1022
263
            DateUnit end = new DateUnit( start );
1023
264
            end = getCalendar().plusYears( end, 1 );
1024
265
            end = getCalendar().minusDays( end, 1 );
1025
266
1026
267
            start.setDayOfWeek( getCalendar().weekday( start ) );
1027
268
            end.setDayOfWeek( getCalendar().weekday( end ) );
1028
269
1029
270
            return new DateInterval( start, end );
1030
271
        }
1031
272
        else if ( DateUnitType.FINANCIAL_OCTOBER.equals( type ) )
1032
273
        {
1033
274
            int year = Integer.parseInt( matcher.group( 1 ) );
1034
275
1035
276
            DateUnit start = new DateUnit( year, 10, 1 );
1036
277
            DateUnit end = new DateUnit( start );
1037
278
            end = getCalendar().plusYears( end, 1 );
1038
279
            end = getCalendar().minusDays( end, 1 );
1039
280
1040
281
            start.setDayOfWeek( getCalendar().weekday( start ) );
1041
282
            end.setDayOfWeek( getCalendar().weekday( end ) );
1042
283
1043
284
            return new DateInterval( start, end );
1044
285
        }
1045
286
1046
287
        return null;
1047
288
    }
1048
289
}
1049
0
290
1050
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateUnitType.java'
1051
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateUnitType.java	1970-01-01 00:00:00 +0000
1052
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateUnitType.java	2014-06-05 17:39:07 +0000
1053
@@ -0,0 +1,92 @@
1054
1
package org.hisp.dhis.calendar;
1055
2
1056
3
/*
1057
4
 * Copyright (c) 2004-2014, University of Oslo
1058
5
 * All rights reserved.
1059
6
 *
1060
7
 * Redistribution and use in source and binary forms, with or without
1061
8
 * modification, are permitted provided that the following conditions are met:
1062
9
 * Redistributions of source code must retain the above copyright notice, this
1063
10
 * list of conditions and the following disclaimer.
1064
11
 *
1065
12
 * Redistributions in binary form must reproduce the above copyright notice,
1066
13
 * this list of conditions and the following disclaimer in the documentation
1067
14
 * and/or other materials provided with the distribution.
1068
15
 * Neither the name of the HISP project nor the names of its contributors may
1069
16
 * be used to endorse or promote products derived from this software without
1070
17
 * specific prior written permission.
1071
18
 *
1072
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
1073
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
1074
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
1075
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
1076
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
1077
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
1078
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
1079
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1080
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
1081
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1082
29
 */
1083
30
1084
31
import org.hisp.dhis.period.BiMonthlyPeriodType;
1085
32
import org.hisp.dhis.period.DailyPeriodType;
1086
33
import org.hisp.dhis.period.FinancialAprilPeriodType;
1087
34
import org.hisp.dhis.period.FinancialJulyPeriodType;
1088
35
import org.hisp.dhis.period.FinancialOctoberPeriodType;
1089
36
import org.hisp.dhis.period.MonthlyPeriodType;
1090
37
import org.hisp.dhis.period.QuarterlyPeriodType;
1091
38
import org.hisp.dhis.period.SixMonthlyAprilPeriodType;
1092
39
import org.hisp.dhis.period.SixMonthlyPeriodType;
1093
40
import org.hisp.dhis.period.WeeklyPeriodType;
1094
41
import org.hisp.dhis.period.YearlyPeriodType;
1095
42
1096
43
/**
1097
44
 * @author Morten Olav Hansen <mortenoh@gmail.com>
1098
45
 */
1099
46
public enum DateUnitType
1100
47
{
1101
48
    DAILY( DailyPeriodType.NAME, "\\b(\\d{4})(\\d{2})(\\d{2})\\b" ),
1102
49
    WEEKLY( WeeklyPeriodType.NAME, "\\b(\\d{4})W(\\d[\\d]?)\\b" ),
1103
50
    MONTHLY( MonthlyPeriodType.NAME, "\\b(\\d{4})[-]?(\\d{2})\\b" ),
1104
51
    BI_MONTHLY( BiMonthlyPeriodType.NAME, "\\b(\\d{4})(\\d{2})B\\b" ),
1105
52
    QUARTERLY( QuarterlyPeriodType.NAME, "\\b(\\d{4})Q(\\d)\\b" ),
1106
53
    SIX_MONTHLY( SixMonthlyPeriodType.NAME, "\\b(\\d{4})S(\\d)\\b" ),
1107
54
    SIX_MONTHLY_APRIL( SixMonthlyAprilPeriodType.NAME, "\\b(\\d{4})AprilS(\\d)\\b" ),
1108
55
    YEARLY( YearlyPeriodType.NAME, "\\b(\\d{4})\\b" ),
1109
56
    FINANCIAL_APRIL( FinancialAprilPeriodType.NAME, "\\b(\\d{4})April\\b" ),
1110
57
    FINANCIAL_JULY( FinancialJulyPeriodType.NAME, "\\b(\\d{4})July\\b" ),
1111
58
    FINANCIAL_OCTOBER( FinancialOctoberPeriodType.NAME, "\\b(\\d{4})Oct\\b" );
1112
59
1113
60
    private final String type;
1114
61
1115
62
    private final String format;
1116
63
1117
64
    public String getType()
1118
65
    {
1119
66
        return type;
1120
67
    }
1121
68
1122
69
    public String getFormat()
1123
70
    {
1124
71
        return format;
1125
72
    }
1126
73
1127
74
    DateUnitType( String type, String format )
1128
75
    {
1129
76
        this.type = type;
1130
77
        this.format = format;
1131
78
    }
1132
79
1133
80
    public static DateUnitType find( String format )
1134
81
    {
1135
82
        for ( DateUnitType type : DateUnitType.values() )
1136
83
        {
1137
84
            if ( format.matches( type.format ) )
1138
85
            {
1139
86
                return type;
1140
87
            }
1141
88
        }
1142
89
1143
90
        return null;
1144
91
    }
1145
92
}
1146
0
93
1147
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/PeriodTypeParser.java'
1148
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/PeriodTypeParser.java	1970-01-01 00:00:00 +0000
1149
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/PeriodTypeParser.java	2014-06-05 17:39:07 +0000
1150
@@ -0,0 +1,37 @@
1151
1
package org.hisp.dhis.calendar;
1152
2
1153
3
/*
1154
4
 * Copyright (c) 2004-2014, University of Oslo
1155
5
 * All rights reserved.
1156
6
 *
1157
7
 * Redistribution and use in source and binary forms, with or without
1158
8
 * modification, are permitted provided that the following conditions are met:
1159
9
 * Redistributions of source code must retain the above copyright notice, this
1160
10
 * list of conditions and the following disclaimer.
1161
11
 *
1162
12
 * Redistributions in binary form must reproduce the above copyright notice,
1163
13
 * this list of conditions and the following disclaimer in the documentation
1164
14
 * and/or other materials provided with the distribution.
1165
15
 * Neither the name of the HISP project nor the names of its contributors may
1166
16
 * be used to endorse or promote products derived from this software without
1167
17
 * specific prior written permission.
1168
18
 *
1169
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
1170
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
1171
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
1172
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
1173
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
1174
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
1175
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
1176
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1177
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
1178
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1179
29
 */
1180
30
1181
31
/**
1182
32
 * @author Morten Olav Hansen <mortenoh@gmail.com>
1183
33
 */
1184
34
public interface PeriodTypeParser
1185
35
{
1186
36
    public DateInterval parse( String period );
1187
37
}
1188
0
38
1189
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/TimeUnit.java'
1190
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/TimeUnit.java	1970-01-01 00:00:00 +0000
1191
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/TimeUnit.java	2014-06-05 17:39:07 +0000
1192
@@ -0,0 +1,154 @@
1193
1
package org.hisp.dhis.calendar;
1194
2
1195
3
/*
1196
4
 * Copyright (c) 2004-2014, University of Oslo
1197
5
 * All rights reserved.
1198
6
 *
1199
7
 * Redistribution and use in source and binary forms, with or without
1200
8
 * modification, are permitted provided that the following conditions are met:
1201
9
 * Redistributions of source code must retain the above copyright notice, this
1202
10
 * list of conditions and the following disclaimer.
1203
11
 *
1204
12
 * Redistributions in binary form must reproduce the above copyright notice,
1205
13
 * this list of conditions and the following disclaimer in the documentation
1206
14
 * and/or other materials provided with the distribution.
1207
15
 * Neither the name of the HISP project nor the names of its contributors may
1208
16
 * be used to endorse or promote products derived from this software without
1209
17
 * specific prior written permission.
1210
18
 *
1211
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
1212
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
1213
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
1214
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
1215
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
1216
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
1217
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
1218
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1219
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
1220
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1221
29
 */
1222
30
1223
31
import org.joda.time.DateTime;
1224
32
1225
33
import java.util.Calendar;
1226
34
import java.util.Date;
1227
35
1228
36
/**
1229
37
 * Simple class to hold information about time, can be used together with DateUnit to form
1230
38
 * a DateTimeUnit which holds both date and time information. Useful in cases where converting
1231
39
 * from a JDK Date/Calendar and you don't want to loose the time dimension.
1232
40
 *
1233
41
 * @author Morten Olav Hansen <mortenoh@gmail.com>
1234
42
 * @see DateUnit
1235
43
 * @see DateTimeUnit
1236
44
 */
1237
45
public class TimeUnit
1238
46
{
1239
47
    /**
1240
48
     * Hour of day, range is 1 - 24.
1241
49
     */
1242
50
    private int hour;
1243
51
1244
52
    /**
1245
53
     * Minute of day, range is 0 - 59.
1246
54
     */
1247
55
    private int minute;
1248
56
1249
57
    /**
1250
58
     * Second of day, range is 0 - 59.
1251
59
     */
1252
60
    private int second;
1253
61
1254
62
    public TimeUnit()
1255
63
    {
1256
64
    }
1257
65
1258
66
    public TimeUnit( int hour, int minute, int second )
1259
67
    {
1260
68
        this.hour = hour;
1261
69
        this.minute = minute;
1262
70
        this.second = second;
1263
71
    }
1264
72
1265
73
    public int getHour()
1266
74
    {
1267
75
        return hour;
1268
76
    }
1269
77
1270
78
    public void setHour( int hour )
1271
79
    {
1272
80
        this.hour = hour;
1273
81
    }
1274
82
1275
83
    public int getMinute()
1276
84
    {
1277
85
        return minute;
1278
86
    }
1279
87
1280
88
    public void setMinute( int minute )
1281
89
    {
1282
90
        this.minute = minute;
1283
91
    }
1284
92
1285
93
    public int getSecond()
1286
94
    {
1287
95
        return second;
1288
96
    }
1289
97
1290
98
    public void setSecond( int second )
1291
99
    {
1292
100
        this.second = second;
1293
101
    }
1294
102
1295
103
    public static TimeUnit fromDateTime( DateTime dateTime )
1296
104
    {
1297
105
        return new TimeUnit( dateTime.getHourOfDay(), dateTime.getMinuteOfHour(), dateTime.getSecondOfMinute() );
1298
106
    }
1299
107
1300
108
    public static TimeUnit fromJdkCalendar( Calendar calendar )
1301
109
    {
1302
110
        int amPm = calendar.get( Calendar.AM_PM );
1303
111
1304
112
        return new TimeUnit( calendar.get( Calendar.HOUR ) + (amPm * 12), calendar.get( Calendar.MINUTE ),
1305
113
            calendar.get( Calendar.SECOND ) );
1306
114
    }
1307
115
1308
116
    public static TimeUnit fromJdkDate( Date date )
1309
117
    {
1310
118
        return fromDateTime( new DateTime( date.getTime() ) );
1311
119
    }
1312
120
1313
121
    @Override
1314
122
    public boolean equals( Object o )
1315
123
    {
1316
124
        if ( this == o ) return true;
1317
125
        if ( o == null || getClass() != o.getClass() ) return false;
1318
126
1319
127
        TimeUnit timeUnit = (TimeUnit) o;
1320
128
1321
129
        if ( hour != timeUnit.hour ) return false;
1322
130
        if ( minute != timeUnit.minute ) return false;
1323
131
        if ( second != timeUnit.second ) return false;
1324
132
1325
133
        return true;
1326
134
    }
1327
135
1328
136
    @Override
1329
137
    public int hashCode()
1330
138
    {
1331
139
        int result = hour;
1332
140
        result = 31 * result + minute;
1333
141
        result = 31 * result + second;
1334
142
        return result;
1335
143
    }
1336
144
1337
145
    @Override
1338
146
    public String toString()
1339
147
    {
1340
148
        return "TimeUnit{" +
1341
149
            "hour=" + hour +
1342
150
            ", minute=" + minute +
1343
151
            ", second=" + second +
1344
152
            '}';
1345
153
    }
1346
154
}
1347
0
155
1348
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/NepaliCalendar.java'
1349
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/NepaliCalendar.java	2014-05-12 07:52:08 +0000
1350
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/NepaliCalendar.java	2014-06-05 17:39:07 +0000
1351
@@ -49,7 +49,7 @@
1352
49
{
49
{
1353
50
    private static final DateUnit startNepal = new DateUnit( 2000, 1, 1, java.util.Calendar.WEDNESDAY );
50
    private static final DateUnit startNepal = new DateUnit( 2000, 1, 1, java.util.Calendar.WEDNESDAY );
1354
51
51
1356
52
    private static final DateUnit startIso = new DateUnit( 1943, 4, 14, java.util.Calendar.WEDNESDAY );
52
    private static final DateUnit startIso = new DateUnit( 1943, 4, 14, java.util.Calendar.WEDNESDAY, true );
1357
53
53
1358
54
    private static final Calendar self = new NepaliCalendar();
54
    private static final Calendar self = new NepaliCalendar();
1359
55
55
1360
@@ -85,7 +85,7 @@
1361
85
85
1362
86
        dateTime = dateTime.plusDays( totalDays );
86
        dateTime = dateTime.plusDays( totalDays );
1363
87
87
1365
88
        return DateUnit.fromDateTime( dateTime );
88
        return new DateUnit( DateUnit.fromDateTime( dateTime ), true );
1366
89
    }
89
    }
1367
90
90
1368
91
    @Override
91
    @Override
1369
@@ -219,6 +219,13 @@
1370
219
    }
219
    }
1371
220
220
1372
221
    @Override
221
    @Override
1373
222
    public int weeksInYear( int year )
1374
223
    {
1375
224
        DateTime dateTime = new DateTime( year, 1, 1, 0, 0, ISOChronology.getInstance() );
1376
225
        return dateTime.weekOfWeekyear().getMaximumValue();
1377
226
    }
1378
227
1379
228
    @Override
1380
222
    public int isoWeek( DateUnit dateUnit )
229
    public int isoWeek( DateUnit dateUnit )
1381
223
    {
230
    {
1382
224
        DateTime dateTime = toIso( dateUnit ).toDateTime( ISOChronology.getInstance() );
231
        DateTime dateTime = toIso( dateUnit ).toDateTime( ISOChronology.getInstance() );
1383
225
232
1384
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AuditLogUtil.java'
1385
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AuditLogUtil.java	2014-03-18 08:10:10 +0000
1386
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AuditLogUtil.java	2014-06-05 17:39:07 +0000
1387
@@ -28,6 +28,7 @@
1388
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1389
29
 */
29
 */
1390
30
30
1391
31
import javassist.util.proxy.ProxyFactory;
1392
31
import org.apache.commons.logging.Log;
32
import org.apache.commons.logging.Log;
1393
32
33
1394
33
public class AuditLogUtil
34
public class AuditLogUtil
1395
@@ -52,7 +53,15 @@
1396
52
                StringBuilder builder = new StringBuilder();
53
                StringBuilder builder = new StringBuilder();
1397
53
54
1398
54
                builder.append( "'" ).append( username ).append( "' " ).append( action );
55
                builder.append( "'" ).append( username ).append( "' " ).append( action );
1400
55
                builder.append( " " ).append( object.getClass().getName() );
56
1401
57
                if ( !ProxyFactory.isProxyClass( object.getClass() ) )
1402
58
                {
1403
59
                    builder.append( " " ).append( object.getClass().getName() );
1404
60
                }
1405
61
                else
1406
62
                {
1407
63
                    builder.append( " " ).append( object.getClass().getSuperclass().getName() );
1408
64
                }
1409
56
65
1410
57
                if ( idObject.getName() != null && !idObject.getName().isEmpty() )
66
                if ( idObject.getName() != null && !idObject.getName().isEmpty() )
1411
58
                {
67
                {
1412
59
68
1413
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionService.java'
1414
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionService.java	2014-03-18 08:10:10 +0000
1415
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionService.java	2014-06-05 17:39:07 +0000
1416
@@ -30,6 +30,8 @@
1417
30
30
1418
31
import java.util.List;
31
import java.util.List;
1419
32
32
1420
33
import org.hisp.dhis.user.User;
1421
34
1422
33
/**
35
/**
1423
34
 * @author Lars Helge Overland
36
 * @author Lars Helge Overland
1424
35
 */
37
 */
1425
@@ -39,9 +41,13 @@
1426
39
    
41
    
1427
40
    List<NameableObject> getCanReadDimensionItems( String uid );
42
    List<NameableObject> getCanReadDimensionItems( String uid );
1428
41
    
43
    
1429
44
    <T extends IdentifiableObject> List<T> filterCanRead( User user, List<T> objects );
1430
45
    
1431
42
    DimensionType getDimensionType( String uid );
46
    DimensionType getDimensionType( String uid );
1432
43
    
47
    
1433
44
    List<DimensionalObject> getAllDimensions();
48
    List<DimensionalObject> getAllDimensions();
1434
45
    
49
    
1435
50
    List<DimensionalObject> getDimensionConstraints();
1436
51
    
1437
46
    void mergeAnalyticalObject( BaseAnalyticalObject object );
52
    void mergeAnalyticalObject( BaseAnalyticalObject object );
1438
47
}
53
}
1439
48
54
1440
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ListMap.java'
1441
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ListMap.java	2014-03-18 08:10:10 +0000
1442
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ListMap.java	2014-06-05 17:39:07 +0000
1443
@@ -31,6 +31,7 @@
1444
31
import java.util.ArrayList;
31
import java.util.ArrayList;
1445
32
import java.util.HashMap;
32
import java.util.HashMap;
1446
33
import java.util.List;
33
import java.util.List;
1447
34
import java.util.Map;
1448
34
35
1449
35
/**
36
/**
1450
36
 * @author Lars Helge Overland
37
 * @author Lars Helge Overland
1451
@@ -38,6 +39,11 @@
1452
38
public class ListMap<T, V>
39
public class ListMap<T, V>
1453
39
    extends HashMap<T, List<V>>
40
    extends HashMap<T, List<V>>
1454
40
{
41
{
1455
42
    /**
1456
43
     * Determines if a de-serialized file is compatible with this class.
1457
44
     */
1458
45
    private static final long serialVersionUID = 4880664228933342003L;
1459
46
1460
41
    public ListMap()
47
    public ListMap()
1461
42
    {
48
    {
1462
43
        super();
49
        super();
1463
@@ -56,4 +62,12 @@
1464
56
        super.put( key, list );        
62
        super.put( key, list );        
1465
57
        return null;
63
        return null;
1466
58
    }
64
    }
1467
65
1468
66
    public void putValueMap( Map<T, V> map )
1469
67
    {
1470
68
        for ( Map.Entry<T, V> entry : map.entrySet() )
1471
69
        {
1472
70
            putValue( entry.getKey(), entry.getValue() );
1473
71
        }
1474
72
    }
1475
59
}
73
}
1476
60
74
1477
=== renamed file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/MapMap.java' => 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/MapMap.java'
1478
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/MapMap.java	2014-03-18 08:10:10 +0000
1479
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/MapMap.java	2014-06-05 17:39:07 +0000
1480
@@ -1,4 +1,4 @@
1482
1
package org.hisp.dhis.system.util;
1
package org.hisp.dhis.common;
1483
2
2
1484
3
/*
3
/*
1485
4
 * Copyright (c) 2004-2014, University of Oslo
4
 * Copyright (c) 2004-2014, University of Oslo
1486
@@ -52,4 +52,9 @@
1487
52
        map.putAll( m );
52
        map.putAll( m );
1488
53
        this.put( key, map );
53
        this.put( key, map );
1489
54
    }
54
    }
1490
55
1491
56
    public V getValue( T key, U valueKey )
1492
57
    {
1493
58
        return this.get( key ) == null ? null : this.get( key ).get( valueKey );
1494
59
    }
1495
55
}
60
}
1496
56
61
1497
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SetMap.java'
1498
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SetMap.java	2014-03-18 08:10:10 +0000
1499
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SetMap.java	2014-06-05 17:39:07 +0000
1500
@@ -55,4 +55,11 @@
1501
55
        set.add( value );
55
        set.add( value );
1502
56
        return super.put( key, set );
56
        return super.put( key, set );
1503
57
    }
57
    }
1504
58
1505
59
    public Set<V> getSet( T key )
1506
60
    {
1507
61
        Set<V> set = this.get( key );
1508
62
        set = set == null ? new HashSet<V>() : set;
1509
63
        return super.put( key, set );
1510
64
    }
1511
58
}
65
}
1512
59
66
1513
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java'
1514
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java	2014-04-25 11:22:12 +0000
1515
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java	2014-06-05 17:39:07 +0000
1516
@@ -28,6 +28,7 @@
1517
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1518
29
 */
29
 */
1519
30
30
1520
31
import java.util.Date;
1521
31
import java.util.HashSet;
32
import java.util.HashSet;
1522
32
import java.util.Set;
33
import java.util.Set;
1523
33
34
1524
@@ -59,6 +60,10 @@
1525
59
60
1526
60
    public static final String DEFAULT_NAME = "default";
61
    public static final String DEFAULT_NAME = "default";
1527
61
62
1528
63
    private Date startDate;
1529
64
1530
65
    private Date endDate;
1531
66
1532
62
    private Set<DataElementCategory> categories = new HashSet<DataElementCategory>();
67
    private Set<DataElementCategory> categories = new HashSet<DataElementCategory>();
1533
63
68
1534
64
    @Scanned
69
    @Scanned
1535
@@ -152,6 +157,30 @@
1536
152
    }
157
    }
1537
153
158
1538
154
    @JsonProperty
159
    @JsonProperty
1539
160
    @JsonView( {DetailedView.class } )
1540
161
    public Date getStartDate()
1541
162
    {
1542
163
        return startDate;
1543
164
    }
1544
165
1545
166
    public void setStartDate( Date startDate )
1546
167
    {
1547
168
        this.startDate = startDate;
1548
169
    }
1549
170
1550
171
    @JsonProperty
1551
172
    @JsonView( {DetailedView.class } )
1552
173
    public Date getEndDate()
1553
174
    {
1554
175
        return endDate;
1555
176
    }
1556
177
1557
178
    public void setEndDate( Date endDate )
1558
179
    {
1559
180
        this.endDate = endDate;
1560
181
    }
1561
182
1562
183
    @JsonProperty
1563
155
    @JsonSerialize(contentAs = BaseIdentifiableObject.class)
184
    @JsonSerialize(contentAs = BaseIdentifiableObject.class)
1564
156
    @JsonView({ DetailedView.class })
185
    @JsonView({ DetailedView.class })
1565
157
    @JacksonXmlElementWrapper(localName = "categories", namespace = DxfNamespaces.DXF_2_0)
186
    @JacksonXmlElementWrapper(localName = "categories", namespace = DxfNamespaces.DXF_2_0)
1566
158
187
1567
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java'
1568
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java	2014-04-17 14:19:13 +0000
1569
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java	2014-06-05 17:39:07 +0000
1570
@@ -30,9 +30,12 @@
1571
30
30
1572
31
import java.util.Collection;
31
import java.util.Collection;
1573
32
import java.util.Date;
32
import java.util.Date;
1575
33
import java.util.Map;
33
import java.util.Set;
1576
34
34
1577
35
import org.hisp.dhis.common.MapMap;
1578
36
import org.hisp.dhis.dataelement.CategoryOptionGroup;
1579
35
import org.hisp.dhis.dataelement.DataElement;
37
import org.hisp.dhis.dataelement.DataElement;
1580
38
import org.hisp.dhis.dataelement.DataElementCategoryOption;
1581
36
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
39
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
1582
37
import org.hisp.dhis.dataelement.DataElementOperand;
40
import org.hisp.dhis.dataelement.DataElementOperand;
1583
38
import org.hisp.dhis.organisationunit.OrganisationUnit;
41
import org.hisp.dhis.organisationunit.OrganisationUnit;
1584
@@ -296,33 +299,26 @@
1585
296
     * @return the number of DataValues.
299
     * @return the number of DataValues.
1586
297
     */
300
     */
1587
298
    int getDataValueCount( int days );
301
    int getDataValueCount( int days );
1588
299
    
1589
300
    /**
1590
301
     * Returns a map of values indexed by DataElementOperand.
1591
302
     * 
1592
303
     * @param dataElements collection of DataElements to fetch for
1593
304
     * @param period period for which to fetch the values
1594
305
     * @param unit OrganisationUnit for which to fetch the values
1595
306
     * @return
1596
307
     */
1597
308
    Map<DataElementOperand, Double> getDataValueMap( Collection<DataElement> dataElements, Period period, OrganisationUnit source );
1598
309
302
1599
310
    /**
303
    /**
1602
311
     * Returns a map of values indexed by DataElementOperand.
304
     * Returns a map of values for each attribute option combo found.
1603
312
     * 
305
     * <p>
1604
313
     * In the (unlikely) event that the same dataElement/optionCombo is found in
306
     * In the (unlikely) event that the same dataElement/optionCombo is found in
1608
314
     * more than one period for the same organisationUnit and date, the value
307
     * more than one period for the same organisationUnit, date, and attribute
1609
315
     * is returned from the period with the shortest duration.
308
     * combo, the value is returned from the period with the shortest duration.
1610
316
     * 
309
     *
1611
317
     * @param dataElements collection of DataElements to fetch for
310
     * @param dataElements collection of DataElements to fetch for
1612
318
     * @param date date which must be present in the period
311
     * @param date date which must be present in the period
1614
319
     * @param unit OrganisationUnit for which to fetch the values
312
     * @param source OrganisationUnit for which to fetch the values
1615
320
     * @param periodTypes allowable period types in which to find the data
313
     * @param periodTypes allowable period types in which to find the data
1616
314
     * @param attributeCombo the attribute combo to check (if restricted)
1617
321
     * @param lastUpdatedMap map in which to return the lastUpdated date for each value
315
     * @param lastUpdatedMap map in which to return the lastUpdated date for each value
1619
322
     * @return
316
     * @return map of values by attribute option combo id, then DataElementOperand
1620
323
     */
317
     */
1623
324
    Map<DataElementOperand, Double> getDataValueMap( Collection<DataElement> dataElements, Date date, OrganisationUnit source,
318
    MapMap<Integer, DataElementOperand, Double> getDataValueMapByAttributeCombo( Collection<DataElement> dataElements, Date date,
1624
325
    		Collection<PeriodType> periodTypes, Map<DataElementOperand, Date> lastUpdatedMap );
319
            OrganisationUnit source, Collection<PeriodType> periodTypes, DataElementCategoryOptionCombo attributeCombo,
1625
320
            Set<CategoryOptionGroup> cogDimensionConstraints, Set<DataElementCategoryOption> coDimensionConstraints,
1626
321
            MapMap<Integer, DataElementOperand, Date> lastUpdatedMap );
1627
326
322
1628
327
    /**
323
    /**
1629
328
     * Gets a Collection of DeflatedDataValues.
324
     * Gets a Collection of DeflatedDataValues.
1630
329
325
1631
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueStore.java'
1632
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueStore.java	2014-03-18 08:10:10 +0000
1633
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueStore.java	2014-06-05 17:39:07 +0000
1634
@@ -30,9 +30,12 @@
1635
30
30
1636
31
import java.util.Collection;
31
import java.util.Collection;
1637
32
import java.util.Date;
32
import java.util.Date;
1639
33
import java.util.Map;
33
import java.util.Set;
1640
34
34
1641
35
import org.hisp.dhis.common.MapMap;
1642
36
import org.hisp.dhis.dataelement.CategoryOptionGroup;
1643
35
import org.hisp.dhis.dataelement.DataElement;
37
import org.hisp.dhis.dataelement.DataElement;
1644
38
import org.hisp.dhis.dataelement.DataElementCategoryOption;
1645
36
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
39
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
1646
37
import org.hisp.dhis.dataelement.DataElementOperand;
40
import org.hisp.dhis.dataelement.DataElementOperand;
1647
38
import org.hisp.dhis.organisationunit.OrganisationUnit;
41
import org.hisp.dhis.organisationunit.OrganisationUnit;
1648
@@ -229,19 +232,19 @@
1649
229
     * collection of Periods, and collection of Sources.
232
     * collection of Periods, and collection of Sources.
1650
230
     * 
233
     * 
1651
231
     * @param dataElement the DataElements of the DataValues.
234
     * @param dataElement the DataElements of the DataValues.
1653
232
     * @param optionCombo the DataElementCategoryOptionCombo of the DataValues.
235
     * @param categoryOptionCombo the DataElementCategoryOptionCombo of the DataValues.
1654
233
     * @param periods the Periods of the DataValues.
236
     * @param periods the Periods of the DataValues.
1655
234
     * @param sources the Sources of the DataValues.
237
     * @param sources the Sources of the DataValues.
1656
235
     * @return a collection of all DataValues which match the given DataElement,
238
     * @return a collection of all DataValues which match the given DataElement,
1657
236
     *         Periods, and Sources.
239
     *         Periods, and Sources.
1658
237
     */
240
     */
1660
238
    Collection<DataValue> getDataValues( DataElement dataElement, DataElementCategoryOptionCombo categoryOptionCombos, 
241
    Collection<DataValue> getDataValues( DataElement dataElement, DataElementCategoryOptionCombo categoryOptionCombo,
1661
239
        Collection<Period> periods, Collection<OrganisationUnit> sources );
242
        Collection<Period> periods, Collection<OrganisationUnit> sources );
1662
240
    
243
    
1663
241
    /**
244
    /**
1664
242
     * Returns all DataValues for a given collection of DataElementCategoryOptionCombos.
245
     * Returns all DataValues for a given collection of DataElementCategoryOptionCombos.
1665
243
     * 
246
     * 
1667
244
     * @param optionCombos the DataElementCategoryOptionCombos of the DataValue.
247
     * @param categoryOptionCombos the DataElementCategoryOptionCombos of the DataValue.
1668
245
     * @return a collection of all DataValues which match the given collection of
248
     * @return a collection of all DataValues which match the given collection of
1669
246
     *         DataElementCategoryOptionCombos.
249
     *         DataElementCategoryOptionCombos.
1670
247
     */
250
     */
1671
@@ -273,34 +276,26 @@
1672
273
     * @return the number of DataValues.
276
     * @return the number of DataValues.
1673
274
     */
277
     */
1674
275
    int getDataValueCount( Date date );
278
    int getDataValueCount( Date date );
1675
276
    
1676
277
    /**
1677
278
     * Returns a map of values indexed by DataElementOperand.
1678
279
     * 
1679
280
     * @param dataElements collection of DataElements to fetch for
1680
281
     * @param period period for which to fetch the values
1681
282
     * @param unit OrganisationUnit for which to fetch the values
1682
283
     * @param lastUpdatedMap optional map in which to return the lastUpdated date for each value
1683
284
     * @return
1684
285
     */
1685
286
    Map<DataElementOperand, Double> getDataValueMap( Collection<DataElement> dataElements, Period period, OrganisationUnit source );
1686
287
279
1687
288
    /**
280
    /**
1690
289
     * Returns a map of values indexed by DataElementOperand.
281
     * Returns a map of values for each attribute option combo found.
1691
290
     * 
282
     * <p>
1692
291
     * In the (unlikely) event that the same dataElement/optionCombo is found in
283
     * In the (unlikely) event that the same dataElement/optionCombo is found in
1695
292
     * more than one period for the same organisationUnit and date, the value
284
     * more than one period for the same organisationUnit, date, and attribute
1696
293
     * is returned from the period with the shortest duration.
285
     * combo, the value is returned from the period with the shortest duration.
1697
294
     * 
286
     * 
1698
295
     * @param dataElements collection of DataElements to fetch for
287
     * @param dataElements collection of DataElements to fetch for
1699
296
     * @param date date which must be present in the period
288
     * @param date date which must be present in the period
1701
297
     * @param unit OrganisationUnit for which to fetch the values
289
     * @param source OrganisationUnit for which to fetch the values
1702
298
     * @param periodTypes allowable period types in which to find the data
290
     * @param periodTypes allowable period types in which to find the data
1703
291
     * @param attributeCombo the attribute combo to check (if restricted)
1704
299
     * @param lastUpdatedMap map in which to return the lastUpdated date for each value
292
     * @param lastUpdatedMap map in which to return the lastUpdated date for each value
1706
300
     * @return
293
     * @return map of values by attribute option combo id, then DataElementOperand
1707
301
     */
294
     */
1710
302
    Map<DataElementOperand, Double> getDataValueMap( Collection<DataElement> dataElements, Date date, OrganisationUnit source,
295
    public MapMap<Integer, DataElementOperand, Double> getDataValueMapByAttributeCombo( Collection<DataElement> dataElements, Date date,
1711
303
    		Collection<PeriodType> periodTypes, Map<DataElementOperand, Date> lastUpdatedMap );
296
        OrganisationUnit source, Collection<PeriodType> periodTypes, DataElementCategoryOptionCombo attributeCombo,
1712
297
        Set<CategoryOptionGroup> cogDimensionConstraints, Set<DataElementCategoryOption> coDimensionConstraints,
1713
298
        MapMap<Integer, DataElementOperand, Date> lastUpdatedMap );
1714
304
    
299
    
1715
305
    /**
300
    /**
1716
306
     * Gets a Collection of DeflatedDataValues.
301
     * Gets a Collection of DeflatedDataValues.
1717
307
302
1718
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventreport/EventReport.java'
1719
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventreport/EventReport.java	2014-05-12 23:03:35 +0000
1720
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventreport/EventReport.java	2014-06-05 17:39:07 +0000
1721
@@ -28,10 +28,11 @@
1722
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1723
29
 */
29
 */
1724
30
30
1729
31
import java.util.ArrayList;
31
import com.fasterxml.jackson.annotation.JsonProperty;
1730
32
import java.util.Date;
32
import com.fasterxml.jackson.annotation.JsonView;
1731
33
import java.util.List;
33
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
1732
34
34
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
1733
35
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
1734
35
import org.hisp.dhis.common.BaseAnalyticalObject;
36
import org.hisp.dhis.common.BaseAnalyticalObject;
1735
36
import org.hisp.dhis.common.BaseIdentifiableObject;
37
import org.hisp.dhis.common.BaseIdentifiableObject;
1736
37
import org.hisp.dhis.common.DxfNamespaces;
38
import org.hisp.dhis.common.DxfNamespaces;
1737
@@ -45,11 +46,9 @@
1738
45
import org.hisp.dhis.program.ProgramStage;
46
import org.hisp.dhis.program.ProgramStage;
1739
46
import org.hisp.dhis.user.User;
47
import org.hisp.dhis.user.User;
1740
47
48
1746
48
import com.fasterxml.jackson.annotation.JsonProperty;
49
import java.util.ArrayList;
1747
49
import com.fasterxml.jackson.annotation.JsonView;
50
import java.util.Date;
1748
50
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
51
import java.util.List;
1744
51
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
1745
52
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
1749
53
52
1750
54
/**
53
/**
1751
55
 * @author Lars Helge Overland
54
 * @author Lars Helge Overland
1752
@@ -183,39 +182,6 @@
1753
183
        }
182
        }
1754
184
    }
183
    }
1755
185
184
1756
186
    @Override
1757
187
    public void mergeWith( IdentifiableObject other )
1758
188
    {
1759
189
        super.mergeWith( other );
1760
190
1761
191
        if ( other.getClass().isInstance( this ) )
1762
192
        {
1763
193
            EventReport report = (EventReport) other;
1764
194
1765
195
            dataType = report.getDataType();
1766
196
            program = report.getProgram();
1767
197
            programStage = report.getProgramStage();
1768
198
            startDate = report.getStartDate();
1769
199
            endDate = report.getEndDate();
1770
200
            totals = report.isTotals();
1771
201
            subtotals = report.isSubtotals();
1772
202
            hideEmptyRows = report.isHideEmptyRows();
1773
203
            countType = report.getCountType();
1774
204
            showHierarchy = report.isShowHierarchy();
1775
205
            displayDensity = report.getDisplayDensity();
1776
206
            fontSize = report.getFontSize();
1777
207
1778
208
            columnDimensions.clear();
1779
209
            columnDimensions.addAll( report.getColumnDimensions() );
1780
210
            
1781
211
            rowDimensions.clear();
1782
212
            rowDimensions.addAll( report.getRowDimensions() );
1783
213
            
1784
214
            filterDimensions.clear();
1785
215
            filterDimensions.addAll( report.getFilterDimensions() );
1786
216
        }
1787
217
    }
1788
218
1789
219
    // -------------------------------------------------------------------------
185
    // -------------------------------------------------------------------------
1790
220
    // Getters and setters
186
    // Getters and setters
1791
221
    // -------------------------------------------------------------------------
187
    // -------------------------------------------------------------------------
1792
@@ -419,4 +385,37 @@
1793
419
    {
385
    {
1794
420
        this.fontSize = fontSize;
386
        this.fontSize = fontSize;
1795
421
    }
387
    }
1796
388
1797
389
    @Override
1798
390
    public void mergeWith( IdentifiableObject other )
1799
391
    {
1800
392
        super.mergeWith( other );
1801
393
1802
394
        if ( other.getClass().isInstance( this ) )
1803
395
        {
1804
396
            EventReport eventReport = (EventReport) other;
1805
397
1806
398
            dataType = eventReport.getDataType();
1807
399
            program = eventReport.getProgram();
1808
400
            programStage = eventReport.getProgramStage();
1809
401
            startDate = eventReport.getStartDate();
1810
402
            endDate = eventReport.getEndDate();
1811
403
            totals = eventReport.isTotals();
1812
404
            subtotals = eventReport.isSubtotals();
1813
405
            hideEmptyRows = eventReport.isHideEmptyRows();
1814
406
            countType = eventReport.getCountType();
1815
407
            showHierarchy = eventReport.isShowHierarchy();
1816
408
            displayDensity = eventReport.getDisplayDensity();
1817
409
            fontSize = eventReport.getFontSize();
1818
410
1819
411
            columnDimensions.clear();
1820
412
            columnDimensions.addAll( eventReport.getColumnDimensions() );
1821
413
1822
414
            rowDimensions.clear();
1823
415
            rowDimensions.addAll( eventReport.getRowDimensions() );
1824
416
1825
417
            filterDimensions.clear();
1826
418
            filterDimensions.addAll( eventReport.getFilterDimensions() );
1827
419
        }
1828
420
    }
1829
422
}
421
}
1830
423
422
1831
=== added directory 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node'
1832
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/AbstractNode.java'
1833
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/AbstractNode.java	1970-01-01 00:00:00 +0000
1834
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/AbstractNode.java	2014-06-05 17:39:07 +0000
1835
@@ -0,0 +1,178 @@
1836
1
package org.hisp.dhis.node;
1837
2
1838
3
/*
1839
4
 * Copyright (c) 2004-2014, University of Oslo
1840
5
 * All rights reserved.
1841
6
 *
1842
7
 * Redistribution and use in source and binary forms, with or without
1843
8
 * modification, are permitted provided that the following conditions are met:
1844
9
 * Redistributions of source code must retain the above copyright notice, this
1845
10
 * list of conditions and the following disclaimer.
1846
11
 *
1847
12
 * Redistributions in binary form must reproduce the above copyright notice,
1848
13
 * this list of conditions and the following disclaimer in the documentation
1849
14
 * and/or other materials provided with the distribution.
1850
15
 * Neither the name of the HISP project nor the names of its contributors may
1851
16
 * be used to endorse or promote products derived from this software without
1852
17
 * specific prior written permission.
1853
18
 *
1854
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
1855
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
1856
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
1857
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
1858
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
1859
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
1860
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
1861
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1862
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
1863
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
1864
29
 */
1865
30
1866
31
import com.google.common.collect.ImmutableList;
1867
32
import com.google.common.collect.Lists;
1868
33
import org.hisp.dhis.node.exception.InvalidTypeException;
1869
34
1870
35
import java.util.List;
1871
36
1872
37
/**
1873
38
 * @author Morten Olav Hansen <mortenoh@gmail.com>
1874
39
 */
1875
40
public abstract class AbstractNode implements Node
1876
41
{
1877
42
    private String name;
1878
43
1879
44
    private final NodeType nodeType;
1880
45
1881
46
    private String namespace;
1882
47
1883
48
    private String comment;
1884
49
1885
50
    private List<Node> children = Lists.newArrayList();
1886
51
1887
52
    protected AbstractNode( String name, NodeType nodeType )
1888
53
    {
1889
54
        this.name = name;
1890
55
        this.nodeType = nodeType;
1891
56
    }
1892
57
1893
58
    @Override
1894
59
    public String getName()
1895
60
    {
1896
61
        return name;
1897
62
    }
1898
63
1899
64
    public void setName( String name )
1900
65
    {
1901
66
        this.name = name;
1902
67
    }
1903
68
1904
69
    @Override
1905
70
    public NodeType getType()
1906
71
    {
1907
72
        return nodeType;
1908
73
    }
1909
74
1910
75
    @Override
1911
76
    public boolean is( NodeType type )
1912
77
    {
1913
78
        return type.equals( nodeType );
1914
79
    }
1915
80
1916
81
    @Override
1917
82
    public boolean isSimple()
1918
83
    {
1919
84
        return is( NodeType.SIMPLE );
1920
85
    }
1921
86
1922
87
    @Override
1923
88
    public boolean isComplex()
1924
89
    {
1925
90
        return is( NodeType.COMPLEX );
1926
91
    }
1927
92
1928
93
    @Override
1929
94
    public boolean isCollection()
1930
95
    {
1931
96
        return is( NodeType.COLLECTION );
1932
97
    }
1933
98
1934
99
    @Override
1935
100
    public String getNamespace()
1936
101
    {
1937
102
        return namespace;
1938
103
    }
1939
104
1940
105
    public void setNamespace( String namespace )
1941
106
    {
1942
107
        this.namespace = namespace;
1943
108
    }
1944
109
1945
110
    @Override
1946
111
    public String getComment()
1947
112
    {
1948
113
        return comment;
1949
114
    }
1950
115
1951
116
    public void setComment( String comment )
1952
117
    {
1953
118
        this.comment = comment;
1954
119
    }
1955
120
1956
121
    @Override
1957
122
    public <T extends Node> T addChild( T child ) throws InvalidTypeException
1958
123
    {
1959
124
        if ( child == null || child.getName() == null )
1960
125
        {
1961
126
            return null;
1962
127
        }
1963
128
1964
129
        children.add( child );
1965
130
        return child;
1966
131
    }
1967
132
1968
133
    @Override
1969
134
    public <T extends Node> void addChildren( Iterable<T> children )
1970
135
    {
1971
136
        for ( Node child : children )
1972
137
        {
1973
138
            addChild( child );
1974
139
        }
1975
140
    }
1976
141
1977
142
    @Override
1978
143
    public List<Node> getChildren()
1979
144
    {
1980
145
        return ImmutableList.copyOf( children );
1981
146
    }
1982
147
1983
148
    @Override
1984
149
    public boolean equals( Object o )
1985
150
    {
1986
151
        if ( this == o ) return true;
1987
152
        if ( o == null || getClass() != o.getClass() ) return false;
1988
153
1989
154
        AbstractNode that = (AbstractNode) o;
1990
155
1991
156
        if ( name != null ? !name.equals( that.name ) : that.name != null ) return false;
1992
157
1993
158
        return true;
1994
159
    }
1995
160
1996
161
    @Override
1997
162
    public int hashCode()
1998
163
    {
1999
164
        return name != null ? name.hashCode() : 0;
2000
165
    }
2001
166
2002
167
    @Override
2003
168
    public String toString()
2004
169
    {
2005
170
        return "Node{" +
2006
171
            "name='" + name + '\'' +
2007
172
            ", nodeType=" + nodeType +
2008
173
            ", namespace='" + namespace + '\'' +
2009
174
            ", comment='" + comment + '\'' +
2010
175
            ", children=" + children +
2011
176
            '}';
2012
177
    }
2013
178
}
2014
0
179
2015
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/Node.java'
2016
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/Node.java	1970-01-01 00:00:00 +0000
2017
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/Node.java	2014-06-05 17:39:07 +0000
2018
@@ -0,0 +1,124 @@
2019
1
package org.hisp.dhis.node;
2020
2
2021
3
/*
2022
4
 * Copyright (c) 2004-2014, University of Oslo
2023
5
 * All rights reserved.
2024
6
 *
2025
7
 * Redistribution and use in source and binary forms, with or without
2026
8
 * modification, are permitted provided that the following conditions are met:
2027
9
 * Redistributions of source code must retain the above copyright notice, this
2028
10
 * list of conditions and the following disclaimer.
2029
11
 *
2030
12
 * Redistributions in binary form must reproduce the above copyright notice,
2031
13
 * this list of conditions and the following disclaimer in the documentation
2032
14
 * and/or other materials provided with the distribution.
2033
15
 * Neither the name of the HISP project nor the names of its contributors may
2034
16
 * be used to endorse or promote products derived from this software without
2035
17
 * specific prior written permission.
2036
18
 *
2037
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
2038
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
2039
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
2040
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
2041
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
2042
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
2043
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
2044
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2045
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2046
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
2047
29
 */
2048
30
2049
31
import java.util.List;
2050
32
2051
33
/**
2052
34
 * @author Morten Olav Hansen <mortenoh@gmail.com>
2053
35
 */
2054
36
public interface Node
2055
37
{
2056
38
    /**
2057
39
     * Name of this node.
2058
40
     *
2059
41
     * @return current name of node
2060
42
     */
2061
43
    String getName();
2062
44
2063
45
    /**
2064
46
     * Type specifier for this node.
2065
47
     *
2066
48
     * @return Node type
2067
49
     * @see org.hisp.dhis.node.NodeType
2068
50
     */
2069
51
    NodeType getType();
2070
52
2071
53
    /**
2072
54
     * @param type Type to check for
2073
55
     * @return True if node is of this type
2074
56
     */
2075
57
    boolean is( NodeType type );
2076
58
2077
59
    /**
2078
60
     * Helper that checks if node is of simple type, useful to checking if
2079
61
     * you are allowed to add children to this node.
2080
62
     *
2081
63
     * @return true if type is simple
2082
64
     * @see org.hisp.dhis.node.NodeType
2083
65
     */
2084
66
    boolean isSimple();
2085
67
2086
68
    /**
2087
69
     * Helper that checks if node is of complex type.
2088
70
     *
2089
71
     * @return true if type is complex
2090
72
     * @see org.hisp.dhis.node.NodeType
2091
73
     */
2092
74
    boolean isComplex();
2093
75
2094
76
    /**
2095
77
     * Helper that checks if node is of collection type.
2096
78
     *
2097
79
     * @return true if type is collection
2098
80
     * @see org.hisp.dhis.node.NodeType
2099
81
     */
2100
82
    boolean isCollection();
2101
83
2102
84
    /**
2103
85
     * Namespace for this node. Not all serializers support this, and its up to the
2104
86
     * NodeSerializer implementation to decide what to do with this.
2105
87
     *
2106
88
     * @return namespace
2107
89
     * @see org.hisp.dhis.node.NodeSerializer
2108
90
     */
2109
91
    String getNamespace();
2110
92
2111
93
    /**
2112
94
     * Comment for this node. Not all serializers support this, and its up to the
2113
95
     * NodeSerializer implementation to decide what to do with this.
2114
96
     *
2115
97
     * @return namespace
2116
98
     * @see org.hisp.dhis.node.NodeSerializer
2117
99
     */
2118
100
    String getComment();
2119
101
2120
102
    /**
2121
103
     * Adds a child to this node.
2122
104
     *
2123
105
     * @param child Child node to add
2124
106
     * @return Child node that was added
2125
107
     */
2126
108
    <T extends Node> T addChild( T child );
2127
109
2128
110
    /**
2129
111
     * Adds a collection of children to this node.
2130
112
     *
2131
113
     * @param children Child nodes to add
2132
114
     */
2133
115
    <T extends Node> void addChildren( Iterable<T> children );
2134
116
2135
117
    /**
2136
118
     * Get all child notes associated with this node. Please note that the returned list is a copy
2137
119
     * of the internal list, and changes to the list will not be reflected in the node.
2138
120
     *
2139
121
     * @return List of child nodes associated with this node
2140
122
     */
2141
123
    List<Node> getChildren();
2142
124
}
2143
0
125
2144
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodeDeserializer.java'
2145
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodeDeserializer.java	1970-01-01 00:00:00 +0000
2146
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodeDeserializer.java	2014-06-05 17:39:07 +0000
2147
@@ -0,0 +1,45 @@
2148
1
package org.hisp.dhis.node;
2149
2
2150
3
/*
2151
4
 * Copyright (c) 2004-2014, University of Oslo
2152
5
 * All rights reserved.
2153
6
 *
2154
7
 * Redistribution and use in source and binary forms, with or without
2155
8
 * modification, are permitted provided that the following conditions are met:
2156
9
 * Redistributions of source code must retain the above copyright notice, this
2157
10
 * list of conditions and the following disclaimer.
2158
11
 *
2159
12
 * Redistributions in binary form must reproduce the above copyright notice,
2160
13
 * this list of conditions and the following disclaimer in the documentation
2161
14
 * and/or other materials provided with the distribution.
2162
15
 * Neither the name of the HISP project nor the names of its contributors may
2163
16
 * be used to endorse or promote products derived from this software without
2164
17
 * specific prior written permission.
2165
18
 *
2166
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
2167
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
2168
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
2169
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
2170
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
2171
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
2172
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
2173
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2174
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2175
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
2176
29
 */
2177
30
2178
31
import org.hisp.dhis.node.types.RootNode;
2179
32
2180
33
import java.io.IOException;
2181
34
import java.io.InputStream;
2182
35
import java.util.List;
2183
36
2184
37
/**
2185
38
 * @author Morten Olav Hansen <mortenoh@gmail.com>
2186
39
 */
2187
40
public interface NodeDeserializer
2188
41
{
2189
42
    List<String> contentTypes();
2190
43
2191
44
    RootNode deserialize( InputStream inputStream ) throws IOException;
2192
45
}
2193
0
46
2194
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodeSerializer.java'
2195
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodeSerializer.java	1970-01-01 00:00:00 +0000
2196
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodeSerializer.java	2014-06-05 17:39:07 +0000
2197
@@ -0,0 +1,45 @@
2198
1
package org.hisp.dhis.node;
2199
2
2200
3
/*
2201
4
 * Copyright (c) 2004-2014, University of Oslo
2202
5
 * All rights reserved.
2203
6
 *
2204
7
 * Redistribution and use in source and binary forms, with or without
2205
8
 * modification, are permitted provided that the following conditions are met:
2206
9
 * Redistributions of source code must retain the above copyright notice, this
2207
10
 * list of conditions and the following disclaimer.
2208
11
 *
2209
12
 * Redistributions in binary form must reproduce the above copyright notice,
2210
13
 * this list of conditions and the following disclaimer in the documentation
2211
14
 * and/or other materials provided with the distribution.
2212
15
 * Neither the name of the HISP project nor the names of its contributors may
2213
16
 * be used to endorse or promote products derived from this software without
2214
17
 * specific prior written permission.
2215
18
 *
2216
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
2217
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
2218
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
2219
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
2220
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
2221
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
2222
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
2223
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2224
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2225
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
2226
29
 */
2227
30
2228
31
import org.hisp.dhis.node.types.RootNode;
2229
32
2230
33
import java.io.IOException;
2231
34
import java.io.OutputStream;
2232
35
import java.util.List;
2233
36
2234
37
/**
2235
38
 * @author Morten Olav Hansen <mortenoh@gmail.com>
2236
39
 */
2237
40
public interface NodeSerializer
2238
41
{
2239
42
    List<String> contentTypes();
2240
43
2241
44
    void serialize( RootNode rootNode, OutputStream outputStream ) throws IOException;
2242
45
}
2243
0
46
2244
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodeService.java'
2245
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodeService.java	1970-01-01 00:00:00 +0000
2246
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodeService.java	2014-06-05 17:39:07 +0000
2247
@@ -0,0 +1,75 @@
2248
1
package org.hisp.dhis.node;
2249
2
2250
3
/*
2251
4
 * Copyright (c) 2004-2014, University of Oslo
2252
5
 * All rights reserved.
2253
6
 *
2254
7
 * Redistribution and use in source and binary forms, with or without
2255
8
 * modification, are permitted provided that the following conditions are met:
2256
9
 * Redistributions of source code must retain the above copyright notice, this
2257
10
 * list of conditions and the following disclaimer.
2258
11
 *
2259
12
 * Redistributions in binary form must reproduce the above copyright notice,
2260
13
 * this list of conditions and the following disclaimer in the documentation
2261
14
 * and/or other materials provided with the distribution.
2262
15
 * Neither the name of the HISP project nor the names of its contributors may
2263
16
 * be used to endorse or promote products derived from this software without
2264
17
 * specific prior written permission.
2265
18
 *
2266
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
2267
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
2268
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
2269
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
2270
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
2271
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
2272
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
2273
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2274
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2275
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
2276
29
 */
2277
30
2278
31
import org.hisp.dhis.node.types.RootNode;
2279
32
2280
33
import java.io.IOException;
2281
34
import java.io.InputStream;
2282
35
import java.io.OutputStream;
2283
36
2284
37
/**
2285
38
 * @author Morten Olav Hansen <mortenoh@gmail.com>
2286
39
 */
2287
40
public interface NodeService
2288
41
{
2289
42
    /**
2290
43
     * Find a nodeSerializer that supports contentType or return null.
2291
44
     *
2292
45
     * @param contentType NodeSerializer contentType
2293
46
     * @return NodeSerializer that support contentType, or null if not match was found
2294
47
     * @see org.hisp.dhis.node.NodeSerializer
2295
48
     */
2296
49
    NodeSerializer getNodeSerializer( String contentType );
2297
50
2298
51
    /**
2299
52
     * Write out rootNode to a nodeSerializer that matches the contentType.
2300
53
     *
2301
54
     * @param rootNode     RootNode to write
2302
55
     * @param contentType  NodeSerializer contentType
2303
56
     * @param outputStream Write to this outputStream
2304
57
     */
2305
58
    void serialize( RootNode rootNode, String contentType, OutputStream outputStream ) throws IOException;
2306
59
2307
60
    /**
2308
61
     * Find a nodeDeserializer that supports contentType or return null.
2309
62
     *
2310
63
     * @param contentType NodeDeserializer contentType
2311
64
     * @return NodeDeserializer that support contentType, or null if not match was found
2312
65
     * @see org.hisp.dhis.node.NodeDeserializer
2313
66
     */
2314
67
    NodeDeserializer getNodeDeserializer( String contentType );
2315
68
2316
69
    /**
2317
70
     * @param contentType NodeDeserializer contentType
2318
71
     * @param inputStream Read RootNode from this stream
2319
72
     * @return RootNode deserialized from inputStream
2320
73
     */
2321
74
    RootNode deserialize( String contentType, InputStream inputStream ) throws IOException;
2322
75
}
2323
0
76
2324
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodeType.java'
2325
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodeType.java	1970-01-01 00:00:00 +0000
2326
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodeType.java	2014-06-05 17:39:07 +0000
2327
@@ -0,0 +1,39 @@
2328
1
package org.hisp.dhis.node;
2329
2
2330
3
/*
2331
4
 * Copyright (c) 2004-2014, University of Oslo
2332
5
 * All rights reserved.
2333
6
 *
2334
7
 * Redistribution and use in source and binary forms, with or without
2335
8
 * modification, are permitted provided that the following conditions are met:
2336
9
 * Redistributions of source code must retain the above copyright notice, this
2337
10
 * list of conditions and the following disclaimer.
2338
11
 *
2339
12
 * Redistributions in binary form must reproduce the above copyright notice,
2340
13
 * this list of conditions and the following disclaimer in the documentation
2341
14
 * and/or other materials provided with the distribution.
2342
15
 * Neither the name of the HISP project nor the names of its contributors may
2343
16
 * be used to endorse or promote products derived from this software without
2344
17
 * specific prior written permission.
2345
18
 *
2346
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
2347
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
2348
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
2349
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
2350
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
2351
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
2352
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
2353
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2354
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2355
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
2356
29
 */
2357
30
2358
31
/**
2359
32
 * @author Morten Olav Hansen <mortenoh@gmail.com>
2360
33
 */
2361
34
public enum NodeType
2362
35
{
2363
36
    SIMPLE,
2364
37
    COMPLEX,
2365
38
    COLLECTION
2366
39
}
2367
0
40
2368
=== added directory 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/annotation'
2369
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/annotation/ExportCollection.java'
2370
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/annotation/ExportCollection.java	1970-01-01 00:00:00 +0000
2371
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/annotation/ExportCollection.java	2014-06-05 17:39:07 +0000
2372
@@ -0,0 +1,54 @@
2373
1
package org.hisp.dhis.node.annotation;
2374
2
2375
3
/*
2376
4
 * Copyright (c) 2004-2014, University of Oslo
2377
5
 * All rights reserved.
2378
6
 *
2379
7
 * Redistribution and use in source and binary forms, with or without
2380
8
 * modification, are permitted provided that the following conditions are met:
2381
9
 * Redistributions of source code must retain the above copyright notice, this
2382
10
 * list of conditions and the following disclaimer.
2383
11
 *
2384
12
 * Redistributions in binary form must reproduce the above copyright notice,
2385
13
 * this list of conditions and the following disclaimer in the documentation
2386
14
 * and/or other materials provided with the distribution.
2387
15
 * Neither the name of the HISP project nor the names of its contributors may
2388
16
 * be used to endorse or promote products derived from this software without
2389
17
 * specific prior written permission.
2390
18
 *
2391
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
2392
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
2393
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
2394
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
2395
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
2396
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
2397
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
2398
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2399
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2400
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
2401
29
 */
2402
30
2403
31
import java.lang.annotation.ElementType;
2404
32
import java.lang.annotation.Retention;
2405
33
import java.lang.annotation.RetentionPolicy;
2406
34
import java.lang.annotation.Target;
2407
35
2408
36
/**
2409
37
 * @author Morten Olav Hansen <mortenoh@gmail.com>
2410
38
 */
2411
39
@Target( { ElementType.FIELD, ElementType.METHOD } )
2412
40
@Retention( RetentionPolicy.RUNTIME )
2413
41
public @interface ExportCollection
2414
42
{
2415
43
    String value() default "";
2416
44
2417
45
    String namespace() default "";
2418
46
2419
47
    String itemName() default "";
2420
48
2421
49
    String itemNamespace() default "";
2422
50
2423
51
    boolean owner() default false;
2424
52
2425
53
    boolean useWrapping() default true;
2426
54
}
2427
0
55
2428
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/annotation/ExportComplex.java'
2429
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/annotation/ExportComplex.java	1970-01-01 00:00:00 +0000
2430
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/annotation/ExportComplex.java	2014-06-05 17:39:07 +0000
2431
@@ -0,0 +1,46 @@
2432
1
package org.hisp.dhis.node.annotation;
2433
2
2434
3
/*
2435
4
 * Copyright (c) 2004-2014, University of Oslo
2436
5
 * All rights reserved.
2437
6
 *
2438
7
 * Redistribution and use in source and binary forms, with or without
2439
8
 * modification, are permitted provided that the following conditions are met:
2440
9
 * Redistributions of source code must retain the above copyright notice, this
2441
10
 * list of conditions and the following disclaimer.
2442
11
 *
2443
12
 * Redistributions in binary form must reproduce the above copyright notice,
2444
13
 * this list of conditions and the following disclaimer in the documentation
2445
14
 * and/or other materials provided with the distribution.
2446
15
 * Neither the name of the HISP project nor the names of its contributors may
2447
16
 * be used to endorse or promote products derived from this software without
2448
17
 * specific prior written permission.
2449
18
 *
2450
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
2451
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
2452
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
2453
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
2454
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
2455
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
2456
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
2457
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2458
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2459
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
2460
29
 */
2461
30
2462
31
import java.lang.annotation.ElementType;
2463
32
import java.lang.annotation.Retention;
2464
33
import java.lang.annotation.RetentionPolicy;
2465
34
import java.lang.annotation.Target;
2466
35
2467
36
/**
2468
37
 * @author Morten Olav Hansen <mortenoh@gmail.com>
2469
38
 */
2470
39
@Target( { ElementType.FIELD, ElementType.METHOD } )
2471
40
@Retention( RetentionPolicy.RUNTIME )
2472
41
public @interface ExportComplex
2473
42
{
2474
43
    String value() default "";
2475
44
2476
45
    String namespace() default "";
2477
46
}
2478
0
47
2479
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/annotation/ExportRoot.java'
2480
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/annotation/ExportRoot.java	1970-01-01 00:00:00 +0000
2481
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/annotation/ExportRoot.java	2014-06-05 17:39:07 +0000
2482
@@ -0,0 +1,46 @@
2483
1
package org.hisp.dhis.node.annotation;
2484
2
2485
3
/*
2486
4
 * Copyright (c) 2004-2014, University of Oslo
2487
5
 * All rights reserved.
2488
6
 *
2489
7
 * Redistribution and use in source and binary forms, with or without
2490
8
 * modification, are permitted provided that the following conditions are met:
2491
9
 * Redistributions of source code must retain the above copyright notice, this
2492
10
 * list of conditions and the following disclaimer.
2493
11
 *
2494
12
 * Redistributions in binary form must reproduce the above copyright notice,
2495
13
 * this list of conditions and the following disclaimer in the documentation
2496
14
 * and/or other materials provided with the distribution.
2497
15
 * Neither the name of the HISP project nor the names of its contributors may
2498
16
 * be used to endorse or promote products derived from this software without
2499
17
 * specific prior written permission.
2500
18
 *
2501
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
2502
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
2503
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
2504
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
2505
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
2506
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
2507
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
2508
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2509
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2510
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
2511
29
 */
2512
30
2513
31
import java.lang.annotation.ElementType;
2514
32
import java.lang.annotation.Retention;
2515
33
import java.lang.annotation.RetentionPolicy;
2516
34
import java.lang.annotation.Target;
2517
35
2518
36
/**
2519
37
 * @author Morten Olav Hansen <mortenoh@gmail.com>
2520
38
 */
2521
39
@Target( { ElementType.TYPE } )
2522
40
@Retention( RetentionPolicy.RUNTIME )
2523
41
public @interface ExportRoot
2524
42
{
2525
43
    String value() default "";
2526
44
2527
45
    String namespace() default "";
2528
46
}
2529
0
47
2530
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/annotation/ExportSimple.java'
2531
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/annotation/ExportSimple.java	1970-01-01 00:00:00 +0000
2532
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/annotation/ExportSimple.java	2014-06-05 17:39:07 +0000
2533
@@ -0,0 +1,48 @@
2534
1
package org.hisp.dhis.node.annotation;
2535
2
2536
3
/*
2537
4
 * Copyright (c) 2004-2014, University of Oslo
2538
5
 * All rights reserved.
2539
6
 *
2540
7
 * Redistribution and use in source and binary forms, with or without
2541
8
 * modification, are permitted provided that the following conditions are met:
2542
9
 * Redistributions of source code must retain the above copyright notice, this
2543
10
 * list of conditions and the following disclaimer.
2544
11
 *
2545
12
 * Redistributions in binary form must reproduce the above copyright notice,
2546
13
 * this list of conditions and the following disclaimer in the documentation
2547
14
 * and/or other materials provided with the distribution.
2548
15
 * Neither the name of the HISP project nor the names of its contributors may
2549
16
 * be used to endorse or promote products derived from this software without
2550
17
 * specific prior written permission.
2551
18
 *
2552
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
2553
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
2554
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
2555
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
2556
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
2557
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
2558
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
2559
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2560
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2561
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
2562
29
 */
2563
30
2564
31
import java.lang.annotation.ElementType;
2565
32
import java.lang.annotation.Retention;
2566
33
import java.lang.annotation.RetentionPolicy;
2567
34
import java.lang.annotation.Target;
2568
35
2569
36
/**
2570
37
 * @author Morten Olav Hansen <mortenoh@gmail.com>
2571
38
 */
2572
39
@Target( { ElementType.FIELD, ElementType.METHOD } )
2573
40
@Retention( RetentionPolicy.RUNTIME )
2574
41
public @interface ExportSimple
2575
42
{
2576
43
    String value() default "";
2577
44
2578
45
    boolean isAttribute() default false;
2579
46
2580
47
    String namespace() default "";
2581
48
}
2582
0
49
2583
=== added directory 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/exception'
2584
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/exception/DuplicateNodeException.java'
2585
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/exception/DuplicateNodeException.java	1970-01-01 00:00:00 +0000
2586
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/exception/DuplicateNodeException.java	2014-06-05 17:39:07 +0000
2587
@@ -0,0 +1,40 @@
2588
1
package org.hisp.dhis.node.exception;
2589
2
2590
3
/*
2591
4
 * Copyright (c) 2004-2014, University of Oslo
2592
5
 * All rights reserved.
2593
6
 *
2594
7
 * Redistribution and use in source and binary forms, with or without
2595
8
 * modification, are permitted provided that the following conditions are met:
2596
9
 * Redistributions of source code must retain the above copyright notice, this
2597
10
 * list of conditions and the following disclaimer.
2598
11
 *
2599
12
 * Redistributions in binary form must reproduce the above copyright notice,
2600
13
 * this list of conditions and the following disclaimer in the documentation
2601
14
 * and/or other materials provided with the distribution.
2602
15
 * Neither the name of the HISP project nor the names of its contributors may
2603
16
 * be used to endorse or promote products derived from this software without
2604
17
 * specific prior written permission.
2605
18
 *
2606
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
2607
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
2608
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
2609
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
2610
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
2611
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
2612
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
2613
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2614
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2615
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
2616
29
 */
2617
30
2618
31
/**
2619
32
 * @author Morten Olav Hansen <mortenoh@gmail.com>
2620
33
 */
2621
34
public class DuplicateNodeException extends RuntimeException
2622
35
{
2623
36
    public DuplicateNodeException()
2624
37
    {
2625
38
        super( "A node with that name already exists in the child list." );
2626
39
    }
2627
40
}
2628
0
41
2629
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/exception/InvalidTypeException.java'
2630
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/exception/InvalidTypeException.java	1970-01-01 00:00:00 +0000
2631
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/exception/InvalidTypeException.java	2014-06-05 17:39:07 +0000
2632
@@ -0,0 +1,40 @@
2633
1
package org.hisp.dhis.node.exception;
2634
2
2635
3
/*
2636
4
 * Copyright (c) 2004-2014, University of Oslo
2637
5
 * All rights reserved.
2638
6
 *
2639
7
 * Redistribution and use in source and binary forms, with or without
2640
8
 * modification, are permitted provided that the following conditions are met:
2641
9
 * Redistributions of source code must retain the above copyright notice, this
2642
10
 * list of conditions and the following disclaimer.
2643
11
 *
2644
12
 * Redistributions in binary form must reproduce the above copyright notice,
2645
13
 * this list of conditions and the following disclaimer in the documentation
2646
14
 * and/or other materials provided with the distribution.
2647
15
 * Neither the name of the HISP project nor the names of its contributors may
2648
16
 * be used to endorse or promote products derived from this software without
2649
17
 * specific prior written permission.
2650
18
 *
2651
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
2652
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
2653
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
2654
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
2655
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
2656
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
2657
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
2658
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2659
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2660
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
2661
29
 */
2662
30
2663
31
/**
2664
32
 * @author Morten Olav Hansen <mortenoh@gmail.com>
2665
33
 */
2666
34
public class InvalidTypeException extends RuntimeException
2667
35
{
2668
36
    public InvalidTypeException()
2669
37
    {
2670
38
        super( "Adding children to a node of type simple is not allowed." );
2671
39
    }
2672
40
}
2673
0
41
2674
=== added directory 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/serializers'
2675
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/serializers/JacksonJsonNodeSerializer.java'
2676
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/serializers/JacksonJsonNodeSerializer.java	1970-01-01 00:00:00 +0000
2677
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/serializers/JacksonJsonNodeSerializer.java	2014-06-05 17:39:07 +0000
2678
@@ -0,0 +1,165 @@
2679
1
package org.hisp.dhis.node.serializers;
2680
2
2681
3
/*
2682
4
 * Copyright (c) 2004-2014, University of Oslo
2683
5
 * All rights reserved.
2684
6
 *
2685
7
 * Redistribution and use in source and binary forms, with or without
2686
8
 * modification, are permitted provided that the following conditions are met:
2687
9
 * Redistributions of source code must retain the above copyright notice, this
2688
10
 * list of conditions and the following disclaimer.
2689
11
 *
2690
12
 * Redistributions in binary form must reproduce the above copyright notice,
2691
13
 * this list of conditions and the following disclaimer in the documentation
2692
14
 * and/or other materials provided with the distribution.
2693
15
 * Neither the name of the HISP project nor the names of its contributors may
2694
16
 * be used to endorse or promote products derived from this software without
2695
17
 * specific prior written permission.
2696
18
 *
2697
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
2698
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
2699
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
2700
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
2701
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
2702
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
2703
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
2704
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2705
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2706
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
2707
29
 */
2708
30
2709
31
import com.fasterxml.jackson.annotation.JsonInclude;
2710
32
import com.fasterxml.jackson.core.JsonGenerator;
2711
33
import com.fasterxml.jackson.databind.ObjectMapper;
2712
34
import com.fasterxml.jackson.databind.SerializationFeature;
2713
35
import com.google.common.collect.Lists;
2714
36
import org.hisp.dhis.node.Node;
2715
37
import org.hisp.dhis.node.NodeSerializer;
2716
38
import org.hisp.dhis.node.types.CollectionNode;
2717
39
import org.hisp.dhis.node.types.ComplexNode;
2718
40
import org.hisp.dhis.node.types.RootNode;
2719
41
import org.hisp.dhis.node.types.SimpleNode;
2720
42
import org.springframework.stereotype.Component;
2721
43
2722
44
import java.io.IOException;
2723
45
import java.io.OutputStream;
2724
46
import java.util.List;
2725
47
2726
48
/**
2727
49
 * @author Morten Olav Hansen <mortenoh@gmail.com>
2728
50
 */
2729
51
@Component
2730
52
public class JacksonJsonNodeSerializer implements NodeSerializer
2731
53
{
2732
54
    public static final String CONTENT_TYPE = "application/json";
2733
55
2734
56
    private final ObjectMapper objectMapper = new ObjectMapper();
2735
57
2736
58
    @Override
2737
59
    public List<String> contentTypes()
2738
60
    {
2739
61
        return Lists.newArrayList( CONTENT_TYPE );
2740
62
    }
2741
63
2742
64
    public JacksonJsonNodeSerializer()
2743
65
    {
2744
66
        objectMapper.setSerializationInclusion( JsonInclude.Include.NON_NULL );
2745
67
        objectMapper.configure( SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false );
2746
68
        objectMapper.configure( SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false );
2747
69
        objectMapper.configure( SerializationFeature.WRAP_EXCEPTIONS, true );
2748
70
        objectMapper.getFactory().enable( JsonGenerator.Feature.QUOTE_FIELD_NAMES );
2749
71
    }
2750
72
2751
73
    @Override
2752
74
    public void serialize( RootNode rootNode, OutputStream outputStream ) throws IOException
2753
75
    {
2754
76
        JsonGenerator generator = objectMapper.getFactory().createGenerator( outputStream );
2755
77
2756
78
        writeRootNode( rootNode, generator );
2757
79
        generator.flush();
2758
80
    }
2759
81
2760
82
    private void writeRootNode( RootNode rootNode, JsonGenerator generator ) throws IOException
2761
83
    {
2762
84
        generator.writeStartObject();
2763
85
2764
86
        for ( Node node : rootNode.getChildren() )
2765
87
        {
2766
88
            dispatcher( node, generator, true );
2767
89
            generator.flush();
2768
90
        }
2769
91
2770
92
        generator.writeEndObject();
2771
93
    }
2772
94
2773
95
    private void writeSimpleNode( SimpleNode simpleNode, JsonGenerator generator, boolean writeKey ) throws IOException
2774
96
    {
2775
97
        if ( simpleNode.getValue() == null ) // add hint for this, exclude if null
2776
98
        {
2777
99
            return;
2778
100
        }
2779
101
2780
102
        if ( writeKey )
2781
103
        {
2782
104
            generator.writeObjectField( simpleNode.getName(), simpleNode.getValue() );
2783
105
        }
2784
106
        else
2785
107
        {
2786
108
            generator.writeObject( simpleNode.getValue() );
2787
109
        }
2788
110
    }
2789
111
2790
112
    private void writeComplexNode( ComplexNode complexNode, JsonGenerator generator, boolean writeKey ) throws IOException
2791
113
    {
2792
114
        if ( writeKey )
2793
115
        {
2794
116
            generator.writeObjectFieldStart( complexNode.getName() );
2795
117
        }
2796
118
        else
2797
119
        {
2798
120
            generator.writeStartObject();
2799
121
        }
2800
122
2801
123
        for ( Node node : complexNode.getChildren() )
2802
124
        {
2803
125
            dispatcher( node, generator, true );
2804
126
        }
2805
127
2806
128
        generator.writeEndObject();
2807
129
    }
2808
130
2809
131
    private void writeCollectionNode( CollectionNode collectionNode, JsonGenerator generator, boolean writeKey ) throws IOException
2810
132
    {
2811
133
        if ( writeKey )
2812
134
        {
2813
135
            generator.writeArrayFieldStart( collectionNode.getName() );
2814
136
        }
2815
137
        else
2816
138
        {
2817
139
            generator.writeStartArray();
2818
140
        }
2819
141
2820
142
        for ( Node node : collectionNode.getChildren() )
2821
143
        {
2822
144
            dispatcher( node, generator, false );
2823
145
        }
2824
146
2825
147
        generator.writeEndArray();
2826
148
    }
2827
149
2828
150
    private void dispatcher( Node node, JsonGenerator generator, boolean writeKey ) throws IOException
2829
151
    {
2830
152
        switch ( node.getType() )
2831
153
        {
2832
154
            case SIMPLE:
2833
155
                writeSimpleNode( (SimpleNode) node, generator, writeKey );
2834
156
                break;
2835
157
            case COMPLEX:
2836
158
                writeComplexNode( (ComplexNode) node, generator, writeKey );
2837
159
                break;
2838
160
            case COLLECTION:
2839
161
                writeCollectionNode( (CollectionNode) node, generator, writeKey );
2840
162
                break;
2841
163
        }
2842
164
    }
2843
165
}
2844
0
166
2845
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/serializers/StAXNodeSerializer.java'
2846
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/serializers/StAXNodeSerializer.java	1970-01-01 00:00:00 +0000
2847
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/serializers/StAXNodeSerializer.java	2014-06-05 17:39:07 +0000
2848
@@ -0,0 +1,197 @@
2849
1
package org.hisp.dhis.node.serializers;
2850
2
2851
3
/*
2852
4
 * Copyright (c) 2004-2014, University of Oslo
2853
5
 * All rights reserved.
2854
6
 *
2855
7
 * Redistribution and use in source and binary forms, with or without
2856
8
 * modification, are permitted provided that the following conditions are met:
2857
9
 * Redistributions of source code must retain the above copyright notice, this
2858
10
 * list of conditions and the following disclaimer.
2859
11
 *
2860
12
 * Redistributions in binary form must reproduce the above copyright notice,
2861
13
 * this list of conditions and the following disclaimer in the documentation
2862
14
 * and/or other materials provided with the distribution.
2863
15
 * Neither the name of the HISP project nor the names of its contributors may
2864
16
 * be used to endorse or promote products derived from this software without
2865
17
 * specific prior written permission.
2866
18
 *
2867
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
2868
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
2869
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
2870
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
2871
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
2872
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
2873
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
2874
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2875
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2876
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
2877
29
 */
2878
30
2879
31
import com.google.common.collect.Lists;
2880
32
import org.hisp.dhis.node.Node;
2881
33
import org.hisp.dhis.node.NodeSerializer;
2882
34
import org.hisp.dhis.node.types.CollectionNode;
2883
35
import org.hisp.dhis.node.types.ComplexNode;
2884
36
import org.hisp.dhis.node.types.RootNode;
2885
37
import org.hisp.dhis.node.types.SimpleNode;
2886
38
import org.springframework.stereotype.Component;
2887
39
import org.springframework.util.StringUtils;
2888
40
2889
41
import javax.xml.stream.XMLOutputFactory;
2890
42
import javax.xml.stream.XMLStreamException;
2891
43
import javax.xml.stream.XMLStreamWriter;
2892
44
import java.io.IOException;
2893
45
import java.io.OutputStream;
2894
46
import java.util.List;
2895
47
2896
48
/**
2897
49
 * @author Morten Olav Hansen <mortenoh@gmail.com>
2898
50
 */
2899
51
@Component
2900
52
public class StAXNodeSerializer implements NodeSerializer
2901
53
{
2902
54
    public static final String CONTENT_TYPE = "application/xml";
2903
55
2904
56
    private final XMLOutputFactory xmlFactory = XMLOutputFactory.newInstance();
2905
57
2906
58
    @Override
2907
59
    public List<String> contentTypes()
2908
60
    {
2909
61
        return Lists.newArrayList( CONTENT_TYPE );
2910
62
    }
2911
63
2912
64
    @Override
2913
65
    public void serialize( RootNode rootNode, OutputStream outputStream ) throws IOException
2914
66
    {
2915
67
        XMLStreamWriter writer;
2916
68
2917
69
        try
2918
70
        {
2919
71
            writer = xmlFactory.createXMLStreamWriter( outputStream );
2920
72
            writeRootNode( rootNode, writer );
2921
73
            writer.flush();
2922
74
        }
2923
75
        catch ( XMLStreamException e )
2924
76
        {
2925
77
            throw new IOException( e.getMessage(), e.getCause() );
2926
78
        }
2927
79
    }
2928
80
2929
81
    private void writeRootNode( RootNode rootNode, XMLStreamWriter writer ) throws IOException, XMLStreamException
2930
82
    {
2931
83
        writer.writeStartDocument( "UTF-8", "1.0" );
2932
84
2933
85
        if ( !StringUtils.isEmpty( rootNode.getComment() ) )
2934
86
        {
2935
87
            writer.writeComment( rootNode.getComment() );
2936
88
        }
2937
89
2938
90
        writeStartElement( rootNode, writer );
2939
91
2940
92
        for ( Node node : rootNode.getChildren() )
2941
93
        {
2942
94
            dispatcher( node, writer );
2943
95
            writer.flush();
2944
96
        }
2945
97
2946
98
        writeEndElement( writer );
2947
99
        writer.writeEndDocument();
2948
100
    }
2949
101
2950
102
    private void writeSimpleNode( SimpleNode simpleNode, XMLStreamWriter writer ) throws XMLStreamException
2951
103
    {
2952
104
        if ( simpleNode.getValue() == null ) // TODO include null or not?
2953
105
        {
2954
106
            return;
2955
107
        }
2956
108
2957
109
        String value = String.format( "%s", simpleNode.getValue() );
2958
110
2959
111
        if ( simpleNode.isAttribute() )
2960
112
        {
2961
113
            if ( !StringUtils.isEmpty( simpleNode.getNamespace() ) )
2962
114
            {
2963
115
                writer.writeAttribute( "", simpleNode.getNamespace(), simpleNode.getName(), value );
2964
116
            }
2965
117
            else
2966
118
            {
2967
119
                writer.writeAttribute( simpleNode.getName(), value );
2968
120
            }
2969
121
        }
2970
122
        else
2971
123
        {
2972
124
            writeStartElement( simpleNode, writer );
2973
125
            writer.writeCharacters( value );
2974
126
            writeEndElement( writer );
2975
127
        }
2976
128
    }
2977
129
2978
130
    private void writeComplexNode( ComplexNode complexNode, XMLStreamWriter writer ) throws XMLStreamException, IOException
2979
131
    {
2980
132
        writeStartElement( complexNode, writer );
2981
133
2982
134
        for ( Node node : complexNode.getChildren() )
2983
135
        {
2984
136
            dispatcher( node, writer );
2985
137
        }
2986
138
2987
139
        writeEndElement( writer );
2988
140
    }
2989
141
2990
142
    private void writeCollectionNode( CollectionNode collectionNode, XMLStreamWriter writer ) throws XMLStreamException, IOException
2991
143
    {
2992
144
        if ( collectionNode.isWrapping() )
2993
145
        {
2994
146
            writeStartElement( collectionNode, writer );
2995
147
        }
2996
148
2997
149
        for ( Node node : collectionNode.getChildren() )
2998
150
        {
2999
151
            dispatcher( node, writer );
3000
152
        }
3001
153
3002
154
        if ( collectionNode.isWrapping() )
3003
155
        {
3004
156
            writeEndElement( writer );
3005
157
        }
3006
158
    }
3007
159
3008
160
    private void dispatcher( Node node, XMLStreamWriter writer ) throws IOException, XMLStreamException
3009
161
    {
3010
162
        if ( !StringUtils.isEmpty( node.getComment() ) )
3011
163
        {
3012
164
            writer.writeComment( node.getComment() );
3013
165
        }
3014
166
3015
167
        switch ( node.getType() )
3016
168
        {
3017
169
            case SIMPLE:
3018
170
                writeSimpleNode( (SimpleNode) node, writer );
3019
171
                break;
3020
172
            case COMPLEX:
3021
173
                writeComplexNode( (ComplexNode) node, writer );
3022
174
                break;
3023
175
            case COLLECTION:
3024
176
                writeCollectionNode( (CollectionNode) node, writer );
3025
177
                break;
3026
178
        }
3027
179
    }
3028
180
3029
181
    private void writeStartElement( Node node, XMLStreamWriter writer ) throws XMLStreamException
3030
182
    {
3031
183
        if ( !StringUtils.isEmpty( node.getNamespace() ) )
3032
184
        {
3033
185
            writer.writeStartElement( "", node.getName(), node.getNamespace() );
3034
186
        }
3035
187
        else
3036
188
        {
3037
189
            writer.writeStartElement( node.getName() );
3038
190
        }
3039
191
    }
3040
192
3041
193
    private void writeEndElement( XMLStreamWriter writer ) throws XMLStreamException
3042
194
    {
3043
195
        writer.writeEndElement();
3044
196
    }
3045
197
}
3046
0
198
3047
=== added directory 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/types'
3048
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/types/CollectionNode.java'
3049
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/types/CollectionNode.java	1970-01-01 00:00:00 +0000
3050
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/types/CollectionNode.java	2014-06-05 17:39:07 +0000
3051
@@ -0,0 +1,58 @@
3052
1
package org.hisp.dhis.node.types;
3053
2
3054
3
/*
3055
4
 * Copyright (c) 2004-2014, University of Oslo
3056
5
 * All rights reserved.
3057
6
 *
3058
7
 * Redistribution and use in source and binary forms, with or without
3059
8
 * modification, are permitted provided that the following conditions are met:
3060
9
 * Redistributions of source code must retain the above copyright notice, this
3061
10
 * list of conditions and the following disclaimer.
3062
11
 *
3063
12
 * Redistributions in binary form must reproduce the above copyright notice,
3064
13
 * this list of conditions and the following disclaimer in the documentation
3065
14
 * and/or other materials provided with the distribution.
3066
15
 * Neither the name of the HISP project nor the names of its contributors may
3067
16
 * be used to endorse or promote products derived from this software without
3068
17
 * specific prior written permission.
3069
18
 *
3070
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
3071
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
3072
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
3073
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
3074
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
3075
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
3076
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
3077
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
3078
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
3079
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
3080
29
 */
3081
30
3082
31
import org.hisp.dhis.node.AbstractNode;
3083
32
import org.hisp.dhis.node.NodeType;
3084
33
3085
34
/**
3086
35
 * @author Morten Olav Hansen <mortenoh@gmail.com>
3087
36
 */
3088
37
public class CollectionNode extends AbstractNode
3089
38
{
3090
39
    /**
3091
40
     * Should this collection act as a wrapper around its children.
3092
41
     */
3093
42
    boolean wrapping = true;
3094
43
3095
44
    public CollectionNode( String name )
3096
45
    {
3097
46
        super( name, NodeType.COLLECTION );
3098
47
    }
3099
48
3100
49
    public boolean isWrapping()
3101
50
    {
3102
51
        return wrapping;
3103
52
    }
3104
53
3105
54
    public void setWrapping( boolean wrapping )
3106
55
    {
3107
56
        this.wrapping = wrapping;
3108
57
    }
3109
58
}
3110
0
59
3111
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/types/ComplexNode.java'
3112
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/types/ComplexNode.java	1970-01-01 00:00:00 +0000
3113
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/types/ComplexNode.java	2014-06-05 17:39:07 +0000
3114
@@ -0,0 +1,43 @@
3115
1
package org.hisp.dhis.node.types;
3116
2
3117
3
/*
3118
4
 * Copyright (c) 2004-2014, University of Oslo
3119
5
 * All rights reserved.
3120
6
 *
3121
7
 * Redistribution and use in source and binary forms, with or without
3122
8
 * modification, are permitted provided that the following conditions are met:
3123
9
 * Redistributions of source code must retain the above copyright notice, this
3124
10
 * list of conditions and the following disclaimer.
3125
11
 *
3126
12
 * Redistributions in binary form must reproduce the above copyright notice,
3127
13
 * this list of conditions and the following disclaimer in the documentation
3128
14
 * and/or other materials provided with the distribution.
3129
15
 * Neither the name of the HISP project nor the names of its contributors may
3130
16
 * be used to endorse or promote products derived from this software without
3131
17
 * specific prior written permission.
3132
18
 *
3133
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
3134
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
3135
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
3136
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
3137
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
3138
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
3139
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
3140
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
3141
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
3142
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
3143
29
 */
3144
30
3145
31
import org.hisp.dhis.node.AbstractNode;
3146
32
import org.hisp.dhis.node.NodeType;
3147
33
3148
34
/**
3149
35
 * @author Morten Olav Hansen <mortenoh@gmail.com>
3150
36
 */
3151
37
public class ComplexNode extends AbstractNode
3152
38
{
3153
39
    public ComplexNode( String name )
3154
40
    {
3155
41
        super( name, NodeType.COMPLEX );
3156
42
    }
3157
43
}
3158
0
44
3159
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/types/RootNode.java'
3160
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/types/RootNode.java	1970-01-01 00:00:00 +0000
3161
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/types/RootNode.java	2014-06-05 17:39:07 +0000
3162
@@ -0,0 +1,40 @@
3163
1
package org.hisp.dhis.node.types;
3164
2
3165
3
/*
3166
4
 * Copyright (c) 2004-2014, University of Oslo
3167
5
 * All rights reserved.
3168
6
 *
3169
7
 * Redistribution and use in source and binary forms, with or without
3170
8
 * modification, are permitted provided that the following conditions are met:
3171
9
 * Redistributions of source code must retain the above copyright notice, this
3172
10
 * list of conditions and the following disclaimer.
3173
11
 *
3174
12
 * Redistributions in binary form must reproduce the above copyright notice,
3175
13
 * this list of conditions and the following disclaimer in the documentation
3176
14
 * and/or other materials provided with the distribution.
3177
15
 * Neither the name of the HISP project nor the names of its contributors may
3178
16
 * be used to endorse or promote products derived from this software without
3179
17
 * specific prior written permission.
3180
18
 *
3181
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
3182
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
3183
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
3184
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
3185
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
3186
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
3187
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
3188
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
3189
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
3190
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
3191
29
 */
3192
30
3193
31
/**
3194
32
 * @author Morten Olav Hansen <mortenoh@gmail.com>
3195
33
 */
3196
34
public class RootNode extends ComplexNode
3197
35
{
3198
36
    public RootNode( String name )
3199
37
    {
3200
38
        super( name );
3201
39
    }
3202
40
}
3203
0
41
3204
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/types/SimpleNode.java'
3205
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/types/SimpleNode.java	1970-01-01 00:00:00 +0000
3206
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/types/SimpleNode.java	2014-06-05 17:39:07 +0000
3207
@@ -0,0 +1,78 @@
3208
1
package org.hisp.dhis.node.types;
3209
2
3210
3
/*
3211
4
 * Copyright (c) 2004-2014, University of Oslo
3212
5
 * All rights reserved.
3213
6
 *
3214
7
 * Redistribution and use in source and binary forms, with or without
3215
8
 * modification, are permitted provided that the following conditions are met:
3216
9
 * Redistributions of source code must retain the above copyright notice, this
3217
10
 * list of conditions and the following disclaimer.
3218
11
 *
3219
12
 * Redistributions in binary form must reproduce the above copyright notice,
3220
13
 * this list of conditions and the following disclaimer in the documentation
3221
14
 * and/or other materials provided with the distribution.
3222
15
 * Neither the name of the HISP project nor the names of its contributors may
3223
16
 * be used to endorse or promote products derived from this software without
3224
17
 * specific prior written permission.
3225
18
 *
3226
19
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
3227
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
3228
21
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
3229
22
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
3230
23
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
3231
24
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
3232
25
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
3233
26
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
3234
27
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
3235
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
3236
29
 */
3237
30
3238
31
import org.hisp.dhis.node.AbstractNode;
3239
32
import org.hisp.dhis.node.Node;
3240
33
import org.hisp.dhis.node.NodeType;
3241
34
import org.hisp.dhis.node.exception.InvalidTypeException;
3242
35
3243
36
/**
3244
37
 * @author Morten Olav Hansen <mortenoh@gmail.com>
3245
38
 */
3246
39
public class SimpleNode extends AbstractNode
3247
40
{
3248
41
    private final Object value;
3249
42
3250
43
    private boolean attribute;
3251
44
3252
45
    public SimpleNode( String name, Object value )
3253
46
    {
3254
47
        super( name, NodeType.SIMPLE );
3255
48
        this.value = value;
3256
49
        this.attribute = false;
3257
50
    }
3258
51
3259
52
    public Object getValue()
3260
53
    {
3261
54
        return value;
3262
55
    }
3263
56
3264
57
    public boolean isAttribute()
3265
58
    {
3266
59
        return attribute;
3267
60
    }
3268
61
3269
62
    public void setAttribute( boolean attribute )
3270
63
    {
3271
64
        this.attribute = attribute;
3272
65
    }
3273
66
3274
67
    @Override
3275
68
    public <T extends Node> T addChild( T child ) throws InvalidTypeException
3276
69
    {
3277
70
        throw new InvalidTypeException();
3278
71
    }
3279
72
3280
73
    @Override
3281
74
    public <T extends Node> void addChildren( Iterable<T> children )
3282
75
    {
3283
76
        throw new InvalidTypeException();
3284
77
    }
3285
78
}
3286
0
79
3287
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/BiMonthlyPeriodType.java'
3288
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/BiMonthlyPeriodType.java	2014-03-18 08:10:10 +0000
3289
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/BiMonthlyPeriodType.java	2014-06-05 17:39:07 +0000
3290
@@ -28,10 +28,9 @@
3291
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3292
29
 */
29
 */
3293
30
30
3298
31
import java.text.ParseException;
31
import com.google.common.collect.Lists;
3299
32
import java.text.SimpleDateFormat;
32
import org.hisp.dhis.calendar.DateUnit;
3300
33
import java.util.ArrayList;
33
3297
34
import java.util.Calendar;
3301
35
import java.util.Date;
34
import java.util.Date;
3302
36
import java.util.List;
35
import java.util.List;
3303
37
36
3304
@@ -61,29 +60,18 @@
3305
61
    }
60
    }
3306
62
61
3307
63
    @Override
62
    @Override
3331
64
    public Period createPeriod()
63
    public Period createPeriod( DateUnit dateUnit )
3332
65
    {
64
    {
3333
66
        return createPeriod( createCalendarInstance() );
65
        DateUnit start = new DateUnit( dateUnit );
3334
67
    }
66
        start.setMonth( ((start.getMonth() - 1) - (start.getMonth() - 1) % 2) + 1 );
3335
68
67
        start.setDay( 1 );
3336
69
    @Override
68
3337
70
    public Period createPeriod( Date date )
69
        DateUnit end = new DateUnit( start );
3338
71
    {
70
3339
72
        return createPeriod( createCalendarInstance( date ) );
71
        end = getCalendar().plusMonths( end, 1 );
3340
73
    }
72
        end.setDay( getCalendar().daysInMonth( end.getYear(), end.getMonth() ) );
3341
74
73
3342
75
    @Override
74
        return toIsoPeriod( start, end );
3320
76
    public Period createPeriod( Calendar cal )
3321
77
    {
3322
78
        cal.set( Calendar.MONTH, cal.get( Calendar.MONTH ) - cal.get( Calendar.MONTH ) % 2 );
3323
79
        cal.set( Calendar.DAY_OF_MONTH, 1 );
3324
80
3325
81
        Date startDate = cal.getTime();
3326
82
3327
83
        cal.add( Calendar.MONTH, 1 );
3328
84
        cal.set( Calendar.DAY_OF_MONTH, cal.getActualMaximum( Calendar.DAY_OF_MONTH ) );
3329
85
3330
86
        return new Period( this, startDate, cal.getTime() );
3343
87
    }
75
    }
3344
88
76
3345
89
    @Override
77
    @Override
3346
@@ -99,17 +87,19 @@
3347
99
    @Override
87
    @Override
3348
100
    public Period getNextPeriod( Period period )
88
    public Period getNextPeriod( Period period )
3349
101
    {
89
    {
3353
102
        Calendar cal = createCalendarInstance( period.getStartDate() );
90
        DateUnit dateUnit = getCalendar().fromIso( DateUnit.fromJdkDate( period.getStartDate() ) );
3354
103
        cal.add( Calendar.MONTH, 2 );
91
        dateUnit = getCalendar().plusMonths( dateUnit, 2 );
3355
104
        return createPeriod( cal );
92
3356
93
        return createPeriod( getCalendar().toIso( dateUnit ) );
3357
105
    }
94
    }
3358
106
95
3359
107
    @Override
96
    @Override
3360
108
    public Period getPreviousPeriod( Period period )
97
    public Period getPreviousPeriod( Period period )
3361
109
    {
98
    {
3365
110
        Calendar cal = createCalendarInstance( period.getStartDate() );
99
        DateUnit dateUnit = getCalendar().fromIso( DateUnit.fromJdkDate( period.getStartDate() ) );
3366
111
        cal.add( Calendar.MONTH, -2 );
100
        dateUnit = getCalendar().minusMonths( dateUnit, 2 );
3367
112
        return createPeriod( cal );
101
3368
102
        return createPeriod( getCalendar().toIso( dateUnit ) );
3369
113
    }
103
    }
3370
114
104
3371
115
    /**
105
    /**
3372
@@ -117,18 +107,19 @@
3373
117
     * the given Period exists.
107
     * the given Period exists.
3374
118
     */
108
     */
3375
119
    @Override
109
    @Override
3377
120
    public List<Period> generatePeriods( Date date )
110
    public List<Period> generatePeriods( DateUnit dateUnit )
3378
121
    {
111
    {
3386
122
        Calendar cal = createCalendarInstance( date );
112
        dateUnit.setMonth( 1 );
3387
123
        cal.set( Calendar.DAY_OF_YEAR, 1 );
113
        dateUnit.setDay( 1 );
3388
124
114
3389
125
        int year = cal.get( Calendar.YEAR );
115
        List<Period> periods = Lists.newArrayList();
3390
126
        ArrayList<Period> periods = new ArrayList<Period>();
116
3391
127
117
        int year = dateUnit.getYear();
3392
128
        while ( cal.get( Calendar.YEAR ) == year )
118
3393
119
        while ( dateUnit.getYear() == year )
3394
129
        {
120
        {
3397
130
            periods.add( createPeriod( cal ) );
121
            periods.add( createPeriod( dateUnit ) );
3398
131
            cal.add( Calendar.MONTH, 2 );
122
            dateUnit = getCalendar().plusMonths( dateUnit, 2 );
3399
132
        }
123
        }
3400
133
124
3401
134
        return periods;
125
        return periods;
3402
@@ -139,41 +130,26 @@
3403
139
     * which the given date is inside.
130
     * which the given date is inside.
3404
140
     */
131
     */
3405
141
    @Override
132
    @Override
3407
142
    public List<Period> generateRollingPeriods( Date date )
133
    public List<Period> generateRollingPeriods( DateUnit dateUnit )
3408
143
    {
134
    {
3415
144
        Calendar cal = createCalendarInstance( date );
135
        dateUnit.setDay( 1 );
3416
145
        cal.set( Calendar.DAY_OF_MONTH, 1 );
136
        dateUnit = getCalendar().minusMonths( dateUnit, (dateUnit.getMonth() % 2) + 10 );
3417
146
        cal.add( Calendar.MONTH, ( ( cal.get( Calendar.MONTH ) % 2 ) * -1 ) - 10 );        
137
3418
147
138
        List<Period> periods = Lists.newArrayList();
3419
148
        ArrayList<Period> periods = new ArrayList<Period>();
139
3414
149
        
3420
150
        for ( int i = 0; i < 6; i++ )
140
        for ( int i = 0; i < 6; i++ )
3421
151
        {
141
        {
3424
152
            periods.add( createPeriod( cal ) );
142
            periods.add( createPeriod( dateUnit ) );
3425
153
            cal.add( Calendar.MONTH, 2 );
143
            dateUnit = getCalendar().plusMonths( dateUnit, 2 );
3426
154
        }
144
        }
3428
155
        
145
3429
156
        return periods;
146
        return periods;
3430
157
    }
147
    }
3431
158
148
3432
159
    @Override
149
    @Override
3440
160
    public String getIsoDate( Period period )
150
    public String getIsoDate( DateUnit dateUnit )
3434
161
    {        
3435
162
        return new SimpleDateFormat( "yyyyMM" ).format( period.getStartDate() ) + "B";
3436
163
    }
3437
164
3438
165
    @Override
3439
166
    public Period createPeriod( String isoDate )
3441
167
    {
151
    {
3451
168
        try
152
        return String.format( "%d%02dB", dateUnit.getYear(), dateUnit.getMonth() );
3443
169
        {
3444
170
            Date date = new SimpleDateFormat( "yyyyMM" ).parse( isoDate.substring( 0, 6 ) );
3445
171
            return createPeriod( date );
3446
172
        }
3447
173
        catch ( ParseException ex )
3448
174
        {
3449
175
            throw new RuntimeException( ex );
3450
176
        }
3452
177
    }
153
    }
3453
178
154
3454
179
    @Override
155
    @Override
3455
@@ -181,16 +157,16 @@
3456
181
    {
157
    {
3457
182
        return ISO_FORMAT;
158
        return ISO_FORMAT;
3458
183
    }
159
    }
3460
184
    
160
3461
185
    @Override
161
    @Override
3462
186
    public Date getRewindedDate( Date date, Integer rewindedPeriods )
162
    public Date getRewindedDate( Date date, Integer rewindedPeriods )
3463
187
    {
163
    {
3465
188
        date = date != null ? date : new Date();        
164
        date = date != null ? date : new Date();
3466
189
        rewindedPeriods = rewindedPeriods != null ? rewindedPeriods : 1;
165
        rewindedPeriods = rewindedPeriods != null ? rewindedPeriods : 1;
3467
190
166
3470
191
        Calendar cal = createCalendarInstance( date );        
167
        DateUnit dateUnit = getCalendar().fromIso( DateUnit.fromJdkDate( date ) );
3471
192
        cal.add( Calendar.MONTH, (rewindedPeriods * -2) );
168
        dateUnit = getCalendar().minusMonths( dateUnit, rewindedPeriods );
3472
193
169
3474
194
        return cal.getTime();
170
        return getCalendar().toIso( dateUnit ).toJdkDate();
3475
195
    }
171
    }
3476
196
}
172
}
3477
197
173
3478
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Cal.java'
3479
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Cal.java	2014-05-14 07:18:32 +0000
3480
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Cal.java	2014-06-05 17:39:07 +0000
3481
@@ -28,43 +28,62 @@
3482
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3483
29
 */
29
 */
3484
30
30
3485
31
import org.hisp.dhis.calendar.CalendarService;
3486
32
import org.hisp.dhis.calendar.DateUnit;
3487
33
import org.hisp.dhis.calendar.impl.Iso8601Calendar;
3488
34
3489
31
import java.util.Calendar;
35
import java.util.Calendar;
3490
32
import java.util.Date;
36
import java.util.Date;
3491
33
import java.util.GregorianCalendar;
3492
34
37
3493
35
/**
38
/**
3494
39
 * An abstraction over a calendar implementation, expects input to be in whatever the current
3495
40
 * system calendar is using, and all output will be in ISO 8601.
3496
41
 *
3497
36
 * @author Lars Helge Overland
42
 * @author Lars Helge Overland
3498
43
 * @author Morten Olav Hansen <mortenoh@gmail.com>
3499
37
 */
44
 */
3500
38
public class Cal
45
public class Cal
3501
39
{
46
{
3504
40
    private Calendar calendar;
47
    private static CalendarService calendarService;
3505
41
    
48
3506
49
    public static void setCalendarService( CalendarService calendarService )
3507
50
    {
3508
51
        Cal.calendarService = calendarService;
3509
52
    }
3510
53
3511
54
    public static org.hisp.dhis.calendar.Calendar getCalendar()
3512
55
    {
3513
56
        if ( calendarService != null )
3514
57
        {
3515
58
            return calendarService.getSystemCalendar();
3516
59
        }
3517
60
3518
61
        return Iso8601Calendar.getInstance();
3519
62
    }
3520
63
3521
64
    private DateUnit dateUnit = new DateUnit( 1, 1, 1 );
3522
65
3523
42
    public Cal()
66
    public Cal()
3524
43
    {
67
    {
3527
44
        calendar = new GregorianCalendar();
68
        dateUnit = getCalendar().today();
3526
45
        calendar.clear();
3528
46
    }
69
    }
3529
47
70
3530
48
    /**
71
    /**
3535
49
    * @param year the year starting at AD 1.
72
     * @param year  the year starting at AD 1.
3536
50
    * @param month the month starting at 1.
73
     * @param month the month starting at 1.
3537
51
    * @param day the day of the month starting at 1.
74
     * @param day   the day of the month starting at 1.
3538
52
    */
75
     */
3539
53
    public Cal( int year, int month, int day )
76
    public Cal( int year, int month, int day )
3540
54
    {
77
    {
3544
55
        calendar = new GregorianCalendar();
78
        dateUnit = new DateUnit( year, month, day );
3542
56
        calendar.clear();
3543
57
        set( year, month, day );
3545
58
    }
79
    }
3547
59
    
80
3548
60
    /**
81
    /**
3549
61
     * @param date the date.
82
     * @param date the date.
3550
62
     */
83
     */
3551
63
    public Cal( Date date )
84
    public Cal( Date date )
3552
64
    {
85
    {
3556
65
        calendar = new GregorianCalendar();
86
        dateUnit = DateUnit.fromJdkDate( date );
3554
66
        calendar.clear();
3555
67
        calendar.setTime( date );
3557
68
    }
87
    }
3558
69
88
3559
70
    /**
89
    /**
3560
@@ -72,95 +91,107 @@
3561
72
     */
91
     */
3562
73
    public Cal now()
92
    public Cal now()
3563
74
    {
93
    {
3565
75
        calendar.setTime( new Date() );
94
        dateUnit = getCalendar().today();
3566
76
        return this;
95
        return this;
3567
77
    }
96
    }
3569
78
        
97
3570
79
    /**
98
    /**
3571
80
     * Adds the given amount of time to the given calendar field.
99
     * Adds the given amount of time to the given calendar field.
3574
81
     * 
100
     * @param field  the calendar field.
3573
82
     * @param field the calendar field.
3575
83
     * @param amount the amount of time.
101
     * @param amount the amount of time.
3576
84
     */
102
     */
3577
85
    public Cal add( int field, int amount )
103
    public Cal add( int field, int amount )
3578
86
    {
104
    {
3580
87
        calendar.add( field, amount );
105
        switch ( field )
3581
106
        {
3582
107
            case Calendar.YEAR:
3583
108
                getCalendar().plusYears( dateUnit, amount );
3584
109
            case Calendar.MONTH:
3585
110
                getCalendar().plusMonths( dateUnit, amount );
3586
111
            case Calendar.DAY_OF_MONTH:
3587
112
                getCalendar().plusDays( dateUnit, amount );
3588
113
        }
3589
114
3590
88
        return this;
115
        return this;
3591
89
    }
116
    }
3592
90
117
3593
91
    /**
118
    /**
3594
92
     * Subtracts the given amount of time to the given calendar field.
119
     * Subtracts the given amount of time to the given calendar field.
3597
93
     * 
120
     * @param field  the calendar field.
3596
94
     * @param field the calendar field.
3598
95
     * @param amount the amount of time.
121
     * @param amount the amount of time.
3599
96
     */
122
     */
3600
97
    public Cal subtract( int field, int amount )
123
    public Cal subtract( int field, int amount )
3601
98
    {
124
    {
3603
99
        calendar.add( field, amount * -1 );
125
        switch ( field )
3604
126
        {
3605
127
            case Calendar.YEAR:
3606
128
                getCalendar().minusYears( dateUnit, amount );
3607
129
            case Calendar.MONTH:
3608
130
                getCalendar().minusMonths( dateUnit, amount );
3609
131
            case Calendar.DAY_OF_MONTH:
3610
132
                getCalendar().minusDays( dateUnit, amount );
3611
133
        }
3612
134
3613
100
        return this;
135
        return this;
3614
101
    }
136
    }
3615
102
137
3616
103
    /**
138
    /**
3617
104
     * Returns the value of the given calendar field.
139
     * Returns the value of the given calendar field.
3618
105
     * 
3619
106
     * @param field the field.
140
     * @param field the field.
3620
107
     */
141
     */
3621
108
    public int get( int field )
142
    public int get( int field )
3622
109
    {
143
    {
3624
110
        return calendar.get( field );
144
        return getCalendar().toIso( dateUnit ).toJdkCalendar().get( field );
3625
111
    }
145
    }
3627
112
    
146
3628
113
    /**
147
    /**
3629
114
     * Returns the current year.
148
     * Returns the current year.
3630
115
     * @return current year
149
     * @return current year
3631
116
     */
150
     */
3632
117
    public int getYear()
151
    public int getYear()
3633
118
    {
152
    {
3635
119
        return calendar.get( Calendar.YEAR );
153
        return getCalendar().toIso( dateUnit ).toJdkCalendar().get( Calendar.YEAR );
3636
120
    }
154
    }
3638
121
    
155
3639
122
    /**
156
    /**
3640
123
     * Sets the current time.
157
     * Sets the current time.
3643
124
     * 
158
     * @param year  the year starting at AD 1.
3642
125
     * @param year the year starting at AD 1.
3644
126
     * @param month the month starting at 1.
159
     * @param month the month starting at 1.
3646
127
     * @param day the day of the month starting at 1.
160
     * @param day   the day of the month starting at 1.
3647
128
     */
161
     */
3648
129
    public Cal set( int year, int month, int day )
162
    public Cal set( int year, int month, int day )
3649
130
    {
163
    {
3651
131
        calendar.set( year, month - 1, day );
164
        dateUnit = new DateUnit( year, month, day );
3652
132
        return this;
165
        return this;
3653
133
    }
166
    }
3654
134
167
3655
135
    /**
168
    /**
3656
136
     * Sets the current month and day.
169
     * Sets the current month and day.
3657
137
     * 
3658
138
     * @param month the month starting at 1.
170
     * @param month the month starting at 1.
3660
139
     * @param day the day of the month starting at 1.
171
     * @param day   the day of the month starting at 1.
3661
140
     */
172
     */
3662
141
    public Cal set( int month, int day )
173
    public Cal set( int month, int day )
3663
142
    {
174
    {
3666
143
        calendar.set( Calendar.MONTH, month - 1 );
175
        dateUnit.setMonth( month );
3667
144
        calendar.set( Calendar.DAY_OF_MONTH, day );
176
        dateUnit.setDay( day );
3668
145
        return this;
177
        return this;
3671
146
    }    
178
    }
3672
147
    
179
3673
148
    /**
180
    /**
3674
149
     * Sets the current time.
181
     * Sets the current time.
3675
150
     * 
3676
151
     * @param date the date to base time on.
182
     * @param date the date to base time on.
3677
152
     */
183
     */
3678
153
    public Cal set( Date date )
184
    public Cal set( Date date )
3679
154
    {
185
    {
3681
155
        calendar.setTime( date );
186
        dateUnit = getCalendar().fromIso( DateUnit.fromJdkDate( date ) );
3682
156
        return this;
187
        return this;
3683
157
    }
188
    }
3685
158
    
189
3686
159
    /**
190
    /**
3687
160
     * Returns the current date the cal.
191
     * Returns the current date the cal.
3688
161
     */
192
     */
3689
162
    public Date time()
193
    public Date time()
3690
163
    {
194
    {
3692
164
        return calendar.getTime();
195
        return getCalendar().toIso( dateUnit ).toJdkDate();
3693
165
    }
196
    }
3694
166
}
197
}
3695
167
198
3696
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/CalendarPeriodType.java'
3697
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/CalendarPeriodType.java	2014-03-18 08:10:10 +0000
3698
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/CalendarPeriodType.java	2014-06-05 17:39:07 +0000
3699
@@ -28,15 +28,17 @@
3700
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3701
29
 */
29
 */
3702
30
30
3703
31
import com.google.common.collect.Lists;
3704
32
import org.hisp.dhis.calendar.DateUnit;
3705
33
3706
31
import java.util.ArrayList;
34
import java.util.ArrayList;
3707
32
import java.util.Calendar;
3708
33
import java.util.Date;
35
import java.util.Date;
3709
34
import java.util.List;
36
import java.util.List;
3710
35
37
3711
36
/**
38
/**
3712
37
 * The superclass of all PeriodTypes which represent typical calendar periods
39
 * The superclass of all PeriodTypes which represent typical calendar periods
3713
38
 * like days, weeks, months, etc.
40
 * like days, weeks, months, etc.
3715
39
 * 
41
 *
3716
40
 * @author Torgeir Lorange Ostby
42
 * @author Torgeir Lorange Ostby
3717
41
 * @version $Id: CalendarPeriodType.java 2952 2007-03-01 23:40:10Z torgeilo $
43
 * @version $Id: CalendarPeriodType.java 2952 2007-03-01 23:40:10Z torgeilo $
3718
42
 */
44
 */
3719
@@ -57,7 +59,7 @@
3720
57
     * Periods are returned. If the given Period is of different PeriodType than
59
     * Periods are returned. If the given Period is of different PeriodType than
3721
58
     * the executing PeriodType, or the given Period is invalid, the returned
60
     * the executing PeriodType, or the given Period is invalid, the returned
3722
59
     * Period might overlap the given Period.
61
     * Period might overlap the given Period.
3724
60
     * 
62
     *
3725
61
     * @param period the Period to base the next Period on.
63
     * @param period the Period to base the next Period on.
3726
62
     * @return a Period which is the next of the given Period.
64
     * @return a Period which is the next of the given Period.
3727
63
     */
65
     */
3728
@@ -68,7 +70,7 @@
3729
68
     * Periods are returned. If the given Period is of different PeriodType than
70
     * Periods are returned. If the given Period is of different PeriodType than
3730
69
     * the executing PeriodType, or the given Period is invalid, the returned
71
     * the executing PeriodType, or the given Period is invalid, the returned
3731
70
     * Period might overlap the given Period.
72
     * Period might overlap the given Period.
3733
71
     * 
73
     *
3734
72
     * @param period the Period to base the previous Period on.
74
     * @param period the Period to base the previous Period on.
3735
73
     * @return a Period which is the previous of the given Period.
75
     * @return a Period which is the previous of the given Period.
3736
74
     */
76
     */
3737
@@ -79,73 +81,83 @@
3738
79
     * Period. E.g. if the given Period is March 2007, and a monthly PeriodType
81
     * Period. E.g. if the given Period is March 2007, and a monthly PeriodType
3739
80
     * generates for a year, all months in 2007 should be generated and returned
82
     * generates for a year, all months in 2007 should be generated and returned
3740
81
     * in order.
83
     * in order.
3742
82
     * 
84
     *
3743
83
     * @param period the Period which touches the time span to generate Periods
85
     * @param period the Period which touches the time span to generate Periods
3745
84
     *        for.
86
     *               for.
3746
85
     * @return a list of Periods for a defined time span.
87
     * @return a list of Periods for a defined time span.
3747
86
     */
88
     */
3748
87
    public List<Period> generatePeriods( Period period )
89
    public List<Period> generatePeriods( Period period )
3749
88
    {
90
    {
3750
89
        return generatePeriods( period.getStartDate() );
91
        return generatePeriods( period.getStartDate() );
3753
90
    }    
92
    }
3754
91
    
93
3755
92
    /**
94
    /**
3756
93
     * Generates a list of Periods for a defined time span containing the given
95
     * Generates a list of Periods for a defined time span containing the given
3757
94
     * date. E.g. if the given date is March 2007, and a monthly PeriodType
96
     * date. E.g. if the given date is March 2007, and a monthly PeriodType
3758
95
     * generates for a year, all months in 2007 should be generated and returned
97
     * generates for a year, all months in 2007 should be generated and returned
3759
96
     * in order.
98
     * in order.
3761
97
     * 
99
     *
3762
98
     * @param date the date which touches the time span to generate Periods for.
100
     * @param date the date which touches the time span to generate Periods for.
3763
99
     * @return a list of Periods for a defined time span.
101
     * @return a list of Periods for a defined time span.
3764
100
     */
102
     */
3769
101
    public abstract List<Period> generatePeriods( Date date );
103
    public List<Period> generatePeriods( Date date )
3770
102
    
104
    {
3771
103
    public abstract List<Period> generateRollingPeriods( Date date );
105
        return generatePeriods( createLocalDateUnitInstance( date ) );
3772
104
    
106
    }
3773
107
3774
108
    public abstract List<Period> generatePeriods( DateUnit dateUnit );
3775
109
3776
110
    public List<Period> generateRollingPeriods( Date date )
3777
111
    {
3778
112
        return generateRollingPeriods( createLocalDateUnitInstance( date ) );
3779
113
    }
3780
114
3781
115
    public abstract List<Period> generateRollingPeriods( DateUnit dateUnit );
3782
116
3783
105
    /**
117
    /**
3784
106
     * Generates a list of Periods for the last 5 years. Must be overridden by
118
     * Generates a list of Periods for the last 5 years. Must be overridden by
3785
107
     * CalendarPeriodTypes which do not generate periods for the current year
119
     * CalendarPeriodTypes which do not generate periods for the current year
3786
108
     * only in their implementation of generatePeriods( Date ).
120
     * only in their implementation of generatePeriods( Date ).
3788
109
     * 
121
     *
3789
110
     * @param date the date which touches the time span to generate Periods for.
122
     * @param date the date which touches the time span to generate Periods for.
3790
111
     * @return a list of Periods for a defined time span.
123
     * @return a list of Periods for a defined time span.
3791
112
     */
124
     */
3792
113
    public List<Period> generateLast5Years( Date date )
125
    public List<Period> generateLast5Years( Date date )
3793
114
    {
126
    {
3798
115
        ArrayList<Period> periods = new ArrayList<Period>();
127
        DateUnit dateUnit = createLocalDateUnitInstance( date );
3799
116
        Calendar cal = createCalendarInstance( date );
128
        dateUnit = getCalendar().minusYears( dateUnit, 4 );
3800
117
        cal.add( Calendar.YEAR, -4 );
129
        List<Period> periods = Lists.newArrayList();
3801
118
        
130
3802
119
        for ( int i = 0; i < 5; i++ )
131
        for ( int i = 0; i < 5; i++ )
3803
120
        {
132
        {
3806
121
            periods.addAll( generatePeriods( cal.getTime() ) );
133
            periods.addAll( generatePeriods( dateUnit ) );
3807
122
            cal.add( Calendar.YEAR, 1 );
134
            dateUnit = getCalendar().plusYears( dateUnit, 1 );
3808
123
        }
135
        }
3810
124
        
136
3811
125
        return periods;
137
        return periods;
3812
126
    }
138
    }
3814
127
    
139
3815
128
    /**
140
    /**
3816
129
     * Generates a list of all Periods between the given start and end date. The
141
     * Generates a list of all Periods between the given start and end date. The
3817
130
     * first period will span the start date. The last period will span the end
142
     * first period will span the start date. The last period will span the end
3818
131
     * date.
143
     * date.
3820
132
     * 
144
     *
3821
133
     * @param startDate the start date.
145
     * @param startDate the start date.
3823
134
     * @param endDate the end date.
146
     * @param endDate   the end date.
3824
135
     * @return a list of Periods for the defined time span.
147
     * @return a list of Periods for the defined time span.
3825
136
     */
148
     */
3826
137
    public List<Period> generatePeriods( Date startDate, Date endDate )
149
    public List<Period> generatePeriods( Date startDate, Date endDate )
3827
138
    {
150
    {
3828
139
        List<Period> periods = new ArrayList<Period>();
151
        List<Period> periods = new ArrayList<Period>();
3830
140
        
152
3831
141
        Period period = createPeriod( startDate );
153
        Period period = createPeriod( startDate );
3833
142
        
154
3834
143
        while ( period.getStartDate().before( endDate ) )
155
        while ( period.getStartDate().before( endDate ) )
3835
144
        {
156
        {
3836
145
            periods.add( period );
157
            periods.add( period );
3837
146
            period = getNextPeriod( period );
158
            period = getNextPeriod( period );
3838
147
        }
159
        }
3840
148
        
160
3841
149
        return periods;
161
        return periods;
3842
150
    }
162
    }
3843
151
}
163
}
3844
152
164
3845
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/DailyPeriodType.java'
3846
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/DailyPeriodType.java	2014-03-18 08:10:10 +0000
3847
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/DailyPeriodType.java	2014-06-05 17:39:07 +0000
3848
@@ -28,19 +28,17 @@
3849
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3850
29
 */
29
 */
3851
30
30
3856
31
import java.text.ParseException;
31
import com.google.common.collect.Lists;
3857
32
import java.text.SimpleDateFormat;
32
import org.hisp.dhis.calendar.DateUnit;
3858
33
import java.util.ArrayList;
33
3855
34
import java.util.Calendar;
3859
35
import java.util.Date;
34
import java.util.Date;
3860
36
import java.util.List;
35
import java.util.List;
3861
37
36
3862
38
/**
37
/**
3863
39
 * PeriodType for daily Periods. A valid daily Period has equal startDate and
38
 * PeriodType for daily Periods. A valid daily Period has equal startDate and
3864
40
 * endDate.
39
 * endDate.
3866
41
 * 
40
 *
3867
42
 * @author Torgeir Lorange Ostby
41
 * @author Torgeir Lorange Ostby
3868
43
 * @version $Id: DailyPeriodType.java 2971 2007-03-03 18:54:56Z torgeilo $
3869
44
 */
42
 */
3870
45
public class DailyPeriodType
43
public class DailyPeriodType
3871
46
    extends CalendarPeriodType
44
    extends CalendarPeriodType
3872
@@ -70,31 +68,17 @@
3873
70
    }
68
    }
3874
71
69
3875
72
    @Override
70
    @Override
3895
73
    public Period createPeriod()
71
    public Period createPeriod( DateUnit dateUnit )
3896
74
    {
72
    {
3897
75
        return createPeriod( createCalendarInstance() );
73
        return toIsoPeriod( dateUnit );
3898
76
    }
74
    }
3899
77
75
3881
78
    @Override
3882
79
    public Period createPeriod( Date date )
3883
80
    {
3884
81
        return createPeriod( createCalendarInstance( date ) );
3885
82
    }
3886
83
    
3887
84
    @Override
3888
85
    public Period createPeriod( Calendar cal )
3889
86
    {
3890
87
        Date date = cal.getTime();
3891
88
3892
89
        return new Period( this, date, date );
3893
90
    }
3894
91
    
3900
92
    @Override
76
    @Override
3901
93
    public int getFrequencyOrder()
77
    public int getFrequencyOrder()
3902
94
    {
78
    {
3903
95
        return FREQUENCY_ORDER;
79
        return FREQUENCY_ORDER;
3904
96
    }
80
    }
3906
97
    
81
3907
98
    // -------------------------------------------------------------------------
82
    // -------------------------------------------------------------------------
3908
99
    // CalendarPeriodType functionality
83
    // CalendarPeriodType functionality
3909
100
    // -------------------------------------------------------------------------
84
    // -------------------------------------------------------------------------
3910
@@ -102,10 +86,10 @@
3911
102
    @Override
86
    @Override
3912
103
    public Period getNextPeriod( Period period )
87
    public Period getNextPeriod( Period period )
3913
104
    {
88
    {
3916
105
        Calendar cal = createCalendarInstance( period.getStartDate() );
89
        DateUnit dateUnit = createLocalDateUnitInstance( period.getStartDate() );
3917
106
        cal.add( Calendar.DAY_OF_YEAR, 1 );
90
        dateUnit = getCalendar().plusDays( dateUnit, 1 );
3918
107
91
3920
108
        Date date = cal.getTime();
92
        Date date = getCalendar().toIso( dateUnit ).toJdkDate();
3921
109
93
3922
110
        return new Period( this, date, date );
94
        return new Period( this, date, date );
3923
111
    }
95
    }
3924
@@ -113,75 +97,61 @@
3925
113
    @Override
97
    @Override
3926
114
    public Period getPreviousPeriod( Period period )
98
    public Period getPreviousPeriod( Period period )
3927
115
    {
99
    {
3930
116
        Calendar cal = createCalendarInstance( period.getStartDate() );
100
        DateUnit dateUnit = createLocalDateUnitInstance( period.getStartDate() );
3931
117
        cal.add( Calendar.DAY_OF_YEAR, -1 );
101
        dateUnit = getCalendar().minusDays( dateUnit, 1 );
3932
118
102
3934
119
        Date date = cal.getTime();
103
        Date date = getCalendar().toIso( dateUnit ).toJdkDate();
3935
120
104
3936
121
        return new Period( this, date, date );
105
        return new Period( this, date, date );
3937
122
    }
106
    }
3939
123
    
107
3940
124
    /**
108
    /**
3941
125
     * Generates daily Periods for the whole year in which the given Period's
109
     * Generates daily Periods for the whole year in which the given Period's
3942
126
     * startDate exists.
110
     * startDate exists.
3943
127
     */
111
     */
3944
128
    @Override
112
    @Override
3946
129
    public List<Period> generatePeriods( Date date )
113
    public List<Period> generatePeriods( DateUnit dateUnit )
3947
130
    {
114
    {
3955
131
        Calendar cal = createCalendarInstance( date );
115
        dateUnit.setMonth( 1 );
3956
132
        cal.set( Calendar.DAY_OF_YEAR, 1 );
116
        dateUnit.setDay( 1 );
3957
133
117
3958
134
        int year = cal.get( Calendar.YEAR );
118
        List<Period> periods = Lists.newArrayList();
3959
135
        ArrayList<Period> periods = new ArrayList<Period>();
119
3960
136
120
        int year = dateUnit.getYear();
3961
137
        while ( cal.get( Calendar.YEAR ) == year )
121
3962
122
        while ( year == dateUnit.getYear() )
3963
138
        {
123
        {
3966
139
            periods.add( createPeriod( cal.getTime() ) );
124
            periods.add( createPeriod( dateUnit ) );
3967
140
            cal.add( Calendar.DAY_OF_YEAR, 1 );
125
            dateUnit = getCalendar().plusDays( dateUnit, 1 );
3968
141
        }
126
        }
3969
142
127
3970
143
        return periods;
128
        return periods;
3971
144
    }
129
    }
3972
145
130
3973
146
    /**
131
    /**
3975
147
     * Generates the last 365 days where the last one is the day of the given 
132
     * Generates the last 365 days where the last one is the day of the given
3976
148
     * date.
133
     * date.
3977
149
     */
134
     */
3978
150
    @Override
135
    @Override
3980
151
    public List<Period> generateRollingPeriods( Date date )
136
    public List<Period> generateRollingPeriods( DateUnit dateUnit )
3981
152
    {
137
    {
3987
153
        Calendar cal = createCalendarInstance( date );
138
        dateUnit = getCalendar().minusDays( dateUnit, 364 );
3988
154
        cal.set( Calendar.DAY_OF_MONTH, -364 );        
139
3989
155
140
        List<Period> periods = Lists.newArrayList();
3990
156
        ArrayList<Period> periods = new ArrayList<Period>();
141
3986
157
        
3991
158
        for ( int i = 0; i < 365; i++ )
142
        for ( int i = 0; i < 365; i++ )
3992
159
        {
143
        {
4018
160
            periods.add( createPeriod( cal ) );
144
            periods.add( createPeriod( dateUnit ) );
4019
161
            cal.add( Calendar.MONTH, 1 );
145
            dateUnit = getCalendar().plusDays( dateUnit, 1 );
4020
162
        }
146
        }
4021
163
        
147
4022
164
        return periods;        
148
        return periods;
4023
165
    }
149
    }
4024
166
150
4025
167
    @Override
151
    @Override
4026
168
    public String getIsoDate( Period period )
152
    public String getIsoDate( DateUnit dateUnit )
4027
169
    {
153
    {
4028
170
        return new SimpleDateFormat( ISO_FORMAT ).format( period.getStartDate() );
154
        return String.format( "%d%02d%02d", dateUnit.getYear(), dateUnit.getMonth(), dateUnit.getDay() );
4004
171
    }
4005
172
4006
173
    @Override
4007
174
    public Period createPeriod( String isoDate )
4008
175
    {
4009
176
        try
4010
177
        {
4011
178
            Date date = new SimpleDateFormat( ISO_FORMAT ).parse( isoDate );
4012
179
            return createPeriod( date );
4013
180
        }
4014
181
        catch ( ParseException e )
4015
182
        {
4016
183
            throw new RuntimeException( e );
4017
184
        }
4029
185
    }
155
    }
4030
186
156
4031
187
    @Override
157
    @Override
4032
@@ -189,16 +159,16 @@
4033
189
    {
159
    {
4034
190
        return ISO_FORMAT;
160
        return ISO_FORMAT;
4035
191
    }
161
    }
4037
192
    
162
4038
193
    @Override
163
    @Override
4039
194
    public Date getRewindedDate( Date date, Integer rewindedPeriods )
164
    public Date getRewindedDate( Date date, Integer rewindedPeriods )
4040
195
    {
165
    {
4042
196
        date = date != null ? date : new Date();        
166
        date = date != null ? date : new Date();
4043
197
        rewindedPeriods = rewindedPeriods != null ? rewindedPeriods : 1;
167
        rewindedPeriods = rewindedPeriods != null ? rewindedPeriods : 1;
4044
198
168
4047
199
        Calendar cal = createCalendarInstance( date );        
169
        DateUnit dateUnit = createLocalDateUnitInstance( date );
4048
200
        cal.add( Calendar.DAY_OF_YEAR, (rewindedPeriods * -1) );
170
        dateUnit = getCalendar().minusDays( dateUnit, rewindedPeriods );
4049
201
171
4051
202
        return cal.getTime();
172
        return getCalendar().toIso( dateUnit ).toJdkDate();
4052
203
    }
173
    }
4053
204
}
174
}
4054
205
175
4055
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialAprilPeriodType.java'
4056
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialAprilPeriodType.java	2014-03-18 08:10:10 +0000
4057
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialAprilPeriodType.java	2014-06-05 17:39:07 +0000
4058
@@ -28,6 +28,8 @@
4059
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4060
29
 */
29
 */
4061
30
30
4062
31
import org.hisp.dhis.calendar.DateUnit;
4063
32
4064
31
import java.util.Calendar;
33
import java.util.Calendar;
4065
32
34
4066
33
/**
35
/**
4067
@@ -58,11 +60,9 @@
4068
58
    }
60
    }
4069
59
61
4070
60
    @Override
62
    @Override
4072
61
    public String getIsoDate( Period period )
63
    public String getIsoDate( DateUnit dateUnit )
4073
62
    {
64
    {
4077
63
        Calendar cal = createCalendarInstance( period.getStartDate() );
65
        return String.format( "%dApril", dateUnit.getYear() );
4075
64
        int year = cal.get( Calendar.YEAR );
4076
65
        return String.valueOf( year ) + "April";
4078
66
    }
66
    }
4079
67
67
4080
68
    @Override
68
    @Override
4081
69
69
4082
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialJulyPeriodType.java'
4083
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialJulyPeriodType.java	2014-03-18 08:10:10 +0000
4084
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialJulyPeriodType.java	2014-06-05 17:39:07 +0000
4085
@@ -28,6 +28,8 @@
4086
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4087
29
 */
29
 */
4088
30
30
4089
31
import org.hisp.dhis.calendar.DateUnit;
4090
32
4091
31
import java.util.Calendar;
33
import java.util.Calendar;
4092
32
34
4093
33
/**
35
/**
4094
@@ -58,11 +60,9 @@
4095
58
    }
60
    }
4096
59
61
4097
60
    @Override
62
    @Override
4099
61
    public String getIsoDate( Period period )
63
    public String getIsoDate( DateUnit dateUnit )
4100
62
    {
64
    {
4104
63
        Calendar cal = createCalendarInstance( period.getStartDate() );
65
        return String.format( "%dJuly", dateUnit.getYear() );
4102
64
        int year = cal.get( Calendar.YEAR );
4103
65
        return String.valueOf( year ) + "July";
4105
66
    }
66
    }
4106
67
67
4107
68
    @Override
68
    @Override
4108
69
69
4109
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialOctoberPeriodType.java'
4110
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialOctoberPeriodType.java	2014-03-18 08:10:10 +0000
4111
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialOctoberPeriodType.java	2014-06-05 17:39:07 +0000
4112
@@ -28,6 +28,8 @@
4113
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4114
29
 */
29
 */
4115
30
30
4116
31
import org.hisp.dhis.calendar.DateUnit;
4117
32
4118
31
import java.util.Calendar;
33
import java.util.Calendar;
4119
32
34
4120
33
/**
35
/**
4121
@@ -50,7 +52,7 @@
4122
50
    {
52
    {
4123
51
        return Calendar.OCTOBER;
53
        return Calendar.OCTOBER;
4124
52
    }
54
    }
4126
53
    
55
4127
54
    @Override
56
    @Override
4128
55
    public String getName()
57
    public String getName()
4129
56
    {
58
    {
4130
@@ -58,11 +60,9 @@
4131
58
    }
60
    }
4132
59
61
4133
60
    @Override
62
    @Override
4135
61
    public String getIsoDate( Period period )
63
    public String getIsoDate( DateUnit dateUnit )
4136
62
    {
64
    {
4140
63
        Calendar cal = createCalendarInstance( period.getStartDate() );
65
        return String.format( "%dOct", dateUnit.getYear() );
4138
64
        int year = cal.get( Calendar.YEAR );
4139
65
        return String.valueOf( year ) + "Oct";
4141
66
    }
66
    }
4142
67
67
4143
68
    @Override
68
    @Override
4144
69
69
4145
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialPeriodType.java'
4146
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialPeriodType.java	2014-03-18 08:10:10 +0000
4147
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialPeriodType.java	2014-06-05 17:39:07 +0000
4148
@@ -28,8 +28,9 @@
4149
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4150
29
 */
29
 */
4151
30
30
4154
31
import java.util.ArrayList;
31
import com.google.common.collect.Lists;
4155
32
import java.util.Calendar;
32
import org.hisp.dhis.calendar.DateUnit;
4156
33
4157
33
import java.util.Date;
34
import java.util.Date;
4158
34
import java.util.List;
35
import java.util.List;
4159
35
36
4160
@@ -45,44 +46,37 @@
4161
45
    private static final long serialVersionUID = 2649990007010207631L;
46
    private static final long serialVersionUID = 2649990007010207631L;
4162
46
47
4163
47
    public static final int FREQUENCY_ORDER = 365;
48
    public static final int FREQUENCY_ORDER = 365;
4165
48
    
49
4166
49
    // -------------------------------------------------------------------------
50
    // -------------------------------------------------------------------------
4167
50
    // Abstract methods
51
    // Abstract methods
4168
51
    // -------------------------------------------------------------------------
52
    // -------------------------------------------------------------------------
4169
52
53
4170
53
    protected abstract int getBaseMonth();
54
    protected abstract int getBaseMonth();
4172
54
    
55
4173
55
    // -------------------------------------------------------------------------
56
    // -------------------------------------------------------------------------
4174
56
    // PeriodType functionality
57
    // PeriodType functionality
4175
57
    // -------------------------------------------------------------------------
58
    // -------------------------------------------------------------------------
4176
58
59
4177
59
    @Override
60
    @Override
4204
60
    public Period createPeriod()
61
    public Period createPeriod( DateUnit dateUnit )
4205
61
    {
62
    {
4206
62
        return createPeriod( createCalendarInstance() );
63
        boolean past = dateUnit.getMonth() >= (getBaseMonth() + 1);
4207
63
    }
64
4208
64
65
        if ( !past )
4209
65
    @Override
66
        {
4210
66
    public Period createPeriod( Date date )
67
            dateUnit = getCalendar().minusYears( dateUnit, 1 );
4211
67
    {
68
        }
4212
68
        return createPeriod( createCalendarInstance( date ) );
69
4213
69
    }
70
        dateUnit.setMonth( getBaseMonth() + 1 );
4214
70
71
        dateUnit.setDay( 1 );
4215
71
    @Override
72
4216
72
    public Period createPeriod( Calendar cal )
73
        DateUnit start = new DateUnit( dateUnit );
4217
73
    {
74
        DateUnit end = new DateUnit( dateUnit );
4218
74
        boolean past = cal.get( Calendar.MONTH ) >= getBaseMonth();
75
4219
75
        
76
        end = getCalendar().plusYears( end, 1 );
4220
76
        cal.set( Calendar.YEAR, past ? cal.get( Calendar.YEAR ) : cal.get( Calendar.YEAR ) - 1 );
77
        end = getCalendar().minusDays( end, 1 );
4221
77
        cal.set( Calendar.MONTH, getBaseMonth() );
78
4222
78
        cal.set( Calendar.DATE, 1 );
79
        return toIsoPeriod( start, end );
4197
79
4198
80
        Date startDate = cal.getTime();
4199
81
4200
82
        cal.add( Calendar.YEAR, 1 );
4201
83
        cal.set( Calendar.DAY_OF_YEAR, cal.get( Calendar.DAY_OF_YEAR ) - 1  );
4202
84
4203
85
        return new Period( this, startDate, cal.getTime() );
4223
86
    }
80
    }
4224
87
81
4225
88
    @Override
82
    @Override
4226
@@ -98,40 +92,40 @@
4227
98
    @Override
92
    @Override
4228
99
    public Period getNextPeriod( Period period )
93
    public Period getNextPeriod( Period period )
4229
100
    {
94
    {
4233
101
        Calendar cal = createCalendarInstance( period.getStartDate() );
95
        DateUnit dateUnit = createLocalDateUnitInstance( period.getStartDate() );
4234
102
        cal.add( Calendar.YEAR, 1 );
96
        dateUnit = getCalendar().plusYears( dateUnit, 1 );
4235
103
        return createPeriod( cal );
97
4236
98
        return createPeriod( dateUnit );
4237
104
    }
99
    }
4238
105
100
4239
106
    @Override
101
    @Override
4240
107
    public Period getPreviousPeriod( Period period )
102
    public Period getPreviousPeriod( Period period )
4241
108
    {
103
    {
4245
109
        Calendar cal = createCalendarInstance( period.getStartDate() );
104
        DateUnit dateUnit = createLocalDateUnitInstance( period.getStartDate() );
4246
110
        cal.add( Calendar.YEAR, -1 );
105
        dateUnit = getCalendar().minusYears( dateUnit, 1 );
4247
111
        return createPeriod( cal );
106
4248
107
        return createPeriod( dateUnit );
4249
112
    }
108
    }
4250
113
109
4251
114
    /**
110
    /**
4253
115
     * Generates financial yearly periods for the last 5, current and next 5 
111
     * Generates financial yearly periods for the last 5, current and next 5
4254
116
     * financial years.
112
     * financial years.
4255
117
     */
113
     */
4256
118
    @Override
114
    @Override
4258
119
    public List<Period> generatePeriods( Date date )
115
    public List<Period> generatePeriods( DateUnit dateUnit )
4259
120
    {
116
    {
4271
121
        Calendar cal = createCalendarInstance( date );
117
        boolean past = dateUnit.getMonth() >= (getBaseMonth() + 1);
4272
122
        
118
4273
123
        boolean past = cal.get( Calendar.MONTH ) >= getBaseMonth();
119
        List<Period> periods = Lists.newArrayList();
4274
124
        
120
4275
125
        cal.add( Calendar.YEAR, past ? -5 : -6 );
121
        dateUnit = getCalendar().minusYears( dateUnit, past ? 5 : 6 );
4276
126
        cal.set( Calendar.MONTH, getBaseMonth() );
122
        dateUnit.setMonth( getBaseMonth() + 1 );
4277
127
        cal.set( Calendar.DATE, 1 );
123
        dateUnit.setDay( 1 );
4278
128
124
4279
129
        ArrayList<Period> periods = new ArrayList<Period>();
125
        for ( int i = 0; i < 11; i++ )
4269
130
4270
131
        for ( int i = 0; i < 11; ++i )
4280
132
        {
126
        {
4283
133
            periods.add( createPeriod( cal ) );
127
            periods.add( createPeriod( dateUnit ) );
4284
134
            cal.add( Calendar.YEAR, 1 );
128
            dateUnit = getCalendar().plusYears( dateUnit, 1 );
4285
135
        }
129
        }
4286
136
130
4287
137
        return periods;
131
        return periods;
4288
@@ -146,49 +140,43 @@
4289
146
    {
140
    {
4290
147
        return generateLast5Years( date );
141
        return generateLast5Years( date );
4291
148
    }
142
    }
4293
149
    
143
4294
144
    @Override
4295
145
    public List<Period> generateRollingPeriods( DateUnit dateUnit )
4296
146
    {
4297
147
        return generateLast5Years( getCalendar().toIso( dateUnit ).toJdkDate() );
4298
148
    }
4299
149
4300
150
    @Override
150
    @Override
4301
151
    public List<Period> generateLast5Years( Date date )
151
    public List<Period> generateLast5Years( Date date )
4302
152
    {
152
    {
4314
153
        Calendar cal = createCalendarInstance( date );
153
        DateUnit dateUnit = createLocalDateUnitInstance( date );
4315
154
        
154
        boolean past = dateUnit.getMonth() >= (getBaseMonth() + 1);
4316
155
        boolean past = cal.get( Calendar.MONTH ) >= getBaseMonth();
155
4317
156
        
156
        List<Period> periods = Lists.newArrayList();
4318
157
        cal.add( Calendar.YEAR, past ? -4 : -5 );
157
4319
158
        cal.set( Calendar.MONTH, getBaseMonth() );
158
        dateUnit = getCalendar().minusYears( dateUnit, past ? 4 : 5 );
4320
159
        cal.set( Calendar.DATE, 1 );
159
        dateUnit.setMonth( getBaseMonth() + 1 );
4321
160
160
        dateUnit.setDay( 1 );
4322
161
        ArrayList<Period> periods = new ArrayList<Period>();
161
4323
162
162
        for ( int i = 0; i < 5; i++ )
4313
163
        for ( int i = 0; i < 5; ++i )
4324
164
        {
163
        {
4327
165
            periods.add( createPeriod( cal ) );
164
            periods.add( createPeriod( dateUnit ) );
4328
166
            cal.add( Calendar.YEAR, 1 );
165
            dateUnit = getCalendar().plusYears( dateUnit, 1 );
4329
167
        }
166
        }
4330
168
167
4331
169
        return periods;
168
        return periods;
4332
170
    }
169
    }
4333
171
170
4334
172
    @Override
171
    @Override
4335
173
    public Period createPeriod( String isoDate )
4336
174
    {
4337
175
        int year = Integer.parseInt( isoDate.substring( 0, 4 ) );
4338
176
        Calendar cal = createCalendarInstance();
4339
177
        cal.set( Calendar.YEAR, year );
4340
178
        cal.set( Calendar.MONTH, 11 );
4341
179
        cal.set( Calendar.DAY_OF_MONTH, 31 );
4342
180
        return createPeriod( cal );
4343
181
    }
4344
182
    
4345
183
    @Override
4346
184
    public Date getRewindedDate( Date date, Integer rewindedPeriods )
172
    public Date getRewindedDate( Date date, Integer rewindedPeriods )
4347
185
    {
173
    {
4349
186
        date = date != null ? date : new Date();        
174
        date = date != null ? date : new Date();
4350
187
        rewindedPeriods = rewindedPeriods != null ? rewindedPeriods : 1;
175
        rewindedPeriods = rewindedPeriods != null ? rewindedPeriods : 1;
4351
188
176
4354
189
        Calendar cal = createCalendarInstance( date );        
177
        DateUnit dateUnit = createLocalDateUnitInstance( date );
4355
190
        cal.add( Calendar.YEAR, (rewindedPeriods * -1) );
178
        dateUnit = getCalendar().minusYears( dateUnit, rewindedPeriods );
4356
191
179
4358
192
        return cal.getTime();
180
        return getCalendar().toIso( dateUnit ).toJdkDate();
4359
193
    }
181
    }
4360
194
}
182
}
4361
195
183
4362
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/MonthlyPeriodType.java'
4363
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/MonthlyPeriodType.java	2014-05-13 16:00:50 +0000
4364
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/MonthlyPeriodType.java	2014-06-05 17:39:07 +0000
4365
@@ -28,10 +28,9 @@
4366
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4367
29
 */
29
 */
4368
30
30
4373
31
import java.text.ParseException;
31
import com.google.common.collect.Lists;
4374
32
import java.text.SimpleDateFormat;
32
import org.hisp.dhis.calendar.DateUnit;
4375
33
import java.util.ArrayList;
33
4372
34
import java.util.Calendar;
4376
35
import java.util.Date;
34
import java.util.Date;
4377
36
import java.util.List;
35
import java.util.List;
4378
37
36
4379
@@ -39,6 +38,7 @@
4380
39
 * PeriodType for monthly Periods. A valid monthly Period has startDate set to
38
 * PeriodType for monthly Periods. A valid monthly Period has startDate set to
4381
40
 * the first day of a calendar month, and endDate set to the last day of the
39
 * the first day of a calendar month, and endDate set to the last day of the
4382
41
 * same month.
40
 * same month.
4383
41
 *
4384
42
 * @author Torgeir Lorange Ostby
42
 * @author Torgeir Lorange Ostby
4385
43
 * @version $Id: MonthlyPeriodType.java 2971 2007-03-03 18:54:56Z torgeilo $
43
 * @version $Id: MonthlyPeriodType.java 2971 2007-03-03 18:54:56Z torgeilo $
4386
44
 */
44
 */
4387
@@ -52,8 +52,6 @@
4388
52
52
4389
53
    private static final String ISO_FORMAT = "yyyyMM";
53
    private static final String ISO_FORMAT = "yyyyMM";
4390
54
54
4391
55
    private static final String ALTERNATIVE_ISO_FORMAT = "yyyy-MM";
4392
56
4393
57
    /**
55
    /**
4394
58
     * The name of the MonthlyPeriodType, which is "Monthly".
56
     * The name of the MonthlyPeriodType, which is "Monthly".
4395
59
     */
57
     */
4396
@@ -72,25 +70,15 @@
4397
72
    }
70
    }
4398
73
71
4399
74
    @Override
72
    @Override
4419
75
    public Period createPeriod()
73
    public Period createPeriod( DateUnit dateUnit )
4420
76
    {
74
    {
4421
77
        return createPeriod( createCalendarInstance() );
75
        DateUnit start = new DateUnit( dateUnit );
4422
78
    }
76
        start.setDay( 1 );
4423
79
77
4424
80
    @Override
78
        DateUnit end = new DateUnit( dateUnit );
4425
81
    public Period createPeriod( Date date )
79
        end.setDay( getCalendar().daysInMonth( end.getYear(), end.getMonth() ) );
4426
82
    {
80
4427
83
        return createPeriod( createCalendarInstance( date ) );
81
        return toIsoPeriod( start, end );
4409
84
    }
4410
85
4411
86
    @Override
4412
87
    public Period createPeriod( Calendar cal )
4413
88
    {
4414
89
        cal.set( Calendar.DAY_OF_MONTH, 1 );
4415
90
        Date startDate = cal.getTime();
4416
91
        cal.set( Calendar.DAY_OF_MONTH, cal.getActualMaximum( Calendar.DAY_OF_MONTH ) );
4417
92
4418
93
        return new Period( this, startDate, cal.getTime() );
4428
94
    }
82
    }
4429
95
83
4430
96
    @Override
84
    @Override
4431
@@ -106,17 +94,19 @@
4432
106
    @Override
94
    @Override
4433
107
    public Period getNextPeriod( Period period )
95
    public Period getNextPeriod( Period period )
4434
108
    {
96
    {
4438
109
        Calendar cal = createCalendarInstance( period.getStartDate() );
97
        DateUnit dateUnit = getCalendar().fromIso( DateUnit.fromJdkDate( period.getStartDate() ) );
4439
110
        cal.add( Calendar.MONTH, 1 );
98
        dateUnit = getCalendar().plusMonths( dateUnit, 1 );
4440
111
        return createPeriod( cal );
99
4441
100
        return createPeriod( getCalendar().toIso( dateUnit ) );
4442
112
    }
101
    }
4443
113
102
4444
114
    @Override
103
    @Override
4445
115
    public Period getPreviousPeriod( Period period )
104
    public Period getPreviousPeriod( Period period )
4446
116
    {
105
    {
4450
117
        Calendar cal = createCalendarInstance( period.getStartDate() );
106
        DateUnit dateUnit = getCalendar().fromIso( DateUnit.fromJdkDate( period.getStartDate() ) );
4451
118
        cal.add( Calendar.MONTH, -1 );
107
        dateUnit = getCalendar().minusMonths( dateUnit, 1 );
4452
119
        return createPeriod( cal );
108
4453
109
        return createPeriod( getCalendar().toIso( dateUnit ) );
4454
120
    }
110
    }
4455
121
111
4456
122
    /**
112
    /**
4457
@@ -124,18 +114,19 @@
4458
124
     * startDate exists.
114
     * startDate exists.
4459
125
     */
115
     */
4460
126
    @Override
116
    @Override
4462
127
    public List<Period> generatePeriods( Date date )
117
    public List<Period> generatePeriods( DateUnit dateUnit )
4463
128
    {
118
    {
4471
129
        Calendar cal = createCalendarInstance( date );
119
        dateUnit.setMonth( 1 );
4472
130
        cal.set( Calendar.DAY_OF_YEAR, 1 );
120
        dateUnit.setDay( 1 );
4473
131
121
4474
132
        int year = cal.get( Calendar.YEAR );
122
        List<Period> periods = Lists.newArrayList();
4475
133
        ArrayList<Period> periods = new ArrayList<Period>();
123
4476
134
124
        int year = dateUnit.getYear();
4477
135
        while ( cal.get( Calendar.YEAR ) == year )
125
4478
126
        while ( dateUnit.getYear() == year )
4479
136
        {
127
        {
4482
137
            periods.add( createPeriod( cal ) );
128
            periods.add( createPeriod( dateUnit ) );
4483
138
            cal.add( Calendar.MONTH, 1 );
129
            dateUnit = getCalendar().plusMonths( dateUnit, 1 );
4484
139
        }
130
        }
4485
140
131
4486
141
        return periods;
132
        return periods;
4487
@@ -146,51 +137,26 @@
4488
146
     * given date is inside.
137
     * given date is inside.
4489
147
     */
138
     */
4490
148
    @Override
139
    @Override
4492
149
    public List<Period> generateRollingPeriods( Date date )
140
    public List<Period> generateRollingPeriods( DateUnit dateUnit )
4493
150
    {
141
    {
4497
151
        Calendar cal = createCalendarInstance( date );
142
        dateUnit.setDay( 1 );
4498
152
        cal.set( Calendar.DAY_OF_MONTH, 1 );
143
        dateUnit = getCalendar().minusMonths( dateUnit, 11 );
4496
153
        cal.add( Calendar.MONTH, -11 );
4499
154
144
4501
155
        ArrayList<Period> periods = new ArrayList<Period>();
145
        List<Period> periods = Lists.newArrayList();
4502
156
146
4503
157
        for ( int i = 0; i < 12; i++ )
147
        for ( int i = 0; i < 12; i++ )
4504
158
        {
148
        {
4507
159
            periods.add( createPeriod( cal ) );
149
            periods.add( createPeriod( dateUnit ) );
4508
160
            cal.add( Calendar.MONTH, 1 );
150
            dateUnit = getCalendar().plusMonths( dateUnit, 1 );
4509
161
        }
151
        }
4510
162
152
4511
163
        return periods;
153
        return periods;
4512
164
    }
154
    }
4513
165
155
4514
166
    @Override
156
    @Override
4542
167
    public String getIsoDate( Period period )
157
    public String getIsoDate( DateUnit dateUnit )
4543
168
    {
158
    {
4544
169
        return new SimpleDateFormat( ISO_FORMAT ).format( period.getStartDate() );
159
        return String.format( "%d%02d", dateUnit.getYear(), dateUnit.getMonth() );
4518
170
    }
4519
171
4520
172
    @Override
4521
173
    public Period createPeriod( String isoDate )
4522
174
    {
4523
175
        try
4524
176
        {
4525
177
            Date date = new SimpleDateFormat( ISO_FORMAT ).parse( isoDate );
4526
178
            return createPeriod( date );
4527
179
        }
4528
180
        catch ( ParseException ex )
4529
181
        {
4530
182
            // Ignore and try alternative format
4531
183
        }
4532
184
4533
185
        try
4534
186
        {
4535
187
            Date date = new SimpleDateFormat( ALTERNATIVE_ISO_FORMAT ).parse( isoDate );
4536
188
            return createPeriod( date );
4537
189
        }
4538
190
        catch ( ParseException ex )
4539
191
        {
4540
192
            throw new RuntimeException( ex );
4541
193
        }
4545
194
    }
160
    }
4546
195
161
4547
196
    @Override
162
    @Override
4548
@@ -205,9 +171,9 @@
4549
205
        date = date != null ? date : new Date();
171
        date = date != null ? date : new Date();
4550
206
        rewindedPeriods = rewindedPeriods != null ? rewindedPeriods : 1;
172
        rewindedPeriods = rewindedPeriods != null ? rewindedPeriods : 1;
4551
207
173
4554
208
        Calendar cal = createCalendarInstance( date );
174
        DateUnit dateUnit = getCalendar().fromIso( DateUnit.fromJdkDate( date ) );
4555
209
        cal.add( Calendar.MONTH, (rewindedPeriods * -1) );
175
        dateUnit = getCalendar().minusMonths( dateUnit, rewindedPeriods );
4556
210
176
4558
211
        return cal.getTime();
177
        return getCalendar().toIso( dateUnit ).toJdkDate();
4559
212
    }
178
    }
4560
213
}
179
}
4561
214
180
4562
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java'
4563
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java	2014-05-13 16:00:50 +0000
4564
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java	2014-06-05 17:39:07 +0000
4565
@@ -30,13 +30,15 @@
4566
30
30
4567
31
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
31
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
4568
32
import org.hisp.dhis.calendar.CalendarService;
32
import org.hisp.dhis.calendar.CalendarService;
4569
33
import org.hisp.dhis.calendar.DateInterval;
4570
34
import org.hisp.dhis.calendar.DateUnit;
4571
35
import org.hisp.dhis.calendar.DateUnitPeriodTypeParser;
4572
36
import org.hisp.dhis.calendar.DateUnitType;
4573
37
import org.hisp.dhis.calendar.PeriodTypeParser;
4574
33
import org.hisp.dhis.calendar.impl.Iso8601Calendar;
38
import org.hisp.dhis.calendar.impl.Iso8601Calendar;
4575
34
import org.hisp.dhis.common.DxfNamespaces;
39
import org.hisp.dhis.common.DxfNamespaces;
4576
35
import org.springframework.beans.factory.annotation.Autowired;
4577
36
40
4578
37
import java.io.Serializable;
41
import java.io.Serializable;
4579
38
import java.text.ParseException;
4580
39
import java.text.SimpleDateFormat;
4581
40
import java.util.ArrayList;
42
import java.util.ArrayList;
4582
41
import java.util.Calendar;
43
import java.util.Calendar;
4583
42
import java.util.Date;
44
import java.util.Date;
4584
@@ -47,9 +49,10 @@
4585
47
49
4586
48
/**
50
/**
4587
49
 * The superclass of all PeriodTypes.
51
 * The superclass of all PeriodTypes.
4588
52
 *
4589
50
 * @author Kristian Nordal
53
 * @author Kristian Nordal
4590
51
 */
54
 */
4592
52
@JacksonXmlRootElement(localName = "periodType", namespace = DxfNamespaces.DXF_2_0)
55
@JacksonXmlRootElement( localName = "periodType", namespace = DxfNamespaces.DXF_2_0 )
4593
53
public abstract class PeriodType
56
public abstract class PeriodType
4594
54
    implements Serializable
57
    implements Serializable
4595
55
{
58
{
4596
@@ -58,15 +61,19 @@
4597
58
     */
61
     */
4598
59
    private static final long serialVersionUID = 2402122626196305083L;
62
    private static final long serialVersionUID = 2402122626196305083L;
4599
60
63
4609
61
    private CalendarService calendarService;
64
    private static CalendarService calendarService;
4610
62
65
4611
63
    @Autowired
66
    public static void setCalendarService( CalendarService calendarService )
4612
64
    public void setCalendarService( CalendarService calendarService )
67
    {
4613
65
    {
68
        PeriodType.calendarService = calendarService;
4614
66
        this.calendarService = calendarService;
69
    }
4615
67
    }
70
4616
68
71
    public static CalendarService getCalendarService()
4617
69
    public org.hisp.dhis.calendar.Calendar getCalendar()
72
    {
4618
73
        return calendarService;
4619
74
    }
4620
75
4621
76
    public static org.hisp.dhis.calendar.Calendar getCalendar()
4622
70
    {
77
    {
4623
71
        if ( calendarService != null )
78
        if ( calendarService != null )
4624
72
        {
79
        {
4625
@@ -76,6 +83,8 @@
4626
76
        return Iso8601Calendar.getInstance();
83
        return Iso8601Calendar.getInstance();
4627
77
    }
84
    }
4628
78
85
4629
86
    protected PeriodTypeParser dateUnitFormat = new DateUnitPeriodTypeParser();
4630
87
4631
79
    // -------------------------------------------------------------------------
88
    // -------------------------------------------------------------------------
4632
80
    // Available PeriodTypes
89
    // Available PeriodTypes
4633
81
    // -------------------------------------------------------------------------
90
    // -------------------------------------------------------------------------
4634
@@ -112,6 +121,7 @@
4635
112
121
4636
113
    /**
122
    /**
4637
114
     * Returns an immutable list of all available PeriodTypes in their natural order.
123
     * Returns an immutable list of all available PeriodTypes in their natural order.
4638
124
     *
4639
115
     * @return all available PeriodTypes in their natural order.
125
     * @return all available PeriodTypes in their natural order.
4640
116
     */
126
     */
4641
117
    public static List<PeriodType> getAvailablePeriodTypes()
127
    public static List<PeriodType> getAvailablePeriodTypes()
4642
@@ -121,6 +131,7 @@
4643
121
131
4644
122
    /**
132
    /**
4645
123
     * Returns a PeriodType with a given name.
133
     * Returns a PeriodType with a given name.
4646
134
     *
4647
124
     * @param name the name of the PeriodType to return.
135
     * @param name the name of the PeriodType to return.
4648
125
     * @return the PeriodType with the given name or null if no such PeriodType
136
     * @return the PeriodType with the given name or null if no such PeriodType
4649
126
     * exists.
137
     * exists.
4650
@@ -145,6 +156,7 @@
4651
145
156
4652
146
    /**
157
    /**
4653
147
     * Get period type according to natural order order.
158
     * Get period type according to natural order order.
4654
159
     *
4655
148
     * @param index the index of the period type with base 1
160
     * @param index the index of the period type with base 1
4656
149
     * @return period type according to index order or null if no match
161
     * @return period type according to index order or null if no match
4657
150
     * TODO: Consider manual ordering, since relying on natural order might create problems if new periods are introduced.
162
     * TODO: Consider manual ordering, since relying on natural order might create problems if new periods are introduced.
4658
@@ -183,6 +195,7 @@
4659
183
195
4660
184
    /**
196
    /**
4661
185
     * Returns a unique name for the PeriodType.
197
     * Returns a unique name for the PeriodType.
4662
198
     *
4663
186
     * @return a unique name for the PeriodType. E.g. "Monthly".
199
     * @return a unique name for the PeriodType. E.g. "Monthly".
4664
187
     */
200
     */
4665
188
    public abstract String getName();
201
    public abstract String getName();
4666
@@ -190,29 +203,54 @@
4667
190
    /**
203
    /**
4668
191
     * Creates a valid Period based on the current date. E.g. if today is
204
     * Creates a valid Period based on the current date. E.g. if today is
4669
192
     * January 5. 2007, a monthly PeriodType should return January 2007.
205
     * January 5. 2007, a monthly PeriodType should return January 2007.
4670
206
     *
4671
193
     * @return a valid Period based on the current date.
207
     * @return a valid Period based on the current date.
4672
194
     */
208
     */
4674
195
    public abstract Period createPeriod();
209
    public Period createPeriod()
4675
210
    {
4676
211
        return createPeriod( createCalendarInstance() );
4677
212
    }
4678
196
213
4679
197
    /**
214
    /**
4680
198
     * Creates a valid Period based on the given date. E.g. the given date is
215
     * Creates a valid Period based on the given date. E.g. the given date is
4681
199
     * February 10. 2007, a monthly PeriodType should return February 2007.
216
     * February 10. 2007, a monthly PeriodType should return February 2007.
4682
217
     *
4683
200
     * @param date the date which is contained by the created period.
218
     * @param date the date which is contained by the created period.
4684
201
     * @return the valid Period based on the given date
219
     * @return the valid Period based on the given date
4685
202
     */
220
     */
4689
203
    public abstract Period createPeriod( Date date );
221
    public Period createPeriod( Date date )
4690
204
222
    {
4691
205
    public abstract Period createPeriod( Calendar cal );
223
        return createPeriod( createCalendarInstance( date ) );
4692
224
    }
4693
225
4694
226
    public Period createPeriod( Calendar cal )
4695
227
    {
4696
228
        return createPeriod( getCalendar().fromIso( DateUnit.fromJdkCalendar( cal ) ) );
4697
229
    }
4698
230
4699
231
    public Period toIsoPeriod( DateUnit start, DateUnit end )
4700
232
    {
4701
233
        return new Period( this, getCalendar().toIso( start ).toJdkDate(), getCalendar().toIso( end ).toJdkDate() );
4702
234
    }
4703
235
4704
236
    public Period toIsoPeriod( DateUnit dateUnit )
4705
237
    {
4706
238
        return toIsoPeriod( dateUnit, dateUnit );
4707
239
    }
4708
240
4709
241
    public abstract Period createPeriod( DateUnit dateUnit );
4710
206
242
4711
207
    /**
243
    /**
4712
208
     * Returns a comparable value for the frequency length of this PeriodType.
244
     * Returns a comparable value for the frequency length of this PeriodType.
4713
209
     * Shortest is 0.
245
     * Shortest is 0.
4714
246
     *
4715
210
     * @return the frequency order.
247
     * @return the frequency order.
4716
211
     */
248
     */
4717
212
    public abstract int getFrequencyOrder();
249
    public abstract int getFrequencyOrder();
4718
213
250
4719
214
    /**
251
    /**
4720
215
     * Returns a new date rewinded from now.
252
     * Returns a new date rewinded from now.
4721
253
     *
4722
216
     * @return the Date.
254
     * @return the Date.
4723
217
     */
255
     */
4724
218
    public abstract Date getRewindedDate( Date date, Integer rewindedPeriods );
256
    public abstract Date getRewindedDate( Date date, Integer rewindedPeriods );
4725
@@ -224,20 +262,18 @@
4726
224
    /**
262
    /**
4727
225
     * Returns an instance of a Calendar without any time of day, with the
263
     * Returns an instance of a Calendar without any time of day, with the
4728
226
     * current date.
264
     * current date.
4729
265
     *
4730
227
     * @return an instance of a Calendar without any time of day.
266
     * @return an instance of a Calendar without any time of day.
4731
228
     */
267
     */
4732
229
    public static Calendar createCalendarInstance()
268
    public static Calendar createCalendarInstance()
4733
230
    {
269
    {
4739
231
        Calendar calendar = new GregorianCalendar();
270
        return getCalendar().toIso( getCalendar().today() ).toJdkCalendar();
4735
232
4736
233
        clearTimeOfDay( calendar );
4737
234
4738
235
        return calendar;
4740
236
    }
271
    }
4741
237
272
4742
238
    /**
273
    /**
4743
239
     * Returns an instance of a Calendar without any time of day, with the given
274
     * Returns an instance of a Calendar without any time of day, with the given
4744
240
     * date.
275
     * date.
4745
276
     *
4746
241
     * @param date the date of the Calendar.
277
     * @param date the date of the Calendar.
4747
242
     * @return an instance of a Calendar without any time of day.
278
     * @return an instance of a Calendar without any time of day.
4748
243
     */
279
     */
4749
@@ -252,7 +288,19 @@
4750
252
    }
288
    }
4751
253
289
4752
254
    /**
290
    /**
4753
291
     * Returns an instance of a DateUnit.
4754
292
     *
4755
293
     * @param date date of calendar in local calendar
4756
294
     * @return an instance of a Calendar without any time of day.
4757
295
     */
4758
296
    public static DateUnit createLocalDateUnitInstance( Date date )
4759
297
    {
4760
298
        return getCalendar().fromIso( DateUnit.fromJdkDate( date ) );
4761
299
    }
4762
300
4763
301
    /**
4764
255
     * Clears the time of day in a Calendar instance.
302
     * Clears the time of day in a Calendar instance.
4765
303
     *
4766
256
     * @param calendar the Calendar to fix.
304
     * @param calendar the Calendar to fix.
4767
257
     */
305
     */
4768
258
    public static void clearTimeOfDay( Calendar calendar )
306
    public static void clearTimeOfDay( Calendar calendar )
4769
@@ -264,85 +312,24 @@
4770
264
    }
312
    }
4771
265
313
4772
266
    /**
314
    /**
4773
267
     * Parses a date from a String on the format YYYY-MM-DD.
4774
268
     * @param dateString the String to parse.
4775
269
     * @return a Date based on the given String.
4776
270
     */
4777
271
    public static Date getMediumDate( String dateString )
4778
272
    {
4779
273
        try
4780
274
        {
4781
275
            final SimpleDateFormat format = new SimpleDateFormat();
4782
276
            format.applyPattern( "yyyy-MM-dd" );
4783
277
            return dateString != null ? format.parse( dateString ) : null;
4784
278
        }
4785
279
        catch ( ParseException ex )
4786
280
        {
4787
281
            throw new RuntimeException( "Failed to parse medium date", ex );
4788
282
        }
4789
283
    }
4790
284
4791
285
    /**
4792
286
     * Returns a PeriodType corresponding to the provided string The test is
315
     * Returns a PeriodType corresponding to the provided string The test is
4793
287
     * quite rudimentary, testing for string format rather than invalid periods.
316
     * quite rudimentary, testing for string format rather than invalid periods.
4794
288
     * Currently only recognizes the basic subset of common period types.
317
     * Currently only recognizes the basic subset of common period types.
4795
318
     *
4796
289
     * @param isoPeriod String formatted period (2011, 201101, 2011W34, 2011Q1
319
     * @param isoPeriod String formatted period (2011, 201101, 2011W34, 2011Q1
4797
290
     *                  etc
320
     *                  etc
4798
291
     * @return the PeriodType or null if unrecognized
321
     * @return the PeriodType or null if unrecognized
4799
292
     */
322
     */
4800
293
    public static PeriodType getPeriodTypeFromIsoString( String isoPeriod )
323
    public static PeriodType getPeriodTypeFromIsoString( String isoPeriod )
4801
294
    {
324
    {
4848
295
        if ( isoPeriod.matches( "\\b\\d{4}\\b" ) )
325
        DateUnitType dateUnitType = DateUnitType.find( isoPeriod );
4849
296
        {
326
        return dateUnitType != null ? PERIOD_TYPE_MAP.get( dateUnitType.getType() ) : null;
4804
297
            return PERIOD_TYPE_MAP.get( YearlyPeriodType.NAME );
4805
298
        }
4806
299
        if ( isoPeriod.matches( "\\b\\d{4}[-]?\\d{2}\\b" ) )
4807
300
        {
4808
301
            return PERIOD_TYPE_MAP.get( MonthlyPeriodType.NAME );
4809
302
        }
4810
303
        if ( isoPeriod.matches( "\\b\\d{4}W\\d[\\d]?\\b" ) )
4811
304
        {
4812
305
            return PERIOD_TYPE_MAP.get( WeeklyPeriodType.NAME );
4813
306
        }
4814
307
        if ( isoPeriod.matches( "\\b\\d{8}\\b" ) )
4815
308
        {
4816
309
            return PERIOD_TYPE_MAP.get( DailyPeriodType.NAME );
4817
310
        }
4818
311
        if ( isoPeriod.matches( "\\b\\d{4}Q\\d\\b" ) )
4819
312
        {
4820
313
            return PERIOD_TYPE_MAP.get( QuarterlyPeriodType.NAME );
4821
314
        }
4822
315
        if ( isoPeriod.matches( "\\b\\d{4}S\\d\\b" ) )
4823
316
        {
4824
317
            return PERIOD_TYPE_MAP.get( SixMonthlyPeriodType.NAME );
4825
318
        }
4826
319
        if ( isoPeriod.matches( "\\b\\d{4}AprilS\\d\\b" ) )
4827
320
        {
4828
321
            return PERIOD_TYPE_MAP.get( SixMonthlyAprilPeriodType.NAME );
4829
322
        }
4830
323
        if ( isoPeriod.matches( "\\b\\d{6}B\\b" ) )
4831
324
        {
4832
325
            return PERIOD_TYPE_MAP.get( BiMonthlyPeriodType.NAME );
4833
326
        }
4834
327
        if ( isoPeriod.matches( "\\b\\d{4}April\\b" ) )
4835
328
        {
4836
329
            return PERIOD_TYPE_MAP.get( FinancialAprilPeriodType.NAME );
4837
330
        }
4838
331
        if ( isoPeriod.matches( "\\b\\d{4}July\\b" ) )
4839
332
        {
4840
333
            return PERIOD_TYPE_MAP.get( FinancialJulyPeriodType.NAME );
4841
334
        }
4842
335
        if ( isoPeriod.matches( "\\b\\d{4}Oct\\b" ) )
4843
336
        {
4844
337
            return PERIOD_TYPE_MAP.get( FinancialOctoberPeriodType.NAME );
4845
338
        }
4846
339
4847
340
        return null;
4850
341
    }
327
    }
4851
342
328
4852
343
    /**
329
    /**
4853
344
     * Returns a period type based on the given date string in ISO format. Returns
330
     * Returns a period type based on the given date string in ISO format. Returns
4854
345
     * null if the date string cannot be parsed to a date.
331
     * null if the date string cannot be parsed to a date.
4855
332
     *
4856
346
     * @param isoPeriod the date string in ISO format.
333
     * @param isoPeriod the date string in ISO format.
4857
347
     * @return a period.
334
     * @return a period.
4858
348
     */
335
     */
4859
@@ -368,6 +355,7 @@
4860
368
    /**
355
    /**
4861
369
     * Return the potential number of periods of the given period type which is
356
     * Return the potential number of periods of the given period type which is
4862
370
     * spanned by this period.
357
     * spanned by this period.
4863
358
     *
4864
371
     * @param type the period type.
359
     * @param type the period type.
4865
372
     * @return the potential number of periods of the given period type spanned
360
     * @return the potential number of periods of the given period type spanned
4866
373
     * by this period.
361
     * by this period.
4867
@@ -384,21 +372,55 @@
4868
384
    // -------------------------------------------------------------------------
372
    // -------------------------------------------------------------------------
4869
385
373
4870
386
    /**
374
    /**
4871
375
     * @param dateInterval DateInterval to create period from
4872
376
     * @return the period.
4873
377
     */
4874
378
    public Period createPeriod( DateInterval dateInterval )
4875
379
    {
4876
380
        if ( dateInterval == null || dateInterval.getFrom() == null || dateInterval.getTo() == null )
4877
381
        {
4878
382
            return null;
4879
383
        }
4880
384
4881
385
        final DateUnit from = getCalendar().toIso( dateInterval.getFrom() );
4882
386
        final DateUnit to = getCalendar().toIso( dateInterval.getTo() );
4883
387
4884
388
        return new Period( this, from.toJdkDate(), to.toJdkDate() );
4885
389
    }
4886
390
4887
391
    /**
4888
387
     * Returns an iso8601 formatted string representation of the period
392
     * Returns an iso8601 formatted string representation of the period
4889
393
     *
4890
388
     * @param period Period
394
     * @param period Period
4891
389
     * @return the period as string
395
     * @return the period as string
4892
390
     */
396
     */
4894
391
    public abstract String getIsoDate( Period period );
397
    public String getIsoDate( Period period )
4895
398
    {
4896
399
        return getIsoDate( createLocalDateUnitInstance( period.getStartDate() ) );
4897
400
    }
4898
401
4899
402
    /**
4900
403
     * Returns an iso8601 formatted string representation of the dataUnit
4901
404
     *
4902
405
     * @param dateUnit Period
4903
406
     * @return the period as string
4904
407
     */
4905
408
    public abstract String getIsoDate( DateUnit dateUnit );
4906
392
409
4907
393
    /**
410
    /**
4908
394
     * Generates a period based on the given iso8601 formatted string.
411
     * Generates a period based on the given iso8601 formatted string.
4909
412
     *
4910
395
     * @param isoDate the iso8601 string.
413
     * @param isoDate the iso8601 string.
4911
396
     * @return the period.
414
     * @return the period.
4912
397
     */
415
     */
4914
398
    public abstract Period createPeriod( String isoDate );
416
    public Period createPeriod( String isoDate )
4915
417
    {
4916
418
        return createPeriod( dateUnitFormat.parse( isoDate ) );
4917
419
    }
4918
399
420
4919
400
    /**
421
    /**
4920
401
     * Returns the iso8601 format as a string for this period type.
422
     * Returns the iso8601 format as a string for this period type.
4921
423
     *
4922
402
     * @return the iso8601 format.
424
     * @return the iso8601 format.
4923
403
     */
425
     */
4924
404
    public abstract String getIsoFormat();
426
    public abstract String getIsoFormat();
4925
405
427
4926
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/QuarterlyPeriodType.java'
4927
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/QuarterlyPeriodType.java	2014-03-18 08:10:10 +0000
4928
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/QuarterlyPeriodType.java	2014-06-05 17:39:07 +0000
4929
@@ -28,7 +28,9 @@
4930
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4931
29
 */
29
 */
4932
30
30
4934
31
import java.util.ArrayList;
31
import com.google.common.collect.Lists;
4935
32
import org.hisp.dhis.calendar.DateUnit;
4936
33
4937
32
import java.util.Calendar;
34
import java.util.Calendar;
4938
33
import java.util.Date;
35
import java.util.Date;
4939
34
import java.util.List;
36
import java.util.List;
4940
@@ -37,7 +39,7 @@
4941
37
 * PeriodType for quarterly Periods. A valid quarterly Period has startDate set
39
 * PeriodType for quarterly Periods. A valid quarterly Period has startDate set
4942
38
 * to the first day of a calendar quarter, and endDate set to the last day of
40
 * to the first day of a calendar quarter, and endDate set to the last day of
4943
39
 * the same quarter.
41
 * the same quarter.
4945
40
 * 
42
 *
4946
41
 * @author Torgeir Lorange Ostby
43
 * @author Torgeir Lorange Ostby
4947
42
 * @version $Id: QuarterlyPeriodType.java 2971 2007-03-03 18:54:56Z torgeilo $
44
 * @version $Id: QuarterlyPeriodType.java 2971 2007-03-03 18:54:56Z torgeilo $
4948
43
 */
45
 */
4949
@@ -69,29 +71,18 @@
4950
69
    }
71
    }
4951
70
72
4952
71
    @Override
73
    @Override
4976
72
    public Period createPeriod()
74
    public Period createPeriod( DateUnit dateUnit )
4977
73
    {
75
    {
4978
74
        return createPeriod( createCalendarInstance() );
76
        DateUnit start = new DateUnit( dateUnit );
4979
75
    }
77
4980
76
78
        start.setMonth( ((dateUnit.getMonth() - 1) - ((dateUnit.getMonth() - 1) % 3)) + 1 );
4981
77
    @Override
79
        start.setDay( 1 );
4982
78
    public Period createPeriod( Date date )
80
4983
79
    {
81
        DateUnit end = new DateUnit( start );
4984
80
        return createPeriod( createCalendarInstance( date ) );
82
        end = getCalendar().plusMonths( end, 2 );
4985
81
    }
83
        end.setDay( getCalendar().daysInMonth( end.getYear(), end.getMonth() ) );
4986
82
84
4987
83
    @Override
85
        return toIsoPeriod( start, end );
4965
84
    public Period createPeriod( Calendar cal )
4966
85
    {
4967
86
        cal.set( Calendar.MONTH, cal.get( Calendar.MONTH ) - cal.get( Calendar.MONTH ) % 3 );
4968
87
        cal.set( Calendar.DAY_OF_MONTH, 1 );
4969
88
4970
89
        Date startDate = cal.getTime();
4971
90
4972
91
        cal.add( Calendar.MONTH, 2 );
4973
92
        cal.set( Calendar.DAY_OF_MONTH, cal.getActualMaximum( Calendar.DAY_OF_MONTH ) );
4974
93
4975
94
        return new Period( this, startDate, cal.getTime() );
4988
95
    }
86
    }
4989
96
87
4990
97
    @Override
88
    @Override
4991
@@ -107,17 +98,19 @@
4992
107
    @Override
98
    @Override
4993
108
    public Period getNextPeriod( Period period )
99
    public Period getNextPeriod( Period period )
4994
109
    {
100
    {
4998
110
        Calendar cal = createCalendarInstance( period.getStartDate() );
101
        DateUnit dateUnit = createLocalDateUnitInstance( period.getStartDate() );
4999
111
        cal.add( Calendar.MONTH, 3 );
102
        dateUnit = getCalendar().plusMonths( dateUnit, 3 );
5000
112
        return createPeriod( cal );
103
Reviewer	Review Type	Date Requested	Status
Lars Helge Øverland		2014-05-12	Pending
Review via email: mp+219164@code.launchpad.net