diff --git a/api/src/org/labkey/api/module/Summary.java b/api/src/org/labkey/api/module/Summary.java index dcdc15d11ff..0840c318d11 100644 --- a/api/src/org/labkey/api/module/Summary.java +++ b/api/src/org/labkey/api/module/Summary.java @@ -10,10 +10,9 @@ public class Summary { private final long count; - private final String nounSingular; - private final String nounPlural; + private final String noun; - private String replaceNounTitles(String nounSingular) { + private String replaceNounTitles(String noun) { String[] search = new String[] { "ExpressionSystem", "Ingredients", @@ -34,30 +33,22 @@ private String replaceNounTitles(String nounSingular) { "Protein sequence", "Raw material" }; - return StringUtils.replaceEach(nounSingular, search, replacements); + return StringUtils.replaceEach(noun, search, replacements); } - public Summary(final long count, final String nounSingular, final String nounPlural) + public Summary(final long count, final String noun) { - this.count = count; - this.nounSingular = nounSingular; - this.nounPlural = nounPlural; - } - - public Summary(final long count, final String nounSingular) - { - String nounName = replaceNounTitles(nounSingular); + String nounName = replaceNounTitles(noun); this.count = count; - this.nounSingular = nounName; - this.nounPlural = nounName.endsWith("s") ? nounName : nounName + "s"; + this.noun = nounName; } public JSONObject toJSON() { JSONObject json = new JSONObject(); json.put("count", count); - json.put("noun", count > 1 ? nounPlural : nounSingular); + json.put("noun", noun); return json; } } diff --git a/experiment/src/org/labkey/experiment/ExperimentModule.java b/experiment/src/org/labkey/experiment/ExperimentModule.java index 5867c8799e3..1cdbe799ea0 100644 --- a/experiment/src/org/labkey/experiment/ExperimentModule.java +++ b/experiment/src/org/labkey/experiment/ExperimentModule.java @@ -871,7 +871,7 @@ public Collection getSummary(Container c) List dataClasses = ExperimentService.get().getDataClasses(c, user, false); int dataClassCount = dataClasses.size(); if (dataClassCount > 0) - summaries.add(new Summary(dataClassCount, "Data Class", "Data Classes")); + summaries.add(new Summary(dataClassCount, "Data Class")); ExpSchema expSchema = new ExpSchema(user, c); @@ -925,7 +925,7 @@ public Collection getSummary(Container c) { String name = entry.getKey(); Summary s = name.equals("MixtureBatches") - ? new Summary(count, "Batch", "Batches") // Special handling for name replacement + pluralization + ? new Summary(count, "Batch") : new Summary(count, name); summaries.add(s); }