Attachment 139461 Details for Bug 272752 – tweaked patch

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

[patch] tweaked patch

272752-2.txt (text/plain), 8.29 KB, created by Brian Vosburgh

on 2009-06-17 14:24:28 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Vosburgh

Created: 2009-06-17 14:24:28 EDT

Size: 8.29 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jpt.ui
>Index: src/org/eclipse/jpt/ui/internal/views/AbstractJpaView.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/AbstractJpaView.java,v
>retrieving revision 1.9
>diff -u -r1.9 AbstractJpaView.java
>--- src/org/eclipse/jpt/ui/internal/views/AbstractJpaView.java	12 May 2009 14:46:51 -0000	1.9
>+++ src/org/eclipse/jpt/ui/internal/views/AbstractJpaView.java	17 Jun 2009 16:48:24 -0000
>@@ -8,6 +8,7 @@
>  ********************************************************************************/
> package org.eclipse.jpt.ui.internal.views;
> 
>+import org.eclipse.jpt.ui.JptUiPlugin;
> import org.eclipse.jpt.ui.WidgetFactory;
> import org.eclipse.jpt.ui.internal.selection.JpaSelection;
> import org.eclipse.jpt.ui.internal.selection.JpaSelectionManager;
>@@ -81,6 +82,7 @@
> 	@Override
> 	public final void createPartControl(Composite parent) {
> 		this.scrolledForm = getFormWidgetFactory().createScrolledForm(parent);
>+		JptUiPlugin.instance().controlAffectsJavaSource(this.scrolledForm);
> 		this.scrolledForm.getBody().setLayout(new GridLayout());
> 
> 		this.pageBook = new PageBook(this.scrolledForm.getBody(), SWT.NONE);
>@@ -157,7 +159,8 @@
> 		this.scrolledForm.reflow(true);
> 	}
> 
>-	protected void subcreatePartControl(Composite parent) {
>+	protected void subcreatePartControl(@SuppressWarnings("unused") Composite parent) {
> 		// no op - for subclasses to override if wished
> 	}
>-}
>\ No newline at end of file
>+
>+}
>Index: src/org/eclipse/jpt/ui/JptUiPlugin.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/JptUiPlugin.java,v
>retrieving revision 1.8
>diff -u -r1.8 JptUiPlugin.java
>--- src/org/eclipse/jpt/ui/JptUiPlugin.java	13 Feb 2009 21:16:08 -0000	1.8
>+++ src/org/eclipse/jpt/ui/JptUiPlugin.java	17 Jun 2009 16:48:24 -0000
>@@ -13,10 +13,17 @@
> import org.eclipse.core.runtime.Status;
> import org.eclipse.jface.resource.ImageDescriptor;
> import org.eclipse.jpt.core.JpaPlatform;
>+import org.eclipse.jpt.core.internal.JpaModelManager;
> import org.eclipse.jpt.ui.internal.platform.JpaPlatformUiRegistry;
> import org.eclipse.jpt.ui.navigator.JpaNavigatorProvider;
>+import org.eclipse.swt.SWT;
> import org.eclipse.swt.graphics.Image;
>+import org.eclipse.swt.widgets.Control;
>+import org.eclipse.swt.widgets.Display;
>+import org.eclipse.swt.widgets.Event;
>+import org.eclipse.swt.widgets.Listener;
> import org.eclipse.ui.plugin.AbstractUIPlugin;
>+import org.osgi.framework.BundleContext;
> 
> /**
>  *
>@@ -30,13 +37,18 @@
> @SuppressWarnings("nls")
> public class JptUiPlugin extends AbstractUIPlugin
> {
>+	private final Listener focusListener;
>+
> 	private static JptUiPlugin INSTANCE;
> 
> 	/**
> 	 * The plug-in identifier of JPA UI support
> 	 * (value <code>"org.eclipse.jpt.ui"</code>).
> 	 */
>-	public final static String PLUGIN_ID = "org.eclipse.jpt.ui";  //$NON-NLS-1$
>+	public static final String PLUGIN_ID = "org.eclipse.jpt.ui";  //$NON-NLS-1$
>+
>+	private static final String FOCUS_DATA_KEY = PLUGIN_ID + ".focus";
>+	private static final Object FOCUS_DATA = new Object();
> 
> 	/**
> 	 * Returns the singleton JPT UI plug-in.
>@@ -86,9 +98,68 @@
> 
> 	public JptUiPlugin() {
> 		super();
>+		this.focusListener = this.buildFocusListener();
> 		INSTANCE = this;
> 	}
> 
>+	private Listener buildFocusListener() {
>+		return new Listener() {
>+			public void handleEvent(Event event) {
>+				JptUiPlugin.this.focusIn((Control) event.widget);
>+			}
>+		};
>+	}
>+
>+	/**
>+	 * This method is called whenever a "focus in" event is generated.
>+	 * If the control gaining focus is part of one of our composites (typically
>+	 * a JPA Details View), we stop listening to Java change events
>+	 * (and assume all changes to the Java model are generated by us).
>+	 * If the control gaining focus is *not* part of one of our composites,
>+	 * we start listening to the Java change events again.
>+	 */
>+	void focusIn(Control control) {
>+		while (control != null) {
>+			if (control.getData(FOCUS_DATA_KEY) == FOCUS_DATA) {
>+				this.focusIn();
>+				return;
>+			}
>+			control = control.getParent();
>+		}
>+		this.focusOut();
>+	}
>+
>+	/**
>+	 * This method is called whenever a Dali UI control that affects Java
>+	 * source code gains the UI focus. When this happens we deactivate
>+	 * the Dali Java change listener so we ignore any changes to the Java
>+	 * source code that probably originated from Dali. This means we will miss
>+	 * any changes to the Java source code that is caused by non-UI activity;
>+	 * but, we hope, these changes are unrelated to JPA annotations etc.
>+	 * @see #focusOut()
>+	 */
>+	private void focusIn() {
>+		JpaModelManager.instance().setJavaElementChangeListenerIsActive(false);
>+	}
>+
>+	/**
>+	 * This method is called whenever a non-Dali UI control gains the UI focus.
>+	 * When this happens we activate the Dali Java change listener so that we
>+	 * begin to keep the Dali model synchronized with the Java source code.
>+	 * @see #focusIn()
>+	 */
>+	private void focusOut() {
>+		JpaModelManager.instance().setJavaElementChangeListenerIsActive(true);
>+	}
>+
>+	/**
>+	 * Tag the specified control so that whenever it (or any of its children,
>+	 * grandchildren, etc.) has the focus, the Dali model ignores any Java
>+	 * change events.
>+	 */
>+	public void controlAffectsJavaSource(Control control) {
>+		control.setData(FOCUS_DATA_KEY, FOCUS_DATA);
>+	}
> 
> 	/**
> 	 * Return the JPA platform UI corresponding to the given JPA platform
>@@ -102,4 +173,29 @@
> 		return platform == null ? null : platform.getNavigatorProvider();
> 	}
> 
>+
>+	// ********** plug-in implementation **********
>+
>+	/**
>+	 * Register our SWT listener with the display so we receive notification
>+	 * of every "focus in" event.
>+	 */
>+	@Override
>+	public void start(BundleContext context) throws Exception {
>+		super.start(context);
>+		Display.getDefault().addFilter(SWT.FocusIn, this.focusListener);
>+	}
>+
>+	/**
>+	 * Unregister our SWT listener with the display.
>+	 */
>+	@Override
>+	public void stop(BundleContext context) throws Exception {
>+		try {
>+			Display.getDefault().removeFilter(SWT.FocusIn, this.focusListener);
>+		} finally {
>+			super.stop(context);
>+		}
>+	}
>+
> }
>#P org.eclipse.jpt.core
>Index: src/org/eclipse/jpt/core/internal/JpaModelManager.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaModelManager.java,v
>retrieving revision 1.24
>diff -u -r1.24 JpaModelManager.java
>--- src/org/eclipse/jpt/core/internal/JpaModelManager.java	18 May 2009 21:07:30 -0000	1.24
>+++ src/org/eclipse/jpt/core/internal/JpaModelManager.java	17 Jun 2009 16:48:25 -0000
>@@ -89,6 +89,7 @@
> 	 * which will forward them to the JPA projects.
> 	 */
> 	private final IElementChangedListener javaElementChangeListener;
>+	private boolean javaElementChangeListenerIsActive;
> 	
> 	
> 	// ********** singleton **********
>@@ -113,6 +114,7 @@
> 		this.resourceChangeListener = new ResourceChangeListener();
> 		this.facetedProjectListener = new FacetedProjectListener();
> 		this.javaElementChangeListener = new JavaElementChangeListener();
>+		this.javaElementChangeListenerIsActive = true;
> 	}
> 
> 
>@@ -186,6 +188,20 @@
> 	}
> 
> 	/**
>+	 * Return whether the model manager's Java change listener is active.
>+	 */
>+	public boolean javaElementChangeListenerIsActive() {
>+		return this.javaElementChangeListenerIsActive;
>+	}
>+
>+	/**
>+	 * Set whether the model manager's Java change listener is active.
>+	 */
>+	public void setJavaElementChangeListenerIsActive(boolean javaElementChangeListenerIsActive) {
>+		this.javaElementChangeListenerIsActive = javaElementChangeListenerIsActive;
>+	}
>+
>+	/**
> 	 * Log the specified status.
> 	 */
> 	public void log(IStatus status) {
>@@ -454,6 +470,9 @@
> 	 * Forward the event to the JPA model.
> 	 */
> 	/* private */ void javaElementChanged(ElementChangedEvent event) {
>+		if ( ! this.javaElementChangeListenerIsActive) {
>+			return;  // ignore Java events
>+		}
> 		if (this.eventIndicatesProjectAddedButNotOpen(event)) {
> 			return;
> 		}

Actions: View | Diff

Attachments on bug 272752: 138978 | 139461