[jboss-svn-commits] JBL Code SVN: r35345 - labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences.

[jboss-svn-commits at lists.jboss.org]

Author: dennyxu
Date: 2010-09-29 05:59:26 -0400 (Wed, 29 Sep 2010)
New Revision: 35345

Modified:
   labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences/GuvnorPreferencePage.java
   labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences/IGuvnorPreferenceConstants.java
Log:
JBDS-1184: BRMS Guvnor New Connection shows wrong defaults


Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences/GuvnorPreferencePage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences/GuvnorPreferencePage.java	2010-09-29 08:30:53 UTC (rev 35344)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences/GuvnorPreferencePage.java	2010-09-29 09:59:26 UTC (rev 35345)
@@ -137,9 +137,12 @@
 	protected void performDefaults() {
 		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
 		
-		store.putValue(IGuvnorPreferenceConstants.GUVNOR_LOC_TEMPLATE_PREF, 
-				      IGuvnorPreferenceConstants.GUVNOR_LOC_TEMPLATE_DEFAULT);
-		guvnorURLTemplate.setText(IGuvnorPreferenceConstants.GUVNOR_LOC_TEMPLATE_DEFAULT);
+		String defaultLoc = store.getDefaultString(IGuvnorPreferenceConstants.GUVNOR_LOC_TEMPLATE_PREF);
+		if(defaultLoc == null || "".equals(defaultLoc)){
+			defaultLoc = IGuvnorPreferenceConstants.GUVNOR_LOC_TEMPLATE_DEFAULT;
+		}
+		store.putValue(IGuvnorPreferenceConstants.GUVNOR_LOC_TEMPLATE_PREF, defaultLoc);
+		guvnorURLTemplate.setText(defaultLoc);
 		
 		store.putValue(IGuvnorPreferenceConstants.SAVE_PASSWORDS_PREF, 
 				      String.valueOf(true));
@@ -195,7 +198,7 @@
 		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
 		String res = null;
 		if (!store.contains(IGuvnorPreferenceConstants.GUVNOR_LOC_TEMPLATE_PREF)) {
-			res = IGuvnorPreferenceConstants.GUVNOR_LOC_TEMPLATE_DEFAULT_ORG;
+			res = IGuvnorPreferenceConstants.GUVNOR_LOC_TEMPLATE_DEFAULT;
 			store.putValue(IGuvnorPreferenceConstants.GUVNOR_LOC_TEMPLATE_PREF, res);
 		} else {
 			res = store.getString(IGuvnorPreferenceConstants.GUVNOR_LOC_TEMPLATE_PREF);

Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences/IGuvnorPreferenceConstants.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences/IGuvnorPreferenceConstants.java	2010-09-29 08:30:53 UTC (rev 35344)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences/IGuvnorPreferenceConstants.java	2010-09-29 09:59:26 UTC (rev 35345)
@@ -27,8 +27,7 @@
 	// Value is a string, specified in GUVNOR_LOC_TEMPLATE_DEFAULT 
 	public String GUVNOR_LOC_TEMPLATE_PREF = "guvnor_loc_template"; //$NON-NLS-1$
 	
-	public String GUVNOR_LOC_TEMPLATE_DEFAULT = "http://localhost:8080/jboss-brms/org.drools.guvnor.Guvnor/webdav/"; //$NON-NLS-1$
-	public String GUVNOR_LOC_TEMPLATE_DEFAULT_ORG = "http://localhost:8080/drools-guvnor/org.drools.guvnor.Guvnor/webdav/"; //$NON-NLS-1$
+	public String GUVNOR_LOC_TEMPLATE_DEFAULT = "http://localhost:8080/drools-guvnor/org.drools.guvnor.Guvnor/webdav/"; //$NON-NLS-1$
 	
 	public String SAVE_PASSWORDS_PREF = "save_passwords"; //$NON-NLS-1$