From f202f1366c7a6db977914754487809de9d0d59e0 Mon Sep 17 00:00:00 2001 From: ryounes Date: Fri, 8 Jul 2011 15:30:28 +0000 Subject: [PATCH] Temporary renaming of JSONtoFmModel --- ...oFmModel.java => JsonToFmModelTemporaryName.java} | 6 +++--- .../utils/pageDataGetter/BrowseDataGetter.java | 12 ++++++------ .../vitro/webapp/web/widgets/BrowseWidget.java | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) rename webapp/src/edu/cornell/mannlib/vitro/webapp/utils/{JSONtoFmModel.java => JsonToFmModelTemporaryName.java} (96%) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/JSONtoFmModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/JsonToFmModelTemporaryName.java similarity index 96% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/utils/JSONtoFmModel.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/utils/JsonToFmModelTemporaryName.java index 707138fcc..175764c21 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/JSONtoFmModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/JsonToFmModelTemporaryName.java @@ -39,7 +39,7 @@ import org.json.JSONTokener; * * @author janv */ -public final class JSONtoFmModel +public final class JsonToFmModelTemporaryName { public static String ROOT_ARRAY = "root"; @@ -157,7 +157,7 @@ public final class JSONtoFmModel // for debugging only public static String toString(Map map) { - return JSONtoFmModel.toStringBuffer(map, 0).toString(); + return JsonToFmModelTemporaryName.toStringBuffer(map, 0).toString(); } @SuppressWarnings("unchecked") @@ -179,7 +179,7 @@ public final class JSONtoFmModel if (entry.getValue() instanceof Map) { sb.append(tabs).append(entry.getKey()).append(":").append(entry.getValue().getClass()).append("\n"); - sb.append(JSONtoFmModel.toStringBuffer((Map)entry.getValue(), indent+1)); + sb.append(JsonToFmModelTemporaryName.toStringBuffer((Map)entry.getValue(), indent+1)); } else if (entry.getValue() instanceof List) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/BrowseDataGetter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/BrowseDataGetter.java index 07062e45d..29338007a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/BrowseDataGetter.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/BrowseDataGetter.java @@ -24,7 +24,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache; -import edu.cornell.mannlib.vitro.webapp.utils.JSONtoFmModel; +import edu.cornell.mannlib.vitro.webapp.utils.JsonToFmModelTemporaryName; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassGroupTemplateModel; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassTemplateModel; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividual; @@ -82,11 +82,11 @@ public class BrowseDataGetter implements PageDataGetter { map.put("class", new VClassTemplateModel(vclass)); JSONObject vclassRes = JSONServlet.getLuceneIndividualsByVClass(vclass.getURI(), request, context); - map.put("totalCount", JSONtoFmModel.convertJSONObjectToMap( (String) vclassRes.get("totalCount") )); - map.put("alpha", JSONtoFmModel.convertJSONObjectToMap( (String) vclassRes.get("alpha") )); - map.put("individuals", JSONtoFmModel.convertJSONArrayToList( (JSONArray) vclassRes.get("individuals") )); - map.put("pages", JSONtoFmModel.convertJSONArrayToList( (JSONArray) vclassRes.get("pages") )); - map.put("letters", JSONtoFmModel.convertJSONArrayToList( (JSONArray) vclassRes.get("letters") )); + map.put("totalCount", JsonToFmModelTemporaryName.convertJSONObjectToMap( (String) vclassRes.get("totalCount") )); + map.put("alpha", JsonToFmModelTemporaryName.convertJSONObjectToMap( (String) vclassRes.get("alpha") )); + map.put("individuals", JsonToFmModelTemporaryName.convertJSONArrayToList( (JSONArray) vclassRes.get("individuals") )); + map.put("pages", JsonToFmModelTemporaryName.convertJSONArrayToList( (JSONArray) vclassRes.get("pages") )); + map.put("letters", JsonToFmModelTemporaryName.convertJSONArrayToList( (JSONArray) vclassRes.get("letters") )); return map; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java index 278b1a0f1..7f4d3324e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java @@ -23,7 +23,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.SolrJsonServlet; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache; -import edu.cornell.mannlib.vitro.webapp.utils.JSONtoFmModel; +import edu.cornell.mannlib.vitro.webapp.utils.JsonToFmModelTemporaryName; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassGroupTemplateModel; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassTemplateModel; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividual; @@ -84,11 +84,11 @@ public class BrowseWidget extends Widget { map.put("class", new VClassTemplateModel(vclass)); JSONObject vclassRes = SolrJsonServlet.getSolrIndividualsByVClass(vclass.getURI(), request, context); - map.put("totalCount", JSONtoFmModel.convertJSONObjectToMap( (String) vclassRes.get("totalCount") )); - map.put("alpha", JSONtoFmModel.convertJSONObjectToMap( (String) vclassRes.get("alpha") )); - map.put("individuals", JSONtoFmModel.convertJSONArrayToList( (JSONArray) vclassRes.get("individuals") )); - map.put("pages", JSONtoFmModel.convertJSONArrayToList( (JSONArray) vclassRes.get("pages") )); - map.put("letters", JSONtoFmModel.convertJSONArrayToList( (JSONArray) vclassRes.get("letters") )); + map.put("totalCount", JsonToFmModelTemporaryName.convertJSONObjectToMap( (String) vclassRes.get("totalCount") )); + map.put("alpha", JsonToFmModelTemporaryName.convertJSONObjectToMap( (String) vclassRes.get("alpha") )); + map.put("individuals", JsonToFmModelTemporaryName.convertJSONArrayToList( (JSONArray) vclassRes.get("individuals") )); + map.put("pages", JsonToFmModelTemporaryName.convertJSONArrayToList( (JSONArray) vclassRes.get("pages") )); + map.put("letters", JsonToFmModelTemporaryName.convertJSONArrayToList( (JSONArray) vclassRes.get("letters") )); return map; }