Attachment 192983 Details for Bug 310876 – proposed bug fix patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] proposed bug fix patch

propossed_patch_310876_2.txt (text/plain), 16.45 KB, created by Leslie Davis

on 2011-04-11 18:33:30 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Leslie Davis

Created: 2011-04-11 18:33:30 EDT

Size: 16.45 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jpt.jpa.ui
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.ui/plugin.xml,v
>retrieving revision 1.4
>diff -u -r1.4 plugin.xml
>--- plugin.xml	9 Feb 2011 21:19:08 -0000	1.4
>+++ plugin.xml	11 Apr 2011 22:29:38 -0000
>@@ -938,7 +938,7 @@
> 		<page
> 			id="org.eclipse.jpt.jpa.ui.preferences"
> 			name="%javaPersistenceNode"
>-			class="org.eclipse.ui.internal.dialogs.EmptyPreferencePage"/>
>+			class="org.eclipse.jpt.jpa.ui.internal.preferences.JptPerferencesPage"/>
> 		
> 		<page
> 			id="org.eclipse.jpt.jpa.ui.jpaPreferences"
>Index: property_files/jpt_ui.properties
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.ui/property_files/jpt_ui.properties,v
>retrieving revision 1.2
>diff -u -r1.2 jpt_ui.properties
>--- property_files/jpt_ui.properties	1 Mar 2011 16:07:29 -0000	1.2
>+++ property_files/jpt_ui.properties	11 Apr 2011 22:29:38 -0000
>@@ -44,6 +44,8 @@
> DatabaseSchemaWizardPage_connectionInfo=(Note: JPA project must have a connection and it must be active to select a schema)
> DatabaseSchemaWizardPage_schemaInfo=(Note: Must have active connection to select schema)
> 
>+DontShowAgainDialog_doNotShowWarning = Don't show me this warning again
>+
> Error_openingEditor=Error Opening Editor
> 
> General_browse=Br&owse...
>@@ -118,6 +120,10 @@
> JpaMakePersistentWizardPage_mappingFileDoesNotExistError=The XML mapping file does not exist
> JpaMakePersistentWizardPage_mappingFileNotListedInPersistenceXmlError=The XML mapping file is not listed in the persistence.xml
> 
>+JptPreferencesPage_DoNotShowDialogs=Dialogs
>+JptPreferencesPage_DoNotShowText=Clear all 'do not show again' settings and show all hidden dialogs again.
>+JptPreferencesPage_ClearButtonText=&Clear
>+
> JpaPreferencesPage_Description=Expand the tree to edit preferences for a particular JPA feature.
> 
> JpaProblemSeveritiesPage_Description=Select the severity level for the following optional Java Persistence validation problems:
>Index: property_files/jpt_ui_entity_gen.properties
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.ui/property_files/jpt_ui_entity_gen.properties,v
>retrieving revision 1.1
>diff -u -r1.1 jpt_ui_entity_gen.properties
>--- property_files/jpt_ui_entity_gen.properties	6 Feb 2011 02:26:35 -0000	1.1
>+++ property_files/jpt_ui_entity_gen.properties	11 Apr 2011 22:29:38 -0000
>@@ -104,7 +104,6 @@
> GenerateEntitiesWizard_assocEditor_tableJoin=Table &join:
> GenerateEntitiesWizard_assocEditor_joinedWhen=The table rows are joined when:\n%s
> GenerateEntitiesWizard_assocEditor_genAssoc=Generate &this association
>-GenerateEntitiesWizard_doNotShowWarning = Don't show me this warning again
> 
> selectCascadeDlgTitle=Select Cascade
> selectTableDlgTitle=Table Selection
>Index: src/org/eclipse/jpt/jpa/ui/internal/JptUiMessages.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JptUiMessages.java,v
>retrieving revision 1.1
>diff -u -r1.1 JptUiMessages.java
>--- src/org/eclipse/jpt/jpa/ui/internal/JptUiMessages.java	6 Feb 2011 02:26:31 -0000	1.1
>+++ src/org/eclipse/jpt/jpa/ui/internal/JptUiMessages.java	11 Apr 2011 22:29:39 -0000
>@@ -49,6 +49,7 @@
> 	public static String DatabaseSchemaWizardPage_schema;
> 	public static String DatabaseSchemaWizardPage_connectionInfo;
> 	public static String DatabaseSchemaWizardPage_schemaInfo;
>+	public static String DontShowAgainDialog_doNotShowWarning;
> 	public static String Error_openingEditor;
> 	public static String General_browse;
> 	public static String General_revert;
>@@ -132,6 +133,9 @@
> 	public static String OverwriteConfirmerDialog_title;
> 	public static String PersistenceItemLabelProviderFactory_persistenceLabel;
> 	public static String EntitiesGenerator_jobName;
>+	public static String JptPreferencesPage_DoNotShowDialogs;
>+	public static String JptPreferencesPage_DoNotShowText;
>+	public static String JptPreferencesPage_ClearButtonText;
> 	public static String JpaPreferencesPage_Description;
> 	public static String JpaProblemSeveritiesPage_Description;
> 	public static String JpaProblemSeveritiesPage_Error;
>Index: src/org/eclipse/jpt/jpa/ui/internal/dialogs/DontShowAgainDialog.java
>===================================================================
>RCS file: src/org/eclipse/jpt/jpa/ui/internal/dialogs/DontShowAgainDialog.java
>diff -N src/org/eclipse/jpt/jpa/ui/internal/dialogs/DontShowAgainDialog.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/jpt/jpa/ui/internal/dialogs/DontShowAgainDialog.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,67 @@
>+package org.eclipse.jpt.jpa.ui.internal.dialogs;
>+
>+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
>+import org.eclipse.core.runtime.preferences.InstanceScope;
>+import org.eclipse.jface.dialogs.Dialog;
>+import org.eclipse.jpt.common.ui.JptCommonUiPlugin;
>+import org.eclipse.jpt.common.utility.internal.iterables.ArrayListIterable;
>+import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
>+import org.eclipse.swt.SWT;
>+import org.eclipse.swt.events.SelectionEvent;
>+import org.eclipse.swt.events.SelectionListener;
>+import org.eclipse.swt.layout.GridData;
>+import org.eclipse.swt.widgets.Button;
>+import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.swt.widgets.Control;
>+import org.eclipse.swt.widgets.Shell;
>+
>+
>+/**
>+ * A <code>DontShowAgainDialog</code> is a dialog that has a check box allowing the
>+ * option to no longer show the dialog in the future.  All such dialogs should 
>+ * descend from this dialog and add a preference key for its option as a static
>+ * variable to this class.  This class provides a central location to store these
>+ * preference keys so that workspace preferences may reset all such preferences.
>+ */
>+public abstract class DontShowAgainDialog extends Dialog {
>+
>+	public static final String DONT_SHOW_OVERWRITE_WARNING_DIALOG = "DONT_SHOW_OVERWRITE_WARNING_DIALOG"; //$NON-NLS-1$
>+
>+	public static Iterable<String> allPreferenceKeys() {
>+		return new ArrayListIterable<String>(new String[] {DONT_SHOW_OVERWRITE_WARNING_DIALOG});
>+	}
>+	
>+	public static IEclipsePreferences getDontShowPreferences() {
>+		return InstanceScope.INSTANCE.getNode(JptCommonUiPlugin.PLUGIN_ID); 
>+	}
>+	
>+	/**
>+	 * Creates a dialog with the given parent.
>+	 * 
>+	 * @param parentShell
>+	 *            object that returns the current parent shell 
>+	 */
>+	public DontShowAgainDialog(Shell parentShell) {
>+		super(parentShell);
>+	}
>+	
>+    protected Control createDontShowControl(Composite composite) {
>+    	
>+    	final Button checkbox = new Button(composite, SWT.CHECK);
>+    	checkbox.setText(JptUiMessages.DontShowAgainDialog_doNotShowWarning);
>+    	checkbox.setSelection(false);
>+    	final IEclipsePreferences pref = getDontShowPreferences(); 
>+    	checkbox.setLayoutData(new GridData(GridData.FILL_BOTH));
>+    	checkbox.addSelectionListener(new SelectionListener (){
>+    		public void widgetDefaultSelected(SelectionEvent e) {}
>+			public void widgetSelected(SelectionEvent e) {
>+				boolean b = checkbox.getSelection();
>+                pref.putBoolean(getPreferenceKey(), b);
>+			}
>+    	});
>+    	return checkbox;
>+    }
>+
>+    protected abstract String getPreferenceKey();
>+    
>+}
>Index: src/org/eclipse/jpt/jpa/ui/internal/preferences/JpaPreferencesPage.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/preferences/JpaPreferencesPage.java,v
>retrieving revision 1.1
>diff -u -r1.1 JpaPreferencesPage.java
>--- src/org/eclipse/jpt/jpa/ui/internal/preferences/JpaPreferencesPage.java	6 Feb 2011 02:26:34 -0000	1.1
>+++ src/org/eclipse/jpt/jpa/ui/internal/preferences/JpaPreferencesPage.java	11 Apr 2011 22:29:40 -0000
>@@ -22,7 +22,7 @@
> import org.eclipse.ui.IWorkbenchPreferencePage;
> 
> /**
>- * This is the root of the Java Persistence preferences hierarchy in the IDE
>+ * This is the root of the JPA preferences hierarchy in the IDE
>  * preferences dialog.
>  * <p>
>  * Structure:
>Index: src/org/eclipse/jpt/jpa/ui/internal/preferences/JptPerferencesPage.java
>===================================================================
>RCS file: src/org/eclipse/jpt/jpa/ui/internal/preferences/JptPerferencesPage.java
>diff -N src/org/eclipse/jpt/jpa/ui/internal/preferences/JptPerferencesPage.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/jpt/jpa/ui/internal/preferences/JptPerferencesPage.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,86 @@
>+package org.eclipse.jpt.jpa.ui.internal.preferences;
>+
>+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
>+import org.eclipse.jface.dialogs.IDialogConstants;
>+import org.eclipse.jface.preference.PreferencePage;
>+import org.eclipse.jpt.jpa.ui.JptJpaUiPlugin;
>+import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
>+import org.eclipse.jpt.jpa.ui.internal.dialogs.DontShowAgainDialog;
>+import org.eclipse.swt.SWT;
>+import org.eclipse.swt.events.SelectionEvent;
>+import org.eclipse.swt.events.SelectionListener;
>+import org.eclipse.swt.layout.GridData;
>+import org.eclipse.swt.layout.GridLayout;
>+import org.eclipse.swt.widgets.Button;
>+import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.swt.widgets.Control;
>+import org.eclipse.swt.widgets.Group;
>+import org.eclipse.swt.widgets.Label;
>+import org.eclipse.ui.IWorkbench;
>+import org.eclipse.ui.IWorkbenchPreferencePage;
>+
>+/**
>+ * This is the root of the Java Persistence preferences hierarchy in the IDE
>+ * preferences dialog.
>+ * <p>
>+ * Structure:
>+ * <p>
>+ * Java Persistence<br>
>+ *
>+ * @version 2.2
>+ * @since 2.2
>+ */
>+public class JptPerferencesPage extends PreferencePage implements IWorkbenchPreferencePage {
>+
>+	@Override
>+	protected Control createContents(Composite parent) {
>+        
>+		Composite container= new Composite(parent, SWT.NONE);
>+		GridLayout layout= new GridLayout();
>+		layout.marginHeight= convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
>+		layout.marginWidth= 0;
>+		layout.verticalSpacing= convertVerticalDLUsToPixels(10);
>+		layout.horizontalSpacing= convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
>+		container.setLayout(layout);
>+
>+		layout = new GridLayout();
>+		layout.numColumns= 2;
>+
>+		Group dontAskGroup = new Group(container, SWT.NONE);
>+		dontAskGroup.setLayout(layout);
>+		dontAskGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
>+		dontAskGroup.setText(JptUiMessages.JptPreferencesPage_DoNotShowDialogs);
>+
>+		Label label = new Label(dontAskGroup, SWT.WRAP);
>+		label.setText(JptUiMessages.JptPreferencesPage_DoNotShowText);
>+		GridData data= new GridData(GridData.FILL, GridData.CENTER, true, false);
>+		data.widthHint= convertVerticalDLUsToPixels(50);
>+		label.setLayoutData(data);
>+		
>+		Button button = new Button(dontAskGroup, SWT.PUSH);
>+		button.setText(JptUiMessages.JptPreferencesPage_ClearButtonText);
>+		button.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, false, false));
>+		button.addSelectionListener(new SelectionListener() {
>+			public void widgetSelected(SelectionEvent e) {
>+				unhideAllDialogs();
>+			}
>+			public void widgetDefaultSelected(SelectionEvent e) {
>+				unhideAllDialogs();
>+			}
>+		});
>+		
>+		return container;
>+	}
>+
>+	public void init(IWorkbench workbench) {
>+		setPreferenceStore(JptJpaUiPlugin.instance().getPreferenceStore());
>+	}
>+	
>+	private final void unhideAllDialogs() {
>+		Iterable<String> preferenceKeys = DontShowAgainDialog.allPreferenceKeys();
>+		for (String preferenceKey : preferenceKeys) {
>+	    	final IEclipsePreferences pref = DontShowAgainDialog.getDontShowPreferences(); 
>+            pref.putBoolean(preferenceKey, false);
>+		}
>+	}
>+}
>Index: src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/GenerateEntitiesFromSchemaWizard.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/GenerateEntitiesFromSchemaWizard.java,v
>retrieving revision 1.2
>diff -u -r1.2 GenerateEntitiesFromSchemaWizard.java
>--- src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/GenerateEntitiesFromSchemaWizard.java	22 Feb 2011 17:58:29 -0000	1.2
>+++ src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/GenerateEntitiesFromSchemaWizard.java	11 Apr 2011 22:29:42 -0000
>@@ -12,6 +12,7 @@
> 
> import java.io.File;
> import java.io.IOException;
>+
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.resources.IResourceRuleFactory;
>@@ -23,10 +24,8 @@
> import org.eclipse.core.runtime.Platform;
> import org.eclipse.core.runtime.Status;
> import org.eclipse.core.runtime.preferences.IEclipsePreferences;
>-import org.eclipse.core.runtime.preferences.InstanceScope;
> import org.eclipse.jdt.core.IPackageFragment;
> import org.eclipse.jdt.core.IPackageFragmentRoot;
>-import org.eclipse.jface.dialogs.Dialog;
> import org.eclipse.jface.dialogs.IDialogConstants;
> import org.eclipse.jface.resource.JFaceResources;
> import org.eclipse.jface.resource.LocalResourceManager;
>@@ -53,13 +52,11 @@
> import org.eclipse.jpt.jpa.ui.JptJpaUiPlugin;
> import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
> import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
>+import org.eclipse.jpt.jpa.ui.internal.dialogs.DontShowAgainDialog;
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.swt.SWT;
>-import org.eclipse.swt.events.SelectionEvent;
>-import org.eclipse.swt.events.SelectionListener;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.layout.GridLayout;
>-import org.eclipse.swt.widgets.Button;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Control;
> import org.eclipse.swt.widgets.Display;
>@@ -73,8 +70,6 @@
> 	
> 	public static final String HELP_CONTEXT_ID = JptJpaUiPlugin.PLUGIN_ID + ".GenerateEntitiesFromSchemaWizard"; //$NON-NLS-1$
> 
>-	private static final String DONT_SHOW_OVERWRITE_WARNING_DIALOG = "DONT_SHOW_OVERWRITE_WARNING_DIALOG"; //$NON-NLS-1$
>-
> 	private JpaProject jpaProject;
> 
> 	private IStructuredSelection selection;
>@@ -251,8 +246,8 @@
> 	}
> 
>     public static boolean showOverwriteWarning(){
>-    	IEclipsePreferences pref = new InstanceScope().getNode(JptJpaUiPlugin.PLUGIN_ID); 
>-    	boolean ret = ! pref.getBoolean( DONT_SHOW_OVERWRITE_WARNING_DIALOG, false) ;
>+    	IEclipsePreferences pref = DontShowAgainDialog.getDontShowPreferences(); 
>+    	boolean ret = ! pref.getBoolean(DontShowAgainDialog.DONT_SHOW_OVERWRITE_WARNING_DIALOG, false) ;
>     	return ret;
>     }
>     
>@@ -312,7 +307,7 @@
> 
> 	// ********** overwrite dialog **********
> 
>-	static class OverwriteConfirmerDialog extends Dialog {
>+	static class OverwriteConfirmerDialog extends DontShowAgainDialog {
> 		private final String className;
> 		private boolean yes = false;
> 		private boolean yesToAll = false;
>@@ -323,6 +318,11 @@
> 			super(parent);
> 			this.className = className;
> 		}
>+		
>+		@Override
>+		protected String getPreferenceKey() {
>+			return DONT_SHOW_OVERWRITE_WARNING_DIALOG;
>+		}
> 
> 		@Override
> 		protected void configureShell(Shell shell) {
>@@ -344,23 +344,7 @@
> 			
> 			return composite;
> 		}
>-	    
>-	    protected Control createDontShowControl(Composite composite) {
>-	    	final Button checkbox = new Button( composite, SWT.CHECK );
>-	    	checkbox.setText( JptUiEntityGenMessages.GenerateEntitiesWizard_doNotShowWarning );
>-	    	checkbox.setSelection(false);
>-	    	final IEclipsePreferences pref = new InstanceScope().getNode( JptJpaUiPlugin.PLUGIN_ID); 
>-	    	checkbox.setLayoutData( new GridData(GridData.FILL_BOTH) );
>-	    	checkbox.addSelectionListener(new SelectionListener (){
>-	    		public void widgetDefaultSelected(SelectionEvent e) {}
>-				public void widgetSelected(SelectionEvent e) {
>-					boolean b = checkbox.getSelection();
>-	                pref.putBoolean( DONT_SHOW_OVERWRITE_WARNING_DIALOG, b);
>-				}
>-	    	});
>-	    	return checkbox;
>-	    }
>-	    
>+	    	    
> 		@Override
> 		protected void createButtonsForButtonBar(Composite parent) {
> 			this.createButton(parent, IDialogConstants.YES_ID, IDialogConstants.YES_LABEL, false);

Actions: View | Diff

Attachments on bug 310876: 192891 | 192983 | 196499 | 199360