[108829] WSDL Editor is silently re-writing bindings on save, likely breaking compatability with existing client/server implementations.

2 files changed, 8 insertions, 6 deletions

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorPlugin.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorPlugin.java
index 2613f72e3..f9e5dfb6c 100644
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorPlugin.java
+++ b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorPlugin.java
@@ -306,13 +306,12 @@ public class WSDLEditorPlugin extends AbstractUIPlugin //, IPluginHelper
    */
   protected void initializeDefaultPreferences(IPreferenceStore store)
   {
-    super.initializeDefaultPreferences(store);
     store.setDefault(DEFAULT_PAGE, GRAPH_PAGE);
     
     // WSDLPreferencePage prefs
     store.setDefault(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_DEFAULT_TARGET_NAMESPACE"), DEFAULT_TARGET_NAMESPACE);
-    store.setDefault(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_AUTO_REGENERATE_BINDING"), true);
-    store.setDefault("Prompt Regenerate Binding on save", true);	// TODO: Externalize
+    store.setDefault(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_AUTO_REGENERATE_BINDING"), false);
+    store.setDefault("Prompt Regenerate Binding on save", false);	// TODO: Externalize
     // Do we need this preference below?  Look at WSDLPreferencePage.java
 //    store.setDefault("Defualt Location:", "http://www.example.com");
   }
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLTextEditor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLTextEditor.java
index 6e35f3d71..726b74e24 100644
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLTextEditor.java
+++ b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLTextEditor.java
@@ -270,7 +270,7 @@ public class WSDLTextEditor extends StructuredTextEditor implements INodeSelecti
   public void doSave(IProgressMonitor monitor) {
       try{
 		  // Display prompt message
-		  boolean continueRegeneration = true;
+		  boolean continueRegeneration = false;
 		  if (WSDLEditorPlugin.getInstance().getPluginPreferences().getBoolean("Prompt Regenerate Binding on save")) {
 			  Shell shell = Display.getCurrent().getActiveShell();
 			  GenerateBindingOnSaveDialog dialog = new GenerateBindingOnSaveDialog(shell);
@@ -288,9 +288,12 @@ public class WSDLTextEditor extends StructuredTextEditor implements INodeSelecti
 			  else {
 				  System.out.println("\nNothing: " + rValue);
 			  }
-		  }	    	  
+		  }
+		  else {
+			  continueRegeneration = WSDLEditorPlugin.getInstance().getPluginPreferences().getBoolean(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_AUTO_REGENERATE_BINDING"));
+		  }
     	  
-		  if (continueRegeneration || WSDLEditorPlugin.getInstance().getPluginPreferences().getBoolean(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_AUTO_REGENERATE_BINDING"))) {
+		  if (continueRegeneration) {
 			  Iterator bindingsIt = wsdlEditor.getDefinition().getEBindings().iterator();
 			  while (bindingsIt.hasNext()) {
 				  Binding binding = (Binding) bindingsIt.next();