[227359] Test facilities do not respect default order in plugin customization.
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/TestFacilityDefaultsPreferencePage.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/TestFacilityDefaultsPreferencePage.java
index d23067b..bef5a36 100644
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/TestFacilityDefaultsPreferencePage.java
+++ b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/TestFacilityDefaultsPreferencePage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,6 +12,7 @@
* 20060217 113169 pmoogk@ca.ibm.com - Peter Moogk
* 20060222 118711 pmoogk@ca.ibm.com - Peter Moogk
* 20070314 154543 makandre@ca.ibm.com - Andrew Mak, WebServiceTestRegistry is tracking extensions using label attribute instead of ID
+ * 20080416 227359 makandre@ca.ibm.com - Andrew Mak, Test facilities do not respect default order in plugin customization
*******************************************************************************/
package org.eclipse.jst.ws.internal.ui.preferences;
@@ -24,6 +25,7 @@
import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jst.ws.internal.context.PersistentScenarioContext;
import org.eclipse.jst.ws.internal.context.ScenarioContext;
import org.eclipse.jst.ws.internal.context.ScenarioDefaults;
import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
@@ -193,11 +195,11 @@
*/
private void initializeDefaults()
{
- ScenarioDefaults defaults = new ScenarioDefaults();
- //pgm launchSample.setSelection( defaults.getLaunchSampleDefault());
+ PersistentScenarioContext context = (PersistentScenarioContext)
+ WebServicePlugin.getInstance().getScenarioContext();
webServiceTestTypes_.clear();
- String[] types = defaults.getWebServiceTestIds();
+ String[] types = context.getDefaultWebServiceTestIds();
for (int i = 0; i < types.length; i++)
webServiceTestTypes_.add(types[i]);
webServiceTestTypeViewer_.refresh();
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java
index a14cf9a..412c053 100644
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java
+++ b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,6 +11,7 @@
* -------- -------- -----------------------------------------------------------
* 20060216 127138 pmoogk@ca.ibm.com - Peter Moogk
* 20070314 154543 makandre@ca.ibm.com - Andrew Mak, WebServiceTestRegistry is tracking extensions using label attribute instead of ID
+ * 20080416 227359 makandre@ca.ibm.com - Andrew Mak, Test facilities do not respect default order in plugin customization
*******************************************************************************/
package org.eclipse.jst.ws.internal.context;
@@ -95,10 +96,9 @@
setValue(PREFERENCE_WEBSERVICE_TEST_TYPES, sb.toString());
}
- public String[] getWebServiceTestIds()
+ private String[] getWebServiceTestIds(String value)
{
- StringTokenizer st = new StringTokenizer(
- getValueAsString(PREFERENCE_WEBSERVICE_TEST_TYPES), ",");
+ StringTokenizer st = new StringTokenizer(value, ",");
String[] s = new String[st.countTokens()];
for (int i = 0; i < s.length; i++) {
// 154543: we have to continue to interpret the old label style preferences
@@ -106,6 +106,16 @@
}
return s;
}
+
+ public String[] getWebServiceTestIds()
+ {
+ return getWebServiceTestIds(getValueAsString(PREFERENCE_WEBSERVICE_TEST_TYPES));
+ }
+
+ public String[] getDefaultWebServiceTestIds()
+ {
+ return getWebServiceTestIds(getDefaultString(PREFERENCE_WEBSERVICE_TEST_TYPES));
+ }
public void setWebServiceTestTypes(String[] ids)
{
