dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12796
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-10-22 17:02:04 +0200
message:
  Renamed method
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/AppManager.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/appmanager/DefaultAppManager.java
  dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/appmanager/DefaultAppManagerServiceTest.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AppController.java
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppListAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppSettingsAction.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/appmanager/AppManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/AppManager.java	2013-10-22 12:17:54 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/AppManager.java	2013-10-22 15:02:04 +0000
@@ -66,7 +66,7 @@
      * Returns a list of all the installed apps at @see getAppFolderPath
      * @return list of installed apps
      */
-    List<App> getInstalledApps();
+    List<App> getApps();
     
     /**
      * Installs the app.

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/appmanager/DefaultAppManager.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/appmanager/DefaultAppManager.java	2013-10-22 12:17:54 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/appmanager/DefaultAppManager.java	2013-10-22 15:02:04 +0000
@@ -91,7 +91,7 @@
     }
 
     @Override
-    public List<App> getInstalledApps()
+    public List<App> getApps()
     {
         String baseUrl = getAppBaseUrl();
         
@@ -117,7 +117,7 @@
 
         // Delete if app is already installed
         
-        if ( getInstalledApps().contains( app ) )
+        if ( getApps().contains( app ) )
         {
             String folderPath = getAppFolderPath() + File.separator + app.getFolderName();
             FileUtils.forceDelete( new File( folderPath ) );
@@ -148,7 +148,7 @@
     @Override
     public boolean deleteApp( String name )
     {
-        for ( App app : getInstalledApps() )
+        for ( App app : getApps() )
         {
             if ( app.getName().equals( name ) )
             {

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/appmanager/DefaultAppManagerServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/appmanager/DefaultAppManagerServiceTest.java	2013-09-26 17:20:47 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/appmanager/DefaultAppManagerServiceTest.java	2013-10-22 15:02:04 +0000
@@ -112,7 +112,7 @@
         System.out.println( "getInstalledApps" );
         DefaultAppManager instance = new DefaultAppManager();
         List<App> expResult = null;
-        List<App> result = instance.getInstalledApps();
+        List<App> result = instance.getApps();
         assertEquals( expResult, result );
         // TODO review the generated test code and remove the default call to fail.
         fail( "The test case is a prototype." );

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AppController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AppController.java	2013-10-09 17:16:20 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AppController.java	2013-10-22 15:02:04 +0000
@@ -53,7 +53,7 @@
     @RequestMapping( method = RequestMethod.GET )
     public String getApps( Model model )
     {
-        List<App> apps = appManager.getInstalledApps();
+        List<App> apps = appManager.getApps();
         
         model.addAttribute( "model", apps );
         

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java	2013-10-02 12:41:09 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java	2013-10-22 15:02:04 +0000
@@ -146,7 +146,7 @@
     {
         List<Module> modules = getAccessibleMenuModules();
         
-        List<App> apps = appManager.getInstalledApps();
+        List<App> apps = appManager.getApps();
         
         for ( App app : apps )
         {   
@@ -188,7 +188,7 @@
     {
         List<Module> modules = getAccessibleServiceModules();
 
-        List<App> apps = appManager.getInstalledApps();
+        List<App> apps = appManager.getApps();
         
         for ( App app : apps )
         {   

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppListAction.java	2013-10-14 15:10:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppListAction.java	2013-10-22 15:02:04 +0000
@@ -86,7 +86,7 @@
     public String execute()
         throws Exception
     {
-        appList = appManager.getInstalledApps();
+        appList = appManager.getApps();
         
         appBaseUrl = appManager.getAppBaseUrl();
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppSettingsAction.java	2013-10-22 12:17:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppSettingsAction.java	2013-10-22 15:02:04 +0000
@@ -131,7 +131,7 @@
 
     public List<App> getAppList()
     {
-        return appManager.getInstalledApps();
+        return appManager.getApps();
     }
 
     private I18n i18n;