Fixes issue 2665 (Adds an optional integer prefs component)

Moves colour dialogs to a separate package

Change-Id: Id0aa4294fdc5f33139a5d14c47afa778346cd6bf
Reviewed-on: http://gerrit.dmdirc.com/100
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>

src/com/dmdirc/addons/nickcolours/NickColourInputDialog.java

@@ -25,7 +25,7 @@ package com.dmdirc.addons.nickcolours;
 import com.dmdirc.Main;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.addons.ui_swing.components.ColourChooser;
+import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

src/com/dmdirc/addons/ui_swing/PrefsComponentFactory.java

@@ -24,14 +24,17 @@ package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.validator.NumericalValidator;
-import com.dmdirc.addons.ui_swing.components.ColourChooser;
+import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
 import com.dmdirc.addons.ui_swing.components.FontPicker;
-import com.dmdirc.addons.ui_swing.components.OptionalColourChooser;
+import com.dmdirc.addons.ui_swing.components.OptionalJSpinner;
+import com.dmdirc.addons.ui_swing.components.colours.OptionalColourChooser;
 import com.dmdirc.addons.ui_swing.components.durationeditor.DurationDisplay;
 import com.dmdirc.addons.ui_swing.components.durationeditor.DurationListener;
 import com.dmdirc.addons.ui_swing.components.renderers.MapEntryRenderer;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 
