From a4639d3f1a9370a3829367dc9795464d35e6baf0 Mon Sep 17 00:00:00 2001 From: Branislav Stojkovic Date: Mon, 7 Jan 2019 23:39:36 +0100 Subject: [PATCH] keep defaults for variants separate --- .../org/diylc/common/ITemplateProcessor.java | 7 ++- .../src/org/diylc/core/Template.java | 17 ++----- .../src/org/diylc/presenter/Presenter.java | 43 ++++++++++-------- diylc/diylc-swing/lib/diylc-core.jar | Bin 249021 -> 248981 bytes diylc/diylc-swing/library/main.jar | Bin 462888 -> 462905 bytes .../toolbox/ComponentButtonFactory.java | 9 ++-- diylc/diylc-swing/update.xml | 6 ++- 7 files changed, 43 insertions(+), 39 deletions(-) diff --git a/diylc/diylc-core/src/org/diylc/common/ITemplateProcessor.java b/diylc/diylc-core/src/org/diylc/common/ITemplateProcessor.java index 4c7fc19d..9498b4e0 100644 --- a/diylc/diylc-core/src/org/diylc/common/ITemplateProcessor.java +++ b/diylc/diylc-core/src/org/diylc/common/ITemplateProcessor.java @@ -27,7 +27,8 @@ import org.diylc.core.Template; public interface ITemplateProcessor { - public static final String TEMPLATES_KEY = "templates"; + public static final String TEMPLATES_KEY = "templates"; + public static final String DEFAULT_TEMPLATES_KEY = "defaultTemplates"; void saveSelectedComponentAsTemplate(String templateName); @@ -39,7 +40,9 @@ public interface ITemplateProcessor { void deleteTemplate(String categoryName, String componentTypeName, String templateName); - void setTemplateDefault(String categoryName, String componentTypeName, String templateName, boolean defaultFlag); + void setTemplateDefault(String categoryName, String componentTypeName, String templateName); + + String getDefaultTemplate(String categoryName, String componentTypeName); public class TemplateAlreadyExistsException extends Exception { diff --git a/diylc/diylc-core/src/org/diylc/core/Template.java b/diylc/diylc-core/src/org/diylc/core/Template.java index dd54bd24..0d2b7811 100644 --- a/diylc/diylc-core/src/org/diylc/core/Template.java +++ b/diylc/diylc-core/src/org/diylc/core/Template.java @@ -29,15 +29,15 @@ public class Template { private String name; private Map values; - private List points; + private List points; + @Deprecated private boolean defaultFlag; - public Template(String name, Map values, List points, boolean defaultFlag) { + public Template(String name, Map values, List points) { super(); this.name = name; this.values = values; this.points = points; - this.defaultFlag = defaultFlag; } public String getName() { @@ -64,19 +64,10 @@ public class Template { this.points = points; } - public boolean isDefaultFlag() { - return defaultFlag; - } - - public void setDefaultFlag(boolean defaultFlag) { - this.defaultFlag = defaultFlag; - } - @Override public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + (defaultFlag ? 1231 : 1237); result = prime * result + ((name == null) ? 0 : name.hashCode()); result = prime * result + ((points == null) ? 0 : points.hashCode()); result = prime * result + ((values == null) ? 0 : values.hashCode()); @@ -92,8 +83,6 @@ public class Template { if (getClass() != obj.getClass()) return false; Template other = (Template) obj; - if (defaultFlag != other.defaultFlag) - return false; if (name == null) { if (other.name != null) return false; diff --git a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java index 8167a06f..ccb2db66 100644 --- a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java +++ b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java @@ -2091,10 +2091,11 @@ public class Presenter implements IPlugInPort { // try to find a default template if none is provided if (componentType != null && template == null) { + String defaultTemplate = getDefaultTemplate(componentType.getCategory(), componentType.getName()); List