dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9706
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-02-04 09:45:14 +0200
message:
  Reverted part of last commit
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.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

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java	2013-02-04 07:29:22 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java	2013-02-04 07:45:14 +0000
@@ -68,7 +68,7 @@
     public static final String TYPE_SECTION = "section";
     public static final String TYPE_CUSTOM = "custom";
     public static final String TYPE_SECTION_MULTIORG = "multiorg_section";
-    
+
     public static final int NO_EXPIRY = 0;
 
     /**
@@ -150,7 +150,7 @@
      * Indicating whether the user completing this data set should be sent a notification.
      */
     private boolean notifyCompletingUser;
-    
+
     // -------------------------------------------------------------------------
     // Form properties
     // -------------------------------------------------------------------------
@@ -175,11 +175,6 @@
      */
     private boolean skipOffline;
 
-    /**
-     * Indicating whether data element names should be prefixed with their codes.
-     */
-    private boolean codePrefixDataElements;
-
     // -------------------------------------------------------------------------
     // Contructors
     // -------------------------------------------------------------------------
@@ -648,19 +643,6 @@
         this.skipOffline = skipOffline;
     }
 
-    @JsonProperty
-    @JsonView( {DetailedView.class, ExportView.class} )
-    @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE )
-    public boolean isCodePrefixDataElements()
-    {
-        return codePrefixDataElements;
-    }
-
-    public void setCodePrefixDataElements( boolean codePrefixDataElements )
-    {
-        this.codePrefixDataElements = codePrefixDataElements;
-    }
-
     @Override
     public void mergeWith( IdentifiableObject other )
     {
@@ -681,7 +663,6 @@
             fieldCombinationRequired = dataSet.isFieldCombinationRequired();
             validCompleteOnly = dataSet.isValidCompleteOnly();
             skipOffline = dataSet.isSkipOffline();
-            codePrefixDataElements = dataSet.isCodePrefixDataElements();
 
             removeAllDataElements();