← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15895: minor change in Schema, rename haveEndpoint => haveApiEndpoint

 

------------------------------------------------------------
revno: 15895
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-06-28 11:21:56 +0700
message:
  minor change in Schema, rename haveEndpoint => haveApiEndpoint
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/IndexController.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/service/DefaultLinkService.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/schema/Schema.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java	2014-06-09 12:27:37 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java	2014-06-28 04:21:56 +0000
@@ -248,7 +248,7 @@
         this.apiEndpoint = apiEndpoint;
     }
 
-    public boolean haveEndpoint()
+    public boolean haveApiEndpoint()
     {
         return getApiEndpoint() != null;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/IndexController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/IndexController.java	2014-05-27 13:46:18 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/IndexController.java	2014-06-28 04:21:56 +0000
@@ -70,7 +70,7 @@
 
         for ( Schema schema : schemaService.getSchemas() )
         {
-            if ( schema.haveEndpoint() )
+            if ( schema.haveApiEndpoint() )
             {
                 Resource resource = new Resource();
                 resource.setSingular( schema.getSingular() );

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/service/DefaultLinkService.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/service/DefaultLinkService.java	2014-06-18 07:15:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/service/DefaultLinkService.java	2014-06-28 04:21:56 +0000
@@ -67,7 +67,7 @@
 
         Schema schema = schemaService.getDynamicSchema( klass );
 
-        if ( !schema.haveEndpoint() )
+        if ( !schema.haveApiEndpoint() )
         {
             return;
         }
@@ -199,7 +199,7 @@
 
         Schema schema = schemaService.getDynamicSchema( klass );
 
-        if ( !schema.haveEndpoint() )
+        if ( !schema.haveApiEndpoint() )
         {
             return;
         }