[CIShell-SVN] SF.net SVN: cishell:[884] trunk

[<mwl...@us...>]

Revision: 884
          http://cishell.svn.sourceforge.net/cishell/?rev=884&view=rev
Author:   mwlinnem
Date:     2009-07-14 17:58:51 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
Turning parameter preferences off by default. These don't yet work nicely with mutateParameters, and are causing bugs. We can re-enable it by default if/when it works for mutateParameters and is shown to be more stable.

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java
    trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/internal/PrefReferenceProcessor.java

Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java	2009-07-14 15:51:03 UTC (rev 883)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java	2009-07-14 17:58:51 UTC (rev 884)
@@ -349,7 +349,7 @@
 	protected boolean hasParamDefaultPreferences(ServiceReference algRef) {
 		String prefsToPublish = (String) algRef.getProperty(UserPrefsProperty.PREFS_PUBLISHED_KEY);
 		if (prefsToPublish == null) {
-			return true;
+			return false;
 		}
 
 		return prefsToPublish.contains(UserPrefsProperty.PUBLISH_PARAM_DEFAULT_PREFS_VALUE);

Modified: trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/internal/PrefReferenceProcessor.java
===================================================================
--- trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/internal/PrefReferenceProcessor.java	2009-07-14 15:51:03 UTC (rev 883)
+++ trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/internal/PrefReferenceProcessor.java	2009-07-14 17:58:51 UTC (rev 884)
@@ -193,11 +193,7 @@
     	} else {
     		String unparsedPublishedPrefsValues = (String) prefReference.getProperty(UserPrefsProperty.PREFS_PUBLISHED_KEY);
     		if (unparsedPublishedPrefsValues == null) {
-    			if (processingKey ==UserPrefsProperty.PUBLISH_PARAM_DEFAULT_PREFS_VALUE) {
-    				return true;
-    			} else {
-    				return false;
-    			}
+    			return false;
     		}
  
     		String[] publishedPrefsValues = unparsedPublishedPrefsValues.split(",");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.