Merge pull request #358 from greboid/dev4

Switch BiMap from DoubleMap.

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

 
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesSetting;
-import com.dmdirc.addons.ui_swing.components.IconManager;
-import com.dmdirc.util.collections.DoubleMap;
+
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
 
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
     /** Use external padding. */
     private final boolean padding;
     /** Current Settings. */
-    private final DoubleMap<PreferencesSetting, JComponent> settings;
+    private final BiMap<PreferencesSetting, JComponent> settings;
     /** Info label. */
     private TextLabel infoLabel;
     /** Current options panel. */
 
         this.compFactory = compFactory;
 
-        settings = new DoubleMap<>();
+        settings = HashBiMap.create();
 
         setOpaque(UIUtilities.getTabbedPaneOpaque());
         this.padding = padding;
      * @param setting Setting to add
      */
     protected void addAddableOption(final JComponent setting) {
-        settings.getKey(setting).setValue(null);
+        settings.inverse().get(setting).setValue(null);
         addOptionPanel.addOption(setting);
     }
 
      * @return Setting or null if not found
      */
     public PreferencesSetting getSettingForComponent(final JComponent comp) {
-        return settings.getKey(comp);
+        return settings.inverse().get(comp);
     }
 
 }