[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/CMS-10572] CMS-10572 Simplified API after review

[Arthur Bogaart]

Arthur Bogaart pushed to branch feature/CMS-10572 at cms-community / hippo-cms


Commits:
6fda0387 by Arthur Bogaart at 2017-01-09T16:37:12+01:00
CMS-10572 Simplified API after review

- - - - -


1 changed file:

- api/src/main/java/org/hippoecm/frontend/dialog/Confirm.java


Changes:

=====================================
api/src/main/java/org/hippoecm/frontend/dialog/Confirm.java
=====================================
--- a/api/src/main/java/org/hippoecm/frontend/dialog/Confirm.java
+++ b/api/src/main/java/org/hippoecm/frontend/dialog/Confirm.java
@@ -15,10 +15,7 @@
  */
 package org.hippoecm.frontend.dialog;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.wicket.Component;
 import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.hippoecm.frontend.model.ReadOnlyModel;
 
@@ -27,7 +24,7 @@ public class Confirm extends Dialog<Void> {
     private static final String DEFAULT_TITLE_KEY = "confirm-title";
     private static final String DEFAULT_TEXT_KEY = "confirm-text";
 
-    private IModel<String> text;
+    private String text;
     private DialogCallback okCallback;
     private DialogCallback cancelCallback;
 
@@ -36,45 +33,19 @@ public class Confirm extends Dialog<Void> {
         setFocusOnCancel();
         setTitleKey(DEFAULT_TITLE_KEY);
 
-        add(new Label("text", ReadOnlyModel.of(() -> getText().getObject())));
+        add(new Label("text", ReadOnlyModel.of(this::getText)));
     }
 
-    public Confirm title(final IModel<String> title) {
-        setTitle(title);
+    public Confirm title(final String title) {
+        setTitle(Model.of(title));
         return this;
     }
 
-    public Confirm title(final String titleKey) {
-        return title(titleKey, null);
-    }
-
-    public Confirm title(final String titleKey, final IModel<?> titleModel) {
-        return title(titleKey, titleModel, null);
-    }
-
-    public Confirm title(final String titleKey, final IModel<?> titleModel, 
final Component component) {
-        setTitle(getString(titleKey, titleModel, component));
-        return this;
-    }
-
-    public Confirm text(final IModel<String> text) {
+    public Confirm text(final String text) {
         this.text = text;
         return this;
     }
 
-    public Confirm text(final String textKey) {
-        return text(textKey, null);
-    }
-
-    public Confirm text(final String textKey, final IModel<?> textModel) {
-        return text(textKey, textModel, null);
-    }
-
-    public Confirm text(final String textKey, final IModel<?> textModel, final 
Component resolver) {
-        text = getString(textKey, textModel, resolver);
-        return this;
-    }
-
     public Confirm ok(final DialogCallback okCallback) {
         this.okCallback = okCallback;
         return this;
@@ -86,14 +57,6 @@ public class Confirm extends Dialog<Void> {
     }
 
     @Override
-    protected void onDetach() {
-        if (text != null) {
-            text.detach();
-        }
-        super.onDetach();
-    }
-
-    @Override
     protected void onOk() {
         if (okCallback != null) {
             okCallback.call();
@@ -107,15 +70,7 @@ public class Confirm extends Dialog<Void> {
         }
     }
 
-    private IModel<String> getString(final String key, final IModel<?> model, 
final Component component) {
-        final Component resolver = component == null ? this : component;
-        return Model.of(resolver.getString(key, model, StringUtils.EMPTY));
-    }
-
-    private IModel<String> getText() {
-        if (text == null) {
-            text(DEFAULT_TEXT_KEY);
-        }
-        return text;
+    private String getText() {
+        return text == null ? getString(DEFAULT_TEXT_KEY) : text;
     }
 }



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/commit/6fda0387277b5c75ec6393e4427d65b22ed3ffd0

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn