dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3584
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-05-12 10:24:55 +0200
message:
  Applied patch from Jason, removes remains of calculated de in import
removed:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/CalculatedDataElementAssociationXSDConverter.java
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/exporter/DefaultDhis14XMLExportService.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/importer/DefaultDhis14XMLImportService.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-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/CalculatedDataElementAssociationXSDConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/CalculatedDataElementAssociationXSDConverter.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/CalculatedDataElementAssociationXSDConverter.java	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-package org.hisp.dhis.importexport.dhis14.xml.converter.xsd;
-
-/*
- * Copyright (c) 2004-2010, 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.amplecode.staxwax.reader.XMLReader;
-import org.amplecode.staxwax.writer.XMLWriter;
-import org.hisp.dhis.importexport.ExportParams;
-import org.hisp.dhis.importexport.ImportParams;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class CalculatedDataElementAssociationXSDConverter
-    extends AbstractXSDConverter
-{
-    // -------------------------------------------------------------------------
-    // Constructor
-    // -------------------------------------------------------------------------
-
-    /**
-     * Constructor for write operations.
-     */
-    public CalculatedDataElementAssociationXSDConverter()
-    {   
-    }
-
-    // -------------------------------------------------------------------------
-    // XMLConverter implementation
-    // -------------------------------------------------------------------------
-    
-    public void write( XMLWriter writer, ExportParams params )
-    {
-        writer.openElement( "xsd:element", "name", "DataElementCalculated" );
-
-        writeAnnotation( writer );
-        
-        writer.openElement( "xsd:complexType" );
-        
-        writer.openElement( "xsd:sequence" );
-        
-        writeInteger( writer, "DataElementCalculatedID", 1, true );
-        
-        writeInteger( writer, "DataElementID", 1, true );
-        
-        writeDouble( writer, "DataElementFactor", 1, false );
-        
-        writer.closeElement();
-        
-        writer.closeElement();
-        
-        writer.closeElement();
-    }
-
-    public void read( XMLReader reader, ImportParams params )
-    {
-        // Not implemented        
-    }
-}

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/exporter/DefaultDhis14XMLExportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/exporter/DefaultDhis14XMLExportService.java	2011-04-22 13:43:13 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/exporter/DefaultDhis14XMLExportService.java	2011-05-12 08:24:55 +0000
@@ -54,7 +54,6 @@
 import org.hisp.dhis.importexport.dhis14.xml.converter.PeriodTypeConverter;
 import org.hisp.dhis.importexport.dhis14.xml.converter.UserConverter;
 import org.hisp.dhis.importexport.dhis14.xml.converter.UserRoleConverter;
-import org.hisp.dhis.importexport.dhis14.xml.converter.xsd.CalculatedDataElementAssociationXSDConverter;
 import org.hisp.dhis.importexport.dhis14.xml.converter.xsd.DataElementXSDConverter;
 import org.hisp.dhis.importexport.dhis14.xml.converter.xsd.DataRootXSDConverter;
 import org.hisp.dhis.importexport.dhis14.xml.converter.xsd.DataTypeXSDConverter;
@@ -174,7 +173,6 @@
 
             thread.registerXSDConverter( new DataRootXSDConverter() );
             thread.registerXSDConverter( new DataElementXSDConverter() );
-            thread.registerXSDConverter( new CalculatedDataElementAssociationXSDConverter() );
             thread.registerXSDConverter( new PeriodTypeXSDConverter() );
             thread.registerXSDConverter(new OrganisationUnitXSDConverter() );
             thread.registerXSDConverter( new OrganisationUnitHierarchyXSDConverter() );

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/importer/DefaultDhis14XMLImportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/importer/DefaultDhis14XMLImportService.java	2011-04-22 13:43:13 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/importer/DefaultDhis14XMLImportService.java	2011-05-12 08:24:55 +0000
@@ -216,11 +216,6 @@
                 // Meta-data
                 // -------------------------------------------------------------
 
-                // -------------------------------------------------------------
-                // This map will be filled with 1.4 calculated dataelement
-                // expression associations and generate expressions, which
-                // are later used during import of calculated dataelements
-                // -------------------------------------------------------------
 
                 state.setMessage( "importing_meta_data" );                
                 log.info( "Importing meta data" );