Hide empty option descriptions

James Moger

2014-06-03 6cc8ec025ad26f1451f0947fa4ad79bb2f9c292a

Hide empty option descriptions

 src/main/java/com/gitblit/wicket/panels/CheckboxOption.java

@@ -18,6 +18,7 @@
import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.form.CheckBox;

import org.apache.wicket.model.IModel;

import org.parboiled.common.StringUtils;



/**

 * A re-usable checkbox option panel.

@@ -35,14 +36,14 @@
    public CheckboxOption(String wicketId, String title, String description, IModel<Boolean> model) {

        super(wicketId);

        add(new Label("name", title));

        add(new Label("description", description));

        add(new Label("description", description).setVisible(!StringUtils.isEmpty(description)));

        add(new CheckBox("checkbox", model));

    }



    public CheckboxOption(String wicketId, String title, String description, CheckBox checkbox) {

        super(wicketId);

        add(new Label("name", title));

        add(new Label("description", description));

        add(new Label("description", description).setVisible(!StringUtils.isEmpty(description)));

        add(checkbox.setMarkupId("checkbox"));

    }




 src/main/java/com/gitblit/wicket/panels/ChoiceOption.java

@@ -20,6 +20,7 @@
import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.form.DropDownChoice;

import org.apache.wicket.model.IModel;

import org.parboiled.common.StringUtils;



/**

 * A re-usable choice option panel.

@@ -38,14 +39,14 @@
    public ChoiceOption(String wicketId, String title, String description, IModel<T> model, List<T> choices) {

        super(wicketId);

        add(new Label("name", title));

        add(new Label("description", description));

        add(new Label("description", description).setVisible(!StringUtils.isEmpty(description)));

        add(new DropDownChoice<>("choice", model, choices).setEnabled(choices.size() > 0));

    }



    public ChoiceOption(String wicketId, String title, String description, DropDownChoice<?> choice) {

        super(wicketId);

        add(new Label("name", title));

        add(new Label("description", description));

        add(new Label("description", description).setVisible(!StringUtils.isEmpty(description)));

        add(choice.setMarkupId("choice").setEnabled(choice.getChoices().size() > 0));

    }

}


 src/main/java/com/gitblit/wicket/panels/TextOption.java

@@ -43,7 +43,7 @@
    public TextOption(String wicketId, String title, String description, String css, IModel<String> model) {

        super(wicketId);

        add(new Label("name", title));

        add(new Label("description", description));

        add(new Label("description", description).setVisible(!StringUtils.isEmpty(description)));

        TextField<String> tf = new TextField<String>("text", model);

        if (!StringUtils.isEmpty(css)) {

            WicketUtils.setCssClass(tf, css);