← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 9837: local vn - Minor fixed

 

------------------------------------------------------------
revno: 9837
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-02-19 15:48:21 +0700
message:
  local vn -  Minor fixed
modified:
  local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/organisationunitprototype/OrganisationUnitPrototype.java
  local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/organisationunitprototype/OrganisationUnitPrototypeGroup.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 'local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/organisationunitprototype/OrganisationUnitPrototype.java'
--- local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/organisationunitprototype/OrganisationUnitPrototype.java	2012-08-20 07:13:48 +0000
+++ local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/organisationunitprototype/OrganisationUnitPrototype.java	2013-02-19 08:48:21 +0000
@@ -31,7 +31,7 @@
 import java.util.Set;
 
 import org.hisp.dhis.common.BaseNameableObject;
-import org.hisp.dhis.common.Dxf2Namespace;
+import org.hisp.dhis.common.DxfNamespaces;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 
@@ -39,7 +39,7 @@
  * @author Dang Duy Hieu
  * @version $Id$
  */
-@JacksonXmlRootElement( localName = "orgUnitProtoype", namespace = Dxf2Namespace.NAMESPACE )
+@JacksonXmlRootElement( localName = "orgUnitProtoype", namespace = DxfNamespaces.DXF_2_0 )
 public class OrganisationUnitPrototype
     extends BaseNameableObject
 {

=== modified file 'local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/organisationunitprototype/OrganisationUnitPrototypeGroup.java'
--- local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/organisationunitprototype/OrganisationUnitPrototypeGroup.java	2012-08-20 07:13:48 +0000
+++ local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/organisationunitprototype/OrganisationUnitPrototypeGroup.java	2013-02-19 08:48:21 +0000
@@ -31,7 +31,7 @@
 import java.util.Set;
 
 import org.hisp.dhis.common.BaseIdentifiableObject;
-import org.hisp.dhis.common.Dxf2Namespace;
+import org.hisp.dhis.common.DxfNamespaces;
 import org.hisp.dhis.common.annotation.Scanned;
 import org.hisp.dhis.common.view.DetailedView;
 import org.hisp.dhis.common.view.ExportView;
@@ -47,7 +47,7 @@
  * @author Dang Duy Hieu
  * @version $Id$
  */
-@JacksonXmlRootElement( localName = "orgUnitPrototypeGroup", namespace = Dxf2Namespace.NAMESPACE )
+@JacksonXmlRootElement( localName = "orgUnitPrototypeGroup", namespace = DxfNamespaces.DXF_2_0 )
 public class OrganisationUnitPrototypeGroup
     extends BaseIdentifiableObject
 {
@@ -139,8 +139,8 @@
     @JsonProperty( value = "orgUnitPrototypes" )
     @JsonSerialize( contentAs = BaseIdentifiableObject.class )
     @JsonView( { DetailedView.class, ExportView.class } )
-    @JacksonXmlElementWrapper( localName = "orgUnitPrototypes", namespace = Dxf2Namespace.NAMESPACE )
-    @JacksonXmlProperty( localName = "orgUnitPrototype", namespace = Dxf2Namespace.NAMESPACE )
+    @JacksonXmlElementWrapper( localName = "orgUnitPrototypes", namespace = DxfNamespaces.DXF_2_0 )
+    @JacksonXmlProperty( localName = "orgUnitPrototype", namespace = DxfNamespaces.DXF_2_0 )
     public Set<OrganisationUnitPrototype> getMembers()
     {
         return members;