Add hasOptionString and deprecate the public hasOption method (should be

made protected at a later stage)

src/com/dmdirc/config/ConfigManager.java

@@ -123,7 +123,7 @@ public class ConfigManager extends ConfigSource implements Serializable,
     }
 
     /** {@inheritDoc} */
-    @Override
+    @Override @Deprecated
     public boolean hasOption(final String domain, final String option) {
         doStats(domain, option);
 

src/com/dmdirc/config/ConfigSource.java

@@ -52,9 +52,23 @@ public abstract class ConfigSource {
      * @param domain The domain of the option
      * @param option The name of the option
      * @return True iff the option exists, false otherwise.
+     * @deprecated Should only be used internally by ConfigSource
      */
+    @Deprecated
     public abstract boolean hasOption(final String domain, final String option);
 
+    /**
+     * Determines if this manager has the specified String option.
+     *
+     * @param domain The domain of the option
+     * @param option The name of the option
+     * @since 0.6.3
+     * @return True iff the option exists and is not empty, false otherwise
+     */
+    public boolean hasOptionString(final String domain, final String option) {
+        return hasOption(domain, option) && !getOption(domain, option).isEmpty();
+    }
+
     /**
      * Determines if this manager has the specified integer option.
      *

src/com/dmdirc/config/Identity.java

@@ -307,7 +307,7 @@ public class Identity extends ConfigSource implements Serializable,
     }
 
     /** {@inheritDoc} */
-    @Override
+    @Override @Deprecated
     public boolean hasOption(final String domain, final String option) {
         return file.isKeyDomain(domain) && file.getKeyDomain(domain).containsKey(option);
     }

src/com/dmdirc/ui/themes/ThemeIdentity.java

@@ -63,7 +63,7 @@ public class ThemeIdentity extends Identity {
     }
     
     /** {@inheritDoc} */
-    @Override
+    @Override @Deprecated
     public boolean hasOption(final String domain, final String option) {
         if (domain.equalsIgnoreCase("ui") || domain.equalsIgnoreCase("identity")
                 || domain.equalsIgnoreCase("icon")  || domain.equalsIgnoreCase("theme")

test/com/dmdirc/harness/TestConfigManagerMap.java

@@ -44,7 +44,7 @@ public class TestConfigManagerMap extends ConfigManager {
         }
     }
 
-    @Override
+    @Override @Deprecated
     public boolean hasOption(String domain, String option) {
         if (settings.containsKey(domain + "." + option)) {
             return true;

test/com/dmdirc/harness/TestConfigManagerOptionToggle.java

@@ -35,7 +35,7 @@ public class TestConfigManagerOptionToggle extends ConfigManager {
         return option.substring(1);
     }
 
-    @Override
+    @Override @Deprecated
     public boolean hasOption(String domain, String option) {
         return option.charAt(0) == '1';
     }

test/com/dmdirc/harness/TestConfigSource.java

@@ -31,7 +31,7 @@ public class TestConfigSource extends ConfigSource {
         return option;
     }
 
-    @Override
+    @Override @Deprecated
     public boolean hasOption(String domain, String option) {
         return Boolean.parseBoolean(domain);
     }