dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5224
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-11-25 19:32:06 +0100
message:
  Removed annotations from transient properties
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/activityplan/Activity.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/comparator/AttributeNameComparator.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/CodeGenerator.java
  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/activityplan/Activity.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/activityplan/Activity.java	2010-09-24 11:12:49 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/activityplan/Activity.java	2011-11-25 18:32:06 +0000
@@ -11,7 +11,6 @@
 
 /**
  * @author abyotag_adm
- * 
  */
 public class Activity
 {

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/comparator/AttributeNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/comparator/AttributeNameComparator.java	2011-09-07 13:42:12 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/comparator/AttributeNameComparator.java	2011-11-25 18:32:06 +0000
@@ -31,6 +31,9 @@
 
 import org.hisp.dhis.attribute.Attribute;
 
+/**
+ * @author mortenoh
+ */
 public class AttributeNameComparator
     implements Comparator<Attribute>
 {

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java	2011-11-25 18:17:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java	2011-11-25 18:32:06 +0000
@@ -550,11 +550,6 @@
         this.relativePeriods = relativePeriods;
     }
 
-    @XmlJavaTypeAdapter( BaseNameableObjectXmlAdapter.class )
-    @XmlElementWrapper( name = "allPeriods" )
-    @XmlElement
-    @JsonProperty
-    @JsonSerialize( using = JsonNameableObjectListSerializer.class )
     public List<Period> getAllPeriods()
     {
         return allPeriods;
@@ -565,9 +560,6 @@
         this.allPeriods = allPeriods;
     }
 
-    @XmlJavaTypeAdapter( BaseNameableObjectXmlAdapter.class )
-    @XmlElement
-    @JsonProperty
     public OrganisationUnit getOrganisationUnit()
     {
         return organisationUnit;
@@ -578,11 +570,6 @@
         this.organisationUnit = organisationUnit;
     }
 
-    @XmlJavaTypeAdapter( BaseNameableObjectXmlAdapter.class )
-    @XmlElementWrapper( name = "allOrganisationUnits" )
-    @XmlElement
-    @JsonProperty
-    @JsonSerialize( using = JsonNameableObjectListSerializer.class )
     public List<OrganisationUnit> getAllOrganisationUnits()
     {
         return allOrganisationUnits;

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/CodeGenerator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/CodeGenerator.java	2011-11-03 14:36:56 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/CodeGenerator.java	2011-11-25 18:32:06 +0000
@@ -61,6 +61,7 @@
         {
             randomChars[i] = allowedChars.charAt( sr.nextInt( NUMBER_OF_CODEPOINTS ) );
         }
+        
         return new String( randomChars );
     }
 }

=== 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	2011-11-25 11:00:15 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java	2011-11-25 18:32:06 +0000
@@ -371,7 +371,7 @@
         this.sortOrder = sortOrder;
     }
 
-/*    @XmlElementWrapper( name = "sections" )
+/*  @XmlElementWrapper( name = "sections" )
     @XmlElement( name = "section" ) */
     public Set<Section> getSections()
     {