Attachment 103874 Details for Bug 234670 – proposed patch - HEAD

[patch] proposed patch - HEAD

234670.txt (text/plain), 9.40 KB, created by Karen Butzke

on 2008-06-05 21:34:05 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Karen Butzke

Created: 2008-06-05 21:34:05 EDT

Size: 9.40 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jpt.ui
>Index: src/org/eclipse/jpt/ui/internal/wizards/JpaFacetWizardPage.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/JpaFacetWizardPage.java,v
>retrieving revision 1.25
>diff -u -r1.25 JpaFacetWizardPage.java
>--- src/org/eclipse/jpt/ui/internal/wizards/JpaFacetWizardPage.java	14 May 2008 15:50:34 -0000	1.25
>+++ src/org/eclipse/jpt/ui/internal/wizards/JpaFacetWizardPage.java	6 Jun 2008 01:22:51 -0000
>@@ -22,6 +22,7 @@
> import org.eclipse.jpt.ui.internal.JptUiIcons;
> import org.eclipse.jpt.ui.internal.JptUiMessages;
> import org.eclipse.jpt.ui.internal.prefs.JpaPreferencePage;
>+import org.eclipse.jpt.ui.internal.properties.JpaDataModelSynchHelper;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.SelectionAdapter;
> import org.eclipse.swt.events.SelectionEvent;
>@@ -31,13 +32,14 @@
> import org.eclipse.swt.widgets.Combo;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Control;
>-import org.eclipse.swt.widgets.Display;
> import org.eclipse.swt.widgets.Group;
> import org.eclipse.swt.widgets.Label;
> import org.eclipse.swt.widgets.Link;
>+import org.eclipse.swt.widgets.List;
> import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.dialogs.PreferencesUtil;
> import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
>+import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
> import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
> import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent;
> import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener;
>@@ -54,6 +56,10 @@
> 		setImageDescriptor(JptUiPlugin.getImageDescriptor(JptUiIcons.JPA_WIZ_BANNER));
> 	}
> 
>+	@Override
>+	public DataModelSynchHelper initializeSynchHelper(IDataModel dm) {
>+		return new JpaDataModelSynchHelper(dm);
>+	}
> 
> 	@Override
> 	protected Composite createTopLevelComposite(Composite parent) {
>@@ -111,6 +117,20 @@
> 		combo.setLayoutData(gd);
> 		return combo;
> 	}
>+	
>+	private List createList(Composite container, int span, boolean fillHorizontal) {
>+		List list = new List(container, SWT.BORDER | SWT.SINGLE | SWT.READ_ONLY);
>+		GridData gd;
>+		if (fillHorizontal) {
>+			gd = new GridData(GridData.FILL_HORIZONTAL);
>+		}
>+		else {
>+			gd = new GridData();
>+		}
>+		gd.horizontalSpan = span;
>+		list.setLayoutData(gd);
>+		return list;
>+	}
> 
> 	@Override
> 	protected String[] getValidationPropertyNames() {
>@@ -146,7 +166,7 @@
> 
> 	private final class PlatformGroup
> 	{
>-		private final Combo platformCombo;
>+		private final List platformList;
> 		
> 		
> 		public PlatformGroup(Composite composite) {
>@@ -156,8 +176,8 @@
> 			group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
> 			PlatformUI.getWorkbench().getHelpSystem().setHelp(group, JpaHelpContextIds.DIALOG_JPA_PLATFORM);
> 
>-			platformCombo = createCombo(group, 1, true);
>-			synchHelper.synchCombo(platformCombo, PLATFORM_ID, null);
>+			platformList = createList(group, 1, true);
>+			synchHelper.synchList(platformList, PLATFORM_ID, null);
> 		}
> 	}
> 
>Index: src/org/eclipse/jpt/ui/internal/properties/DataModelPropertyPage.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/DataModelPropertyPage.java,v
>retrieving revision 1.2
>diff -u -r1.2 DataModelPropertyPage.java
>--- src/org/eclipse/jpt/ui/internal/properties/DataModelPropertyPage.java	26 Apr 2007 14:52:21 -0000	1.2
>+++ src/org/eclipse/jpt/ui/internal/properties/DataModelPropertyPage.java	6 Jun 2008 01:22:51 -0000
>@@ -54,7 +54,7 @@
> 	 * @return
> 	 */
> 	public DataModelSynchHelper initializeSynchHelper(IDataModel dm) {
>-		return new DataModelSynchHelper(dm);
>+		return new JpaDataModelSynchHelper(dm);
> 	}
> 
> 	
>Index: src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java,v
>retrieving revision 1.17
>diff -u -r1.17 JpaProjectPropertiesPage.java
>--- src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java	14 May 2008 15:50:34 -0000	1.17
>+++ src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java	6 Jun 2008 01:22:51 -0000
>@@ -40,6 +40,7 @@
> import org.eclipse.swt.widgets.Group;
> import org.eclipse.swt.widgets.Label;
> import org.eclipse.swt.widgets.Link;
>+import org.eclipse.swt.widgets.List;
> import org.eclipse.ui.PlatformUI;
> import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
> import org.eclipse.wst.common.project.facet.core.IFacetedProject;
>@@ -124,6 +125,20 @@
> 		combo.setLayoutData(gd);
> 		return combo;
> 	}
>+	
>+	List createList(Composite container, int span, boolean fillHorizontal) {
>+		List list = new List(container, SWT.BORDER | SWT.SINGLE | SWT.READ_ONLY);
>+		GridData gd;
>+		if (fillHorizontal) {
>+			gd = new GridData(GridData.FILL_HORIZONTAL);
>+		}
>+		else {
>+			gd = new GridData();
>+		}
>+		gd.horizontalSpan = span;
>+		list.setLayoutData(gd);
>+		return list;
>+	}
> 
> 	Button createButton(Composite container, int span, String text, int style) {
> 		Button button = new Button(container, SWT.NONE | style);
>@@ -215,7 +230,7 @@
> 
> 	private final class PlatformGroup
> 	{
>-		final Combo platformCombo;
>+		final List platformList;
> 		
> 		
> 		public PlatformGroup(Composite composite) {
>@@ -226,8 +241,8 @@
> 			// TODO
> 			// PlatformUI.getWorkbench().getHelpSystem().setHelp(group, IDaliHelpContextIds.NEW_JPA_PROJECT_CONTENT_PAGE_DATABASE);
> 			
>-			platformCombo = createCombo(group, 1, true);
>-			synchHelper.synchCombo(platformCombo, PLATFORM_ID, null);
>+			platformList = createList(group, 1, true);
>+			synchHelper.synchList(platformList, PLATFORM_ID, null);
> 			
> 			performDefaults();
> 		}
>Index: src/org/eclipse/jpt/ui/internal/properties/JpaDataModelSynchHelper.java
>===================================================================
>RCS file: src/org/eclipse/jpt/ui/internal/properties/JpaDataModelSynchHelper.java
>diff -N src/org/eclipse/jpt/ui/internal/properties/JpaDataModelSynchHelper.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/jpt/ui/internal/properties/JpaDataModelSynchHelper.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,78 @@
>+package org.eclipse.jpt.ui.internal.properties;
>+
>+import org.eclipse.swt.events.SelectionEvent;
>+import org.eclipse.swt.events.SelectionListener;
>+import org.eclipse.swt.widgets.Control;
>+import org.eclipse.swt.widgets.List;
>+import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
>+import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
>+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
>+import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
>+
>+public class JpaDataModelSynchHelper extends DataModelSynchHelper
>+{
>+	private ListListener listListener;
>+
>+	public JpaDataModelSynchHelper(IDataModel model) {
>+		super(model);
>+	}	
>+	
>+	@Override
>+	public void synchList(List list, String propertyName, Control[] dependentControls) {
>+		super.synchList(list, propertyName, dependentControls);
>+		if (this.listListener == null) {
>+			this.listListener = new ListListener();
>+		}
>+		list.addSelectionListener(this.listListener);	
>+	}	
>+	
>+	@Override
>+	protected void setWidgetValue(String propertyName, int flag, List list) {	
>+		if (flag == DataModelEvent.VALID_VALUES_CHG || list.getItemCount() == 0) {
>+			// Display properties should only fire if the contents change.
>+			DataModelPropertyDescriptor[] descriptors = dataModel.getValidPropertyDescriptors(propertyName);
>+			String[] items = new String[descriptors.length];
>+			for (int i = 0; i < descriptors.length; i++) {
>+				items[i] = descriptors[i].getPropertyDescription();
>+			}
>+			list.setItems(items);
>+		}
>+		String newText = dataModel.getPropertyDescriptor(propertyName).getPropertyDescription();
>+		int selIndex = list.getSelectionIndex();
>+		if (selIndex < 0 || !newText.equals(list.getItem(selIndex))) {
>+			String[] items = list.getItems();
>+			for (int i = 0; i < items.length; i++) {
>+				if (items[i].equals(newText)) {
>+					list.select(i);
>+					return;
>+				}
>+			}
>+		}
>+		list.setSelection(list.indexOf(newText));
>+	}
>+	
>+	private class ListListener implements SelectionListener {
>+
>+		public void widgetSelected(SelectionEvent e) {
>+			List list = (List) e.getSource();
>+			if (currentWidget == list)
>+				return;
>+			String propertyName = (String) widgetToPropertyHash.get(list);
>+			if (list.getSelectionIndex() >= 0) {
>+				DataModelPropertyDescriptor[] descriptors = dataModel.getValidPropertyDescriptors(propertyName);
>+				String description = list.getItem(list.getSelectionIndex());
>+				for (int i = 0; i < descriptors.length; i++) {
>+					if (description.equals(descriptors[i].getPropertyDescription())) {
>+						setProperty(propertyName, descriptors[i].getPropertyValue());
>+						return;
>+					}
>+				}
>+				setProperty(propertyName, list.getItem(list.getSelectionIndex()));
>+			}
>+		}
>+
>+		public void widgetDefaultSelected(SelectionEvent e) {
>+		}
>+	}
>+
>+}

Actions: View | Diff

Attachments on bug 234670: 103874 | 104022 | 104024