### Eclipse Workspace Patch 1.0
#P org.eclipse.gmf.bridge.ui
Index: src/org/eclipse/gmf/internal/bridge/transform/TransformOptions.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.bridge.ui/src/org/eclipse/gmf/internal/bridge/transform/TransformOptions.java,v
retrieving revision 1.1
diff -u -r1.1 TransformOptions.java
--- src/org/eclipse/gmf/internal/bridge/transform/TransformOptions.java	18 Jan 2007 18:49:15 -0000	1.1
+++ src/org/eclipse/gmf/internal/bridge/transform/TransformOptions.java	2 Feb 2007 15:32:59 -0000
@@ -25,32 +25,39 @@
 	public static final String PREF_USE_MAP_MODE = "use_map_mode"; //$NON-NLS-1$
 	public static final String PREF_USE_RUNTIME_FIGURES = "use_runtime_figures"; //$NON-NLS-1$
 	
+	private static String[] PROP_NAMES = new String[] {
+		PREF_GENERATE_RCP, 
+		PREF_USE_MAP_MODE, 
+		PREF_USE_RUNTIME_FIGURES 
+		};
+	
 	private Preferences myPreferences;
 	
 	public TransformOptions() {
-		myPreferences = new Preferences();
 		reset();
 	}
-	
+
 	private Preferences getPreferences() {
+		if (myPreferences == null) {
+			myPreferences = new Preferences();
+		}
 		return myPreferences;
 	}
 	
 	public void reset() {
 		Preferences pluginPrefs = Plugin.getDefault().getPluginPreferences();
-		copyPreferences(pluginPrefs, myPreferences);
+		copyPreferences(pluginPrefs, getPreferences());
 	}
 	
 	public void flush() {
 		Preferences pluginPrefs = Plugin.getDefault().getPluginPreferences();
-		copyPreferences(myPreferences, pluginPrefs);
+		copyPreferences(getPreferences(), pluginPrefs);
 		Plugin.getDefault().savePluginPreferences();
 	}
 	
 	private void copyPreferences(Preferences source, Preferences target) {
-		String[] propNames = source.propertyNames();
-		for (int i = 0; i < propNames.length; i++) {
-			String name = propNames[i];
+		for (int i = 0; i < PROP_NAMES.length; i++) {
+			String name = PROP_NAMES[i];
 			String value = source.getString(name);
 			target.setValue(name, value);
 		}
Index: src/org/eclipse/gmf/internal/bridge/transform/TransformToGenModelWizard.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.bridge.ui/src/org/eclipse/gmf/internal/bridge/transform/TransformToGenModelWizard.java,v
retrieving revision 1.2
diff -u -r1.2 TransformToGenModelWizard.java
--- src/org/eclipse/gmf/internal/bridge/transform/TransformToGenModelWizard.java	25 Jan 2007 18:14:32 -0000	1.2
+++ src/org/eclipse/gmf/internal/bridge/transform/TransformToGenModelWizard.java	2 Feb 2007 15:32:59 -0000
@@ -59,7 +59,12 @@
 		newFileCreationPage = new GMFGenNewFileCreationPage(PAGE_ID_GMFGEN, mySelection);
 		newFileCreationPage.setTitle(Messages.TransformToGenModelWizard_title_gmfgen);
 		newFileCreationPage.setDescription(Messages.TransformToGenModelWizard_descr_gmfgen);
-		newFileCreationPage.setFileName(WizardUtil.getDefaultFileName(mySelection, defaultName, GMFGenNewFileCreationPage.EXT_GMFGEN));
+		IFile file = WizardUtil.findExistingFile(mySelection, GMFGenNewFileCreationPage.EXT_GMFGEN);
+		if (file != null) {
+			newFileCreationPage.setFileName(file.getName());
+		} else {
+			newFileCreationPage.setFileName(WizardUtil.getDefaultFileName(mySelection, defaultName, GMFGenNewFileCreationPage.EXT_GMFGEN));
+		}
 		addPage(newFileCreationPage);
 		
 		resourceSet = new ResourceSetImpl();
Index: src/org/eclipse/gmf/internal/bridge/transform/GMFGenNewFileCreationPage.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.bridge.ui/src/org/eclipse/gmf/internal/bridge/transform/GMFGenNewFileCreationPage.java,v
retrieving revision 1.2
diff -u -r1.2 GMFGenNewFileCreationPage.java
--- src/org/eclipse/gmf/internal/bridge/transform/GMFGenNewFileCreationPage.java	29 Jan 2007 19:13:08 -0000	1.2
+++ src/org/eclipse/gmf/internal/bridge/transform/GMFGenNewFileCreationPage.java	2 Feb 2007 15:32:59 -0000
@@ -44,6 +44,7 @@
 	public void createControl(Composite parent) {
 		resourceGroupEmulator = new ResourceGroupEmulator();
 		super.createControl(parent);
+		validateFileExists();
 	}
 
 	protected boolean validatePage() {
@@ -57,11 +58,7 @@
 				return false;
 			}
 			else {
-		        IPath resourcePath = getContainerFullPath().append(
-		        		getFileName());
-		        if (isFileExists(resourcePath)) {
-					setMessage(Messages.ResourceGroup_nameExists, IMessageProvider.WARNING);
-				}
+		        validateFileExists();
 				return true;
 			}
 		}
@@ -70,6 +67,14 @@
 		}
 	}
 
+	private void validateFileExists() {
+		IPath resourcePath = getContainerFullPath().append(
+				getFileName());
+		if (isFileExists(resourcePath)) {
+			setMessage(Messages.ResourceGroup_nameExists, IMessageProvider.WARNING);
+		}
+	}
+
 	public IFile getModelFile() {
 		return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
 	}