dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21277
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-12-03 09:17:45 +0700
message:
  Minor fixes
modified:
  dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/IdSchemes.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemController.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-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/IdSchemes.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/IdSchemes.java	2015-12-03 02:06:56 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/IdSchemes.java	2015-12-03 02:17:45 +0000
@@ -76,6 +76,11 @@
         return idScheme;
     }
 
+    public String getIdSchemeAttribute()
+    {
+        return idSchemeAttribute;
+    }
+
     public void setIdScheme( String idScheme )
     {
         if ( isAttribute( idScheme ) )
@@ -93,6 +98,11 @@
         return getScheme( dataElementIdScheme );
     }
 
+    public String getDataElementIdSchemeAttribute()
+    {
+        return dataElementIdSchemeAttribute;
+    }
+
     public void setDataElementIdScheme( String idScheme )
     {
         if ( isAttribute( idScheme ) )
@@ -110,6 +120,11 @@
         return getScheme( categoryOptionComboIdScheme );
     }
 
+    public String getCategoryOptionComboIdSchemeAttribute()
+    {
+        return categoryOptionComboIdSchemeAttribute;
+    }
+
     public void setCategoryOptionComboIdScheme( String idScheme )
     {
         if ( isAttribute( idScheme ) )
@@ -127,6 +142,11 @@
         return getScheme( orgUnitIdScheme );
     }
 
+    public String getOrgUnitIdSchemeAttribute()
+    {
+        return orgUnitIdSchemeAttribute;
+    }
+
     public void setOrgUnitIdScheme( String idScheme )
     {
         if ( isAttribute( idScheme ) )
@@ -144,6 +164,11 @@
         return getScheme( programIdScheme );
     }
 
+    public String getProgramIdSchemeAttribute()
+    {
+        return programIdSchemeAttribute;
+    }
+
     public void setProgramIdScheme( String idScheme )
     {
         if ( isAttribute( idScheme ) )
@@ -161,6 +186,11 @@
         return getScheme( programStageIdScheme );
     }
 
+    public String getProgramStageIdSchemeAttribute()
+    {
+        return programStageIdSchemeAttribute;
+    }
+
     public void setProgramStageIdScheme( String idScheme )
     {
         if ( isAttribute( idScheme ) )

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemController.java	2015-12-03 02:06:56 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemController.java	2015-12-03 02:17:45 +0000
@@ -202,13 +202,6 @@
         return "pong";
     }
 
-    @RequestMapping( value = "/scheme", method = RequestMethod.GET, produces = "text/plain" )
-    public @ResponseBody String scheme( IdSchemes idSchemes )
-    {
-        System.err.println( "id: " + idSchemes );
-        return "pong";
-    }
-
     @RequestMapping( value = "/flags", method = RequestMethod.GET, produces = { "application/json" } )
     public @ResponseBody List<StyleObject> getFlags()
     {