dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #40876
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20819: Unused classes
------------------------------------------------------------
revno: 20819
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-10-21 11:06:21 +0200
message:
Unused classes
removed:
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/InternalProcessUtil.java
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportExportInternalProcessUtil.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== removed file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/InternalProcessUtil.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/InternalProcessUtil.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/InternalProcessUtil.java 1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-package org.hisp.dhis.util;
-
-/*
- * Copyright (c) 2004-2015, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.hisp.dhis.util.SessionUtils;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class InternalProcessUtil
-{
- public static final String PROCESS_KEY_DATAMART = "CurrentRunningDataMartInternalProcess";
- public static final String PROCESS_KEY_IMPORT = "CurrentRunningImportInternalProcess";
- public static final String PROCESS_KEY_EXPORT = "CurrentRunningExportInternalProcess";
- public static final String PROCESS_KEY_REPORT = "CurrentRunningReportInternalProcess";
-
- public static String getCurrentRunningProcess( String processKey )
- {
- return String.valueOf( SessionUtils.getSessionVar( processKey ) );
- }
-
- public static void setCurrentRunningProcess( String processKey , String id )
- {
- SessionUtils.setSessionVar( processKey, id );
- }
-
- public static boolean processIsRunning( String processKey )
- {
- return SessionUtils.containsSessionVar( processKey );
- }
-
- public static void removeCurrentRunningProcess( String processKey )
- {
- SessionUtils.removeSessionVar( processKey );
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportExportInternalProcessUtil.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportExportInternalProcessUtil.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportExportInternalProcessUtil.java 1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-package org.hisp.dhis.importexport.action.util;
-
-/*
- * Copyright (c) 2004-2015, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.hisp.dhis.util.InternalProcessUtil;
-import org.hisp.dhis.util.SessionUtils;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class ImportExportInternalProcessUtil
- extends InternalProcessUtil
-{
- private static final String DEFAULT_IMPORT_FORMAT = "DXF";
-
- public static final String TYPE_IMPORT = "import";
- public static final String TYPE_PREVIEW = "preview";
- public static final String TYPE_ANALYSIS = "analysis";
-
- private static final String KEY_PROCESS_TYPE = "CurrentRunningImportInternalProcessType";
- private static final String KEY_PROCESS_IMPORT_FORMAT = "CurrentRunningImportInternalProcessImportFormat";
- private static final String KEY_PROCESS_IMPORT_FILENAME = "CurrentRunningImportFileName";
-
- // -----------------------------------------------------------------------
- // InternalProcess type
- // -----------------------------------------------------------------------
-
- public static void setCurrentRunningProcessType( String type )
- {
- SessionUtils.setSessionVar( KEY_PROCESS_TYPE, type );
- }
-
- public static String getCurrentRunningProcessType()
- {
- return String.valueOf( SessionUtils.getSessionVar( KEY_PROCESS_TYPE ) );
- }
-
- // -----------------------------------------------------------------------
- // InternalProcess import format
- // -----------------------------------------------------------------------
-
- public static void setCurrentRunningProcessImportFormat( String importFormat )
- {
- SessionUtils.setSessionVar( KEY_PROCESS_IMPORT_FORMAT, importFormat );
- }
-
- public static String getCurrentRunningProcessImportFormat()
- {
- String importFormat = String.valueOf( SessionUtils.getSessionVar( KEY_PROCESS_IMPORT_FORMAT ) );
-
- return importFormat != null ? importFormat : DEFAULT_IMPORT_FORMAT;
- }
-
- // -----------------------------------------------------------------------
- // InternalProcess import file name
- // -----------------------------------------------------------------------
-
- public static void setCurrentImportFileName( String fileName )
- {
- SessionUtils.setSessionVar( KEY_PROCESS_IMPORT_FILENAME, fileName );
- }
-
- public static String getCurrentImportFileName()
- {
- return String.valueOf( SessionUtils.getSessionVar( KEY_PROCESS_IMPORT_FILENAME ) );
- }
-}
