diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java index 0d6c88651..7b11268df 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java @@ -509,7 +509,7 @@ public class EditConfigurationVTwo { } public void addUrisOnForm(String ... strs){ - this.urisOnform.addAll(Arrays.asList( strs )); + this.urisOnform.addAll(new ArrayList(Arrays.asList( strs ))); } @@ -557,6 +557,8 @@ public class EditConfigurationVTwo { return this; } + + public Map> getLiteralsInScope() { return literalsInScope; } @@ -967,7 +969,9 @@ public class EditConfigurationVTwo { } public boolean isUpdate(){ - return isObjectPropertyUpdate() || isDataPropertyUpdate(); + //return isObjectPropertyUpdate() || isDataPropertyUpdate(); + //TODO: Change back if this doesn't work + return isObjectPropertyUpdate() || isDataPropertyUpdate() || isParamUpdate(); } public boolean isObjectPropertyUpdate(){ @@ -978,6 +982,15 @@ public class EditConfigurationVTwo { return this.getDatapropKey() != null ; } + //*****TEST Method***Remove if doesn't work******// + public boolean isParamUpdate = false; + public void setParamUpdate (boolean inputParamUpdate) { + this.isParamUpdate = inputParamUpdate; + } + public boolean isParamUpdate() { + return this.isParamUpdate; + } + //TODO: can we rename this to match the name "pageData" that is used on the templates for this? //How about we change pageData to something else since page is in the name of just about everything related //to templates. diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManagePagePreprocessor.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManagePagePreprocessor.java index 0030d7038..6496ad9c1 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManagePagePreprocessor.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManagePagePreprocessor.java @@ -150,6 +150,10 @@ public class ManagePagePreprocessor extends } else if(jsonValue instanceof JSONArray) { JSONArray values = jsonObject.getJSONArray(literalLabel); literalValues = (List) JSONSerializer.toJava(values); + } else if(jsonValue instanceof Boolean) { + Boolean booleanValue = jsonObject.getBoolean(literalLabel); + //Adds string version + literalValues.add(booleanValue.toString()); } String[] literalValuesSubmission = new String[literalValues.size()]; literalValuesSubmission = literalValues.toArray(literalValuesSubmission); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Utils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Utils.java index 2026ce7e9..a4dbacd0b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Utils.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Utils.java @@ -28,18 +28,9 @@ import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.DataGetter; */ public class ProcessDataGetterN3Utils { private static final Log log = LogFactory.getLog(ProcessDataGetterN3Utils.class); - public static HashMap getDataGetterTypeToProcessorMap() { - HashMap map = new HashMap(); - map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessSparqlDataGetterN3"); - map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessClassGroupDataGetterN3"); - map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.IndividualsForClassesDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessIndividualsForClassesDataGetterN3"); - map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessFixedHTMLN3"); - - return map; - } public static ProcessDataGetterN3 getDataGetterProcessorN3(String dataGetterClass, JSONObject jsonObject) { - HashMap map = getDataGetterTypeToProcessorMap(); + HashMap map = ProcessDataGetterN3Map.getDataGetterTypeToProcessorMap(); // if(map.containsKey(dataGetterClass)) { String processorClass = map.get(dataGetterClass);