=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/action/ImportDataValueAction.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/action/ImportDataValueAction.java 2011-01-12 09:13:36 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/action/ImportDataValueAction.java 2011-05-05 21:15:45 +0000 @@ -47,11 +47,11 @@ import org.hisp.dhis.patientdatavalue.PatientDataValueService; import org.hisp.dhis.program.ProgramStageInstance; import org.hisp.dhis.program.ProgramStageInstanceService; -import com.opensymphony.xwork2.ActionSupport; + +import com.opensymphony.xwork2.Action; public class ImportDataValueAction - extends ActionSupport - implements ServletRequestAware, ServletResponseAware + implements ServletRequestAware, ServletResponseAware, Action { // Dependencies private ProgramStageInstanceService programStageInstanceService; @@ -186,12 +186,12 @@ this.setInputStream( new ByteArrayInputStream( message.getBytes() ) ); } } + return SUCCESS; } private void saveDataValue( DataInputStream dis, OrganisationUnit orgUnit ) throws IOException - { DataElement dataElement = dataElementService.getDataElement( dis.readInt() ); ProgramStageInstance programStageInstance = programStageInstanceService.getProgramStageInstance( dis.readInt() ); @@ -208,5 +208,4 @@ patientDataValueService.savePatientDataValue( patientDataValue ); } - } === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/NotAllowedException.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/NotAllowedException.java 2011-01-17 06:28:00 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/NotAllowedException.java 2011-05-05 21:15:45 +0000 @@ -30,6 +30,10 @@ public class NotAllowedException extends Exception { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = 2830950542493770883L; public static final NotAllowedException INVALID_PROGRAM_STAGE = new NotAllowedException( "INVALID_PROGRAM_STAGE" ); === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataElementGroupAction.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataElementGroupAction.java 2010-11-20 08:23:34 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataElementGroupAction.java 2011-05-05 21:15:45 +0000 @@ -30,14 +30,14 @@ import org.hisp.dhis.dataelement.DataElementGroup; import org.hisp.dhis.dataelement.DataElementService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: GetDataElementGroupAction.java 2869 2007-02-20 14:26:09Z andegje $ */ public class GetDataElementGroupAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetIndicatorGroupAction.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetIndicatorGroupAction.java 2010-11-20 08:23:34 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetIndicatorGroupAction.java 2011-05-05 21:15:45 +0000 @@ -30,14 +30,14 @@ import org.hisp.dhis.indicator.IndicatorGroup; import org.hisp.dhis.indicator.IndicatorService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: GetIndicatorGroupAction.java 3305 2007-05-14 18:55:52Z larshelg $ */ public class GetIndicatorGroupAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/LoadDocumentAction.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/LoadDocumentAction.java 2011-04-07 13:48:56 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/LoadDocumentAction.java 2011-05-05 21:15:45 +0000 @@ -48,7 +48,7 @@ extends StreamActionSupport { private static final Log log = LogFactory.getLog( LoadDocumentAction.class ); - + // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/AbstractPreResultListener.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/AbstractPreResultListener.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/AbstractPreResultListener.java 2011-05-05 21:15:45 +0000 @@ -44,6 +44,11 @@ public abstract class AbstractPreResultListener implements Interceptor, PreResultListener { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = -4459571006411990169L; + private static final Log LOG = LogFactory.getLog( AbstractPreResultListener.class ); private boolean executePreResultListener; === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ContextInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ContextInterceptor.java 2011-04-01 19:47:09 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ContextInterceptor.java 2011-05-05 21:15:45 +0000 @@ -41,6 +41,11 @@ public class ContextInterceptor implements Interceptor { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = 5247533061332275754L; + private static final String KEY_IN_MEMORY_DATABASE = "inMemoryDatabase"; private DatabaseInfoProvider databaseInfoProvider; === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/DisplayPropertyInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/DisplayPropertyInterceptor.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/DisplayPropertyInterceptor.java 2011-05-05 21:15:45 +0000 @@ -46,6 +46,11 @@ public class DisplayPropertyInterceptor implements Interceptor { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = -400429585902812175L; + private static final String KEY_DISPLAY_PROPERTY_HANDLER = "displayPropertyHandler"; // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ExceptionInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ExceptionInterceptor.java 2011-01-19 14:18:22 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ExceptionInterceptor.java 2011-05-05 21:15:45 +0000 @@ -51,6 +51,11 @@ public class ExceptionInterceptor implements Interceptor { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = 8500468340861599537L; + private static final Log LOG = LogFactory.getLog( ExceptionInterceptor.class ); public static final String EXCEPTION_RESULT_KEY = "onExceptionReturn"; === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/I18nInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/I18nInterceptor.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/I18nInterceptor.java 2011-05-05 21:15:45 +0000 @@ -50,6 +50,11 @@ public class I18nInterceptor implements Interceptor { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = -1684761883368013838L; + private static final String KEY_I18N = "i18n"; private static final String KEY_I18N_FORMAT = "format"; private static final String KEY_LOCALE = "locale"; === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SortOrderInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SortOrderInterceptor.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SortOrderInterceptor.java 2011-05-05 21:15:45 +0000 @@ -50,6 +50,11 @@ public class SortOrderInterceptor implements Interceptor { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = -2581250719044309788L; + private static final String KEY_DATAELEMENT_COMPARATOR = "dataElementComparator"; private static final String KEY_INDICATOR_COMPARATOR = "indicatorComparator"; private static final String KEY_ORGANISATIONUNIT_COMPARATOR = "organisationUnitComparator"; === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/StyleInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/StyleInterceptor.java 2010-10-28 09:17:13 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/StyleInterceptor.java 2011-05-05 21:15:45 +0000 @@ -43,6 +43,11 @@ public class StyleInterceptor implements Interceptor { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = -4046465567852737440L; + private static final String KEY_STYLE = "stylesheet"; private static final String KEY_STYLE_DIRECTORY = "stylesheetDirectory"; === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java 2011-04-04 17:23:41 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java 2011-05-05 21:15:45 +0000 @@ -52,6 +52,11 @@ public class SystemSettingInterceptor implements Interceptor { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = 7410474100313067470L; + // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/interceptor/OrganisationUnitTreeInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/interceptor/OrganisationUnitTreeInterceptor.java 2011-02-15 13:45:11 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/interceptor/OrganisationUnitTreeInterceptor.java 2011-05-05 21:15:45 +0000 @@ -52,6 +52,11 @@ public class OrganisationUnitTreeInterceptor extends AbstractPreResultListener { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = 8494211825850245931L; + private static final String VALUE_KEY = "organisationUnitTree"; // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/paging/ActionPagingSupport.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/paging/ActionPagingSupport.java 2011-04-02 12:26:50 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/paging/ActionPagingSupport.java 2011-05-05 21:15:45 +0000 @@ -36,13 +36,13 @@ import org.hisp.dhis.system.paging.Paging; import org.hisp.dhis.util.ContextUtils; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Quang Nguyen */ public abstract class ActionPagingSupport - extends ActionSupport + implements Action { protected Integer currentPage; === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/ChartResult.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/ChartResult.java 2011-01-27 16:15:25 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/ChartResult.java 2011-05-05 21:15:45 +0000 @@ -38,6 +38,11 @@ public class ChartResult implements Result { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = -8364233242858237681L; + private static final String DEFAULT_FILENAME = "chart.png"; private JFreeChart chart = null; === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridCsvResult.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridCsvResult.java 2011-03-31 11:10:04 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridCsvResult.java 2011-05-05 21:15:45 +0000 @@ -47,6 +47,11 @@ public class GridCsvResult implements Result { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = -8568665099535892269L; + private static final String DEFAULT_FILENAME = "Grid.csv"; // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridJasperResult.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridJasperResult.java 2011-03-31 11:10:04 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridJasperResult.java 2011-05-05 21:15:45 +0000 @@ -45,6 +45,11 @@ public class GridJasperResult implements Result { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = 7071299079048199227L; + private static final String DEFAULT_FILENAME = "Grid"; // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridJrxmlResult.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridJrxmlResult.java 2011-03-31 11:10:04 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridJrxmlResult.java 2011-05-05 21:15:45 +0000 @@ -47,6 +47,11 @@ public class GridJrxmlResult implements Result { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = -2883847942469564557L; + private static final String DEFAULT_FILENAME = "Grid"; // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridPdfResult.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridPdfResult.java 2011-03-31 11:10:04 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridPdfResult.java 2011-05-05 21:15:45 +0000 @@ -47,6 +47,11 @@ public class GridPdfResult implements Result { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = 6613101138470779866L; + private static final String DEFAULT_FILENAME = "Grid"; // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridXlsResult.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridXlsResult.java 2011-03-31 11:10:04 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridXlsResult.java 2011-05-05 21:15:45 +0000 @@ -47,6 +47,11 @@ public class GridXlsResult implements Result { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = 3030165635768899728L; + private static final String DEFAULT_FILENAME = "Grid.xls"; // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/OutputStreamResult.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/OutputStreamResult.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/OutputStreamResult.java 2011-05-05 21:15:45 +0000 @@ -37,6 +37,11 @@ public class OutputStreamResult implements Result { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = -6337406648858377663L; + public void execute( ActionInvocation arg0 ) throws Exception { === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/PlainTextErrorResult.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/PlainTextErrorResult.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/PlainTextErrorResult.java 2011-05-05 21:15:45 +0000 @@ -45,6 +45,11 @@ public class PlainTextErrorResult implements Result { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = 5500263448725254319L; + // ------------------------------------------------------------------------- // Parameters // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/VelocityJsonResult.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/VelocityJsonResult.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/VelocityJsonResult.java 2011-05-05 21:15:45 +0000 @@ -36,6 +36,11 @@ public class VelocityJsonResult extends VelocityResult { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = 1038408218156030639L; + @Override protected final String getContentType( String templateLocation ) { === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/VelocityXMLResult.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/VelocityXMLResult.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/VelocityXMLResult.java 2011-05-05 21:15:45 +0000 @@ -36,6 +36,11 @@ public class VelocityXMLResult extends VelocityResult { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = 3813189797060697257L; + @Override protected final String getContentType( String templateLocation ) { === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/HttpMethodInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/HttpMethodInterceptor.java 2010-05-03 12:19:21 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/HttpMethodInterceptor.java 2011-05-05 21:15:45 +0000 @@ -40,6 +40,11 @@ public class HttpMethodInterceptor implements Interceptor { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = -7882464040475459114L; + private static final Log log = LogFactory.getLog( HttpMethodInterceptor.class ); private static final String DEFAULT_METHOD = "POST"; === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/XWorkSecurityInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/XWorkSecurityInterceptor.java 2010-05-03 13:44:59 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/XWorkSecurityInterceptor.java 2011-05-05 21:15:45 +0000 @@ -48,6 +48,11 @@ extends AbstractSecurityInterceptor implements Interceptor { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = -3734961911452433836L; + private static final String KEY_ACTION_ACCESS_RESOLVER = "auth"; private ThreadLocal definitionSourceTag = new ThreadLocal(); === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/ContextUtils.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/ContextUtils.java 2011-04-02 12:26:50 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/ContextUtils.java 2011-05-05 21:15:45 +0000 @@ -57,7 +57,12 @@ private static final String PORT_SEPARATOR = ":"; private static final String PROTOCOL = "http://"; - private static final Map CONTENT_TYPE_MAP = new HashMap() { { + private static final Map CONTENT_TYPE_MAP = new HashMap() { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = -8332376695197474041L; + { put( "pdf", CONTENT_TYPE_PDF ); put( "zip", CONTENT_TYPE_ZIP ); put( "json", CONTENT_TYPE_JSON ); === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/JRExportUtils.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/JRExportUtils.java 2011-04-03 10:25:42 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/JRExportUtils.java 2011-05-05 21:15:45 +0000 @@ -49,7 +49,12 @@ public static final String TYPE_XLS = "xls"; public static final String TYPE_PDF = "pdf"; - private static final Map exporters = new HashMap() { { + private static final Map exporters = new HashMap() { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = 6662444011214507874L; + { put( TYPE_XLS, new JRXlsExportProvider() ); put( TYPE_PDF, new JRPdfExportProvider() ); } }; === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/StreamActionSupport.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/StreamActionSupport.java 2011-04-12 13:07:35 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/StreamActionSupport.java 2011-05-05 21:15:45 +0000 @@ -34,14 +34,14 @@ import org.apache.struts2.ServletActionContext; import org.hisp.dhis.system.util.StreamUtils; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public abstract class StreamActionSupport - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // ActionSupport implementation === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalMenuInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalMenuInterceptor.java 2010-10-21 14:24:15 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalMenuInterceptor.java 2011-05-05 21:15:45 +0000 @@ -43,6 +43,11 @@ public class XWorkPortalMenuInterceptor implements Interceptor { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = 6165469913988612348L; + private static final String KEY_MENU_STATE = "menuState"; // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalModuleInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalModuleInterceptor.java 2010-10-21 14:24:15 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalModuleInterceptor.java 2011-05-05 21:15:45 +0000 @@ -42,6 +42,11 @@ public class XWorkPortalModuleInterceptor implements Interceptor { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = 8996189907119658364L; + private static final String KEY_MAINTENANCE_MODULES = "maintenanceModules"; private static final String KEY_SERVICE_MODULES = "serviceModules"; === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalParamsInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalParamsInterceptor.java 2010-10-21 14:24:15 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalParamsInterceptor.java 2011-05-05 21:15:45 +0000 @@ -43,6 +43,11 @@ public class XWorkPortalParamsInterceptor implements Interceptor { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = 4915716647953480053L; + // ------------------------------------------------------------------------- // External configuration // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalUserInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalUserInterceptor.java 2010-10-21 14:24:15 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalUserInterceptor.java 2011-05-05 21:15:45 +0000 @@ -42,6 +42,11 @@ public class XWorkPortalUserInterceptor implements Interceptor { + /** + * Determines if a de-serialized file is compatible with this class. + */ + private static final long serialVersionUID = 2809606672626282043L; + // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SelectAction.java' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SelectAction.java 2011-03-20 21:45:37 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SelectAction.java 2011-05-05 21:15:45 +0000 @@ -40,14 +40,14 @@ import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.period.Period; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: SelectAction.java 5930 2008-10-15 03:30:52Z tri $ */ public class SelectAction - extends ActionSupport + implements Action { private static final Log log = LogFactory.getLog( SelectAction.class ); === modified file 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/CancelExportAction.java' --- dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/CancelExportAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/CancelExportAction.java 2011-05-05 21:15:45 +0000 @@ -33,14 +33,14 @@ import org.amplecode.cave.process.ProcessCoordinator; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class CancelExportAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetExportStatusAction.java' --- dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetExportStatusAction.java 2010-09-25 20:13:04 +0000 +++ dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetExportStatusAction.java 2011-05-05 21:15:45 +0000 @@ -27,21 +27,24 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import static org.hisp.dhis.util.InternalProcessUtil.*; +import static org.hisp.dhis.util.InternalProcessUtil.PROCESS_KEY_DATAMART; +import static org.hisp.dhis.util.InternalProcessUtil.getCurrentRunningProcess; +import static org.hisp.dhis.util.InternalProcessUtil.processIsRunning; +import static org.hisp.dhis.util.InternalProcessUtil.removeCurrentRunningProcess; import org.amplecode.cave.process.ProcessCoordinator; import org.amplecode.cave.process.ProcessExecutor; import org.amplecode.cave.process.state.MessageState; import org.hisp.dhis.i18n.I18n; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class GetExportStatusAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetOptionsAction.java' --- dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetOptionsAction.java 2010-07-18 15:17:23 +0000 +++ dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/GetOptionsAction.java 2011-05-05 21:15:45 +0000 @@ -57,14 +57,14 @@ import org.hisp.dhis.system.filter.PastAndCurrentPeriodFilter; import org.hisp.dhis.system.util.FilterUtils; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id: GetOptionsAction.java 6256 2008-11-10 17:10:30Z larshelg $ */ public class GetOptionsAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/NoAction.java' --- dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/NoAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-datamart/src/main/java/org/hisp/dhis/datamart/action/NoAction.java 2011-05-05 21:15:45 +0000 @@ -27,14 +27,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id: NoAction.java 2869 2007-02-20 14:26:09Z andegje $ */ public class NoAction - extends ActionSupport + implements Action { public String execute() { === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/NoAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/NoAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/NoAction.java 2011-05-05 21:15:45 +0000 @@ -31,10 +31,10 @@ * @author Lars Helge Overland * @version $Id: NoAction.java 3331 2007-06-01 07:29:02Z torgeilo $ */ -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; public class NoAction - extends ActionSupport + implements Action { public String execute() { === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dhis14/GetDhis14ConfigurationAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dhis14/GetDhis14ConfigurationAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dhis14/GetDhis14ConfigurationAction.java 2011-05-05 21:15:45 +0000 @@ -32,14 +32,14 @@ import org.hisp.dhis.importexport.IbatisConfiguration; import org.hisp.dhis.importexport.IbatisConfigurationManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class GetDhis14ConfigurationAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dhis14/SetDhis14ConfigurationAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dhis14/SetDhis14ConfigurationAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dhis14/SetDhis14ConfigurationAction.java 2011-05-05 21:15:45 +0000 @@ -30,14 +30,14 @@ import org.hisp.dhis.importexport.IbatisConfiguration; import org.hisp.dhis.importexport.IbatisConfigurationManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class SetDhis14ConfigurationAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/DataValueExportAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/DataValueExportAction.java 2011-03-13 07:25:37 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/DataValueExportAction.java 2011-05-05 21:15:45 +0000 @@ -47,14 +47,14 @@ import org.hisp.dhis.period.PeriodService; import org.hisp.dhis.system.util.ConversionUtils; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class DataValueExportAction - extends ActionSupport + implements Action { private final static String FILE_EXTENSION = ".zip"; private final static String FILE_PREFIX = "Export"; === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/GetExportOptionsAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/GetExportOptionsAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/GetExportOptionsAction.java 2011-05-05 21:15:45 +0000 @@ -36,14 +36,14 @@ import org.hisp.dhis.organisationunit.OrganisationUnitService; import org.hisp.dhis.oust.manager.SelectionTreeManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id: GetOptionsAction.java 2869 2007-02-20 14:26:09Z andegje $ */ public class GetExportOptionsAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/MetaDataExportAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/MetaDataExportAction.java 2011-04-24 15:50:02 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/MetaDataExportAction.java 2011-05-05 21:15:45 +0000 @@ -35,14 +35,14 @@ import org.hisp.dhis.importexport.ExportParams; import org.hisp.dhis.importexport.ExportService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class MetaDataExportAction - extends ActionSupport + implements Action { private static final String FILENAME = "Export_meta.zip"; === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetCompareOptionsAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetCompareOptionsAction.java 2010-05-12 13:38:28 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetCompareOptionsAction.java 2011-05-05 21:15:45 +0000 @@ -30,14 +30,14 @@ import org.hisp.dhis.importexport.ImportObject; import org.hisp.dhis.importexport.ImportObjectService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class GetCompareOptionsAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Input === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetImportOptionsAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetImportOptionsAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetImportOptionsAction.java 2011-05-05 21:15:45 +0000 @@ -27,19 +27,19 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import static org.hisp.dhis.importexport.action.util.ImportExportInternalProcessUtil.*; +import static org.hisp.dhis.importexport.action.util.ImportExportInternalProcessUtil.getCurrentRunningProcessImportFormat; import org.hisp.dhis.external.configuration.NoConfigurationFoundException; import org.hisp.dhis.importexport.IbatisConfigurationManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class GetImportOptionsAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetImportStatusAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetImportStatusAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetImportStatusAction.java 2011-05-05 21:15:45 +0000 @@ -27,22 +27,29 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import static org.hisp.dhis.importexport.action.util.ImportExportInternalProcessUtil.*; +import static org.hisp.dhis.importexport.action.util.ImportExportInternalProcessUtil.TYPE_ANALYSIS; +import static org.hisp.dhis.importexport.action.util.ImportExportInternalProcessUtil.TYPE_IMPORT; +import static org.hisp.dhis.importexport.action.util.ImportExportInternalProcessUtil.TYPE_PREVIEW; +import static org.hisp.dhis.importexport.action.util.ImportExportInternalProcessUtil.getCurrentImportFileName; +import static org.hisp.dhis.importexport.action.util.ImportExportInternalProcessUtil.getCurrentRunningProcessType; +import static org.hisp.dhis.importexport.action.util.ImportExportInternalProcessUtil.setCurrentRunningProcessType; import static org.hisp.dhis.util.InternalProcessUtil.PROCESS_KEY_IMPORT; +import static org.hisp.dhis.util.InternalProcessUtil.getCurrentRunningProcess; +import static org.hisp.dhis.util.InternalProcessUtil.processIsRunning; import org.amplecode.cave.process.ProcessCoordinator; import org.amplecode.cave.process.ProcessExecutor; import org.amplecode.cave.process.state.MessageState; import org.hisp.dhis.i18n.I18n; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class GetImportStatusAction - extends ActionSupport + implements Action { private static final String ACTION_INFO = "info"; private static final String ACTION_PREVIEW = "preview"; === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetMatchOptionsAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetMatchOptionsAction.java 2011-04-24 15:50:02 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetMatchOptionsAction.java 2011-05-05 21:15:45 +0000 @@ -59,14 +59,14 @@ import org.hisp.dhis.reporttable.ReportTableService; import org.hisp.dhis.validation.ValidationRuleService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class GetMatchOptionsAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Input === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetPreviewOptionsAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetPreviewOptionsAction.java 2011-04-24 15:50:02 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetPreviewOptionsAction.java 2011-05-05 21:15:45 +0000 @@ -62,14 +62,14 @@ import org.hisp.dhis.reporttable.ReportTable; import org.hisp.dhis.validation.ValidationRule; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class GetPreviewOptionsAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/ImportAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/ImportAction.java 2011-01-17 17:03:05 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/ImportAction.java 2011-05-05 21:15:45 +0000 @@ -52,14 +52,14 @@ import org.hisp.dhis.system.util.DateUtils; import org.hisp.dhis.user.CurrentUserService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class ImportAction - extends ActionSupport + implements Action { private static final String IMPORT_INTERNAL_PROCESS_ID_POSTFIX = "ImportService"; === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/object/DiscardAllObjectsAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/object/DiscardAllObjectsAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/object/DiscardAllObjectsAction.java 2011-05-05 21:15:45 +0000 @@ -27,18 +27,20 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import static org.hisp.dhis.util.SessionUtils.*; +import static org.hisp.dhis.util.SessionUtils.KEY_PREVIEW_STATUS; +import static org.hisp.dhis.util.SessionUtils.KEY_PREVIEW_TYPE; +import static org.hisp.dhis.util.SessionUtils.removeSessionVar; import org.hisp.dhis.importexport.ImportObjectService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class DiscardAllObjectsAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/object/DiscardObjectAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/object/DiscardObjectAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/object/DiscardObjectAction.java 2011-05-05 21:15:45 +0000 @@ -31,14 +31,14 @@ import org.hisp.dhis.importexport.ImportObjectService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class DiscardObjectAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Input === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/object/DiscardObjectsOfTypeAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/object/DiscardObjectsOfTypeAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/object/DiscardObjectsOfTypeAction.java 2011-05-05 21:15:45 +0000 @@ -30,14 +30,14 @@ import org.hisp.dhis.importexport.ImportObjectService; import org.hisp.dhis.importexport.action.util.ClassMapUtil; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class DiscardObjectsOfTypeAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Input === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/object/ImportAllObjectsAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/object/ImportAllObjectsAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/object/ImportAllObjectsAction.java 2011-05-05 21:15:45 +0000 @@ -27,7 +27,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import static org.hisp.dhis.importexport.action.util.ImportExportInternalProcessUtil.*; +import static org.hisp.dhis.util.InternalProcessUtil.PROCESS_KEY_IMPORT; +import static org.hisp.dhis.util.InternalProcessUtil.setCurrentRunningProcess; import static org.hisp.dhis.util.SessionUtils.KEY_PREVIEW_STATUS; import static org.hisp.dhis.util.SessionUtils.KEY_PREVIEW_TYPE; import static org.hisp.dhis.util.SessionUtils.removeSessionVar; @@ -36,14 +37,14 @@ import org.amplecode.cave.process.ProcessExecutor; import org.hisp.dhis.user.CurrentUserService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class ImportAllObjectsAction - extends ActionSupport + implements Action { private static final String PROCESS_TYPE = "ImportPreview"; === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/object/MatchObjectAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/object/MatchObjectAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/object/MatchObjectAction.java 2011-05-05 21:15:45 +0000 @@ -29,14 +29,14 @@ import org.hisp.dhis.importexport.ImportObjectService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class MatchObjectAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Input === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/dataprune/PruneOrganisationUnitAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/dataprune/PruneOrganisationUnitAction.java 2010-11-11 07:30:38 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/dataprune/PruneOrganisationUnitAction.java 2011-05-05 21:15:45 +0000 @@ -33,7 +33,7 @@ import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.oust.manager.SelectionTreeManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Quang Nguyen @@ -41,7 +41,7 @@ */ public class PruneOrganisationUnitAction - extends ActionSupport + implements Action { private static final Log log = LogFactory.getLog( PruneOrganisationUnitAction.class ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/maintenance/PerformMaintenanceAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/maintenance/PerformMaintenanceAction.java 2011-02-03 20:42:05 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/maintenance/PerformMaintenanceAction.java 2011-05-05 21:15:45 +0000 @@ -36,14 +36,14 @@ import org.hisp.dhis.period.Period; import org.hisp.dhis.period.PeriodService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class PerformMaintenanceAction - extends ActionSupport + implements Action { private static final Log log = LogFactory.getLog( PerformMaintenanceAction.class ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/organisationunitmerge/MergeOrganisationUnitsAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/organisationunitmerge/MergeOrganisationUnitsAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/organisationunitmerge/MergeOrganisationUnitsAction.java 2011-05-05 21:15:45 +0000 @@ -33,13 +33,13 @@ import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland */ public class MergeOrganisationUnitsAction - extends ActionSupport + implements Action { private static final Log log = LogFactory.getLog( MergeOrganisationUnitsAction.class ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/resourcetable/GenerateResourceTableAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/resourcetable/GenerateResourceTableAction.java 2011-03-17 19:31:16 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/resourcetable/GenerateResourceTableAction.java 2011-05-05 21:15:45 +0000 @@ -32,14 +32,14 @@ import org.hisp.dhis.resourcetable.ResourceTableService; import org.hisp.dhis.sqlview.SqlViewService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class GenerateResourceTableAction - extends ActionSupport + implements Action { private static final Log log = LogFactory.getLog( GenerateResourceTableAction.class ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/AddSqlViewAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/AddSqlViewAction.java 2010-11-12 16:03:47 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/AddSqlViewAction.java 2011-05-05 21:15:45 +0000 @@ -29,14 +29,14 @@ import org.hisp.dhis.sqlview.SqlView; import org.hisp.dhis.sqlview.SqlViewService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Dang Duy Hieu * @version $Id AddSqlViewAction.java July 06, 2010$ */ public class AddSqlViewAction - extends ActionSupport + implements Action { private static final String REGEX = "\\s+"; === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/CheckViewTableExistenceAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/CheckViewTableExistenceAction.java 2010-07-19 15:20:24 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/CheckViewTableExistenceAction.java 2011-05-05 21:15:45 +0000 @@ -30,7 +30,7 @@ import org.hisp.dhis.i18n.I18n; import org.hisp.dhis.sqlview.SqlViewService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * Updates a existing sqlview in database. @@ -39,7 +39,7 @@ * @version $Id CheckViewTableExistenceAction.java July 16, 2010$ */ public class CheckViewTableExistenceAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ExecuteSqlViewQueryAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ExecuteSqlViewQueryAction.java 2010-08-24 07:43:37 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ExecuteSqlViewQueryAction.java 2011-05-05 21:15:45 +0000 @@ -31,7 +31,7 @@ import org.hisp.dhis.sqlview.SqlView; import org.hisp.dhis.sqlview.SqlViewService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * Updates a existing sqlview to the database. @@ -40,7 +40,7 @@ * @version $Id ExecuteSqlViewQueryAction.java July 06, 2010$ */ public class ExecuteSqlViewQueryAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewListAction.java 2010-07-19 15:20:24 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewListAction.java 2011-05-05 21:15:45 +0000 @@ -33,14 +33,14 @@ import org.hisp.dhis.sqlview.SqlView; import org.hisp.dhis.sqlview.SqlViewService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Dang Duy Hieu * @version $Id GetSqlViewListAction.java July 10, 2010$ */ public class GetSqlViewListAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewObjectAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewObjectAction.java 2010-08-24 07:43:37 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewObjectAction.java 2011-05-05 21:15:45 +0000 @@ -30,7 +30,7 @@ import org.hisp.dhis.sqlview.SqlView; import org.hisp.dhis.sqlview.SqlViewService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * Removes a existing regular expression from the database. @@ -39,7 +39,7 @@ * @version $Id GetSqlViewObjectAction.java July 06, 2010$ */ public class GetSqlViewObjectAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/RemoveSqlViewAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/RemoveSqlViewAction.java 2010-08-24 07:43:37 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/RemoveSqlViewAction.java 2011-05-05 21:15:45 +0000 @@ -29,7 +29,7 @@ import org.hisp.dhis.sqlview.SqlViewService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * Removes a existing regular expression from the database. @@ -38,7 +38,7 @@ * @version $Id RemoveSqlViewAction.java July 06, 2010$ */ public class RemoveSqlViewAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ShowUpSqlViewTableAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ShowUpSqlViewTableAction.java 2010-07-19 15:20:24 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ShowUpSqlViewTableAction.java 2011-05-05 21:15:45 +0000 @@ -30,7 +30,7 @@ import org.hisp.dhis.sqlview.SqlViewService; import org.hisp.dhis.sqlview.SqlViewTable; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * Updates a existing sqlview in database. @@ -39,7 +39,7 @@ * @version $Id ShowUpSqlViewTableAction.java July 12, 2010$ */ public class ShowUpSqlViewTableAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/UpdateSqlViewAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/UpdateSqlViewAction.java 2010-07-19 15:20:24 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/UpdateSqlViewAction.java 2011-05-05 21:15:45 +0000 @@ -30,7 +30,7 @@ import org.hisp.dhis.sqlview.SqlView; import org.hisp.dhis.sqlview.SqlViewService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * Updates a existing sqlview in database. @@ -39,7 +39,7 @@ * @version $Id UpdateSqlViewAction.java July 06, 2010$ */ public class UpdateSqlViewAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ValidateAddUpdateSqlViewAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ValidateAddUpdateSqlViewAction.java 2011-01-21 10:26:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ValidateAddUpdateSqlViewAction.java 2011-05-05 21:15:45 +0000 @@ -34,14 +34,14 @@ import org.hisp.dhis.i18n.I18n; import org.hisp.dhis.sqlview.SqlViewService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Dang Duy Hieu * @version $Id ValidateAddUpdateSqlViewAction.java July 07, 2010$ */ public class ValidateAddUpdateSqlViewAction - extends ActionSupport + implements Action { private static final String ADD = "add"; === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/NoAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/NoAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/NoAction.java 2011-05-05 21:15:45 +0000 @@ -27,14 +27,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id: NoAction.java 4279 2007-12-11 18:41:22Z larshelg $ */ public class NoAction - extends ActionSupport + implements Action { public String execute() { === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/AddConceptAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/AddConceptAction.java 2010-09-04 07:26:32 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/AddConceptAction.java 2011-05-05 21:15:45 +0000 @@ -27,17 +27,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.hisp.dhis.concept.Concept; import org.hisp.dhis.concept.ConceptService; -import org.hisp.dhis.concept.Concept; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Dang Duy Hieu * @version $Id$ */ public class AddConceptAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/GetConceptAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/GetConceptAction.java 2010-09-04 07:26:32 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/GetConceptAction.java 2011-05-05 21:15:45 +0000 @@ -27,17 +27,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.hisp.dhis.concept.Concept; import org.hisp.dhis.concept.ConceptService; -import org.hisp.dhis.concept.Concept; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Dang Duy Hieu * @version $Id$ */ public class GetConceptAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/RemoveConceptAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/RemoveConceptAction.java 2010-09-04 07:26:32 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/RemoveConceptAction.java 2011-05-05 21:15:45 +0000 @@ -27,18 +27,18 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.hisp.dhis.common.DeleteNotAllowedException; import org.hisp.dhis.concept.ConceptService; -import org.hisp.dhis.common.DeleteNotAllowedException; import org.hisp.dhis.i18n.I18n; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Dang Duy Hieu * @version $Id$ */ public class RemoveConceptAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/UpdateConceptAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/UpdateConceptAction.java 2010-09-04 07:26:32 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/UpdateConceptAction.java 2011-05-05 21:15:45 +0000 @@ -27,17 +27,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.hisp.dhis.concept.Concept; import org.hisp.dhis.concept.ConceptService; -import org.hisp.dhis.concept.Concept; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Dang Duy Hieu * @version $Id$ */ public class UpdateConceptAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/ValidateAddUpdateConceptAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/ValidateAddUpdateConceptAction.java 2010-11-23 18:25:34 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/ValidateAddUpdateConceptAction.java 2011-05-05 21:15:45 +0000 @@ -30,14 +30,14 @@ import org.hisp.dhis.concept.ConceptService; import org.hisp.dhis.i18n.I18n; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Dang Duy Hieu * @version $Id$ */ public class ValidateAddUpdateConceptAction - extends ActionSupport + implements Action { //TODO private static final Pattern conceptNamePattern = Pattern.compile( "^[a-zA-Z][a-zA-Z0-9_]{0,9}$" ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/AddDataElementAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/AddDataElementAction.java 2011-04-26 17:29:50 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/AddDataElementAction.java 2011-05-05 21:15:45 +0000 @@ -36,13 +36,13 @@ import org.hisp.dhis.dataelement.DataElementService; import org.hisp.dhis.system.util.ConversionUtils; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby */ public class AddDataElementAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementAction.java 2010-06-01 04:05:59 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementAction.java 2011-05-05 21:15:45 +0000 @@ -37,14 +37,14 @@ import org.hisp.dhis.dataelement.DataElementService; import org.hisp.dhis.dataelement.comparator.DataElementGroupNameComparator; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: GetDataElementAction.java 5789 2008-10-02 09:47:04Z larshelg $ */ public class GetDataElementAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementGroupMembersAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementGroupMembersAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementGroupMembersAction.java 2011-05-05 21:15:45 +0000 @@ -41,14 +41,14 @@ import org.hisp.dhis.dataelement.DataElementService; import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: GetDataElementListAction.java 4378 2008-01-02 10:13:39Z abyot $ */ public class GetDataElementGroupMembersAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === 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-04-26 17:29:50 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowUpdateDataElementFormAction.java 2011-05-05 21:15:45 +0000 @@ -40,14 +40,14 @@ import org.hisp.dhis.organisationunit.OrganisationUnitLevel; import org.hisp.dhis.organisationunit.OrganisationUnitService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Hans S. Toemmerholt * @version $Id: GetDataElementAction.java 2869 2007-02-20 14:26:09Z andegje $ */ public class ShowUpdateDataElementFormAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/UpdateDataElementAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/UpdateDataElementAction.java 2011-04-26 17:29:50 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/UpdateDataElementAction.java 2011-05-05 21:15:45 +0000 @@ -39,13 +39,13 @@ import org.hisp.dhis.dataset.DataSetService; import org.hisp.dhis.system.util.ConversionUtils; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby */ public class UpdateDataElementAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/AddDataElementGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/AddDataElementGroupAction.java 2010-12-10 07:45:59 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/AddDataElementGroupAction.java 2011-05-05 21:15:45 +0000 @@ -34,7 +34,7 @@ import org.hisp.dhis.dataelement.DataElementGroup; import org.hisp.dhis.dataelement.DataElementService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby @@ -42,7 +42,7 @@ * andegje $ */ public class AddDataElementGroupAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetDataElementGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetDataElementGroupAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetDataElementGroupAction.java 2011-05-05 21:15:45 +0000 @@ -30,14 +30,14 @@ import org.hisp.dhis.dataelement.DataElementGroup; import org.hisp.dhis.dataelement.DataElementService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: GetDataElementGroupAction.java 2869 2007-02-20 14:26:09Z andegje $ */ public class GetDataElementGroupAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/RemoveDataElementGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/RemoveDataElementGroupAction.java 2010-12-10 07:45:59 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/RemoveDataElementGroupAction.java 2011-05-05 21:15:45 +0000 @@ -31,7 +31,7 @@ import org.hisp.dhis.dataelement.DataElementService; import org.hisp.dhis.i18n.I18n; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby @@ -39,7 +39,7 @@ * andegje $ */ public class RemoveDataElementGroupAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/UpdateDataElementGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/UpdateDataElementGroupAction.java 2010-12-11 20:38:50 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/UpdateDataElementGroupAction.java 2011-05-05 21:15:45 +0000 @@ -34,7 +34,7 @@ import org.hisp.dhis.dataelement.DataElementGroup; import org.hisp.dhis.dataelement.DataElementService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby @@ -42,7 +42,7 @@ * andegje $ */ public class UpdateDataElementGroupAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ValidateDataElementGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ValidateDataElementGroupAction.java 2010-09-01 16:55:23 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ValidateDataElementGroupAction.java 2011-05-05 21:15:45 +0000 @@ -31,7 +31,7 @@ import org.hisp.dhis.dataelement.DataElementService; import org.hisp.dhis.i18n.I18n; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby @@ -39,7 +39,7 @@ * andegje $ */ public class ValidateDataElementGroupAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/AddIndicatorAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/AddIndicatorAction.java 2011-04-24 15:50:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/AddIndicatorAction.java 2011-05-05 21:15:45 +0000 @@ -31,14 +31,14 @@ import org.hisp.dhis.indicator.IndicatorService; import org.hisp.dhis.indicator.IndicatorType; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: AddIndicatorAction.java 5164 2008-05-16 12:23:58Z larshelg $ */ public class AddIndicatorAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorAction.java 2011-05-05 21:15:45 +0000 @@ -30,14 +30,14 @@ import org.hisp.dhis.indicator.Indicator; import org.hisp.dhis.indicator.IndicatorService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: GetIndicatorAction.java 4281 2007-12-12 12:35:11Z larshelg $ */ public class GetIndicatorAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/RemoveIndicatorAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/RemoveIndicatorAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/RemoveIndicatorAction.java 2011-05-05 21:15:45 +0000 @@ -31,14 +31,14 @@ import org.hisp.dhis.i18n.I18n; import org.hisp.dhis.indicator.IndicatorService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: RemoveIndicatorAction.java 3305 2007-05-14 18:55:52Z larshelg $ */ public class RemoveIndicatorAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/UpdateIndicatorAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/UpdateIndicatorAction.java 2011-04-24 15:50:02 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/UpdateIndicatorAction.java 2011-05-05 21:15:45 +0000 @@ -31,14 +31,14 @@ import org.hisp.dhis.indicator.IndicatorService; import org.hisp.dhis.indicator.IndicatorType; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: UpdateIndicatorAction.java 5164 2008-05-16 12:23:58Z larshelg $ */ public class UpdateIndicatorAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ValidateIndicatorAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ValidateIndicatorAction.java 2010-09-01 16:55:23 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ValidateIndicatorAction.java 2011-05-05 21:15:45 +0000 @@ -31,7 +31,7 @@ import org.hisp.dhis.indicator.Indicator; import org.hisp.dhis.indicator.IndicatorService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby @@ -39,7 +39,7 @@ * $ */ public class ValidateIndicatorAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatordenum/GetDenumAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatordenum/GetDenumAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatordenum/GetDenumAction.java 2011-05-05 21:15:45 +0000 @@ -38,14 +38,14 @@ import org.hisp.dhis.dataelement.comparator.DataElementGroupNameComparator; import org.hisp.dhis.expression.ExpressionService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Oeverland * @version $id$ */ public class GetDenumAction - extends ActionSupport + implements Action { private String formula; === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatordenum/GetFilteredDataElementsAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatordenum/GetFilteredDataElementsAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatordenum/GetFilteredDataElementsAction.java 2011-05-05 21:15:45 +0000 @@ -42,14 +42,14 @@ import org.hisp.dhis.system.filter.AggregatableDataElementFilter; import org.hisp.dhis.system.util.FilterUtils; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id: GetFilteredDataElementsAction.java 6256 2008-11-10 17:10:30Z larshelg $ */ public class GetFilteredDataElementsAction - extends ActionSupport + implements Action { private static final int ALL = 0; === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatordenum/GetFormulaTextAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatordenum/GetFormulaTextAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatordenum/GetFormulaTextAction.java 2011-05-05 21:15:45 +0000 @@ -30,14 +30,14 @@ import org.hisp.dhis.expression.ExpressionService; import org.hisp.dhis.i18n.I18n; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id: GetFormulaTextAction.java 5334 2008-06-04 13:45:41Z larshelg $ */ public class GetFormulaTextAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/AddIndicatorGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/AddIndicatorGroupAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/AddIndicatorGroupAction.java 2011-05-05 21:15:45 +0000 @@ -35,14 +35,14 @@ import org.hisp.dhis.indicator.IndicatorGroup; import org.hisp.dhis.indicator.IndicatorService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: AddIndicatorGroupAction.java 3305 2007-05-14 18:55:52Z larshelg $ */ public class AddIndicatorGroupAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupAction.java 2011-05-05 21:15:45 +0000 @@ -30,14 +30,14 @@ import org.hisp.dhis.indicator.IndicatorGroup; import org.hisp.dhis.indicator.IndicatorService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: GetIndicatorGroupAction.java 3305 2007-05-14 18:55:52Z larshelg $ */ public class GetIndicatorGroupAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupMembersAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupMembersAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupMembersAction.java 2011-05-05 21:15:45 +0000 @@ -37,14 +37,14 @@ import org.hisp.dhis.indicator.IndicatorService; import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: GetIndicatorGroupMembersAction.java 6475 2008-11-25 15:42:55Z larshelg $ */ public class GetIndicatorGroupMembersAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/RemoveIndicatorGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/RemoveIndicatorGroupAction.java 2010-12-13 06:40:41 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/RemoveIndicatorGroupAction.java 2011-05-05 21:15:45 +0000 @@ -31,7 +31,7 @@ import org.hisp.dhis.i18n.I18n; import org.hisp.dhis.indicator.IndicatorService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby @@ -39,7 +39,7 @@ * larshelg $ */ public class RemoveIndicatorGroupAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/UpdateIndicatorGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/UpdateIndicatorGroupAction.java 2011-03-14 07:06:31 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/UpdateIndicatorGroupAction.java 2011-05-05 21:15:45 +0000 @@ -35,7 +35,7 @@ import org.hisp.dhis.indicator.IndicatorGroup; import org.hisp.dhis.indicator.IndicatorService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby @@ -43,7 +43,7 @@ * larshelg $ */ public class UpdateIndicatorGroupAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/ValidateIndicatorGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/ValidateIndicatorGroupAction.java 2010-09-08 10:40:26 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/ValidateIndicatorGroupAction.java 2011-05-05 21:15:45 +0000 @@ -31,7 +31,7 @@ import org.hisp.dhis.indicator.IndicatorGroup; import org.hisp.dhis.indicator.IndicatorService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby @@ -39,7 +39,7 @@ * larshelg $ */ public class ValidateIndicatorGroupAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/AddIndicatorTypeAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/AddIndicatorTypeAction.java 2010-12-16 04:38:17 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/AddIndicatorTypeAction.java 2011-05-05 21:15:45 +0000 @@ -30,7 +30,7 @@ import org.hisp.dhis.indicator.IndicatorService; import org.hisp.dhis.indicator.IndicatorType; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby @@ -38,7 +38,7 @@ * $ */ public class AddIndicatorTypeAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/GetIndicatorTypeAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/GetIndicatorTypeAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/GetIndicatorTypeAction.java 2011-05-05 21:15:45 +0000 @@ -30,14 +30,14 @@ import org.hisp.dhis.indicator.IndicatorService; import org.hisp.dhis.indicator.IndicatorType; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: GetIndicatorTypeAction.java 3305 2007-05-14 18:55:52Z larshelg $ */ public class GetIndicatorTypeAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/RemoveIndicatorTypeAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/RemoveIndicatorTypeAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/RemoveIndicatorTypeAction.java 2011-05-05 21:15:45 +0000 @@ -31,14 +31,14 @@ import org.hisp.dhis.i18n.I18n; import org.hisp.dhis.indicator.IndicatorService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: RemoveIndicatorTypeAction.java 5693 2008-09-13 17:56:36Z larshelg $ */ public class RemoveIndicatorTypeAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/UpdateIndicatorTypeAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/UpdateIndicatorTypeAction.java 2010-12-16 04:38:17 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/UpdateIndicatorTypeAction.java 2011-05-05 21:15:45 +0000 @@ -30,7 +30,7 @@ import org.hisp.dhis.indicator.IndicatorService; import org.hisp.dhis.indicator.IndicatorType; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby @@ -38,7 +38,7 @@ * larshelg $ */ public class UpdateIndicatorTypeAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/ValidateIndicatorTypeAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/ValidateIndicatorTypeAction.java 2010-09-08 10:40:26 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/ValidateIndicatorTypeAction.java 2011-05-05 21:15:45 +0000 @@ -31,7 +31,7 @@ import org.hisp.dhis.indicator.IndicatorService; import org.hisp.dhis.indicator.IndicatorType; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby @@ -39,7 +39,7 @@ * larshelg $ */ public class ValidateIndicatorTypeAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/hierarchy/GetSelectedOrganisationUnitAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/hierarchy/GetSelectedOrganisationUnitAction.java 2010-07-17 12:46:48 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/hierarchy/GetSelectedOrganisationUnitAction.java 2011-05-05 21:15:45 +0000 @@ -30,7 +30,7 @@ import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby @@ -38,7 +38,7 @@ * 12:06:56Z torgeilo $ */ public class GetSelectedOrganisationUnitAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/hierarchy/MoveOrganisationUnitAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/hierarchy/MoveOrganisationUnitAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/hierarchy/MoveOrganisationUnitAction.java 2011-05-05 21:15:45 +0000 @@ -31,14 +31,14 @@ import org.hisp.dhis.organisationunit.OrganisationUnitService; import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: MoveOrganisationUnitAction.java 1898 2006-09-22 12:06:56Z torgeilo $ */ public class MoveOrganisationUnitAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/hierarchy/ValidateNewParentOrganisationUnitAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/hierarchy/ValidateNewParentOrganisationUnitAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/hierarchy/ValidateNewParentOrganisationUnitAction.java 2011-05-05 21:15:45 +0000 @@ -32,14 +32,14 @@ import org.hisp.dhis.organisationunit.OrganisationUnitService; import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: ValidateNewParentOrganisationUnitAction.java 1232 2006-01-30 06:29:30Z torgeilo $ */ public class ValidateNewParentOrganisationUnitAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/hierarchy/ValidateOrganisationUnitToMoveAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/hierarchy/ValidateOrganisationUnitToMoveAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/hierarchy/ValidateOrganisationUnitToMoveAction.java 2011-05-05 21:15:45 +0000 @@ -32,14 +32,14 @@ import org.hisp.dhis.organisationunit.OrganisationUnitService; import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: ValidateOrganisationUnitToMoveAction.java 1232 2006-01-30 06:29:30Z torgeilo $ */ public class ValidateOrganisationUnitToMoveAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java 2011-03-17 10:20:34 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java 2011-05-05 21:15:45 +0000 @@ -40,7 +40,7 @@ import org.hisp.dhis.organisationunit.OrganisationUnitService; import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby @@ -48,7 +48,7 @@ * torgeilo $ */ public class AddOrganisationUnitAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/GetOrganisationUnitAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/GetOrganisationUnitAction.java 2011-03-17 10:20:34 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/GetOrganisationUnitAction.java 2011-05-05 21:15:45 +0000 @@ -37,14 +37,14 @@ import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: GetOrganisationUnitAction.java 1898 2006-09-22 12:06:56Z torgeilo $ */ public class GetOrganisationUnitAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // 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-03-17 10:20:34 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/PrepareAddOrganisationUnitAction.java 2011-05-05 21:15:45 +0000 @@ -37,13 +37,13 @@ import org.hisp.dhis.dataset.comparator.DataSetNameComparator; import org.hisp.dhis.period.Cal; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Nguyen Dang Quang */ public class PrepareAddOrganisationUnitAction - extends ActionSupport + implements Action { private DataSetService dataSetService; === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/RemoveOrganisationUnitAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/RemoveOrganisationUnitAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/RemoveOrganisationUnitAction.java 2011-05-05 21:15:45 +0000 @@ -32,14 +32,14 @@ import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: RemoveOrganisationUnitAction.java 1898 2006-09-22 12:06:56Z torgeilo $ */ public class RemoveOrganisationUnitAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/UpdateOrganisationUnitAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/UpdateOrganisationUnitAction.java 2011-03-21 20:20:48 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/UpdateOrganisationUnitAction.java 2011-05-05 21:15:45 +0000 @@ -39,14 +39,14 @@ import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: UpdateOrganisationUnitAction.java 1898 2006-09-22 12:06:56Z torgeilo $ */ public class UpdateOrganisationUnitAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/ValidateOrganisationUnitAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/ValidateOrganisationUnitAction.java 2011-02-15 13:44:03 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/ValidateOrganisationUnitAction.java 2011-05-05 21:15:45 +0000 @@ -31,7 +31,7 @@ import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby @@ -39,7 +39,7 @@ * torgeilo $ */ public class ValidateOrganisationUnitAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/GetOrganisationUnitGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/GetOrganisationUnitGroupAction.java 2010-09-17 12:11:18 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/GetOrganisationUnitGroupAction.java 2011-05-05 21:15:45 +0000 @@ -31,7 +31,7 @@ import org.hisp.dhis.organisationunit.OrganisationUnitGroupService; import org.hisp.dhis.oust.manager.SelectionTreeManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby @@ -39,7 +39,7 @@ * torgeilo $ */ public class GetOrganisationUnitGroupAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/RemoveOrganisationUnitGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/RemoveOrganisationUnitGroupAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/RemoveOrganisationUnitGroupAction.java 2011-05-05 21:15:45 +0000 @@ -29,14 +29,14 @@ import org.hisp.dhis.organisationunit.OrganisationUnitGroupService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: RemoveOrganisationUnitGroupAction.java 1898 2006-09-22 12:06:56Z torgeilo $ */ public class RemoveOrganisationUnitGroupAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/ValidateOrganisationUnitGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/ValidateOrganisationUnitGroupAction.java 2010-09-09 09:38:13 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/ValidateOrganisationUnitGroupAction.java 2011-05-05 21:15:45 +0000 @@ -31,7 +31,7 @@ import org.hisp.dhis.organisationunit.OrganisationUnitGroup; import org.hisp.dhis.organisationunit.OrganisationUnitGroupService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby @@ -39,7 +39,7 @@ * 12:06:56Z torgeilo $ */ public class ValidateOrganisationUnitGroupAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/AddGroupSetAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/AddGroupSetAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/AddGroupSetAction.java 2011-05-05 21:15:45 +0000 @@ -35,14 +35,14 @@ import org.hisp.dhis.organisationunit.OrganisationUnitGroupService; import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class AddGroupSetAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/GetGroupSetAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/GetGroupSetAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/GetGroupSetAction.java 2011-05-05 21:15:45 +0000 @@ -30,14 +30,14 @@ import org.hisp.dhis.organisationunit.OrganisationUnitGroupService; import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class GetGroupSetAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/PrepareAddGroupSetAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/PrepareAddGroupSetAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/PrepareAddGroupSetAction.java 2011-05-05 21:15:45 +0000 @@ -37,14 +37,14 @@ import org.hisp.dhis.system.filter.OrganisationUnitGroupWithoutGroupSetFilter; import org.hisp.dhis.system.util.FilterUtils; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class PrepareAddGroupSetAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/PrepareUpdateGroupSetAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/PrepareUpdateGroupSetAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/PrepareUpdateGroupSetAction.java 2011-05-05 21:15:45 +0000 @@ -38,14 +38,14 @@ import org.hisp.dhis.system.filter.OrganisationUnitGroupWithoutGroupSetFilter; import org.hisp.dhis.system.util.FilterUtils; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class PrepareUpdateGroupSetAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/RemoveGroupSetAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/RemoveGroupSetAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/RemoveGroupSetAction.java 2011-05-05 21:15:45 +0000 @@ -29,14 +29,14 @@ import org.hisp.dhis.organisationunit.OrganisationUnitGroupService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class RemoveGroupSetAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/UpdateGroupSetAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/UpdateGroupSetAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/UpdateGroupSetAction.java 2011-05-05 21:15:45 +0000 @@ -35,14 +35,14 @@ import org.hisp.dhis.organisationunit.OrganisationUnitGroupService; import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class UpdateGroupSetAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/ValidateGroupSetAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/ValidateGroupSetAction.java 2010-09-09 09:38:13 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/ValidateGroupSetAction.java 2011-05-05 21:15:45 +0000 @@ -39,14 +39,14 @@ import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator; import org.hisp.dhis.system.util.ListUtils; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class ValidateGroupSetAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/GetAvailableAutoSaveDataEntryFormAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/GetAvailableAutoSaveDataEntryFormAction.java 2010-07-01 10:08:55 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/GetAvailableAutoSaveDataEntryFormAction.java 2011-05-05 21:15:45 +0000 @@ -29,14 +29,14 @@ import org.hisp.dhis.user.UserSettingService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Chau Thu Tran * @version GetAvailableAutoSaveDataEntryFormAction.java Jun 23, 2010 3:49:11 PM */ public class GetAvailableAutoSaveDataEntryFormAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependency === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/GetAvailableDisplayPropertiesAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/GetAvailableDisplayPropertiesAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/GetAvailableDisplayPropertiesAction.java 2011-05-05 21:15:45 +0000 @@ -31,14 +31,14 @@ import org.hisp.dhis.options.displayproperty.DisplayPropertyManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id: GetAvailableDisplayPropertiesAction.java 3264 2007-04-25 14:54:05Z stianast $ */ public class GetAvailableDisplayPropertiesAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/GetAvailableLocalesAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/GetAvailableLocalesAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/GetAvailableLocalesAction.java 2011-05-05 21:15:45 +0000 @@ -36,14 +36,14 @@ import org.hisp.dhis.i18n.locale.LocaleManager; import org.hisp.dhis.i18n.resourcebundle.ResourceBundleManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: GetAvailableLocalesAction.java 3264 2007-04-25 14:54:05Z stianast $ */ public class GetAvailableLocalesAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/GetAvailableLocalesDbAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/GetAvailableLocalesDbAction.java 2009-08-20 08:17:49 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/GetAvailableLocalesDbAction.java 2011-05-05 21:15:45 +0000 @@ -9,7 +9,7 @@ import org.hisp.dhis.i18n.I18nService; import org.hisp.dhis.i18n.locale.LocaleManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * Created by IntelliJ IDEA. @@ -19,7 +19,7 @@ * To change this template use File | Settings | File Templates. */ public class GetAvailableLocalesDbAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/GetAvailableSortOrdersAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/GetAvailableSortOrdersAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/GetAvailableSortOrdersAction.java 2011-05-05 21:15:45 +0000 @@ -31,14 +31,14 @@ import org.hisp.dhis.options.sortorder.SortOrderManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id: GetAvailableSortOrdersAction.java 3264 2007-04-25 14:54:05Z stianast $ */ public class GetAvailableSortOrdersAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/GetAvailableStylesAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/GetAvailableStylesAction.java 2010-10-28 09:25:22 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/GetAvailableStylesAction.java 2011-05-05 21:15:45 +0000 @@ -32,14 +32,14 @@ import org.hisp.dhis.options.style.StyleManager; import org.hisp.dhis.options.style.UserStyleManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Chau Thu Tran * @version $Id: GetAvailableStylesAction.java 2010-10-26 17:28:05Z $ */ public class GetAvailableStylesAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/SetAutoSaveDataEntryFormAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/SetAutoSaveDataEntryFormAction.java 2010-07-01 10:08:55 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/SetAutoSaveDataEntryFormAction.java 2011-05-05 21:15:45 +0000 @@ -29,14 +29,14 @@ import org.hisp.dhis.user.UserSettingService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Chau Thu Tran * @version GetAvailableAutoSaveDataEntryFormAction.java Jun 23, 2010 3:49:11 PM */ public class SetAutoSaveDataEntryFormAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependency === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/SetCurrentDisplayPropertyAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/SetCurrentDisplayPropertyAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/SetCurrentDisplayPropertyAction.java 2011-05-05 21:15:45 +0000 @@ -29,14 +29,14 @@ import org.hisp.dhis.options.displayproperty.DisplayPropertyManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id: SetCurrentDisplayPropertyAction.java 3264 2007-04-25 14:54:05Z stianast $ */ public class SetCurrentDisplayPropertyAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/SetCurrentLocaleAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/SetCurrentLocaleAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/SetCurrentLocaleAction.java 2011-05-05 21:15:45 +0000 @@ -31,14 +31,14 @@ import org.hisp.dhis.i18n.locale.LocaleManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Torgeir Lorange Ostby * @version $Id: SetCurrentLocaleAction.java 3264 2007-04-25 14:54:05Z stianast $ */ public class SetCurrentLocaleAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/SetCurrentLocaleDbAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/SetCurrentLocaleDbAction.java 2009-08-20 08:17:49 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/SetCurrentLocaleDbAction.java 2011-05-05 21:15:45 +0000 @@ -28,14 +28,16 @@ */ import java.util.Locale; + import org.hisp.dhis.i18n.locale.LocaleManager; -import com.opensymphony.xwork2.ActionSupport; + +import com.opensymphony.xwork2.Action; /** * @author Oyvind Brucker */ public class SetCurrentLocaleDbAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/SetCurrentSortOrderAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/SetCurrentSortOrderAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/SetCurrentSortOrderAction.java 2011-05-05 21:15:45 +0000 @@ -29,14 +29,14 @@ import org.hisp.dhis.options.sortorder.SortOrderManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id: SetCurrentSortOrderAction.java 3264 2007-04-25 14:54:05Z stianast $ */ public class SetCurrentSortOrderAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/SetCurrentStyleAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/SetCurrentStyleAction.java 2010-10-28 09:25:22 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/user/SetCurrentStyleAction.java 2011-05-05 21:15:45 +0000 @@ -29,14 +29,14 @@ import org.hisp.dhis.options.style.UserStyleManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Chau Thu Tran * @version $Id: SetCurrentStyleAction.java 2010-10-26 17:29:15Z $ */ public class SetCurrentStyleAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/exp/MetaDataExportAction.java' --- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/exp/MetaDataExportAction.java 2011-04-24 15:50:02 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/exp/MetaDataExportAction.java 2011-05-05 21:15:45 +0000 @@ -35,14 +35,14 @@ import org.hisp.dhis.importexport.ExportParams; import org.hisp.dhis.importexport.ExportService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class MetaDataExportAction - extends ActionSupport + implements Action { private static final String FILENAME = "Export_meta.zip"; === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/AddReportAction.java' --- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/AddReportAction.java 2011-02-22 23:05:45 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/AddReportAction.java 2011-05-05 21:15:45 +0000 @@ -37,14 +37,14 @@ import org.hisp.dhis.reporttable.ReportTableService; import org.hisp.dhis.system.util.StreamUtils; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id: UploadDesignAction.java 5207 2008-05-22 12:16:36Z larshelg $ */ public class AddReportAction - extends ActionSupport + implements Action { private static final Log log = LogFactory.getLog( AddReportAction.class ); === modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/AddValidationRuleAction.java' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/AddValidationRuleAction.java 2010-12-29 10:06:33 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/AddValidationRuleAction.java 2011-05-05 21:15:45 +0000 @@ -35,7 +35,7 @@ import org.hisp.dhis.validation.ValidationRule; import org.hisp.dhis.validation.ValidationRuleService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * Adds a new validation rule to the database. @@ -45,7 +45,7 @@ * @version $Id: AddValidationRuleAction.java 3868 2007-11-08 15:11:12Z larshelg $ */ public class AddValidationRuleAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetFilteredDataElementsAction.java' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetFilteredDataElementsAction.java 2010-05-26 15:58:31 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetFilteredDataElementsAction.java 2011-05-05 21:15:45 +0000 @@ -46,7 +46,7 @@ import org.hisp.dhis.period.PeriodService; import org.hisp.dhis.period.PeriodType; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland @@ -54,7 +54,7 @@ * larshelg $ */ public class GetFilteredDataElementsAction - extends ActionSupport + implements Action { private static final int ALL = 0; === modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetTextualExpressionAction.java' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetTextualExpressionAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetTextualExpressionAction.java 2011-05-05 21:15:45 +0000 @@ -30,14 +30,14 @@ import org.hisp.dhis.expression.ExpressionService; import org.hisp.dhis.i18n.I18n; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id: GetFormulaTextAction.java 3814 2007-11-02 12:11:54Z larshelg $ */ public class GetTextualExpressionAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetValidationResultDetailsAction.java' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetValidationResultDetailsAction.java 2011-04-22 21:04:14 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetValidationResultDetailsAction.java 2011-05-05 21:15:45 +0000 @@ -45,14 +45,14 @@ import org.hisp.dhis.validation.ValidationRule; import org.hisp.dhis.validation.ValidationRuleService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class GetValidationResultDetailsAction - extends ActionSupport + implements Action { private static final String NULL_REPLACEMENT = "-"; === modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetValidationRuleAction.java' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetValidationRuleAction.java 2010-12-29 10:06:33 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetValidationRuleAction.java 2011-05-05 21:15:45 +0000 @@ -32,7 +32,7 @@ import org.hisp.dhis.validation.ValidationRule; import org.hisp.dhis.validation.ValidationRuleService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** @@ -40,7 +40,7 @@ * @version $Id: GetValidationRuleAction.java 4438 2008-01-26 16:35:24Z abyot $ */ public class GetValidationRuleAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/NoAction.java' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/NoAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/NoAction.java 2011-05-05 21:15:45 +0000 @@ -27,14 +27,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Margrethe Store * @version $Id: NoAction.java 3868 2007-11-08 15:11:12Z larshelg $ */ public class NoAction - extends ActionSupport + implements Action { public String execute() throws Exception { === modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/RemoveValidationRuleAction.java' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/RemoveValidationRuleAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/RemoveValidationRuleAction.java 2011-05-05 21:15:45 +0000 @@ -30,14 +30,14 @@ import org.hisp.dhis.validation.ValidationRule; import org.hisp.dhis.validation.ValidationRuleService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland * @version $Id$ */ public class RemoveValidationRuleAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/RunValidationAction.java' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/RunValidationAction.java 2011-02-10 23:09:13 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/RunValidationAction.java 2011-05-05 21:15:45 +0000 @@ -51,7 +51,7 @@ import org.hisp.dhis.validation.ValidationRuleService; import org.hisp.dhis.validation.comparator.ValidationResultComparator; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Margrethe Store @@ -59,7 +59,7 @@ * @version $Id: RunValidationAction.java 6059 2008-10-28 15:15:34Z larshelg $ */ public class RunValidationAction - extends ActionSupport + implements Action { private static final Log log = LogFactory.getLog( RunValidationAction.class ); === modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/SetupTreeAction.java' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/SetupTreeAction.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/SetupTreeAction.java 2011-05-05 21:15:45 +0000 @@ -34,14 +34,14 @@ import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager; import org.hisp.dhis.user.CurrentUserService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Margrethe Store * @version $Id: SetupTreeAction.java 5556 2008-08-20 11:36:20Z abyot $ */ public class SetupTreeAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/UpdateValidationRuleAction.java' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/UpdateValidationRuleAction.java 2010-12-29 10:06:33 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/UpdateValidationRuleAction.java 2011-05-05 21:15:45 +0000 @@ -34,7 +34,7 @@ import org.hisp.dhis.validation.ValidationRule; import org.hisp.dhis.validation.ValidationRuleService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Margrethe Store @@ -43,7 +43,7 @@ * larshelg $ */ public class UpdateValidationRuleAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/ValidateRunValidationAction.java' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/ValidateRunValidationAction.java 2010-09-22 09:14:07 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/ValidateRunValidationAction.java 2011-05-05 21:15:45 +0000 @@ -36,14 +36,14 @@ import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.oust.manager.SelectionTreeManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Margrethe Store * @version $Id: ValidateRunValidationAction.java 3868 2007-11-08 15:11:12Z larshelg $ */ public class ValidateRunValidationAction - extends ActionSupport + implements Action { private static final Log LOG = LogFactory.getLog( ValidateRunValidationAction.class ); === modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/ValidateValidationRuleAction.java' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/ValidateValidationRuleAction.java 2011-01-25 19:26:03 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/ValidateValidationRuleAction.java 2011-05-05 21:15:45 +0000 @@ -31,14 +31,14 @@ import org.hisp.dhis.validation.ValidationRule; import org.hisp.dhis.validation.ValidationRuleService; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Margrethe Store * @version $Id: ValidateValidationRuleAction.java 3868 2007-11-08 15:11:12Z larshelg $ */ public class ValidateValidationRuleAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies === modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/ValidationRunAnalysisAction.java' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/ValidationRunAnalysisAction.java 2011-03-01 04:17:29 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/ValidationRunAnalysisAction.java 2011-05-05 21:15:45 +0000 @@ -34,14 +34,14 @@ import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.oust.manager.SelectionTreeManager; -import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Action; /** * @author Chau Thu Tran * @version $Id ValidationRunAnalysisAction.java Mar 1, 2011 9:54:31 AM $ */ public class ValidationRunAnalysisAction - extends ActionSupport + implements Action { // ------------------------------------------------------------------------- // Dependencies