=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/Util.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/Util.java 2011-09-20 22:17:20 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/Util.java 2011-09-23 18:54:49 +0000 @@ -2,7 +2,6 @@ import java.util.Calendar; import java.util.GregorianCalendar; -import java.util.StringTokenizer; /* * Copyright (c) 2004-2005, University of Oslo === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf2/service/DataValueSetServiceTest.java' --- dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf2/service/DataValueSetServiceTest.java 2011-09-05 20:30:27 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf2/service/DataValueSetServiceTest.java 2011-09-23 18:54:49 +0000 @@ -37,7 +37,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; -import java.util.HashMap; import java.util.Map; import javax.xml.bind.JAXBContext; === modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java 2011-09-22 13:25:54 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java 2011-09-23 18:54:49 +0000 @@ -27,7 +27,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import org.hisp.dhis.attribute.AttributeValue; import org.hisp.dhis.caseaggregation.CaseAggregationCondition; import org.hisp.dhis.chart.Chart; import org.hisp.dhis.chart.ChartGroup; === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetDataRecordsAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetDataRecordsAction.java 2011-07-27 03:07:45 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetDataRecordsAction.java 2011-09-23 18:54:49 +0000 @@ -54,11 +54,6 @@ public class GetDataRecordsAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = 1994974012114016133L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SearchPatientAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SearchPatientAction.java 2011-09-14 06:36:13 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SearchPatientAction.java 2011-09-23 18:54:49 +0000 @@ -50,11 +50,6 @@ public class SearchPatientAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = -2815128850665795197L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateReportAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateReportAction.java 2011-07-15 08:07:54 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateReportAction.java 2011-09-23 18:54:49 +0000 @@ -51,11 +51,6 @@ public class GenerateReportAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = 3785792832775238394L; - public static final String RED = "#ff0000"; public static final String YELLOW = "#ffff00"; === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.java 2011-09-23 18:54:49 +0000 @@ -50,11 +50,6 @@ public class GetOperandsAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = -5383013578576715476L; - private static Filter AGGREGATABLE_FILTER = new AggregatableDataElementFilter(); // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/help/action/GetHelpContentAction.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/help/action/GetHelpContentAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/help/action/GetHelpContentAction.java 2011-09-23 18:54:49 +0000 @@ -41,11 +41,6 @@ public class GetHelpContentAction extends StreamActionSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = 7191591296478690775L; - private HelpManager helpManager; public void setHelpManager( HelpManager helpManager ) === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/help/action/GetHelpItemsAction.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/help/action/GetHelpItemsAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/help/action/GetHelpItemsAction.java 2011-09-23 18:54:49 +0000 @@ -41,11 +41,6 @@ public class GetHelpItemsAction extends StreamActionSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = 856423230079440766L; - private HelpManager helpManager; public void setHelpManager( HelpManager helpManager ) === modified file 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetAllDataMartExportsAction.java' --- dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetAllDataMartExportsAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetAllDataMartExportsAction.java 2011-09-23 18:54:49 +0000 @@ -45,11 +45,6 @@ public class GetAllDataMartExportsAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = 6689317770553253852L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetSectionFormAction.java' --- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetSectionFormAction.java 2011-09-23 18:11:09 +0000 +++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetSectionFormAction.java 2011-09-23 18:54:49 +0000 @@ -29,9 +29,7 @@ import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.dataset.DataSetService; -import org.hisp.dhis.i18n.I18nFormat; import org.hisp.dhis.period.Period; -import org.hisp.dhis.period.PeriodService; import com.opensymphony.xwork2.Action; @@ -49,20 +47,6 @@ this.dataSetService = dataSetService; } - private PeriodService periodService; - - public void setPeriodService( PeriodService periodService ) - { - this.periodService = periodService; - } - - private I18nFormat format; - - public void setFormat( I18nFormat format ) - { - this.format = format; - } - // ------------------------------------------------------------------------- // Input & Output // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml 2011-09-23 18:11:09 +0000 +++ dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml 2011-09-23 18:54:49 +0000 @@ -20,7 +20,6 @@ - { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = 2687396226111218636L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/GetDataElementCategoryComboListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/GetDataElementCategoryComboListAction.java 2011-06-20 06:56:23 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/GetDataElementCategoryComboListAction.java 2011-09-23 18:54:49 +0000 @@ -45,11 +45,6 @@ public class GetDataElementCategoryComboListAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = -2420271352701508808L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/GetConceptListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/GetConceptListAction.java 2011-07-01 03:36:32 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/GetConceptListAction.java 2011-09-23 18:54:49 +0000 @@ -45,11 +45,6 @@ public class GetConceptListAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = 8508083790278682228L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/GetDataDictionaryListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/GetDataDictionaryListAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/GetDataDictionaryListAction.java 2011-09-23 18:54:49 +0000 @@ -45,11 +45,6 @@ public class GetDataDictionaryListAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = 4425135902567832056L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementListAction.java 2011-06-02 08:44:31 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementListAction.java 2011-09-23 18:54:49 +0000 @@ -51,11 +51,6 @@ public class GetDataElementListAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = 5245805858199221545L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowAddDataElementForm.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowAddDataElementForm.java 2011-09-21 15:41:25 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowAddDataElementForm.java 2011-09-23 18:54:49 +0000 @@ -34,7 +34,6 @@ import org.hisp.dhis.attribute.Attribute; import org.hisp.dhis.attribute.AttributeService; -import org.hisp.dhis.attribute.comparator.AttributeNameComparator; import org.hisp.dhis.attribute.comparator.AttributeSortOrderComparator; import org.hisp.dhis.dataelement.DataElementCategoryCombo; import org.hisp.dhis.dataelement.DataElementCategoryService; === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowUpdateDataElementFormAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowUpdateDataElementFormAction.java 2011-09-21 15:41:25 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowUpdateDataElementFormAction.java 2011-09-23 18:54:49 +0000 @@ -36,7 +36,6 @@ import org.hisp.dhis.attribute.Attribute; import org.hisp.dhis.attribute.AttributeService; -import org.hisp.dhis.attribute.comparator.AttributeNameComparator; import org.hisp.dhis.attribute.comparator.AttributeSortOrderComparator; import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dataelement.DataElementCategoryCombo; === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetDataElementGroupListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetDataElementGroupListAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetDataElementGroupListAction.java 2011-09-23 18:54:49 +0000 @@ -43,11 +43,6 @@ public class GetDataElementGroupListAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = -3245814174208392338L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/ListDataElementGroupSetAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/ListDataElementGroupSetAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/ListDataElementGroupSetAction.java 2011-09-23 18:54:49 +0000 @@ -45,11 +45,6 @@ public class ListDataElementGroupSetAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = -7103802182794593240L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorListAction.java 2011-09-23 08:49:46 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorListAction.java 2011-09-23 18:54:49 +0000 @@ -51,11 +51,6 @@ public class GetIndicatorListAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = -8113994255652430513L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ShowUpdateIndicatorFormAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ShowUpdateIndicatorFormAction.java 2011-09-21 15:41:25 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ShowUpdateIndicatorFormAction.java 2011-09-23 18:54:49 +0000 @@ -35,8 +35,6 @@ import org.hisp.dhis.attribute.Attribute; import org.hisp.dhis.attribute.AttributeService; -import org.hisp.dhis.attribute.AttributeValue; -import org.hisp.dhis.attribute.comparator.AttributeNameComparator; import org.hisp.dhis.attribute.comparator.AttributeSortOrderComparator; import org.hisp.dhis.indicator.Indicator; import org.hisp.dhis.indicator.IndicatorService; === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupListAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupListAction.java 2011-09-23 18:54:49 +0000 @@ -45,11 +45,6 @@ public class GetIndicatorGroupListAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = -1518182947390522061L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/ListIndicatorGroupSetAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/ListIndicatorGroupSetAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/ListIndicatorGroupSetAction.java 2011-09-23 18:54:49 +0000 @@ -46,11 +46,6 @@ public class ListIndicatorGroupSetAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = -657322804458699115L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/GetIndicatorTypeListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/GetIndicatorTypeListAction.java 2011-09-21 15:41:25 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/GetIndicatorTypeListAction.java 2011-09-23 18:54:49 +0000 @@ -35,7 +35,6 @@ import org.hisp.dhis.attribute.Attribute; import org.hisp.dhis.attribute.AttributeService; -import org.hisp.dhis.attribute.comparator.AttributeNameComparator; import org.hisp.dhis.attribute.comparator.AttributeSortOrderComparator; import org.hisp.dhis.indicator.IndicatorService; import org.hisp.dhis.indicator.IndicatorType; @@ -48,11 +47,6 @@ public class GetIndicatorTypeListAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = 6266707412846006610L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DataSetListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DataSetListAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DataSetListAction.java 2011-09-23 18:54:49 +0000 @@ -46,11 +46,6 @@ public class DataSetListAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = 8082918338462445257L; - private List dataSets; // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/GetOrganisationUnitListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/GetOrganisationUnitListAction.java 2011-09-14 03:44:56 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/GetOrganisationUnitListAction.java 2011-09-23 18:54:49 +0000 @@ -49,11 +49,6 @@ public class GetOrganisationUnitListAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = -5977539372198760349L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/PrepareAddOrganisationUnitAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/PrepareAddOrganisationUnitAction.java 2011-09-21 15:41:25 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/PrepareAddOrganisationUnitAction.java 2011-09-23 18:54:49 +0000 @@ -34,7 +34,6 @@ import org.hisp.dhis.attribute.Attribute; import org.hisp.dhis.attribute.AttributeService; -import org.hisp.dhis.attribute.comparator.AttributeNameComparator; import org.hisp.dhis.attribute.comparator.AttributeSortOrderComparator; import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.dataset.DataSetService; === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/GetOrganisationUnitGroupListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/GetOrganisationUnitGroupListAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/GetOrganisationUnitGroupListAction.java 2011-09-23 18:54:49 +0000 @@ -45,11 +45,6 @@ public class GetOrganisationUnitGroupListAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = 7497235575670188086L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/GetGroupSetListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/GetGroupSetListAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/GetGroupSetListAction.java 2011-09-23 18:54:49 +0000 @@ -45,11 +45,6 @@ public class GetGroupSetListAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = -4996503815547403053L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetOrgunitUserListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetOrgunitUserListAction.java 2011-09-09 06:18:32 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetOrgunitUserListAction.java 2011-09-23 18:54:49 +0000 @@ -51,11 +51,6 @@ public class GetOrgunitUserListAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = -5175610874946088030L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleListAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleListAction.java 2011-09-23 18:54:49 +0000 @@ -43,11 +43,6 @@ public class GetRoleListAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = -9049555067079089282L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserGroupListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserGroupListAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserGroupListAction.java 2011-09-23 18:54:49 +0000 @@ -39,11 +39,6 @@ public class GetUserGroupListAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = -6368907684073119546L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserListAction.java 2011-09-06 05:37:32 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserListAction.java 2011-09-23 18:54:49 +0000 @@ -49,11 +49,6 @@ public class GetUserListAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = 4089608846157081457L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.java 2011-09-21 15:41:25 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.java 2011-09-23 18:54:49 +0000 @@ -36,7 +36,6 @@ import org.hisp.dhis.attribute.Attribute; import org.hisp.dhis.attribute.AttributeService; -import org.hisp.dhis.attribute.comparator.AttributeNameComparator; import org.hisp.dhis.attribute.comparator.AttributeSortOrderComparator; import org.hisp.dhis.organisationunit.OrganisationUnitGroup; import org.hisp.dhis.oust.manager.SelectionTreeManager; === modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportExcelAction.java' --- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportExcelAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportExcelAction.java 2011-09-23 18:54:49 +0000 @@ -66,11 +66,6 @@ public class ExportExcelAction extends StreamActionSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = -2250356459364593446L; - private static final Log log = LogFactory.getLog( ExportExcelAction.class ); // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportImageAction.java' --- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportImageAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportImageAction.java 2011-09-23 18:54:49 +0000 @@ -47,11 +47,6 @@ public class ExportImageAction extends StreamActionSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = 8329931104387254592L; - private static final Log log = LogFactory.getLog( ExportImageAction.class ); private static final String SVGDOCUMENT = "SVGDOCUMENT"; === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/GetAllChartsAction.java' --- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/GetAllChartsAction.java 2011-07-21 09:09:42 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/GetAllChartsAction.java 2011-09-23 18:54:49 +0000 @@ -45,11 +45,6 @@ public class GetAllChartsAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = -5514430921098331756L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/GetChartGroupListAction.java' --- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/GetChartGroupListAction.java 2011-07-21 06:51:02 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/GetChartGroupListAction.java 2011-09-23 18:54:49 +0000 @@ -45,11 +45,6 @@ public class GetChartGroupListAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = -1L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/document/action/GetAllDocumentsAction.java' --- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/document/action/GetAllDocumentsAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/document/action/GetAllDocumentsAction.java 2011-09-23 18:54:49 +0000 @@ -43,11 +43,6 @@ public class GetAllDocumentsAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = 3239745318140276726L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/GetReportGroupListAction.java' --- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/GetReportGroupListAction.java 2011-07-21 09:09:42 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportgroup/action/GetReportGroupListAction.java 2011-09-23 18:54:49 +0000 @@ -45,11 +45,6 @@ public class GetReportGroupListAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = -1L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/GetReportTableGroupListAction.java' --- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/GetReportTableGroupListAction.java 2011-07-21 09:09:42 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reporttablegroup/action/GetReportTableGroupListAction.java 2011-09-23 18:54:49 +0000 @@ -45,11 +45,6 @@ public class GetReportTableGroupListAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = -1L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/GetAllReportsAction.java' --- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/GetAllReportsAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/GetAllReportsAction.java 2011-09-23 18:54:49 +0000 @@ -45,11 +45,6 @@ public class GetAllReportsAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = -4304183507305998104L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/GetReportDesignAction.java' --- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/GetReportDesignAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/GetReportDesignAction.java 2011-09-23 18:54:49 +0000 @@ -44,11 +44,6 @@ public class GetReportDesignAction extends StreamActionSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = 4854712118983643988L; - private static final String EXT_JRXML = ".jrxml"; // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetAllTablesAction.java' --- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetAllTablesAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetAllTablesAction.java 2011-09-23 18:54:49 +0000 @@ -45,11 +45,6 @@ public class GetAllTablesAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = 392357311060063539L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetValidationRuleListAction.java' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetValidationRuleListAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetValidationRuleListAction.java 2011-09-23 18:54:49 +0000 @@ -45,11 +45,6 @@ public class GetValidationRuleListAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = -5674675722729050868L; - // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/validationrulegroup/GetValidationRuleGroupListAction.java' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/validationrulegroup/GetValidationRuleGroupListAction.java 2011-05-06 11:10:34 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/validationrulegroup/GetValidationRuleGroupListAction.java 2011-09-23 18:54:49 +0000 @@ -45,11 +45,6 @@ public class GetValidationRuleGroupListAction extends ActionPagingSupport { - /** - * Determines if a de-serialized file is compatible with this class. - */ - private static final long serialVersionUID = 7120556296320802407L; - // ------------------------------------------------------------------------- // Dependencies // -------------------------------------------------------------------------