diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/Field.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/Field.java index a6705fdad..49b9f02e8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/Field.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/Field.java @@ -18,6 +18,7 @@ public class Field { public enum OptionsType { LITERALS, + UNSORTED_LITERALS, STRINGS_VIA_DATATYPE_PROPERTY, INDIVIDUALS_VIA_OBJECT_PROPERTY, INDIVIDUALS_VIA_VCLASS, @@ -204,6 +205,8 @@ public class Field { public void setOptionsType(String s) { if ("LITERALS".equals(s)) { setOptionsType(Field.OptionsType.LITERALS); + } else if ("UNSORTED_LITERALS".equals(s)) { + setOptionsType(Field.OptionsType.UNSORTED_LITERALS); } else if ("STRINGS_VIA_DATATYPE_PROPERTY".equalsIgnoreCase(s)) { setOptionsType(Field.OptionsType.STRINGS_VIA_DATATYPE_PROPERTY); } else if ("INDIVIDUALS_VIA_OBJECT_PROPERTY".equalsIgnoreCase(s)) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/SelectListGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/SelectListGenerator.java index 13598ea23..faef9a71f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/SelectListGenerator.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/SelectListGenerator.java @@ -59,10 +59,11 @@ public class SelectListGenerator { Field.OptionsType optionsType = field.getOptionsType(); String vclassUri = null; switch (optionsType){ + case UNSORTED_LITERALS: // deliberate fall-through case! Like LITERALS, but should not be sorted - order as specified case LITERALS: List> literalOptions = field.getLiteralOptions(); if (literalOptions==null) { - log.error("no literalOptions List found for field \""+fieldName+"\" in SelectListGenerator.getOptions() when OptionsType LITERAL specified"); + log.error("no literalOptions List found for field \""+fieldName+"\" in SelectListGenerator.getOptions() when OptionsType LITERALS or UNSORTED_LITERALS specified"); return new HashMap (); } for(Object obj: ((Iterable)literalOptions)){ diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java index 27ff93118..fd724ff07 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java @@ -454,7 +454,11 @@ public class InputElementFormattingTag extends TagSupport { } else { out.print("