dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #39821
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20183: API cleanup
------------------------------------------------------------
revno: 20183
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-09-16 16:49:50 +0200
message:
API cleanup
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/App.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/AppManager.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/CalendarService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/PeriodTypeParser.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/CopticCalendar.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/EthiopianCalendar.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/GregorianCalendar.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/IslamicCalendar.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/Iso8601Calendar.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/NepaliCalendar.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/ThaiCalendar.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/CodeGenerator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DeleteNotAllowedException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObject.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonOrganisationUnitChildrenSerializer.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonOrganisationUnitGroupSymbolSerializer.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessEngine.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/ConfigurationService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/constant/ConstantService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/DataAnalysisService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/DataAnalysisStore.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/FollowupAnalysisService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalLevelService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataSetNotMarkedForApprovalException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/PeriodShorterThanDataSetPeriodException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserCannotAccessApprovalLevelException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserCannotApproveAttributeComboException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotApproveDataException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryComboMap.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datasetreport/DataSetReportStore.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueStore.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dbms/DbmsManager.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/Expression.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/ExpressionService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/configuration/NoConfigurationFoundException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/location/LocationManagerException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/help/HelpManager.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/hierarchy/HierarchyViolationException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/I18n.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/locale/LocaleManager.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataDailyPeriod.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataValue.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportObject.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/maintenance/MaintenanceService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapgeneration/MapGenerationService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/minmax/MinMaxDataElement.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/AbstractNode.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/CoordinatesTuple.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/orgunitdistribution/OrgUnitDistributionService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramDataEntryService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramExpressionService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/ResourceTableStore.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/MessageQueue.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/SmsServiceException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/incoming/IncomingSmsService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/incoming/IncomingSmsStore.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/parse/ParserManager.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/parse/SMSParserException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViewService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeGroupService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceStore.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationResult.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/version/VersionService.java
dhis-2/dhis-api/src/test/java/org/hisp/dhis/common/CombinationGeneratorTest.java
dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/RelativePeriodTest.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/App.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/App.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/App.java 2015-09-16 14:49:50 +0000
@@ -249,6 +249,11 @@
@Override
public boolean equals( Object obj )
{
+ if ( this == obj )
+ {
+ return true;
+ }
+
if ( obj == null )
{
return false;
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/AppManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/AppManager.java 2015-08-18 20:08:20 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/AppManager.java 2015-09-16 14:49:50 +0000
@@ -41,12 +41,12 @@
{
final String ID = AppManager.class.getName();
- final String KEY_APP_FOLDER_PATH = "appFolderPath";
- final String KEY_APP_BASE_URL = "appBaseUrl";
- final String KEY_APP_STORE_URL = "appStoreUrl";
- final String DEFAULT_APP_STORE_URL = "http://www.dhis2.org/appstore";;
- final String APPS_DIR = "/apps";
- final String APPS_API_PATH = "/api/apps";
+ String KEY_APP_FOLDER_PATH = "appFolderPath";
+ String KEY_APP_BASE_URL = "appBaseUrl";
+ String KEY_APP_STORE_URL = "appStoreUrl";
+ String DEFAULT_APP_STORE_URL = "http://www.dhis2.org/appstore";;
+ String APPS_DIR = "/apps";
+ String APPS_API_PATH = "/api/apps";
/**
* Returns a list of all the installed apps at @see getAppFolderPath
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/CalendarService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/CalendarService.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/CalendarService.java 2015-09-16 14:49:50 +0000
@@ -37,11 +37,11 @@
*/
public interface CalendarService
{
- final String KEY_CALENDAR = "keyCalendar";
- final String KEY_DATE_FORMAT = "keyDateFormat";
+ String KEY_CALENDAR = "keyCalendar";
+ String KEY_DATE_FORMAT = "keyDateFormat";
- final String DEFAULT_CALENDAR = "iso8601";
- final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd"; // ISO 8601
+ String DEFAULT_CALENDAR = "iso8601";
+ String DEFAULT_DATE_FORMAT = "yyyy-MM-dd"; // ISO 8601
/**
* Gets all available calendars as a sorted list.
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/PeriodTypeParser.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/PeriodTypeParser.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/PeriodTypeParser.java 2015-09-16 14:49:50 +0000
@@ -33,7 +33,7 @@
*/
public interface PeriodTypeParser
{
- public DateInterval parse( String period );
+ DateInterval parse( String period );
- public DateInterval parse( Calendar calendar, String period );
+ DateInterval parse( Calendar calendar, String period );
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/CopticCalendar.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/CopticCalendar.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/CopticCalendar.java 2015-09-16 14:49:50 +0000
@@ -40,11 +40,11 @@
@Component
public class CopticCalendar extends ChronologyBasedCalendar
{
- private static final Calendar self = new CopticCalendar();
+ private static final Calendar SELF = new CopticCalendar();
public static Calendar getInstance()
{
- return self;
+ return SELF;
}
protected CopticCalendar()
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/EthiopianCalendar.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/EthiopianCalendar.java 2015-08-26 08:16:18 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/EthiopianCalendar.java 2015-09-16 14:49:50 +0000
@@ -43,11 +43,11 @@
@Component
public class EthiopianCalendar extends ChronologyBasedCalendar
{
- private static final Calendar self = new EthiopianCalendar();
+ private static final Calendar SELF = new EthiopianCalendar();
public static Calendar getInstance()
{
- return self;
+ return SELF;
}
protected EthiopianCalendar()
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/GregorianCalendar.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/GregorianCalendar.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/GregorianCalendar.java 2015-09-16 14:49:50 +0000
@@ -40,11 +40,11 @@
@Component
public class GregorianCalendar extends ChronologyBasedCalendar
{
- private static final Calendar self = new GregorianCalendar();
+ private static final Calendar SELF = new GregorianCalendar();
public static Calendar getInstance()
{
- return self;
+ return SELF;
}
protected GregorianCalendar()
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/IslamicCalendar.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/IslamicCalendar.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/IslamicCalendar.java 2015-09-16 14:49:50 +0000
@@ -40,11 +40,11 @@
@Component
public class IslamicCalendar extends ChronologyBasedCalendar
{
- private static final Calendar self = new IslamicCalendar();
+ private static final Calendar SELF = new IslamicCalendar();
public static Calendar getInstance()
{
- return self;
+ return SELF;
}
protected IslamicCalendar()
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/Iso8601Calendar.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/Iso8601Calendar.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/Iso8601Calendar.java 2015-09-16 14:49:50 +0000
@@ -40,11 +40,11 @@
@Component
public class Iso8601Calendar extends ChronologyBasedCalendar
{
- private static final Calendar self = new Iso8601Calendar();
+ private static final Calendar SELF = new Iso8601Calendar();
public static Calendar getInstance()
{
- return self;
+ return SELF;
}
protected Iso8601Calendar()
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/NepaliCalendar.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/NepaliCalendar.java 2015-08-24 03:20:05 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/NepaliCalendar.java 2015-09-16 14:49:50 +0000
@@ -49,15 +49,15 @@
@Component
public class NepaliCalendar extends AbstractCalendar
{
- private static final DateTimeUnit startNepal = new DateTimeUnit( 2000, 1, 1, java.util.Calendar.WEDNESDAY );
-
- private static final DateTimeUnit startIso = new DateTimeUnit( 1943, 4, 14, java.util.Calendar.WEDNESDAY, true );
-
- private static final Calendar self = new NepaliCalendar();
+ private static final DateTimeUnit START_NEPAL = new DateTimeUnit( 2000, 1, 1, java.util.Calendar.WEDNESDAY );
+
+ private static final DateTimeUnit START_ISO = new DateTimeUnit( 1943, 4, 14, java.util.Calendar.WEDNESDAY, true );
+
+ private static final Calendar SELF = new NepaliCalendar();
public static Calendar getInstance()
{
- return self;
+ return SELF;
}
@Override
@@ -74,21 +74,21 @@
return dateTimeUnit;
}
- DateTime dateTime = startIso.toJodaDateTime();
+ DateTime dateTime = START_ISO.toJodaDateTime();
int totalDays = 0;
-
- for ( int year = startNepal.getYear(); year < dateTimeUnit.getYear(); year++ )
+
+ for ( int year = START_NEPAL.getYear(); year < dateTimeUnit.getYear(); year++ )
{
totalDays += getYearTotal( year );
}
- for ( int month = startNepal.getMonth(); month < dateTimeUnit.getMonth(); month++ )
+ for ( int month = START_NEPAL.getMonth(); month < dateTimeUnit.getMonth(); month++ )
{
- totalDays += conversionMap.get( dateTimeUnit.getYear() )[month];
+ totalDays += CONVERSION_MAP.get( dateTimeUnit.getYear() )[month];
}
- totalDays += dateTimeUnit.getDay() - startNepal.getDay();
+ totalDays += dateTimeUnit.getDay() - START_NEPAL.getDay();
dateTime = dateTime.plusDays( totalDays );
@@ -104,10 +104,10 @@
@Override
public DateTimeUnit fromIso( DateTimeUnit dateTimeUnit )
{
- DateTime start = startIso.toJodaDateTime();
+ DateTime start = START_ISO.toJodaDateTime();
DateTime end = dateTimeUnit.toJodaDateTime();
- return plusDays( startNepal, Days.daysBetween( start, end ).getDays() );
+ return plusDays( START_NEPAL, Days.daysBetween( start, end ).getDays() );
}
@Override
@@ -228,7 +228,7 @@
@Override
public int daysInMonth( int year, int month )
{
- return conversionMap.get( year )[month];
+ return CONVERSION_MAP.get( year )[month];
}
@Override
@@ -318,15 +318,15 @@
private int getYearTotal( int year )
{
// if year total index is uninitialized, calculate and set in array
- if ( conversionMap.get( year )[0] == 0 )
+ if ( CONVERSION_MAP.get( year )[0] == 0 )
{
for ( int j = 1; j <= 12; j++ )
{
- conversionMap.get( year )[0] += conversionMap.get( year )[j];
+ CONVERSION_MAP.get( year )[0] += CONVERSION_MAP.get( year )[j];
}
}
- return conversionMap.get( year )[0];
+ return CONVERSION_MAP.get( year )[0];
}
@Override
@@ -389,7 +389,7 @@
curMonth = 12;
}
- curDay = conversionMap.get( curYear )[curMonth];
+ curDay = CONVERSION_MAP.get( curYear )[curMonth];
}
dayOfWeek--;
@@ -454,7 +454,7 @@
while ( days != 0 )
{
// days in month
- int dm = conversionMap.get( curYear )[curMonth];
+ int dm = CONVERSION_MAP.get( curYear )[curMonth];
curDay++;
@@ -486,14 +486,14 @@
@Override
public DateTimeUnit isoStartOfYear( int year )
{
- return startIso;
+ return START_ISO;
}
// check if day is more than current maximum for month, don't overflow, just set to maximum
// set day of week
private void updateDateUnit( DateTimeUnit result )
{
- int dm = conversionMap.get( result.getYear() )[result.getMonth()];
+ int dm = CONVERSION_MAP.get( result.getYear() )[result.getMonth()];
if ( result.getDay() > dm )
{
@@ -514,110 +514,110 @@
* Map that gives an array of month lengths based on Nepali year lookup.
* Index 1 - 12 is used for months, index 0 is used to give year total (lazy calculated).
*/
- private final static Map<Integer, int[]> conversionMap = new HashMap<>();
+ private static final Map<Integer, int[]> CONVERSION_MAP = new HashMap<>();
static
{
- conversionMap.put( 2000, new int[]{ 0, 30, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
- conversionMap.put( 2001, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2002, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2003, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
- conversionMap.put( 2004, new int[]{ 0, 30, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
- conversionMap.put( 2005, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2006, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2007, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
- conversionMap.put( 2008, new int[]{ 0, 31, 31, 31, 32, 31, 31, 29, 30, 30, 29, 29, 31 } );
- conversionMap.put( 2009, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2010, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2011, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
- conversionMap.put( 2012, new int[]{ 0, 31, 31, 31, 32, 31, 31, 29, 30, 30, 29, 30, 30 } );
- conversionMap.put( 2013, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2014, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2015, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
- conversionMap.put( 2016, new int[]{ 0, 31, 31, 31, 32, 31, 31, 29, 30, 30, 29, 30, 30 } );
- conversionMap.put( 2017, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2018, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2019, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
- conversionMap.put( 2020, new int[]{ 0, 31, 31, 31, 32, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2021, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2022, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 30 } );
- conversionMap.put( 2023, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
- conversionMap.put( 2024, new int[]{ 0, 31, 31, 31, 32, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2025, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2026, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
- conversionMap.put( 2027, new int[]{ 0, 30, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
- conversionMap.put( 2028, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2029, new int[]{ 0, 31, 31, 32, 31, 32, 30, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2030, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
- conversionMap.put( 2031, new int[]{ 0, 30, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
- conversionMap.put( 2032, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2033, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2034, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
- conversionMap.put( 2035, new int[]{ 0, 30, 32, 31, 32, 31, 31, 29, 30, 30, 29, 29, 31 } );
- conversionMap.put( 2036, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2037, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2038, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
- conversionMap.put( 2039, new int[]{ 0, 31, 31, 31, 32, 31, 31, 29, 30, 30, 29, 30, 30 } );
- conversionMap.put( 2040, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2041, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2042, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
- conversionMap.put( 2043, new int[]{ 0, 31, 31, 31, 32, 31, 31, 29, 30, 30, 29, 30, 30 } );
- conversionMap.put( 2044, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2045, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2046, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
- conversionMap.put( 2047, new int[]{ 0, 31, 31, 31, 32, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2048, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2049, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 30 } );
- conversionMap.put( 2050, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
- conversionMap.put( 2051, new int[]{ 0, 31, 31, 31, 32, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2052, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2053, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 30 } );
- conversionMap.put( 2054, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
- conversionMap.put( 2055, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2056, new int[]{ 0, 31, 31, 32, 31, 32, 30, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2057, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
- conversionMap.put( 2058, new int[]{ 0, 30, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
- conversionMap.put( 2059, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2060, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2061, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
- conversionMap.put( 2062, new int[]{ 0, 30, 32, 31, 32, 31, 31, 29, 30, 29, 30, 29, 31 } );
- conversionMap.put( 2063, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2064, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2065, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
- conversionMap.put( 2066, new int[]{ 0, 31, 31, 31, 32, 31, 31, 29, 30, 30, 29, 29, 31 } );
- conversionMap.put( 2067, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2068, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2069, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
- conversionMap.put( 2070, new int[]{ 0, 31, 31, 31, 32, 31, 31, 29, 30, 30, 29, 30, 30 } );
- conversionMap.put( 2071, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2072, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2073, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
- conversionMap.put( 2074, new int[]{ 0, 31, 31, 31, 32, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2075, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2076, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 30 } );
- conversionMap.put( 2077, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
- conversionMap.put( 2078, new int[]{ 0, 31, 31, 31, 32, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2079, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2080, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 30 } );
- conversionMap.put( 2081, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
- conversionMap.put( 2082, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2083, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2084, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
- conversionMap.put( 2085, new int[]{ 0, 30, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
- conversionMap.put( 2086, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2087, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2088, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
- conversionMap.put( 2089, new int[]{ 0, 30, 32, 31, 32, 31, 31, 29, 30, 29, 30, 29, 31 } );
- conversionMap.put( 2090, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2091, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2092, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
- conversionMap.put( 2093, new int[]{ 0, 31, 31, 31, 32, 31, 31, 29, 30, 30, 29, 29, 31 } );
- conversionMap.put( 2094, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2095, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 29 } );
- conversionMap.put( 2096, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 32 } );
- conversionMap.put( 2097, new int[]{ 0, 31, 31, 31, 32, 31, 31, 29, 30, 30, 29, 30, 30 } );
- conversionMap.put( 2098, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2099, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
- conversionMap.put( 2100, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
+ CONVERSION_MAP.put( 2000, new int[]{ 0, 30, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
+ CONVERSION_MAP.put( 2001, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2002, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2003, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
+ CONVERSION_MAP.put( 2004, new int[]{ 0, 30, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
+ CONVERSION_MAP.put( 2005, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2006, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2007, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
+ CONVERSION_MAP.put( 2008, new int[]{ 0, 31, 31, 31, 32, 31, 31, 29, 30, 30, 29, 29, 31 } );
+ CONVERSION_MAP.put( 2009, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2010, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2011, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
+ CONVERSION_MAP.put( 2012, new int[]{ 0, 31, 31, 31, 32, 31, 31, 29, 30, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2013, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2014, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2015, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
+ CONVERSION_MAP.put( 2016, new int[]{ 0, 31, 31, 31, 32, 31, 31, 29, 30, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2017, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2018, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2019, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
+ CONVERSION_MAP.put( 2020, new int[]{ 0, 31, 31, 31, 32, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2021, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2022, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2023, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
+ CONVERSION_MAP.put( 2024, new int[]{ 0, 31, 31, 31, 32, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2025, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2026, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
+ CONVERSION_MAP.put( 2027, new int[]{ 0, 30, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
+ CONVERSION_MAP.put( 2028, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2029, new int[]{ 0, 31, 31, 32, 31, 32, 30, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2030, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
+ CONVERSION_MAP.put( 2031, new int[]{ 0, 30, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
+ CONVERSION_MAP.put( 2032, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2033, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2034, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
+ CONVERSION_MAP.put( 2035, new int[]{ 0, 30, 32, 31, 32, 31, 31, 29, 30, 30, 29, 29, 31 } );
+ CONVERSION_MAP.put( 2036, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2037, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2038, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
+ CONVERSION_MAP.put( 2039, new int[]{ 0, 31, 31, 31, 32, 31, 31, 29, 30, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2040, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2041, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2042, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
+ CONVERSION_MAP.put( 2043, new int[]{ 0, 31, 31, 31, 32, 31, 31, 29, 30, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2044, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2045, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2046, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
+ CONVERSION_MAP.put( 2047, new int[]{ 0, 31, 31, 31, 32, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2048, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2049, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2050, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
+ CONVERSION_MAP.put( 2051, new int[]{ 0, 31, 31, 31, 32, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2052, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2053, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2054, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
+ CONVERSION_MAP.put( 2055, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2056, new int[]{ 0, 31, 31, 32, 31, 32, 30, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2057, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
+ CONVERSION_MAP.put( 2058, new int[]{ 0, 30, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
+ CONVERSION_MAP.put( 2059, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2060, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2061, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
+ CONVERSION_MAP.put( 2062, new int[]{ 0, 30, 32, 31, 32, 31, 31, 29, 30, 29, 30, 29, 31 } );
+ CONVERSION_MAP.put( 2063, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2064, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2065, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
+ CONVERSION_MAP.put( 2066, new int[]{ 0, 31, 31, 31, 32, 31, 31, 29, 30, 30, 29, 29, 31 } );
+ CONVERSION_MAP.put( 2067, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2068, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2069, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
+ CONVERSION_MAP.put( 2070, new int[]{ 0, 31, 31, 31, 32, 31, 31, 29, 30, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2071, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2072, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2073, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
+ CONVERSION_MAP.put( 2074, new int[]{ 0, 31, 31, 31, 32, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2075, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2076, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2077, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
+ CONVERSION_MAP.put( 2078, new int[]{ 0, 31, 31, 31, 32, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2079, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2080, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2081, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
+ CONVERSION_MAP.put( 2082, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2083, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2084, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
+ CONVERSION_MAP.put( 2085, new int[]{ 0, 30, 32, 31, 32, 31, 30, 30, 30, 29, 30, 29, 31 } );
+ CONVERSION_MAP.put( 2086, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2087, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2088, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
+ CONVERSION_MAP.put( 2089, new int[]{ 0, 30, 32, 31, 32, 31, 31, 29, 30, 29, 30, 29, 31 } );
+ CONVERSION_MAP.put( 2090, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2091, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2092, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
+ CONVERSION_MAP.put( 2093, new int[]{ 0, 31, 31, 31, 32, 31, 31, 29, 30, 30, 29, 29, 31 } );
+ CONVERSION_MAP.put( 2094, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2095, new int[]{ 0, 31, 31, 32, 32, 31, 30, 30, 29, 30, 29, 30, 29 } );
+ CONVERSION_MAP.put( 2096, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 32 } );
+ CONVERSION_MAP.put( 2097, new int[]{ 0, 31, 31, 31, 32, 31, 31, 29, 30, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2098, new int[]{ 0, 31, 31, 32, 31, 31, 31, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2099, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 29, 30, 29, 30, 30 } );
+ CONVERSION_MAP.put( 2100, new int[]{ 0, 31, 32, 31, 32, 31, 30, 30, 30, 29, 29, 30, 31 } );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/ThaiCalendar.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/ThaiCalendar.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/ThaiCalendar.java 2015-09-16 14:49:50 +0000
@@ -40,11 +40,11 @@
@Component
public class ThaiCalendar extends ChronologyBasedCalendar
{
- private static final Calendar self = new ThaiCalendar();
+ private static final Calendar SELF = new ThaiCalendar();
public static Calendar getInstance()
{
- return self;
+ return SELF;
}
protected ThaiCalendar()
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/CodeGenerator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/CodeGenerator.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/CodeGenerator.java 2015-09-16 14:49:50 +0000
@@ -39,9 +39,9 @@
public static final String letters = "abcdefghijklmnopqrstuvwxyz"
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
- public static final String allowedChars = "0123456789" + letters;
+ public static final String ALLOWED_CHARS = "0123456789" + letters;
- public static final int NUMBER_OF_CODEPOINTS = allowedChars.length();
+ public static final int NUMBER_OF_CODEPOINTS = ALLOWED_CHARS.length();
public static final int CODESIZE = 11;
private static final Pattern CODE_PATTERN = Pattern.compile( "^[a-zA-Z]{1}[a-zA-Z0-9]{10}$" );
@@ -76,7 +76,7 @@
for ( int i = 1; i < codeSize; ++i )
{
- randomChars[i] = allowedChars.charAt( sr.nextInt( NUMBER_OF_CODEPOINTS ) );
+ randomChars[i] = ALLOWED_CHARS.charAt( sr.nextInt( NUMBER_OF_CODEPOINTS ) );
}
return new String( randomChars );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DeleteNotAllowedException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DeleteNotAllowedException.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DeleteNotAllowedException.java 2015-09-16 14:49:50 +0000
@@ -34,11 +34,6 @@
public class DeleteNotAllowedException
extends RuntimeException
{
- /**
- * Determines if a de-serialized file is compatible with this class.
- */
- private static final long serialVersionUID = -4102764536406530234L;
-
public static final String ERROR_ASSOCIATED_BY_OTHER_OBJECTS = "Object associated by other objects";
private String errorCode;
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObject.java 2015-08-02 14:59:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObject.java 2015-09-16 14:49:50 +0000
@@ -53,35 +53,35 @@
public interface DimensionalObject
extends NameableObject
{
- final String DATA_X_DIM_ID = "dx"; // in, de, ds, do
- final String DATA_COLLAPSED_DIM_ID = "dy"; // Collapsed event data dimensions
- final String CATEGORYOPTIONCOMBO_DIM_ID = "co";
- final String ATTRIBUTEOPTIONCOMBO_DIM_ID = "ao";
- final String PERIOD_DIM_ID = "pe";
- final String ORGUNIT_DIM_ID = "ou";
- final String ORGUNIT_GROUP_DIM_ID = "oug"; // Used for org unit target
- final String ITEM_DIM_ID = "item";
+ String DATA_X_DIM_ID = "dx"; // in, de, ds, do
+ String DATA_COLLAPSED_DIM_ID = "dy"; // Collapsed event data dimensions
+ String CATEGORYOPTIONCOMBO_DIM_ID = "co";
+ String ATTRIBUTEOPTIONCOMBO_DIM_ID = "ao";
+ String PERIOD_DIM_ID = "pe";
+ String ORGUNIT_DIM_ID = "ou";
+ String ORGUNIT_GROUP_DIM_ID = "oug"; // Used for org unit target
+ String ITEM_DIM_ID = "item";
- final String OU_MODE_SELECTED = "selected"; //TODO replace with OrganisationUnitSelectionMode
- final String OU_MODE_CHILDREN = "children";
- final String OU_MODE_DESCENDANTS = "descendants";
- final String OU_MODE_ALL = "all";
+ String OU_MODE_SELECTED = "selected"; //TODO replace with OrganisationUnitSelectionMode
+ String OU_MODE_CHILDREN = "children";
+ String OU_MODE_DESCENDANTS = "descendants";
+ String OU_MODE_ALL = "all";
- final String DIMENSION_SEP = "-";
+ String DIMENSION_SEP = "-";
- final String LONGITUDE_DIM_ID = "longitude";
- final String LATITUDE_DIM_ID = "latitude";
+ String LONGITUDE_DIM_ID = "longitude";
+ String LATITUDE_DIM_ID = "latitude";
- final List<String> STATIC_DIMS = Arrays.asList(
+ List<String> STATIC_DIMS = Arrays.asList(
LONGITUDE_DIM_ID, LATITUDE_DIM_ID );
- final Map<String, String> PRETTY_NAMES = DimensionalObjectUtils.asMap(
+ Map<String, String> PRETTY_NAMES = DimensionalObjectUtils.asMap(
DATA_X_DIM_ID, "Data",
CATEGORYOPTIONCOMBO_DIM_ID, "Data details",
PERIOD_DIM_ID, "Period",
ORGUNIT_DIM_ID, "Organisation unit" );
- final Map<DimensionType, Class<? extends DimensionalObject>> DYNAMIC_DIMENSION_TYPE_CLASS_MAP = ImmutableMap.<DimensionType, Class<? extends DimensionalObject>>builder().
+ Map<DimensionType, Class<? extends DimensionalObject>> DYNAMIC_DIMENSION_TYPE_CLASS_MAP = ImmutableMap.<DimensionType, Class<? extends DimensionalObject>>builder().
put( DimensionType.CATEGORY, DataElementCategory.class ).
put( DimensionType.DATAELEMENT_GROUPSET, DataElementGroupSet.class ).
put( DimensionType.ORGANISATIONUNIT_GROUPSET, OrganisationUnitGroupSet.class ).
@@ -89,7 +89,7 @@
put( DimensionType.PROGRAM_ATTRIBUTE, TrackedEntityAttribute.class ).
put( DimensionType.PROGRAM_DATAELEMENT, DataElement.class ).build();
- final Map<Class<? extends DimensionalObject>, Class<? extends NameableObject>> DIMENSION_CLASS_ITEM_CLASS_MAP = ImmutableMap.<Class<? extends DimensionalObject>, Class<? extends NameableObject>>builder().
+ Map<Class<? extends DimensionalObject>, Class<? extends NameableObject>> DIMENSION_CLASS_ITEM_CLASS_MAP = ImmutableMap.<Class<? extends DimensionalObject>, Class<? extends NameableObject>>builder().
put( DataElementCategory.class, DataElementCategoryOption.class ).
put( DataElementGroupSet.class, DataElementGroup.class ).
put( OrganisationUnitGroupSet.class, OrganisationUnitGroup.class ).
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java 2015-06-25 18:50:24 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java 2015-09-16 14:49:50 +0000
@@ -41,7 +41,7 @@
*/
public interface IdentifiableObjectManager
{
- final String ID = IdentifiableObjectManager.class.getName();
+ String ID = IdentifiableObjectManager.class.getName();
void save( IdentifiableObject object );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonOrganisationUnitChildrenSerializer.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonOrganisationUnitChildrenSerializer.java 2015-03-26 14:31:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonOrganisationUnitChildrenSerializer.java 2015-09-16 14:49:50 +0000
@@ -77,7 +77,7 @@
}
catch ( XMLStreamException e )
{
- e.printStackTrace();
+ e.printStackTrace(); //TODO fix
}
}
else
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonOrganisationUnitGroupSymbolSerializer.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonOrganisationUnitGroupSymbolSerializer.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonOrganisationUnitGroupSymbolSerializer.java 2015-09-16 14:49:50 +0000
@@ -75,7 +75,7 @@
}
catch ( XMLStreamException e )
{
- e.printStackTrace();
+ e.printStackTrace(); //TODO fix
}
}
else
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessEngine.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessEngine.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessEngine.java 2015-09-16 14:49:50 +0000
@@ -37,7 +37,7 @@
*/
public interface DataSetCompletenessEngine
{
- final String ID = DataSetCompletenessEngine.class.getName();
+ String ID = DataSetCompletenessEngine.class.getName();
void exportDataSetCompleteness( Collection<Integer> periodIds, TaskId id );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/ConfigurationService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/ConfigurationService.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/ConfigurationService.java 2015-09-16 14:49:50 +0000
@@ -33,7 +33,7 @@
*/
public interface ConfigurationService
{
- final String ID = ConfigurationService.class.getName();
+ String ID = ConfigurationService.class.getName();
void setConfiguration( Configuration configuration );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/constant/ConstantService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/constant/ConstantService.java 2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/constant/ConstantService.java 2015-09-16 14:49:50 +0000
@@ -33,7 +33,6 @@
/**
* @author Dang Duy Hieu
- * @version $Id ConstantService.java June 29, 2011$
*/
public interface ConstantService
{
@@ -51,7 +50,7 @@
Constant getConstant( int constantId );
- public Constant getConstant( String uid );
+ Constant getConstant( String uid );
Constant getConstantByName( String constantName );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardService.java 2015-09-15 10:15:00 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardService.java 2015-09-16 14:49:50 +0000
@@ -41,7 +41,7 @@
*/
public interface DashboardService
{
- final String ID = DashboardService.class.getName();
+ String ID = DashboardService.class.getName();
// -------------------------------------------------------------------------
// Dashboard
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/DataAnalysisService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/DataAnalysisService.java 2015-06-14 12:54:38 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/DataAnalysisService.java 2015-09-16 14:49:50 +0000
@@ -44,7 +44,7 @@
{
String ID = DataAnalysisService.class.getName();
- final int MAX_OUTLIERS = 500;
+ int MAX_OUTLIERS = 500;
List<DeflatedDataValue> analyse( Collection<OrganisationUnit> organisationUnits, Collection<DataElement> dataElements,
Collection<Period> periods, Double stdDevFactor, Date from );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/DataAnalysisStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/DataAnalysisStore.java 2015-06-14 12:54:38 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/DataAnalysisStore.java 2015-09-16 14:49:50 +0000
@@ -45,7 +45,7 @@
*/
public interface DataAnalysisStore
{
- final String ID = DataAnalysisStore.class.getName();
+ String ID = DataAnalysisStore.class.getName();
/**
* Calculates the standard deviation of the DataValues registered for the given
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/FollowupAnalysisService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/FollowupAnalysisService.java 2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/FollowupAnalysisService.java 2015-09-16 14:49:50 +0000
@@ -38,5 +38,5 @@
*/
public interface FollowupAnalysisService
{
- public List<DeflatedDataValue> getFollowupDataValues( OrganisationUnit organisationUnit, int limit );
+ List<DeflatedDataValue> getFollowupDataValues( OrganisationUnit organisationUnit, int limit );
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalLevelService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalLevelService.java 2015-04-22 11:19:40 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalLevelService.java 2015-09-16 14:49:50 +0000
@@ -48,12 +48,12 @@
* Constant that can be used in place of approval level
* for data that has not been approved at any level.
*/
- public static final int APPROVAL_LEVEL_UNAPPROVED = 999;
+ int APPROVAL_LEVEL_UNAPPROVED = 999;
/**
* Constant representing the highest possible level of approval.
*/
- public static final int APPROVAL_LEVEL_HIGHEST = 0;
+ int APPROVAL_LEVEL_HIGHEST = 0;
/**
* Gets the data approval level with the given id.
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataSetNotMarkedForApprovalException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataSetNotMarkedForApprovalException.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataSetNotMarkedForApprovalException.java 2015-09-16 14:49:50 +0000
@@ -28,8 +28,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import org.hisp.dhis.dataapproval.exceptions.DataApprovalException;
-
/**
* @author Jim Grace
*/
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/PeriodShorterThanDataSetPeriodException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/PeriodShorterThanDataSetPeriodException.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/PeriodShorterThanDataSetPeriodException.java 2015-09-16 14:49:50 +0000
@@ -28,8 +28,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import org.hisp.dhis.dataapproval.exceptions.DataApprovalException;
-
/**
* @author Jim Grace
*/
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserCannotAccessApprovalLevelException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserCannotAccessApprovalLevelException.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserCannotAccessApprovalLevelException.java 2015-09-16 14:49:50 +0000
@@ -28,8 +28,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import org.hisp.dhis.dataapproval.exceptions.DataApprovalException;
-
/**
* @author Jim Grace
*/
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserCannotApproveAttributeComboException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserCannotApproveAttributeComboException.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserCannotApproveAttributeComboException.java 2015-09-16 14:49:50 +0000
@@ -28,8 +28,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import org.hisp.dhis.dataapproval.exceptions.DataApprovalException;
-
/**
* @author Jim Grace
*/
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotApproveDataException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotApproveDataException.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotApproveDataException.java 2015-09-16 14:49:50 +0000
@@ -28,8 +28,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import org.hisp.dhis.dataapproval.exceptions.DataApprovalException;
-
/**
* @author Jim Grace
*/
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryComboMap.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryComboMap.java 2015-06-11 19:52:58 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryComboMap.java 2015-09-16 14:49:50 +0000
@@ -121,8 +121,9 @@
}
if ( identifier == null )
- throw new CategoryComboMapException( "No " + idScheme.toString()
- + " identifier for CategoryOption: " + catopt.getName() );
+ {
+ throw new CategoryComboMapException( "No " + idScheme.toString() + " identifier for CategoryOption: " + catopt.getName() );
+ }
compositeIdentifier += "\"" + identifier + "\"";
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java 2015-09-08 08:43:48 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java 2015-09-16 14:49:50 +0000
@@ -197,7 +197,6 @@
CombinationGenerator<DataElementCategoryOption> generator =
new CombinationGenerator<>( getCategoryOptionsAsArray() );
- sortLoop:
while ( generator.hasNext() )
{
List<DataElementCategoryOption> categoryOptions = generator.getNext();
@@ -210,7 +209,7 @@
{
optionCombo.setName( getNameFromCategoryOptions( categoryOptions ) );
list.add( optionCombo );
- continue sortLoop;
+ continue;
}
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java 2015-07-13 12:34:39 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java 2015-09-16 14:49:50 +0000
@@ -84,12 +84,6 @@
private boolean ignoreApproval;
// -------------------------------------------------------------------------
- // Transient properties
- // -------------------------------------------------------------------------
-
- private transient String name;
-
- // -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormService.java 2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormService.java 2015-09-16 14:49:50 +0000
@@ -45,12 +45,12 @@
{
String ID = DataEntryFormService.class.getName();
- final Pattern INPUT_PATTERN = Pattern.compile( "(<input.*?/>)", Pattern.DOTALL );
- final Pattern IDENTIFIER_PATTERN = Pattern.compile( "id=\"(\\w+)-(\\w+)-val\"" );
- final Pattern DATAELEMENT_TOTAL_PATTERN = Pattern.compile( "dataelementid=\"(\\w+?)\"" );
- final Pattern INDICATOR_PATTERN = Pattern.compile( "indicatorid=\"(\\w+)\"" );
- final Pattern VALUE_TAG_PATTERN = Pattern.compile( "value=\"(.*?)\"", Pattern.DOTALL );
- final Pattern TITLE_TAG_PATTERN = Pattern.compile( "title=\"(.*?)\"", Pattern.DOTALL );
+ Pattern INPUT_PATTERN = Pattern.compile( "(<input.*?/>)", Pattern.DOTALL );
+ Pattern IDENTIFIER_PATTERN = Pattern.compile( "id=\"(\\w+)-(\\w+)-val\"" );
+ Pattern DATAELEMENT_TOTAL_PATTERN = Pattern.compile( "dataelementid=\"(\\w+?)\"" );
+ Pattern INDICATOR_PATTERN = Pattern.compile( "indicatorid=\"(\\w+)\"" );
+ Pattern VALUE_TAG_PATTERN = Pattern.compile( "value=\"(.*?)\"", Pattern.DOTALL );
+ Pattern TITLE_TAG_PATTERN = Pattern.compile( "title=\"(.*?)\"", Pattern.DOTALL );
// -------------------------------------------------------------------------
// DataEntryForm
@@ -108,7 +108,7 @@
* @param identifiers the collection of identifiers.
* @return a collection of DataEntryForms.
*/
- List<DataEntryForm> getDataEntryForms( final Collection<Integer> identifiers );
+ List<DataEntryForm> getDataEntryForms( Collection<Integer> identifiers );
/**
* Prepare DataEntryForm code for save by reversing the effects of
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java 2015-08-26 06:51:40 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java 2015-09-16 14:49:50 +0000
@@ -292,7 +292,7 @@
*
* @return A list of all unique combinations (only dataSet and period is set)
*/
- public List<LockException> getLockExceptionCombinations();
+ List<LockException> getLockExceptionCombinations();
/**
* Delete a dataSet + period combination, used for batch removal, e.g. when you
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datasetreport/DataSetReportStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datasetreport/DataSetReportStore.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datasetreport/DataSetReportStore.java 2015-09-16 14:49:50 +0000
@@ -40,7 +40,7 @@
*/
public interface DataSetReportStore
{
- final String SEPARATOR = "-";
+ String SEPARATOR = "-";
Map<String, Object> getAggregatedValues( DataSet dataSet, Period period, OrganisationUnit unit, Set<String> dimensions, boolean rawData );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java 2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java 2015-09-16 14:49:50 +0000
@@ -53,11 +53,6 @@
{
String ID = DataValueService.class.getName();
- /**
- * @deprecated To be removed
- */
- public static final String FLAG = "RoutineData";
-
// -------------------------------------------------------------------------
// Basic DataValue
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueStore.java 2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueStore.java 2015-09-16 14:49:50 +0000
@@ -294,7 +294,7 @@
* @param lastUpdatedMap map in which to return the lastUpdated date for each value
* @return map of values by attribute option combo id, then DataElementOperand
*/
- public MapMap<Integer, DataElementOperand, Double> getDataValueMapByAttributeCombo( Collection<DataElement> dataElements, Date date,
+ MapMap<Integer, DataElementOperand, Double> getDataValueMapByAttributeCombo( Collection<DataElement> dataElements, Date date,
OrganisationUnit source, Collection<PeriodType> periodTypes, DataElementCategoryOptionCombo attributeCombo,
Set<CategoryOptionGroup> cogDimensionConstraints, Set<DataElementCategoryOption> coDimensionConstraints,
MapMap<Integer, DataElementOperand, Date> lastUpdatedMap );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dbms/DbmsManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dbms/DbmsManager.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dbms/DbmsManager.java 2015-09-16 14:49:50 +0000
@@ -34,7 +34,7 @@
*/
public interface DbmsManager
{
- final String ID = DbmsManager.class.getName();
+ String ID = DbmsManager.class.getName();
void emptyDatabase();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/Expression.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/Expression.java 2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/Expression.java 2015-09-16 14:49:50 +0000
@@ -204,10 +204,10 @@
@Override
public int hashCode()
{
- final int PRIME = 31;
+ final int prime = 31;
int result = 1;
- result = PRIME * result + ( ( description == null ) ? 0 : description.hashCode() );
- result = PRIME * result + ( ( expression == null ) ? 0 : expression.hashCode() );
+ result = prime * result + ( ( description == null ) ? 0 : description.hashCode() );
+ result = prime * result + ( ( expression == null ) ? 0 : expression.hashCode() );
return result;
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/ExpressionService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/ExpressionService.java 2015-06-18 09:23:25 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/ExpressionService.java 2015-09-16 14:49:50 +0000
@@ -60,35 +60,35 @@
{
String ID = ExpressionService.class.getName();
- final String VALID = "valid";
- final String EXPRESSION_IS_EMPTY = "expression_is_empty";
- final String DATAELEMENT_DOES_NOT_EXIST = "data_element_does_not_exist";
- final String CATEGORYOPTIONCOMBO_DOES_NOT_EXIST = "category_option_combo_does_not_exist";
- final String CONSTANT_DOES_NOT_EXIST = "constant_does_not_exist";
- final String OU_GROUP_DOES_NOT_EXIST = "org_unit_group_does_not_exist";
- final String EXPRESSION_NOT_WELL_FORMED = "expression_not_well_formed";
-
- final String DAYS_DESCRIPTION = "[Number of days]";
- final String NULL_REPLACEMENT = "0";
- final String SPACE = " ";
-
- final String OPERAND_EXPRESSION = "#\\{(\\w+)\\.?(\\w*)\\}";
- final String OPERAND_UID_EXPRESSION = "(\\w+)\\.?(\\w*)";
- final String DATA_ELEMENT_TOTAL_EXPRESSION = "#\\{(\\w+)\\}";
- final String OPTION_COMBO_OPERAND_EXPRESSION = "#\\{(\\w+)\\.(\\w+)\\}";
- final String CONSTANT_EXPRESSION = "C\\{(\\w+)\\}";
- final String OU_GROUP_EXPRESSION = "OUG\\{(\\w+)\\}";
- final String DAYS_EXPRESSION = "\\[days\\]";
-
- final Pattern OPERAND_PATTERN = Pattern.compile( OPERAND_EXPRESSION );
- final Pattern OPERAND_UID_PATTERN = Pattern.compile( OPERAND_UID_EXPRESSION );
- final Pattern DATA_ELEMENT_TOTAL_PATTERN = Pattern.compile( DATA_ELEMENT_TOTAL_EXPRESSION );
- final Pattern OPTION_COMBO_OPERAND_PATTERN = Pattern.compile( OPTION_COMBO_OPERAND_EXPRESSION );
- final Pattern CONSTANT_PATTERN = Pattern.compile( CONSTANT_EXPRESSION );
- final Pattern OU_GROUP_PATTERN = Pattern.compile( OU_GROUP_EXPRESSION );
- final Pattern DAYS_PATTERN = Pattern.compile( DAYS_EXPRESSION );
-
- final String DAYS_SYMBOL = "[days]";
+ String VALID = "valid";
+ String EXPRESSION_IS_EMPTY = "expression_is_empty";
+ String DATAELEMENT_DOES_NOT_EXIST = "data_element_does_not_exist";
+ String CATEGORYOPTIONCOMBO_DOES_NOT_EXIST = "category_option_combo_does_not_exist";
+ String CONSTANT_DOES_NOT_EXIST = "constant_does_not_exist";
+ String OU_GROUP_DOES_NOT_EXIST = "org_unit_group_does_not_exist";
+ String EXPRESSION_NOT_WELL_FORMED = "expression_not_well_formed";
+
+ String DAYS_DESCRIPTION = "[Number of days]";
+ String NULL_REPLACEMENT = "0";
+ String SPACE = " ";
+
+ String OPERAND_EXPRESSION = "#\\{(\\w+)\\.?(\\w*)\\}";
+ String OPERAND_UID_EXPRESSION = "(\\w+)\\.?(\\w*)";
+ String DATA_ELEMENT_TOTAL_EXPRESSION = "#\\{(\\w+)\\}";
+ String OPTION_COMBO_OPERAND_EXPRESSION = "#\\{(\\w+)\\.(\\w+)\\}";
+ String CONSTANT_EXPRESSION = "C\\{(\\w+)\\}";
+ String OU_GROUP_EXPRESSION = "OUG\\{(\\w+)\\}";
+ String DAYS_EXPRESSION = "\\[days\\]";
+
+ Pattern OPERAND_PATTERN = Pattern.compile( OPERAND_EXPRESSION );
+ Pattern OPERAND_UID_PATTERN = Pattern.compile( OPERAND_UID_EXPRESSION );
+ Pattern DATA_ELEMENT_TOTAL_PATTERN = Pattern.compile( DATA_ELEMENT_TOTAL_EXPRESSION );
+ Pattern OPTION_COMBO_OPERAND_PATTERN = Pattern.compile( OPTION_COMBO_OPERAND_EXPRESSION );
+ Pattern CONSTANT_PATTERN = Pattern.compile( CONSTANT_EXPRESSION );
+ Pattern OU_GROUP_PATTERN = Pattern.compile( OU_GROUP_EXPRESSION );
+ Pattern DAYS_PATTERN = Pattern.compile( DAYS_EXPRESSION );
+
+ String DAYS_SYMBOL = "[days]";
/**
* Adds a new Expression to the database.
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/configuration/NoConfigurationFoundException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/configuration/NoConfigurationFoundException.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/configuration/NoConfigurationFoundException.java 2015-09-16 14:49:50 +0000
@@ -35,11 +35,6 @@
public class NoConfigurationFoundException
extends Exception
{
- /**
- * Determines if a de-serialized file is compatible with this class.
- */
- private static final long serialVersionUID = 5030826893740758095L;
-
public NoConfigurationFoundException( String message )
{
super( message );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/location/LocationManagerException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/location/LocationManagerException.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/location/LocationManagerException.java 2015-09-16 14:49:50 +0000
@@ -35,11 +35,6 @@
public class LocationManagerException
extends RuntimeException
{
- /**
- * Determines if a de-serialized file is compatible with this class.
- */
- private static final long serialVersionUID = -9034096136406983058L;
-
public LocationManagerException( String message )
{
super( message );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/help/HelpManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/help/HelpManager.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/help/HelpManager.java 2015-09-16 14:49:50 +0000
@@ -36,7 +36,7 @@
*/
public interface HelpManager
{
- final String ID = HelpManager.class.getName();
+ String ID = HelpManager.class.getName();
void getHelpContent( OutputStream out, String id, Locale locale );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/hierarchy/HierarchyViolationException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/hierarchy/HierarchyViolationException.java 2015-09-13 17:45:53 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/hierarchy/HierarchyViolationException.java 2015-09-16 14:49:50 +0000
@@ -37,11 +37,6 @@
public class HierarchyViolationException
extends RuntimeException
{
- /**
- * Determines if a de-serialized file is compatible with this class.
- */
- private static final long serialVersionUID = -6006664467676025829L;
-
public HierarchyViolationException( String message )
{
super( message );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/I18n.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/I18n.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/I18n.java 2015-09-16 14:49:50 +0000
@@ -37,9 +37,7 @@
* @author Anders Gjendem
*/
public class I18n
-{
- final String ID = I18n.class.getName();
-
+{
private ResourceBundle globalResourceBundle;
private ResourceBundle specificResourceBundle;
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/locale/LocaleManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/locale/LocaleManager.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/locale/LocaleManager.java 2015-09-16 14:49:50 +0000
@@ -37,9 +37,9 @@
*/
public interface LocaleManager
{
- final String ID = LocaleManager.class.getName();
+ String ID = LocaleManager.class.getName();
- final Locale DHIS_STANDARD_LOCALE = new Locale( "en" );
+ Locale DHIS_STANDARD_LOCALE = new Locale( "en" );
Locale getCurrentLocale();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataDailyPeriod.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataDailyPeriod.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataDailyPeriod.java 2015-09-16 14:49:50 +0000
@@ -31,141 +31,118 @@
import java.io.Serializable;
import java.util.Date;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
public class ImportDataDailyPeriod
implements Serializable
-{
- /**
- *
- */
- private static final long serialVersionUID = -5777420243045995151L;
-
- /**
- * Determines if a de-serialized file is compatible with this class.
- */
-
+{
private int periodId;
-
+
private int periodTypeId;
-
+
private Date startDate;
-
+
private Date endDate;
public ImportDataDailyPeriod()
{
}
-
- public ImportDataDailyPeriod(int periodId, int periodTypeId,
- Date startDate, Date endDate) {
- super();
- this.periodId = periodId;
- this.periodTypeId = periodTypeId;
- this.startDate = startDate;
- this.endDate = endDate;
- }
-
- public int getPeriodId() {
- return periodId;
- }
-
- public void setPeriodId(int periodId) {
- this.periodId = periodId;
- }
-
- public int getPeriodTypeId() {
- return periodTypeId;
- }
-
- public void setPeriodTypeId(int periodTypeId) {
- this.periodTypeId = periodTypeId;
- }
-
- public Date getStartDate() {
- return startDate;
- }
-
- public void setStartDate(Date startDate) {
- this.startDate = startDate;
- }
-
- public Date getEndDate() {
- return endDate;
- }
-
- public void setEndDate(Date endDate) {
- this.endDate = endDate;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((endDate == null) ? 0 : endDate.hashCode());
- result = prime * result + periodId;
- result = prime * result + periodTypeId;
- result = prime * result
- + ((startDate == null) ? 0 : startDate.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- ImportDataDailyPeriod other = (ImportDataDailyPeriod) obj;
- if (endDate == null) {
- if (other.endDate != null)
- return false;
- } else if (!endDate.equals(other.endDate))
- return false;
- if (periodId != other.periodId)
- return false;
- if (periodTypeId != other.periodTypeId)
- return false;
- if (startDate == null) {
- if (other.startDate != null)
- return false;
- } else if (!startDate.equals(other.startDate))
- return false;
- return true;
- }
-
- @Override
- public String toString() {
- return "ImportDataDailyPeriod [periodId=" + periodId
- + ", periodTypeId=" + periodTypeId + ", startDate=" + startDate
- + ", endDate=" + endDate + "]";
- }
-
-
-
- // -------------------------------------------------------------------------
- // Constructors
- // -------------------------------------------------------------------------
-
-
- // -------------------------------------------------------------------------
- // Logic
- // -------------------------------------------------------------------------
-
-
- // -------------------------------------------------------------------------
- // Equals & hashCode
- // -------------------------------------------------------------------------
-
-
-
- // -------------------------------------------------------------------------
- // Getters & setters
- // -------------------------------------------------------------------------
+
+ public ImportDataDailyPeriod( int periodId, int periodTypeId, Date startDate, Date endDate )
+ {
+ super();
+ this.periodId = periodId;
+ this.periodTypeId = periodTypeId;
+ this.startDate = startDate;
+ this.endDate = endDate;
+ }
+
+ public int getPeriodId()
+ {
+ return periodId;
+ }
+
+ public void setPeriodId( int periodId )
+ {
+ this.periodId = periodId;
+ }
+
+ public int getPeriodTypeId()
+ {
+ return periodTypeId;
+ }
+
+ public void setPeriodTypeId( int periodTypeId )
+ {
+ this.periodTypeId = periodTypeId;
+ }
+
+ public Date getStartDate()
+ {
+ return startDate;
+ }
+
+ public void setStartDate( Date startDate )
+ {
+ this.startDate = startDate;
+ }
+
+ public Date getEndDate()
+ {
+ return endDate;
+ }
+
+ public void setEndDate( Date endDate )
+ {
+ this.endDate = endDate;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((endDate == null) ? 0 : endDate.hashCode());
+ result = prime * result + periodId;
+ result = prime * result + periodTypeId;
+ result = prime * result + ((startDate == null) ? 0 : startDate.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals( Object obj )
+ {
+ if ( this == obj )
+ return true;
+ if ( obj == null )
+ return false;
+ if ( getClass() != obj.getClass() )
+ return false;
+ ImportDataDailyPeriod other = (ImportDataDailyPeriod) obj;
+ if ( endDate == null )
+ {
+ if ( other.endDate != null )
+ return false;
+ }
+ else if ( !endDate.equals( other.endDate ) )
+ return false;
+ if ( periodId != other.periodId )
+ return false;
+ if ( periodTypeId != other.periodTypeId )
+ return false;
+ if ( startDate == null )
+ {
+ if ( other.startDate != null )
+ return false;
+ }
+ else if ( !startDate.equals( other.startDate ) )
+ return false;
+ return true;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "ImportDataDailyPeriod [periodId=" + periodId + ", periodTypeId=" + periodTypeId + ", startDate="
+ + startDate + ", endDate=" + endDate + "]";
+ }
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataValue.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataValue.java 2015-09-16 14:49:50 +0000
@@ -131,15 +131,11 @@
public int hashCode()
{
- final int PRIME = 31;
-
- int result = 1;
-
- result = PRIME * result + dataElementId;
-
- result = PRIME * result + periodId;
-
- result = PRIME * result + sourceId;
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + dataElementId;
+ result = prime * result + periodId;
+ result = prime * result + sourceId;
return result;
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportObject.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportObject.java 2015-09-16 14:49:50 +0000
@@ -107,13 +107,10 @@
@Override
public int hashCode()
{
- final int PRIME = 31;
-
- int result = 1;
-
- result = PRIME * result + className.hashCode();
-
- result = PRIME * result + object.hashCode();
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + className.hashCode();
+ result = prime * result + object.hashCode();
return result;
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/maintenance/MaintenanceService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/maintenance/MaintenanceService.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/maintenance/MaintenanceService.java 2015-09-16 14:49:50 +0000
@@ -34,7 +34,7 @@
*/
public interface MaintenanceService
{
- final String ID = MaintenanceService.class.getName();
+ String ID = MaintenanceService.class.getName();
/**
* Deletes data values registered with 0 as value and associated with
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapgeneration/MapGenerationService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapgeneration/MapGenerationService.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapgeneration/MapGenerationService.java 2015-09-16 14:49:50 +0000
@@ -49,7 +49,7 @@
*/
public interface MapGenerationService
{
- public final String ID = MapGenerationService.class.getName();
+ String ID = MapGenerationService.class.getName();
/**
* Generate an image that represents this map.
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java 2015-06-23 17:32:04 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java 2015-09-16 14:49:50 +0000
@@ -42,23 +42,23 @@
*/
public interface MappingService
{
- final String ID = MappingService.class.getName();
-
- final String GEOJSON_DIR = "geojson";
-
- final String MAP_LEGEND_SYMBOLIZER_COLOR = "color";
- final String MAP_LEGEND_SYMBOLIZER_IMAGE = "image";
-
- final String KEY_MAP_DATE_TYPE = "dateType";
-
- final String MAP_DATE_TYPE_FIXED = "fixed";
- final String MAP_DATE_TYPE_START_END = "start-end";
-
- final String ORGANISATION_UNIT_SELECTION_TYPE_PARENT = "parent";
- final String ORGANISATION_UNIT_SELECTION_TYPE_LEVEL = "level";
-
- final String MAP_LAYER_TYPE_BASELAYER = "baselayer";
- final String MAP_LAYER_TYPE_OVERLAY = "overlay";
+ String ID = MappingService.class.getName();
+
+ String GEOJSON_DIR = "geojson";
+
+ String MAP_LEGEND_SYMBOLIZER_COLOR = "color";
+ String MAP_LEGEND_SYMBOLIZER_IMAGE = "image";
+
+ String KEY_MAP_DATE_TYPE = "dateType";
+
+ String MAP_DATE_TYPE_FIXED = "fixed";
+ String MAP_DATE_TYPE_START_END = "start-end";
+
+ String ORGANISATION_UNIT_SELECTION_TYPE_PARENT = "parent";
+ String ORGANISATION_UNIT_SELECTION_TYPE_LEVEL = "level";
+
+ String MAP_LAYER_TYPE_BASELAYER = "baselayer";
+ String MAP_LAYER_TYPE_OVERLAY = "overlay";
// -------------------------------------------------------------------------
// Map
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/minmax/MinMaxDataElement.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/minmax/MinMaxDataElement.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/minmax/MinMaxDataElement.java 2015-09-16 14:49:50 +0000
@@ -85,13 +85,10 @@
@Override
public int hashCode()
{
- final int PRIME = 31;
-
+ final int prime = 31;
int result = 1;
-
- result = PRIME * result + max;
-
- result = PRIME * result + min;
+ result = prime * result + max;
+ result = prime * result + min;
return result;
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/AbstractNode.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/AbstractNode.java 2015-07-16 06:54:49 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/AbstractNode.java 2015-09-16 14:49:50 +0000
@@ -265,6 +265,7 @@
{
return true;
}
+
if ( obj == null || getClass() != obj.getClass() )
{
return false;
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionService.java 2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionService.java 2015-09-16 14:49:50 +0000
@@ -35,7 +35,7 @@
*/
public interface OptionService
{
- final String ID = OptionService.class.getName();
+ String ID = OptionService.class.getName();
// -------------------------------------------------------------------------
// OptionSet
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/CoordinatesTuple.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/CoordinatesTuple.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/CoordinatesTuple.java 2015-09-16 14:49:50 +0000
@@ -113,7 +113,9 @@
return false;
}
- for ( int i = 0; i < coordinatesTuple.size(); i++ )
+ int size = coordinatesTuple.size();
+
+ for ( int i = 0; i < size; i++ )
{
if ( !coordinatesTuple.get( i ).equals( other.getCoordinatesTuple().get( i ) ) )
{
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java 2015-09-09 08:45:33 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java 2015-09-16 14:49:50 +0000
@@ -46,7 +46,7 @@
{
String ID = OrganisationUnitService.class.getName();
- final int MAX_LIMIT = 500;
+ int MAX_LIMIT = 500;
// -------------------------------------------------------------------------
// OrganisationUnit
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/orgunitdistribution/OrgUnitDistributionService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/orgunitdistribution/OrgUnitDistributionService.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/orgunitdistribution/OrgUnitDistributionService.java 2015-09-16 14:49:50 +0000
@@ -38,7 +38,7 @@
*/
public interface OrgUnitDistributionService
{
- final String ID = OrgUnitDistributionService.class.getName();
+ String ID = OrgUnitDistributionService.class.getName();
JFreeChart getOrganisationUnitDistributionChart( OrganisationUnitGroupSet groupSet, OrganisationUnit organisationUnit );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramDataEntryService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramDataEntryService.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramDataEntryService.java 2015-09-16 14:49:50 +0000
@@ -41,9 +41,9 @@
*/
public interface ProgramDataEntryService
{
- final Pattern INPUT_PATTERN = Pattern.compile( "(<input.*?)[/]?>", Pattern.DOTALL );
+ Pattern INPUT_PATTERN = Pattern.compile( "(<input.*?)[/]?>", Pattern.DOTALL );
- final Pattern IDENTIFIER_PATTERN_FIELD = Pattern.compile( "id=\"(\\w+)-(\\w+)-val\"" );
+ Pattern IDENTIFIER_PATTERN_FIELD = Pattern.compile( "id=\"(\\w+)-(\\w+)-val\"" );
// --------------------------------------------------------------------------
// ProgramDataEntryService
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramExpressionService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramExpressionService.java 2015-02-02 13:58:48 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramExpressionService.java 2015-09-16 14:49:50 +0000
@@ -53,7 +53,7 @@
{
String ID = ProgramExpressionService.class.getName();
- public static final String INVALID_CONDITION = "Expression is not well-formed";
+ String INVALID_CONDITION = "Expression is not well-formed";
/**
* Adds an {@link ProgramExpression}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramService.java 2015-09-13 14:17:27 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramService.java 2015-09-16 14:49:50 +0000
@@ -46,24 +46,16 @@
*/
public interface ProgramService
{
-
String ID = ProgramService.class.getName();
- final Pattern INPUT_PATTERN = Pattern.compile( "(<input.*?/>)", Pattern.DOTALL );
-
- final Pattern DYNAMIC_ATTRIBUTE_PATTERN = Pattern.compile( "attributeid=\"(\\w+)\"" );
-
- final Pattern PROGRAM_PATTERN = Pattern.compile( "programid=\"(\\w+)\"" );
-
- final Pattern VALUE_TAG_PATTERN = Pattern.compile( "value=\"(.*?)\"", Pattern.DOTALL );
-
- final Pattern TITLE_TAG_PATTERN = Pattern.compile( "title=\"(.*?)\"", Pattern.DOTALL );
-
- final Pattern SUGGESTED_VALUE_PATTERN = Pattern.compile( "suggested=('|\")(\\w*)('|\")" );
-
- final Pattern CLASS_PATTERN = Pattern.compile( "class=('|\")(\\w*)('|\")" );
-
- final Pattern STYLE_PATTERN = Pattern.compile( "style=('|\")([\\w|\\d\\:\\;]+)('|\")" );
+ Pattern INPUT_PATTERN = Pattern.compile( "(<input.*?/>)", Pattern.DOTALL );
+ Pattern DYNAMIC_ATTRIBUTE_PATTERN = Pattern.compile( "attributeid=\"(\\w+)\"" );
+ Pattern PROGRAM_PATTERN = Pattern.compile( "programid=\"(\\w+)\"" );
+ Pattern VALUE_TAG_PATTERN = Pattern.compile( "value=\"(.*?)\"", Pattern.DOTALL );
+ Pattern TITLE_TAG_PATTERN = Pattern.compile( "title=\"(.*?)\"", Pattern.DOTALL );
+ Pattern SUGGESTED_VALUE_PATTERN = Pattern.compile( "suggested=('|\")(\\w*)('|\")" );
+ Pattern CLASS_PATTERN = Pattern.compile( "class=('|\")(\\w*)('|\")" );
+ Pattern STYLE_PATTERN = Pattern.compile( "style=('|\")([\\w|\\d\\:\\;]+)('|\")" );
/**
* Adds an {@link Program}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java 2015-06-16 18:35:12 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java 2015-09-16 14:49:50 +0000
@@ -46,18 +46,18 @@
{
final String ID = ReportService.class.getName();
- final String REPORTTYPE_PDF = "pdf";
- final String REPORTTYPE_XLS = "xls";
+ String REPORTTYPE_PDF = "pdf";
+ String REPORTTYPE_XLS = "xls";
- final String PARAM_RELATIVE_PERIODS = "periods";
- final String PARAM_RELATIVE_ISO_PERIODS = "periods_iso";
- final String PARAM_ORG_UNITS = "organisationunits";
- final String PARAM_ORG_UNITS_UID = "organisationunits_uid";
- final String PARAM_ORGANISATIONUNIT_LEVEL = "organisationunit_level";
- final String PARAM_ORGANISATIONUNIT_LEVEL_COLUMN = "organisationunit_level_column";
- final String PARAM_ORGANISATIONUNIT_UID_LEVEL_COLUMN = "organisationunit_uid_level_column";
- final String PARAM_ORGANISATIONUNIT_COLUMN_NAME = "organisationunit_name";
- final String PARAM_PERIOD_NAME = "period_name";
+ String PARAM_RELATIVE_PERIODS = "periods";
+ String PARAM_RELATIVE_ISO_PERIODS = "periods_iso";
+ String PARAM_ORG_UNITS = "organisationunits";
+ String PARAM_ORG_UNITS_UID = "organisationunits_uid";
+ String PARAM_ORGANISATIONUNIT_LEVEL = "organisationunit_level";
+ String PARAM_ORGANISATIONUNIT_LEVEL_COLUMN = "organisationunit_level_column";
+ String PARAM_ORGANISATIONUNIT_UID_LEVEL_COLUMN = "organisationunit_uid_level_column";
+ String PARAM_ORGANISATIONUNIT_COLUMN_NAME = "organisationunit_name";
+ String PARAM_PERIOD_NAME = "period_name";
/**
* Renders a Jasper Report.
@@ -178,7 +178,7 @@
* @param identifiers the Collection of identifiers.
* @return a Collection of Reports.
*/
- List<Report> getReports( final Collection<Integer> identifiers );
+ List<Report> getReports( Collection<Integer> identifiers );
/**
* Retrieves Reports with the given uids.
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java 2015-06-16 18:35:12 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java 2015-09-16 14:49:50 +0000
@@ -49,8 +49,8 @@
{
String ID = ReportTableService.class.getName();
- final String MODE_REPORT = "report";
- final String MODE_REPORT_TABLE = "table";
+ String MODE_REPORT = "report";
+ String MODE_REPORT_TABLE = "table";
/**
* Saves a ReportTable.
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/ResourceTableStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/ResourceTableStore.java 2015-04-16 21:24:00 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/ResourceTableStore.java 2015-09-16 14:49:50 +0000
@@ -45,13 +45,13 @@
{
String ID = ResourceTableStore.class.getName();
- final String TABLE_NAME_CATEGORY_OPTION_COMBO_NAME = "_categoryoptioncomboname";
- final String TABLE_NAME_ORGANISATION_UNIT_STRUCTURE = "_orgunitstructure";
- final String TABLE_NAME_DATA_ELEMENT_STRUCTURE = "_dataelementstructure";
- final String TABLE_NAME_PERIOD_STRUCTURE = "_periodstructure";
- final String TABLE_NAME_DATE_PERIOD_STRUCTURE = "_dateperiodstructure";
- final String TABLE_NAME_DATA_ELEMENT_CATEGORY_OPTION_COMBO = "_dataelementcategoryoptioncombo";
- final String TABLE_NAME_DATA_APPROVAL_MIN_LEVEL = "_dataapprovalminlevel";
+ String TABLE_NAME_CATEGORY_OPTION_COMBO_NAME = "_categoryoptioncomboname";
+ String TABLE_NAME_ORGANISATION_UNIT_STRUCTURE = "_orgunitstructure";
+ String TABLE_NAME_DATA_ELEMENT_STRUCTURE = "_dataelementstructure";
+ String TABLE_NAME_PERIOD_STRUCTURE = "_periodstructure";
+ String TABLE_NAME_DATE_PERIOD_STRUCTURE = "_dateperiodstructure";
+ String TABLE_NAME_DATA_ELEMENT_CATEGORY_OPTION_COMBO = "_dataelementcategoryoptioncombo";
+ String TABLE_NAME_DATA_APPROVAL_MIN_LEVEL = "_dataapprovalminlevel";
/**
* Performs a batch update.
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/MessageQueue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/MessageQueue.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/MessageQueue.java 2015-09-16 14:49:50 +0000
@@ -32,11 +32,11 @@
public interface MessageQueue
{
- public void put( IncomingSms message );
-
- public IncomingSms get();
-
- public void remove( IncomingSms message );
-
- public void initialize();
+ void put( IncomingSms message );
+
+ IncomingSms get();
+
+ void remove( IncomingSms message );
+
+ void initialize();
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/SmsServiceException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/SmsServiceException.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/SmsServiceException.java 2015-09-16 14:49:50 +0000
@@ -34,8 +34,6 @@
public class SmsServiceException
extends RuntimeException
{
- private static final long serialVersionUID = -7927288362330380301L;
-
public SmsServiceException( String message )
{
super( message );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/incoming/IncomingSmsService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/incoming/IncomingSmsService.java 2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/incoming/IncomingSmsService.java 2015-09-16 14:49:50 +0000
@@ -63,7 +63,7 @@
void save ( IncomingSms sms );
- public void setIncomingSmsQueue( MessageQueue incomingSmsQueue );
+ void setIncomingSmsQueue( MessageQueue incomingSmsQueue );
List<IncomingSms> getSmsByStatus( SmsMessageStatus status, String keyword );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/incoming/IncomingSmsStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/incoming/IncomingSmsStore.java 2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/incoming/IncomingSmsStore.java 2015-09-16 14:49:50 +0000
@@ -35,7 +35,7 @@
*/
public interface IncomingSmsStore
{
- static final String ID = IncomingSmsStore.class.getName();
+ String ID = IncomingSmsStore.class.getName();
int save( IncomingSms incomingSms );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/parse/ParserManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/parse/ParserManager.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/parse/ParserManager.java 2015-09-16 14:49:50 +0000
@@ -32,6 +32,6 @@
public interface ParserManager
{
- public void parse( IncomingSms sms )
+ void parse( IncomingSms sms )
throws SMSParserException;
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/parse/SMSParserException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/parse/SMSParserException.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/parse/SMSParserException.java 2015-09-16 14:49:50 +0000
@@ -33,8 +33,6 @@
{
private String reason;
- private static final long serialVersionUID = -8088120989819092567L;
-
public static final String NO_VALUE = "no_value";
public static final String WRONG_FORMAT = "wrong_format";
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViewService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViewService.java 2015-07-14 14:50:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViewService.java 2015-09-16 14:49:50 +0000
@@ -42,13 +42,13 @@
*/
public interface SqlViewService
{
- final String ID = SqlViewService.class.getName();
-
- final String VARIABLE_EXPRESSION = "\\$\\{(\\w+)\\}";
- final String SELECT_EXPRESSION = "^(?i)\\s*select\\s+.+";
-
- final Pattern VARIABLE_PATTERN = Pattern.compile( VARIABLE_EXPRESSION, Pattern.DOTALL );
- final Pattern SELECT_PATTERN = Pattern.compile( SELECT_EXPRESSION, Pattern.DOTALL );
+ String ID = SqlViewService.class.getName();
+
+ String VARIABLE_EXPRESSION = "\\$\\{(\\w+)\\}";
+ String SELECT_EXPRESSION = "^(?i)\\s*select\\s+.+";
+
+ Pattern VARIABLE_PATTERN = Pattern.compile( VARIABLE_EXPRESSION, Pattern.DOTALL );
+ Pattern SELECT_PATTERN = Pattern.compile( SELECT_EXPRESSION, Pattern.DOTALL );
// -------------------------------------------------------------------------
// CRUD
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeGroupService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeGroupService.java 2015-06-16 13:17:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeGroupService.java 2015-09-16 14:49:50 +0000
@@ -47,7 +47,7 @@
* @return A generated unique id of the added
* {@link TrackedEntityAttributeGroup}.
*/
- int addTrackedEntityAttributeGroup( TrackedEntityAttributeGroup TrackedEntityAttributeGroup );
+ int addTrackedEntityAttributeGroup( TrackedEntityAttributeGroup trackedEntityAttributeGroup );
/**
* Deletes a {@link TrackedEntityAttributeGroup}.
@@ -55,7 +55,7 @@
* @param TrackedEntityAttributeGroup the TrackedEntityAttributeGroup to
* delete.
*/
- void deleteTrackedEntityAttributeGroup( TrackedEntityAttributeGroup TrackedEntityAttributeGroup );
+ void deleteTrackedEntityAttributeGroup( TrackedEntityAttributeGroup trackedEntityAttributeGroup );
/**
* Updates a {@link TrackedEntityAttributeGroup}.
@@ -63,7 +63,7 @@
* @param TrackedEntityAttributeGroup the TrackedEntityAttributeGroup to
* update.
*/
- void updateTrackedEntityAttributeGroup( TrackedEntityAttributeGroup TrackedEntityAttributeGroup );
+ void updateTrackedEntityAttributeGroup( TrackedEntityAttributeGroup trackedEntityAttributeGroup );
/**
* Returns a {@link TrackedEntityAttributeGroup}.
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceStore.java 2015-07-03 08:41:47 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceStore.java 2015-09-16 14:49:50 +0000
@@ -42,9 +42,9 @@
public interface TrackedEntityInstanceStore
extends GenericIdentifiableObjectStore<TrackedEntityInstance>
{
- final String ID = TrackedEntityInstanceStore.class.getName();
+ String ID = TrackedEntityInstanceStore.class.getName();
- final int MAX_RESULTS = 50000;
+ int MAX_RESULTS = 50000;
int countTrackedEntityInstances( TrackedEntityInstanceQueryParams params );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserService.java 2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserService.java 2015-09-16 14:49:50 +0000
@@ -113,7 +113,7 @@
* @param userCredentials User credentials to check restrictions for.
* @return Set of CategoryOptionGroups if constrained, else null.
*/
- public Set<CategoryOptionGroup> getCogDimensionConstraints( UserCredentials userCredentials );
+ Set<CategoryOptionGroup> getCogDimensionConstraints( UserCredentials userCredentials );
/**
* Returns a set of CategoryOptions that may be seen by the current
@@ -122,7 +122,7 @@
* @param userCredentials User credentials to check restrictions for.
* @return Set of CategoryOptions if constrained, else null.
*/
- public Set<DataElementCategoryOption> getCoDimensionConstraints( UserCredentials userCredentials );
+ Set<DataElementCategoryOption> getCoDimensionConstraints( UserCredentials userCredentials );
boolean isLastSuperUser( UserCredentials userCredentials );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingService.java 2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingService.java 2015-09-16 14:49:50 +0000
@@ -29,7 +29,6 @@
*/
import java.io.Serializable;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -44,22 +43,20 @@
{
String ID = UserSettingService.class.getName();
- final String AUTO_SAVE_DATA_ENTRY_FORM = "autoSaveDataEntryForm";
- final String KEY_CURRENT_DOMAIN_TYPE = "currentDomainType";
- final String KEY_STYLE = "stylesheet";
- final String KEY_STYLE_DIRECTORY = "stylesheetDirectory";
- final String KEY_MESSAGE_EMAIL_NOTIFICATION = "keyMessageEmailNotification";
- final String KEY_MESSAGE_SMS_NOTIFICATION = "keyMessageSmsNotification";
- final String KEY_UI_LOCALE = "keyUiLocale";
- final String KEY_DB_LOCALE = "keyDbLocale";
- final String KEY_GENERATE_REPORT_INTERFACE = "keyGenerateReportInterface";
- final String KEY_ANALYSIS_DISPLAY_PROPERTY = "keyAnalysisDisplayProperty";
- final String AUTO_SAVE_CASE_ENTRY_FORM = "autoSaveCaseEntryForm";
- final String AUTO_SAVE_TRACKED_ENTITY_REGISTRATION_ENTRY_FORM = "autoSavetTrackedEntityForm";
- final String DEFAULT_ANALYSIS_DISPLAY_PROPERTY = "name";
+ String AUTO_SAVE_DATA_ENTRY_FORM = "autoSaveDataEntryForm";
+ String KEY_CURRENT_DOMAIN_TYPE = "currentDomainType";
+ String KEY_STYLE = "stylesheet";
+ String KEY_STYLE_DIRECTORY = "stylesheetDirectory";
+ String KEY_MESSAGE_EMAIL_NOTIFICATION = "keyMessageEmailNotification";
+ String KEY_MESSAGE_SMS_NOTIFICATION = "keyMessageSmsNotification";
+ String KEY_UI_LOCALE = "keyUiLocale";
+ String KEY_DB_LOCALE = "keyDbLocale";
+ String KEY_GENERATE_REPORT_INTERFACE = "keyGenerateReportInterface";
+ String KEY_ANALYSIS_DISPLAY_PROPERTY = "keyAnalysisDisplayProperty";
+ String AUTO_SAVE_CASE_ENTRY_FORM = "autoSaveCaseEntryForm";
+ String AUTO_SAVE_TRACKED_ENTITY_REGISTRATION_ENTRY_FORM = "autoSavetTrackedEntityForm";
+ String DEFAULT_ANALYSIS_DISPLAY_PROPERTY = "name";
- final List<Integer> DASHBOARD_CHARTS_TO_DISPLAY = Arrays.asList( 4, 6, 8 );
-
// -------------------------------------------------------------------------
// UserSettings
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationResult.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationResult.java 2015-02-09 16:30:46 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationResult.java 2015-09-16 14:49:50 +0000
@@ -92,13 +92,11 @@
@Override
public int hashCode()
{
- final int PRIME = 31;
-
- int result = 1;
-
- result = PRIME * result + ((period == null) ? 0 : period.hashCode());
- result = PRIME * result + ((orgUnit == null) ? 0 : orgUnit.hashCode());
- result = PRIME * result + ((validationRule == null) ? 0 : validationRule.hashCode());
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((period == null) ? 0 : period.hashCode());
+ result = prime * result + ((orgUnit == null) ? 0 : orgUnit.hashCode());
+ result = prime * result + ((validationRule == null) ? 0 : validationRule.hashCode());
return result;
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/version/VersionService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/version/VersionService.java 2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/version/VersionService.java 2015-09-16 14:49:50 +0000
@@ -35,7 +35,7 @@
*/
public interface VersionService
{
- public final String ORGANISATIONUNIT_VERSION = "organisationUnit";
+ String ORGANISATIONUNIT_VERSION = "organisationUnit";
String ID = VersionService.class.getName();
=== modified file 'dhis-2/dhis-api/src/test/java/org/hisp/dhis/common/CombinationGeneratorTest.java'
--- dhis-2/dhis-api/src/test/java/org/hisp/dhis/common/CombinationGeneratorTest.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/test/java/org/hisp/dhis/common/CombinationGeneratorTest.java 2015-09-16 14:49:50 +0000
@@ -31,7 +31,6 @@
import java.util.Arrays;
import java.util.List;
-import org.hisp.dhis.common.IdentifiableObject;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.junit.Test;
=== modified file 'dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/RelativePeriodTest.java'
--- dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/RelativePeriodTest.java 2015-04-08 22:57:51 +0000
+++ dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/RelativePeriodTest.java 2015-09-16 14:49:50 +0000
@@ -46,7 +46,7 @@
*/
public class RelativePeriodTest
{
- private static final I18nFormat i18nFormat = new MockI18nFormat();
+ private static final I18nFormat I18N_FORMAT = new MockI18nFormat();
private static Date getDate( int year, int month, int day )
{
@@ -58,7 +58,7 @@
{
RelativePeriods periods = new RelativePeriods( true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true );
- List<Period> relatives = periods.getRelativePeriods( getDate( 2001, 1, 1 ), i18nFormat, false );
+ List<Period> relatives = periods.getRelativePeriods( getDate( 2001, 1, 1 ), I18N_FORMAT, false );
assertEquals( 157, relatives.size() );
assertTrue( relatives.contains( new Period( new MonthlyPeriodType(), getDate( 2001, 1, 1 ), getDate( 2001, 1, 31 ) ) ) );
@@ -134,7 +134,7 @@
{
RelativePeriods periods = new RelativePeriods().setLast12Months( true );
- List<Period> relatives = periods.getRewindedRelativePeriods( 1, getDate( 2001, 7, 15 ), i18nFormat, false );
+ List<Period> relatives = periods.getRewindedRelativePeriods( 1, getDate( 2001, 7, 15 ), I18N_FORMAT, false );
assertEquals( 12, relatives.size() );
assertTrue( relatives.contains( new Period( new MonthlyPeriodType(), getDate( 2000, 7, 1 ), getDate( 2000, 7, 31 ) ) ) );
@@ -314,7 +314,7 @@
assertEquals( 12, relatives.size() );
- relatives = new RelativePeriods().setLast4Quarters( true ).getRelativePeriods( i18nFormat, true );
+ relatives = new RelativePeriods().setLast4Quarters( true ).getRelativePeriods( I18N_FORMAT, true );
assertEquals( 4, relatives.size() );
}
