Index: src/com/metamatrix/modeler/internal/xml/ui/wizards/NewVirtualDocumentWizardPage.java
===================================================================
--- src/com/metamatrix/modeler/internal/xml/ui/wizards/NewVirtualDocumentWizardPage.java	(revision 286)
+++ src/com/metamatrix/modeler/internal/xml/ui/wizards/NewVirtualDocumentWizardPage.java	(working copy)
@@ -72,7 +72,6 @@
 import com.metamatrix.modeler.xml.IVirtualDocumentFragmentSource;
 import com.metamatrix.modeler.xml.PluginConstants;
 import com.metamatrix.modeler.xml.ui.ModelerXmlUiConstants;
-import com.metamatrix.modeler.xml.ui.ModelerXmlUiPlugin;
 import com.metamatrix.ui.internal.eventsupport.SelectionUtilities;
 import com.metamatrix.ui.internal.util.WidgetFactory;
 import com.metamatrix.ui.internal.viewsupport.StatusInfo;
@@ -303,8 +302,6 @@
     private static final String DATATYPE_OPTIONS = Util.getString("NewVirtualDocumentWizardPage.datatypeOptions"); //$NON-NLS-1$
     private static final String STRATEGY_OPTIONS = Util.getString("NewVirtualDocumentWizardPage.strategyOptions"); //$NON-NLS-1$
 
-    private static final String STRATEGY_PREF_KEY = "NewVirtualDocumentWizardPanel.defaultStrategy"; //$NON-NLS-1$
-
     private final static String BROWSE_SHORTHAND = "..."; //$NON-NLS-1$
     private final static int FILE_NAME_TEXT_WIDTH = (int)(Display.getCurrent().getBounds().width * .25);
     private static final int FILE_NAME_TEXT_HEIGHT = 16;
@@ -326,7 +323,7 @@
     Button useSchemaTypeButton;
     private Button useStringTypeButton;
     Button buildMappingClassesButton;
-    Button iterationStragetyButton;
+    Button iterationStrategyButton;
     Button compositorStrategyButton;
     NewDocumentWizardModel model;
     private WizardPage page;
@@ -466,25 +463,30 @@
         strategyGroup.setText(STRATEGY_OPTIONS);
 
         MappingClassBuilderStrategy strategy = this.model.getMappingClassBuilderStrategy();
+        if(strategy==null) {
+        	strategy = MappingClassFactory.getDefaultStrategy();
+        }
+
+        boolean isCompositorStrategy = (strategy instanceof CompositorBasedBuilderStrategy);
 
-        iterationStragetyButton = new Button(strategyGroup, SWT.RADIO);
-        iterationStragetyButton.setText(MappingClassBuilderStrategy.iterationStrategyDescription);
+        iterationStrategyButton = new Button(strategyGroup, SWT.RADIO);
+        iterationStrategyButton.setText(MappingClassBuilderStrategy.iterationStrategyDescription);
 
         compositorStrategyButton = new Button(strategyGroup, SWT.RADIO);
         compositorStrategyButton.setText(MappingClassBuilderStrategy.compositorStrategyDescription);
 
-        if (strategy == null) {
-            iterationStragetyButton.setSelection(MappingClassFactory.getDefaultStrategy() instanceof IterationBasedBuilderStrategy);
+        if(isCompositorStrategy) {
+            compositorStrategyButton.setSelection(true);
+            iterationStrategyButton.setSelection(false);
         } else {
-            iterationStragetyButton.setSelection(strategy instanceof IterationBasedBuilderStrategy);
+        	compositorStrategyButton.setSelection(false);
+        	iterationStrategyButton.setSelection(true);
         }
 
-        compositorStrategyButton.setSelection(!iterationStragetyButton.getSelection());
-
-        iterationStragetyButton.addSelectionListener(new SelectionAdapter() {
+        iterationStrategyButton.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected( SelectionEvent e ) {
-                if (iterationStragetyButton.getSelection()) {
+                if (iterationStrategyButton.getSelection()) {
                     model.setMappingClassBuilderStrategy(MappingClassBuilderStrategy.iterationStrategy);
                     MappingClassFactory.setDefaultStrategy(MappingClassBuilderStrategy.iterationStrategy);
                     updateComponentEnabledStates();
@@ -498,8 +500,6 @@
                 if (compositorStrategyButton.getSelection()) {
                     model.setMappingClassBuilderStrategy(MappingClassBuilderStrategy.compositorStrategy);
                     MappingClassFactory.setDefaultStrategy(MappingClassBuilderStrategy.compositorStrategy);
-                    ModelerXmlUiPlugin.getDefault().getPreferenceStore().setValue(STRATEGY_PREF_KEY,
-                                                                                  MappingClassBuilderStrategy.compositorStrategyDescription);
                     updateComponentEnabledStates();
                 }
             }
@@ -591,10 +591,10 @@
 
         if ((this.compositorStrategyButton != null) && (theStrategy instanceof CompositorBasedBuilderStrategy)) {
             this.compositorStrategyButton.setSelection(true);
-            this.iterationStragetyButton.setSelection(false);
+            this.iterationStrategyButton.setSelection(false);
             updateComponentEnabledStates();
-        } else if ((this.iterationStragetyButton != null) && (theStrategy instanceof IterationBasedBuilderStrategy)) {
-            this.iterationStragetyButton.setSelection(true);
+        } else if ((this.iterationStrategyButton != null) && (theStrategy instanceof IterationBasedBuilderStrategy)) {
+            this.iterationStrategyButton.setSelection(true);
             this.compositorStrategyButton.setSelection(false);
             updateComponentEnabledStates();
         }
@@ -609,7 +609,7 @@
         useSchemaTypeButton.setEnabled(enable);
         useStringTypeButton.setEnabled(enable);
         compositorStrategyButton.setEnabled(enable);
-        iterationStragetyButton.setEnabled(enable);
+        iterationStrategyButton.setEnabled(enable);
     }
 
     void browseButtonClicked() {