ConfigItem: remove logic from UI, improve UI

[fanfix.git] / src / be / nikiroo / utils / ui / ConfigItem.java

diff --git a/src/be/nikiroo/utils/ui/ConfigItem.java b/src/be/nikiroo/utils/ui/ConfigItem.java
index 691c6198319b24d71ea2710e6f96f7aa348a3c49..beed66f55f9de312998924c0e85c06f01344a45c 100644 (file)
--- a/src/be/nikiroo/utils/ui/ConfigItem.java
+++ b/src/be/nikiroo/utils/ui/ConfigItem.java
@@ -1,17 +1,15 @@
 package be.nikiroo.utils.ui;
 
 import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.util.ArrayList;
-import java.util.List;
 
-import javax.swing.JLabel;
+import javax.swing.JCheckBox;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.border.EmptyBorder;
 
 import be.nikiroo.utils.resources.Bundle;
-import be.nikiroo.utils.resources.Meta;
+import be.nikiroo.utils.resources.Meta.Format;
+import be.nikiroo.utils.resources.MetaInfo;
 
 /**
  * A graphical item that reflect a configuration option from the given
@@ -24,92 +22,50 @@ import be.nikiroo.utils.resources.Meta;
  */
 public class ConfigItem<E extends Enum<E>> extends JPanel {
        private static final long serialVersionUID = 1L;
-       private Class<E> type;
-       private final Bundle<E> bundle;
-       private final E id;
-
-       private Meta meta;
-       private String value;
-
-       private JTextField valueField;
-
-       public ConfigItem(Class<E> type, Bundle<E> bundle, E id) {
-               this.type = type;
-               this.bundle = bundle;
-               this.id = id;
-
-               try {
-                       this.meta = type.getDeclaredField(id.name()).getAnnotation(
-                                       Meta.class);
-               } catch (NoSuchFieldException e) {
-               } catch (SecurityException e) {
-               }
 
+       public ConfigItem(final MetaInfo<E> info) {
                this.setLayout(new BorderLayout());
                this.setBorder(new EmptyBorder(2, 10, 2, 10));
 
-               String tooltip = null;
-               if (bundle.getDescriptionBundle() != null) {
-                       tooltip = bundle.getDescriptionBundle().getString(id);
-                       if (tooltip != null && tooltip.trim().isEmpty()) {
-                               tooltip = null;
+               if (info.getFormat() == Format.BOOLEAN) {
+                       final JCheckBox field = new JCheckBox();
+                       field.setToolTipText(info.getDescription());
+                       Boolean state = info.getBoolean();
+                       if (state == null) {
+                               info.getDefaultBoolean();
                        }
-               }
-
-               String name = id.toString();
-               if (name.length() > 1) {
-                       name = name.substring(0, 1) + name.substring(1).toLowerCase();
-                       name = name.replace("_", " ");
-               }
-
-               JLabel nameLabel = new JLabel(name);
-               nameLabel.setToolTipText(tooltip);
-               nameLabel.setPreferredSize(new Dimension(400, 0));
-               this.add(nameLabel, BorderLayout.WEST);
 
-               valueField = new JTextField();
-               valueField.setText(value);
-
-               reload();
-               this.add(valueField, BorderLayout.CENTER);
-       }
-
-       /**
-        * Reload the value from the {@link Bundle}.
-        */
-       public void reload() {
-               value = bundle.getString(id);
-               valueField.setText(value);
-       }
-
-       /**
-        * Save the current value to the {@link Bundle}.
-        */
-       public void save() {
-               value = valueField.getText();
-               bundle.setString(id, value);
-       }
+                       // Should not happen!
+                       if (state == null) {
+                               System.err
+                                               .println("No default value given for BOOLEAN parameter "
+                                                               + info.getName() + ", we consider it is FALSE");
+                               state = false;
+                       }
 
-       /**
-        * Create a list of {@link ConfigItem}, one for each of the item in the
-        * given {@link Bundle}.
-        * 
-        * @param <E>
-        *            the type of {@link Bundle} to edit
-        * @param type
-        *            a class instance of the item type to work on
-        * @param bundle
-        *            the {@link Bundle} to sort through
-        * 
-        * @return the list
-        */
-       static public <E extends Enum<E>> List<ConfigItem<E>> getItems(
-                       Class<E> type, Bundle<E> bundle) {
-               List<ConfigItem<E>> list = new ArrayList<ConfigItem<E>>();
-               for (E id : type.getEnumConstants()) {
-                       list.add(new ConfigItem<E>(type, bundle, id));
+                       field.setSelected(state);
+
+                       info.addReloadListener(new Runnable() {
+                               @Override
+                               public void run() {
+                                       field.setText(info.getString());
+                               }
+                       });
+
+                       this.add(field, BorderLayout.CENTER);
+               } else {
+                       final JTextField field = new JTextField();
+                       field.setToolTipText(info.getDescription());
+                       field.setText(info.getString());
+
+                       info.addReloadListener(new Runnable() {
+                               @Override
+                               public void run() {
+                                       field.setText(info.getString());
+                               }
+                       });
+
+                       this.add(field, BorderLayout.CENTER);
                }
-
-               return list;
        }
 }