litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Temporary renaming of JSONtoFmModel

Browse source
This commit is contained in:
ryounes 2011-07-08 15:30:28 +00:00
parent d230bd73d7
commit f202f1366c
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
webapp/src/edu/cornell/mannlib/vitro/webapp/utils/JSONtoFmModel.java → webapp/src/edu/cornell/mannlib/vitro/webapp/utils/JsonToFmModelTemporaryName.java
View file

@ -39,7 +39,7 @@ import org.json.JSONTokener;
* *
* @author janv * @author janv
*/ */
public final class JSONtoFmModel public final class JsonToFmModelTemporaryName
{ {
public static String ROOT_ARRAY = "root"; public static String ROOT_ARRAY = "root";
@ -157,7 +157,7 @@ public final class JSONtoFmModel
// for debugging only // for debugging only
public static String toString(Map<String, Object> map) public static String toString(Map<String, Object> map)
{ {
return JSONtoFmModel.toStringBuffer(map, 0).toString(); return JsonToFmModelTemporaryName.toStringBuffer(map, 0).toString();
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@ -179,7 +179,7 @@ public final class JSONtoFmModel
if (entry.getValue() instanceof Map) if (entry.getValue() instanceof Map)
{ {
sb.append(tabs).append(entry.getKey()).append(":").append(entry.getValue().getClass()).append("\n"); sb.append(tabs).append(entry.getKey()).append(":").append(entry.getValue().getClass()).append("\n");
sb.append(JSONtoFmModel.toStringBuffer((Map<String, Object>)entry.getValue(), indent+1)); sb.append(JsonToFmModelTemporaryName.toStringBuffer((Map<String, Object>)entry.getValue(), indent+1));
} }
else if (entry.getValue() instanceof List) else if (entry.getValue() instanceof List)
{ {

12
webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/BrowseDataGetter.java
View file

@ -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.controller.freemarker.UrlBuilder;
import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache; 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.VClassGroupTemplateModel;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassTemplateModel; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassTemplateModel;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividual; 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)); map.put("class", new VClassTemplateModel(vclass));
JSONObject vclassRes = JSONServlet.getLuceneIndividualsByVClass(vclass.getURI(), request, context); JSONObject vclassRes = JSONServlet.getLuceneIndividualsByVClass(vclass.getURI(), request, context);
map.put("totalCount", JSONtoFmModel.convertJSONObjectToMap( (String) vclassRes.get("totalCount") )); map.put("totalCount", JsonToFmModelTemporaryName.convertJSONObjectToMap( (String) vclassRes.get("totalCount") ));
map.put("alpha", JSONtoFmModel.convertJSONObjectToMap( (String) vclassRes.get("alpha") )); map.put("alpha", JsonToFmModelTemporaryName.convertJSONObjectToMap( (String) vclassRes.get("alpha") ));
map.put("individuals", JSONtoFmModel.convertJSONArrayToList( (JSONArray) vclassRes.get("individuals") )); map.put("individuals", JsonToFmModelTemporaryName.convertJSONArrayToList( (JSONArray) vclassRes.get("individuals") ));
map.put("pages", JSONtoFmModel.convertJSONArrayToList( (JSONArray) vclassRes.get("pages") )); map.put("pages", JsonToFmModelTemporaryName.convertJSONArrayToList( (JSONArray) vclassRes.get("pages") ));
map.put("letters", JSONtoFmModel.convertJSONArrayToList( (JSONArray) vclassRes.get("letters") )); map.put("letters", JsonToFmModelTemporaryName.convertJSONArrayToList( (JSONArray) vclassRes.get("letters") ));
return map; return map;
} }

12
webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java
View file

@ -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.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache; 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.VClassGroupTemplateModel;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassTemplateModel; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassTemplateModel;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividual; 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)); map.put("class", new VClassTemplateModel(vclass));
JSONObject vclassRes = SolrJsonServlet.getSolrIndividualsByVClass(vclass.getURI(), request, context); JSONObject vclassRes = SolrJsonServlet.getSolrIndividualsByVClass(vclass.getURI(), request, context);
map.put("totalCount", JSONtoFmModel.convertJSONObjectToMap( (String) vclassRes.get("totalCount") )); map.put("totalCount", JsonToFmModelTemporaryName.convertJSONObjectToMap( (String) vclassRes.get("totalCount") ));
map.put("alpha", JSONtoFmModel.convertJSONObjectToMap( (String) vclassRes.get("alpha") )); map.put("alpha", JsonToFmModelTemporaryName.convertJSONObjectToMap( (String) vclassRes.get("alpha") ));
map.put("individuals", JSONtoFmModel.convertJSONArrayToList( (JSONArray) vclassRes.get("individuals") )); map.put("individuals", JsonToFmModelTemporaryName.convertJSONArrayToList( (JSONArray) vclassRes.get("individuals") ));
map.put("pages", JSONtoFmModel.convertJSONArrayToList( (JSONArray) vclassRes.get("pages") )); map.put("pages", JsonToFmModelTemporaryName.convertJSONArrayToList( (JSONArray) vclassRes.get("pages") ));
map.put("letters", JSONtoFmModel.convertJSONArrayToList( (JSONArray) vclassRes.get("letters") )); map.put("letters", JsonToFmModelTemporaryName.convertJSONArrayToList( (JSONArray) vclassRes.get("letters") ));
return map; return map;
} }