+import com.dmdirc.config.prefs.validator.OptionalValidator;
+import com.dmdirc.config.prefs.validator.Validator;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.event.ActionEvent;
@@ -87,6 +90,9 @@ public final class PrefsComponentFactory {
             case INTEGER:
                 option = getIntegerOption(setting);
                 break;
+            case OPTIONALINTEGER:
+                option = getOptionalIntegerOption(setting);
+                break;
             case DURATION:
                 option = getDurationOption(setting);
                 break;
@@ -207,7 +213,7 @@ public final class PrefsComponentFactory {
         }
 
         option.addChangeListener(new ChangeListener() {
-            
+
             /** {@inheritDoc} */
             @Override
             public void stateChanged(final ChangeEvent e) {
@@ -219,6 +225,59 @@ public final class PrefsComponentFactory {
         return option;
     }
 
+    /**
+     * Initialises and returns a JSpinner for the specified setting.
+     *
+     * @param setting The setting to create the component for
+     * @return A JComponent descendent for the specified setting
+     */
+    private static JComponent getOptionalIntegerOption(final PreferencesSetting setting) {
+        final boolean state = setting.getValue() != null
+                && !setting.getValue().startsWith("false:");
+        final String integer = setting.getValue() == null ? "0" : setting.getValue().
+                substring(1 + setting.getValue().indexOf(':'));
+        
+        OptionalJSpinner option;
+        Validator optionalValidator = setting.getValidator();
+        Validator numericalValidator = null;
+        if (optionalValidator instanceof OptionalValidator) {
+            numericalValidator = ((OptionalValidator) setting.getValidator()).
+                    getValidator();
+            if (!(numericalValidator instanceof NumericalValidator)) {
+                numericalValidator = null;
+            }
+        }
+
+        try {
+            if (numericalValidator != null) {
+                option = new OptionalJSpinner(
+                        new SpinnerNumberModel(Integer.parseInt(integer),
+                        ((NumericalValidator) numericalValidator).getMin(),
+                        ((NumericalValidator) numericalValidator).getMax(),
+                        1), state);
+            } else {
+                option = new OptionalJSpinner(new SpinnerNumberModel());
+                option.setValue(Integer.parseInt(integer));
+                option.setSelected(state);
+            }
+        } catch (NumberFormatException ex) {
+            option = new OptionalJSpinner(new SpinnerNumberModel(), state);
+        }
+
+        option.addChangeListener(new ChangeListener() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void stateChanged(final ChangeEvent e) {
+                setting.setValue(((OptionalJSpinner) e.getSource()).isSelected() + ":" +
+                        ((OptionalJSpinner) e.getSource()).getValue().
+                        toString());
+            }
+        });
+
+        return option;
+    }
+
     /**
      * Initialises and returns a DurationDisplay for the specified setting.
      *

src/com/dmdirc/addons/ui_swing/components/OptionalJSpinner.java

@@ -0,0 +1,217 @@
+/*
+ * 
+ * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.components;
+
+import com.dmdirc.util.ListenerList;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JCheckBox;
+import javax.swing.JPanel;
+import javax.swing.JSpinner;
+import javax.swing.SpinnerModel;
+import javax.swing.SpinnerNumberModel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * Optional JSpinner component.  Composite JSpinner, JCheckbox component.
+ */
+public class OptionalJSpinner extends JPanel implements ActionListener,
+        ChangeListener {
+
+    private static final long serialVersionUID = -2867331420063503447L;
+    private final JSpinner spinner;
+    private final JCheckBox checkbox;
+    private final ListenerList listeners;
+
+    /**
+     * Creates a new optional JSpinner with a default number model.
+     */
+    public OptionalJSpinner() {
+        this(new SpinnerNumberModel());
+    }
+
+    /**
+     * Creates a new optional JSpinner with a default number model.
+     *
+     * @param enabled Initial selected state
+     */
+    public OptionalJSpinner(final boolean enabled) {
+        this(new SpinnerNumberModel(), enabled);
+    }
+
+    /**
+     * Creates a new optional SPinner with a default number model.
+     *
+     * @param model Model to show
+     */
+    public OptionalJSpinner(final SpinnerModel model) {
+        this(model, true);
+    }
+
+    /**
+     * Creates a new optional SPinner with a default number model.
+     *
+     * @param model Model to show
+     * @param enabled Initial selected state
+     */
+    public OptionalJSpinner(final SpinnerModel model, final boolean enabled) {
+        checkbox = new JCheckBox("", enabled);
+        spinner = new JSpinner(model);
+        listeners = new ListenerList();
+
+        spinner.setEnabled(enabled);
+
+        spinner.addChangeListener(this);
+        checkbox.addActionListener(this);
+
+        setLayout(new MigLayout("fill"));
+
+        add(checkbox, "");
+        add(spinner, "growx, pushx");
+    }
+
+    /**
+     * Returns the state of the button. True if the toggle button is selected,
+     * false if it's not.
+     *
+     * @return true if the toggle button is selected, otherwise false
+     */
+    public boolean isSelected() {
+        return checkbox.isSelected();
+    }
+
+    /**
+     * Sets the state of the button.
+     *
+     * @param selected true if the button is selected, otherwise false
+     */
+    public void setSelected(final boolean selected) {
+        checkbox.setSelected(selected);
+    }
+
+    /**
+     * Returns the current value of the model, typically this value is
+     * displayed by the editor. If the user has changed the value displayed
+     * by the editor it is possible for the model's value to differ from that
+     * of the editor, refer to the class level javadoc for examples of how to
+     * deal with this.
+     *
+     * This method simply delegates to the model. It is equivalent to:
+     * 
+     * getModel().getValue()
+     *
+     * @return The current value
+     */
+    public Object getValue() {
+        return spinner.getValue();
+    }
+
+    /**
+     * Changes current value of the model, typically this value is displayed
+     * by the editor. If the SpinnerModel implementation doesn't support
+     * the specified value then an IllegalArgumentException is thrown.
+     * This method simply delegates to the model. It is equivalent to:
+     *
+     * getModel().setValue(value)
+     *
+     * @param value Value to set
+     */
+    public void setValue(final Object value) {
+        spinner.setValue(value);
+    }
+
+    /**
+     * Returns the SpinnerModel that defines this spinners sequence of values.
+     *
+     * @return the value of the model property
+     */
+    public SpinnerModel getModel() {
+        return spinner.getModel();
+    }
+
+    /**
+     * Changes the model that represents the value of this spinner. If the
+     * editor property has not been explicitly set, the editor property
+     * is (implicitly) set after the "model" PropertyChangeEvent has been
+     * fired. The editor property is set to the value returned by createEditor,
+     * as in:
+     *
+     * setEditor(createEditor(model));
+     *
+     * @param model the new SpinnerModel
+     */
+    public void setModel(final SpinnerModel model) {
+        spinner.setModel(model);
+    }
+
+    /**
+     * Adds a change listener to this optional spinner.
+     *
+     * @param listener Listener to add
+     */
+    public void addChangeListener(final ChangeListener listener) {
+        synchronized (listeners) {
+            listeners.add(ChangeListener.class, listener);
+        }
+    }
+
+    /**
+     * Removes a change listener from this optional spinner.
+     *
+     * @param listener Listener to remove
+     */
+    public void removeChangeListener(final ChangeListener listener) {
+        synchronized (listeners) {
+            listeners.remove(ChangeListener.class, listener);
+        }
+    }
+
+    private void fireChangeListener() {
+        for (ChangeListener listener : listeners.get(ChangeListener.class)) {
+            listener.stateChanged(new ChangeEvent(this));
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void stateChanged(final ChangeEvent e) {
+        fireChangeListener();
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param e Action event
+     */
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        fireChangeListener();
+        spinner.setEnabled(checkbox.isSelected());
+    }
+}

src/com/dmdirc/addons/ui_swing/components/SwingInputField.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
+import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.interfaces.InputField;

src/com/dmdirc/addons/ui_swing/components/TextAreaInputField.java

@@ -21,6 +21,7 @@
  */
 package com.dmdirc.addons.ui_swing.components;
 
+import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.interfaces.InputField;
 

src/com/dmdirc/addons/ui_swing/components/ColourChooser.java → src/com/dmdirc/addons/ui_swing/components/colours/ColourChooser.java

@@ -20,8 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.components;
+package com.dmdirc.addons.ui_swing.components.colours;
 
+import com.dmdirc.addons.ui_swing.components.*;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 

src/com/dmdirc/addons/ui_swing/components/ColourPickerDialog.java → src/com/dmdirc/addons/ui_swing/components/colours/ColourPickerDialog.java

@@ -20,10 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.components;
+package com.dmdirc.addons.ui_swing.components.colours;
 
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.addons.ui_swing.SwingController;
 
 import java.awt.Window;
 import java.awt.event.ActionListener;

src/com/dmdirc/addons/ui_swing/components/ColourPickerPanel.java → src/com/dmdirc/addons/ui_swing/components/colours/ColourPickerPanel.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.components;
+package com.dmdirc.addons.ui_swing.components.colours;
 
 import com.dmdirc.ui.messages.ColourManager;
 

src/com/dmdirc/addons/ui_swing/components/OptionalColourChooser.java → src/com/dmdirc/addons/ui_swing/components/colours/OptionalColourChooser.java

@@ -20,8 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.components;
+package com.dmdirc.addons.ui_swing.components.colours;
 
+import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.util.ListenerList;
 import com.dmdirc.addons.ui_swing.UIUtilities;

src/com/dmdirc/addons/ui_swing/components/expandingsettings/AddOptionPanel.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.expandingsettings;
 
 import com.dmdirc.addons.ui_swing.components.renderers.AddOptionCellRenderer;
-import com.dmdirc.addons.ui_swing.components.ColourChooser;
+import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel.OptionType;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.FontPicker;

src/com/dmdirc/addons/ui_swing/components/expandingsettings/CurrentOptionsPanel.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.expandingsettings;
 
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.addons.ui_swing.components.ColourChooser;
+import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
 import com.dmdirc.addons.ui_swing.components.ImageButton;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel.OptionType;
 import com.dmdirc.addons.ui_swing.UIUtilities;

src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java

@@ -351,10 +351,10 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
             final String inputFieldText = getInputField().getText();
             final String text = inputFieldText.substring(0, caretPosition) + clipboard + inputFieldText.substring(caretPosition);
             //check the limit
-            final int pasteTrigger = getConfigManager().getOptionInt("ui",
+            final Integer pasteTrigger = getConfigManager().getOptionInt("ui",
                     "pasteProtectionLimit");
             //check whether the number of lines is over the limit
-            if (getContainer().getNumLines(text) > pasteTrigger) {
+            if (pasteTrigger != null && getContainer().getNumLines(text) > pasteTrigger) {
                 //show the multi line paste dialog
                 new PasteDialog(this, text, getController().getMainFrame()).setVisible(true);
                 inputField.setText("");

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionGroupSettingsPanel.java

@@ -25,8 +25,8 @@ package com.dmdirc.addons.ui_swing.dialogs.actionsmanager;
 import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
-import com.dmdirc.addons.ui_swing.components.ColourChooser;
-import com.dmdirc.addons.ui_swing.components.OptionalColourChooser;
+import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
+import com.dmdirc.addons.ui_swing.components.colours.OptionalColourChooser;
 import com.dmdirc.addons.ui_swing.components.durationeditor.DurationDisplay;
 
 import java.awt.Window;

src/com/dmdirc/addons/ui_swing/dialogs/prefs/PrefsCategoryLoader.java

@@ -26,10 +26,10 @@ package com.dmdirc.addons.ui_swing.dialogs.prefs;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.components.ColourChooser;
-import com.dmdirc.addons.ui_swing.components.OptionalColourChooser;
-import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
+import com.dmdirc.addons.ui_swing.components.colours.OptionalColourChooser;
 import com.dmdirc.addons.ui_swing.components.durationeditor.DurationDisplay;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesSetting;
 

src/com/dmdirc/config/ConfigSource.java

@@ -210,11 +210,29 @@ public abstract class ConfigSource {
      *
      * @param domain The domain of the option
      * @param option The name of the option
+     * @param fallbacks An ordered array of further domains and options
+     * (in pairs) to try if the specified domain/option isn't found
      * @throws NumberFormatException If the setting can't be parsed
-     * @return The integer representation of the option
+     * @return The integer representation of the option or null if optional
+     * setting is false
      */
-    public int getOptionInt(final String domain, final String option) {
-        return Integer.parseInt(getOption(domain, option).trim());
+    public Integer getOptionInt(final String domain, final String option,
+            final String ... fallbacks) {
+        String value;
+
+        if (!hasOption(domain, option) || (value = getOption(domain, option))
+                .startsWith("false:")) {
+            return fallbacks.length >= 2 ? getOptionInt(fallbacks[0], fallbacks[1],
+                    Arrays.copyOfRange(fallbacks, 2, fallbacks.length)) : null;
+        }
+        if (value.startsWith("true:")) {
+            return Integer.parseInt(getOption(domain, option).trim().substring(
+                    5));
+        } else if (value.startsWith("false:")) {
+            return null;
+        } else {
+            return Integer.parseInt(getOption(domain, option).trim());
+        }
     }
 
 }

src/com/dmdirc/config/defaults/default/defaults

@@ -157,7 +157,7 @@ ui:
   nickListAltBackgroundColour=false:f0f0f0
   nicklistbackgroundcolour=false:0
   nicklistforegroundcolour=false:1
-  pasteProtectionLimit=1
+  pasteProtectionLimit=true:1
   quickCopy=false
   shownickcoloursinnicklist=true
   shownickcoloursintext=false

src/com/dmdirc/config/prefs/PreferencesManager.java

@@ -25,6 +25,7 @@ import com.dmdirc.Main;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.config.prefs.validator.NumericalValidator;
+import com.dmdirc.config.prefs.validator.OptionalValidator;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
 import com.dmdirc.util.ListenerList;
@@ -165,8 +166,8 @@ public class PreferencesManager {
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "ui", "awayindicator", "Away indicator",
                 "Shows an indicator in windows when you are marked as away"));
-        category.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
-                new NumericalValidator(0, 100), "ui", "pasteProtectionLimit",
+        category.addSetting(new PreferencesSetting(PreferencesType.OPTIONALINTEGER,
+                new OptionalValidator(new NumericalValidator(0, 100)), "ui", "pasteProtectionLimit",
                 "Paste protection trigger", "Confirm pasting of text that " +
                 "contains more than this many lines."));
         

src/com/dmdirc/config/prefs/PreferencesType.java

@@ -32,6 +32,8 @@ public enum PreferencesType {
     TEXT,
     /** A free-form integer preference. */
     INTEGER,
+    /** A optional free-form integer preference. */
+    OPTIONALINTEGER,
     /** A boolean preference. */
     BOOLEAN,
     /** A colour preference. */

src/com/dmdirc/config/prefs/validator/OptionalValidator.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.dmdirc.config.prefs.validator;
+
+/**
+ * Validates an optional setting in tandem with another validator.
+ */
+public class OptionalValidator implements Validator<String> {
+    
+    /** The minimum value for this number. */
+    protected final Validator<String> validator;
+
+    /**
+     * Creates a new Optional validator
+     * @param validator 
+     */
+    public OptionalValidator(Validator<String> validator) {
+        this.validator = validator;
+    }
+
+    /**
+     * Gets the secondary validator.
+     *
+     * @return Secondary validator
+     */
+    public Validator getValidator() {
+        return validator;
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public ValidationResponse validate(final String object) {
+        String booleanv;
+        String otherv;
+        int colonIndex = object.indexOf(":");
+
+        if (colonIndex == -1) {
+            return new ValidationResponse("Must contain boolean int seperator.");
+        }
+
+        booleanv = object.substring(0, colonIndex);
+        otherv = object.substring(colonIndex + 1);
+
+        if (!"true".equals(booleanv) && !"false".equals(booleanv)) {
+            return new ValidationResponse("Must be true or false.");
+        }
+
+        return validator.validate(otherv);
+    }
+
+}