svn commit: r967019 - /felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/OptionalPrompt.java

[dsavage]

Author: dsavage
Date: Fri Jul 23 10:18:29 2010
New Revision: 967019

URL: http://svn.apache.org/viewvc?rev=967019&view=rev
Log:
handle uninitialized prefs more gracefully - default to prompt vs runtime 
exception

Modified:
    
felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/OptionalPrompt.java

Modified: 
felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/OptionalPrompt.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/OptionalPrompt.java?rev=967019&r1=967018&r2=967019&view=diff
==============================================================================
--- 
felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/OptionalPrompt.java
 (original)
+++ 
felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/OptionalPrompt.java
 Fri Jul 23 10:18:29 2010
@@ -34,7 +34,7 @@ public class OptionalPrompt
     {
         boolean result = false;
 
-        PromptablePreference value = PromptablePreference.valueOf( 
prefStore.getString( prefName ) );
+        PromptablePreference value = preference(prefStore, prefName);
         switch ( value )
         {
             case Always:
@@ -64,7 +64,7 @@ public class OptionalPrompt
     {
         int result = IDialogConstants.NO_ID;
 
-        PromptablePreference value = PromptablePreference.valueOf( 
prefStore.getString( prefName ) );
+        PromptablePreference value = preference(prefStore, prefName);
         switch ( value )
         {
             case Always:
@@ -91,4 +91,15 @@ public class OptionalPrompt
 
         return result;
     }
+    
+    /**
+     * @param prefStore 
+     * @param prefName
+     * @return
+     */
+    private static PromptablePreference preference(IPreferenceStore prefStore, 
String prefName)
+    {
+        String val = prefStore.getString( prefName );
+        return (val == null || val.trim().length() == 0) ? 
PromptablePreference.Prompt : PromptablePreference.valueOf( val );
+    }    
 }