[337742] FACET_PROJECT_NAME not updated in DataModel when project name is changed for facet added after opening the new project

plugins/org.eclipse.wst.common.project.facet.ui/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.wst.common.project.facet.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.project.facet.ui/META-INF/MANIFEST.MF
index c233829..9be9d65 100644
--- a/plugins/org.eclipse.wst.common.project.facet.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.project.facet.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Vendor: %providerName
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.common.project.facet.ui; singleton:=true
-Bundle-Version: 1.3.10.qualifier
+Bundle-Version: 1.3.11.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.wst.common.project.facet.ui.internal.FacetUiPlugin
 Bundle-Localization: plugin

plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/FacetsSelectionDialog.java

diff --git a/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/FacetsSelectionDialog.java b/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/FacetsSelectionDialog.java
index c8a7aa9..a3ceef1 100644
--- a/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/FacetsSelectionDialog.java
+++ b/plugins/org.eclipse.wst.common.project.facet.ui/src/org/eclipse/wst/common/project/facet/ui/internal/FacetsSelectionDialog.java
@@ -15,6 +15,7 @@
 import static org.eclipse.wst.common.project.facet.ui.internal.util.GridLayoutUtil.gl;
 import static org.eclipse.wst.common.project.facet.ui.internal.util.GridLayoutUtil.glmargins;
 
+import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
@@ -32,8 +33,7 @@
     extends TitleAreaDialog
     
 {
-    private final IFacetedProjectWorkingCopy fpjwcOriginal;
-    private final IFacetedProjectWorkingCopy fpjwcLocal;
+    private final IFacetedProjectWorkingCopy fpjwc;
     private FacetsSelectionPanel panel;
 
     public FacetsSelectionDialog( final Shell parentShell,
@@ -43,8 +43,7 @@
         
         setShellStyle( getShellStyle() | SWT.RESIZE );
 
-        this.fpjwcOriginal = fpjwc;
-        this.fpjwcLocal = fpjwc.clone();
+        this.fpjwc = fpjwc;
         this.panel = null;
     }
     
@@ -62,7 +61,7 @@
         composite.setLayoutData( gdfill() );
         composite.setLayout( glmargins( gl( 1 ), 5, 5 ) );
         
-        this.panel = new FacetsSelectionPanel( composite, this.fpjwcLocal );
+        this.panel = new FacetsSelectionPanel( composite, this.fpjwc );
         this.panel.setLayoutData( gdfill() );
         this.panel.setFocus();
 
@@ -70,13 +69,13 @@
     }
     
     @Override
-    protected void okPressed()
+    protected void createButtonsForButtonBar( final Composite parent ) 
     {
-        this.fpjwcOriginal.mergeChanges( this.fpjwcLocal );
-        super.okPressed();
+        // Create only the OK button. There is no handling for cancel.
+        
+        createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true );
     }
 
-    
     public static final void openDialog( final Shell parentShell,
                                          final IFacetedProjectWorkingCopy fpjwc )
     {