From 725f60d768330e6e1624bef9d18fc2bbd4da1208 Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 18 Jul 2014 14:44:15 +0000 Subject: [PATCH] Some formatting etc. git-svn-id: https://svn.libreccm.org/ccm/trunk@2766 8810af33-2d31-482b-a856-94f89814c4df --- .../com/arsdigita/docmgr/ui/RepositoriesSuperTreeModel.java | 4 ++-- .../src/com/arsdigita/simplesurvey/SimpleSurveyUtil.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ccm-docmgr/src-2/com/arsdigita/docmgr/ui/RepositoriesSuperTreeModel.java b/ccm-docmgr/src-2/com/arsdigita/docmgr/ui/RepositoriesSuperTreeModel.java index f4a88a4ab..471c7953a 100755 --- a/ccm-docmgr/src-2/com/arsdigita/docmgr/ui/RepositoriesSuperTreeModel.java +++ b/ccm-docmgr/src-2/com/arsdigita/docmgr/ui/RepositoriesSuperTreeModel.java @@ -93,7 +93,7 @@ class RepositoriesSuperTreeModel implements TreeModel, DMConstants { */ // Return the Root of this Application's repository - Repository repository = (Repository) Web.getContext().getApplication(); + Repository repository = (Repository) Web.getWebContext().getApplication(); Folder root = repository.getRoot(); @@ -142,7 +142,7 @@ class RepositoriesSuperTreeModel implements TreeModel, DMConstants { // Get Root folder. Repository currentRepository = - (Repository) Web.getContext().getApplication(); + (Repository) Web.getWebContext().getApplication(); Folder root = currentRepository.getRoot(); diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/SimpleSurveyUtil.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/SimpleSurveyUtil.java index 5ccb2e528..a997adb8d 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/SimpleSurveyUtil.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/SimpleSurveyUtil.java @@ -102,7 +102,6 @@ public class SimpleSurveyUtil { // user); // TODO: Replacement code not tested yet (both alternatives)! - // Application app = Web.getContext().getApplication(); Application app = (Application)Kernel.getContext().getResource(); PermissionDescriptor admin = new PermissionDescriptor (PrivilegeDescriptor.ADMIN,