=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java 2011-11-30 14:39:36 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java 2011-11-30 18:36:57 +0000 @@ -57,58 +57,36 @@ { private static final long serialVersionUID = 2570074075484545534L; - public static final String DIMENSION_PERIOD_INDICATOR = "period"; - - public static final String DIMENSION_ORGANISATIONUNIT_INDICATOR = "organisationUnit"; - - public static final String DIMENSION_INDICATOR_PERIOD = "indicator"; - - public static final String DIMENSION_PERIOD_DATAELEMENT = "period_dataElement"; - - public static final String DIMENSION_ORGANISATIONUNIT_DATAELEMENT = "organisationUnit_dataElement"; - - public static final String DIMENSION_DATAELEMENT_PERIOD = "dataElement_period"; - - public static final String DIMENSION_PERIOD_COMPLETENESS = "period_completeness"; - - public static final String DIMENSION_ORGANISATIONUNIT_COMPLETENESS = "organisationUnit_completeness"; - - public static final String DIMENSION_COMPLETENESS_PERIOD = "completeness_period"; - - public static final String TYPE_BAR3D = "bar3d"; - - public static final String TYPE_STACKED_BAR3D = "stackedBar3d"; - - public static final String TYPE_LINE3D = "line3d"; - - public static final String TYPE_PIE3D = "pie3d"; - - public static final String SIZE_NORMAL = "normal"; - - public static final String SIZE_WIDE = "wide"; - - public static final String SIZE_TALL = "tall"; - - public static final String TYPE = "tall"; - - public static final String TYPE_COLUMN = "column"; - - public static final String TYPE_STACKED_COLUMN = "stackedColumn"; - - public static final String TYPE_BAR = "bar"; - - public static final String TYPE_STACKED_BAR = "stackedBar"; - - public static final String TYPE_LINE = "line"; - - public static final String TYPE_AREA = "area"; - + public static final String DIMENSION_PERIOD_INDICATOR = "period"; + public static final String DIMENSION_ORGANISATIONUNIT_INDICATOR = "organisationUnit"; + public static final String DIMENSION_INDICATOR_PERIOD = "indicator"; + public static final String DIMENSION_PERIOD_DATAELEMENT = "period_dataElement"; + public static final String DIMENSION_ORGANISATIONUNIT_DATAELEMENT = "organisationUnit_dataElement"; + public static final String DIMENSION_DATAELEMENT_PERIOD = "dataElement_period"; + public static final String DIMENSION_PERIOD_COMPLETENESS = "period_completeness"; + public static final String DIMENSION_ORGANISATIONUNIT_COMPLETENESS = "organisationUnit_completeness"; + public static final String DIMENSION_COMPLETENESS_PERIOD = "completeness_period"; + + public static final String TYPE_BAR3D = "bar3d"; + public static final String TYPE_STACKED_BAR3D = "stackedBar3d"; + public static final String TYPE_LINE3D = "line3d"; + public static final String TYPE_PIE3D = "pie3d"; + + public static final String SIZE_NORMAL = "normal"; + public static final String SIZE_WIDE = "wide"; + public static final String SIZE_TALL = "tall"; + + public static final String TYPE = "tall"; + public static final String TYPE_COLUMN = "column"; + public static final String TYPE_STACKED_COLUMN = "stackedColumn"; + public static final String TYPE_BAR = "bar"; + public static final String TYPE_STACKED_BAR = "stackedBar"; + public static final String TYPE_LINE = "line"; + public static final String TYPE_AREA = "area"; public static final String TYPE_PIE = "pie"; - public static final String DIMENSION_DATA = "data"; - - public static final String DIMENSION_PERIOD = "period"; - + public static final String DIMENSION_DATA = "data"; + public static final String DIMENSION_PERIOD = "period"; public static final String DIMENSION_ORGANISATIONUNIT = "organisationUnit"; private String domainAxixLabel; @@ -117,9 +95,9 @@ private String type; - private String size; + private String size; - private String dimension; + private String dimension; private String series; @@ -127,37 +105,37 @@ private String filter; - private boolean hideLegend; - - private boolean verticalLabels; - - private boolean horizontalPlotOrientation; - - private boolean regression; - - private boolean targetLine; - - private boolean hideSubtitle; - - private Double targetLineValue; - - private String targetLineLabel; - - private Set groups = new HashSet(); + private boolean hideLegend; + + private boolean verticalLabels; + + private boolean horizontalPlotOrientation; + + private boolean regression; + + private boolean targetLine; + + private boolean hideSubtitle; + + private Double targetLineValue; + + private String targetLineLabel; + + private Set groups = new HashSet(); private List indicators = new ArrayList(); private List dataElements = new ArrayList(); - private List dataSets = new ArrayList(); + private List dataSets = new ArrayList(); private List periods = new ArrayList(); private List organisationUnits = new ArrayList(); - private RelativePeriods relatives; + private RelativePeriods relatives; - private boolean userOrganisationUnit; + private boolean userOrganisationUnit; // ------------------------------------------------------------------------- // Transient properties