From 00f5c5ff914eab40604b992d1122ace185bedbec Mon Sep 17 00:00:00 2001 From: briancaruso Date: Fri, 10 Feb 2012 21:22:51 +0000 Subject: [PATCH] Working on model switching. Renamed dataGetter package to pageDataGetter. Created package menuManagement. --- productMods/WEB-INF/web.xml | 4 ++-- .../MenuManagementDataUtils.java | 3 ++- .../ProcessInternalClasses.java | 4 +++- .../SelectDataGetterUtils.java | 5 ++++- .../utils/pageDataGetter/InternalClassesDataGetter.java | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) rename src/edu/cornell/mannlib/vitro/webapp/utils/{pageDataGetter => menuManagement}/MenuManagementDataUtils.java (93%) rename src/edu/cornell/mannlib/vitro/webapp/utils/{pageDataGetter => menuManagement}/ProcessInternalClasses.java (92%) rename src/edu/cornell/mannlib/vitro/webapp/utils/{pageDataGetter => menuManagement}/SelectDataGetterUtils.java (90%) diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml index 1cfa60f2..15aee537 100644 --- a/productMods/WEB-INF/web.xml +++ b/productMods/WEB-INF/web.xml @@ -265,7 +265,7 @@ MenuManagementController - /editDisplayModel + /menuManagementController @@ -274,7 +274,7 @@ MenuManagementEdit - /processEditDisplayModel + /menuManagementEdit diff --git a/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/MenuManagementDataUtils.java b/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/MenuManagementDataUtils.java similarity index 93% rename from src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/MenuManagementDataUtils.java rename to src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/MenuManagementDataUtils.java index 6c5a0c00..a8bd9ceb 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/MenuManagementDataUtils.java +++ b/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/MenuManagementDataUtils.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter; +package edu.cornell.mannlib.vitro.webapp.utils.menuManagement; import java.net.URLEncoder; import java.util.ArrayList; @@ -42,6 +42,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext; import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache; +import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.MenuManagementDataUtils; /* * This class includes methods that help in selecting a data getter based on diff --git a/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/ProcessInternalClasses.java b/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessInternalClasses.java similarity index 92% rename from src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/ProcessInternalClasses.java rename to src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessInternalClasses.java index dcf34913..d2a401fe 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/ProcessInternalClasses.java +++ b/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessInternalClasses.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter; +package edu.cornell.mannlib.vitro.webapp.utils.menuManagement; import java.net.URLEncoder; import java.util.ArrayList; @@ -41,6 +41,8 @@ import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache; +import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.ProcessIndividualsForClasses; +import edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.InternalClassesDataGetter; /* * Handle processing of data retrieved from IndividualsForClasses data getter to return to form template diff --git a/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/SelectDataGetterUtils.java b/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/SelectDataGetterUtils.java similarity index 90% rename from src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/SelectDataGetterUtils.java rename to src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/SelectDataGetterUtils.java index 449f072b..c809c1ea 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/SelectDataGetterUtils.java +++ b/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/SelectDataGetterUtils.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter; +package edu.cornell.mannlib.vitro.webapp.utils.menuManagement; import java.net.URLEncoder; import java.util.ArrayList; @@ -40,6 +40,9 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache; +import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.ProcessClassGroup; +import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.ProcessDataGetter; +import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.SelectDataGetterUtils; import edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.*; diff --git a/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/InternalClassesDataGetter.java b/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/InternalClassesDataGetter.java index 9d93c248..aad17ec9 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/InternalClassesDataGetter.java +++ b/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/InternalClassesDataGetter.java @@ -83,7 +83,7 @@ public class InternalClassesDataGetter extends IndividualsForClassesDataGetter{ @Override public String getType(){ - return DataGetterUtils.generateDataGetterTypeURI(InternalClassesDataGetter.class.getName()); + return PageDataGetterUtils.generateDataGetterTypeURI(InternalClassesDataGetter.class.getName()); } } \ No newline at end of file