Attachment 159945 Details for Bug 303635 – Same as 303070 but with an @Override above the method

[patch] Same as 303070 but with an @Override above the method

bug303635.patch (text/plain), 2.79 KB, created by Carl Anderson

on 2010-02-23 11:08:36 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Anderson

Created: 2010-02-23 11:08:36 EST

Size: 2.79 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.j2ee.core
>Index: mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/XMLResourceImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/XMLResourceImpl.java,v
>retrieving revision 1.11
>diff -u -r1.11 XMLResourceImpl.java
>--- mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/XMLResourceImpl.java	26 Aug 2009 02:19:13 -0000	1.11
>+++ mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/XMLResourceImpl.java	23 Feb 2010 16:06:21 -0000
>@@ -10,8 +10,14 @@
>  *******************************************************************************/
> package org.eclipse.jst.j2ee.common.internal.impl;
> 
>+import java.io.IOException;
> import java.math.BigDecimal;
>+import java.util.Map;
> 
>+import org.eclipse.core.internal.resources.Workspace;
>+import org.eclipse.core.resources.IFile;
>+import org.eclipse.core.resources.IResource;
>+import org.eclipse.core.runtime.CoreException;
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
> import org.eclipse.emf.common.notify.Notifier;
>@@ -26,6 +32,7 @@
> import org.eclipse.wst.common.internal.emf.resource.Renderer;
> import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
> import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceImpl;
>+import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
> import org.xml.sax.EntityResolver;
> 
> 
>@@ -37,6 +44,7 @@
> 	  * alt dd */
> 	protected Application application;
> 	protected boolean isNew = true;
>+	private Boolean needsSync = new Boolean(true);
> 	
> 	
> 	private static class RootVersionAdapter extends AdapterImpl {
>@@ -295,4 +303,31 @@
> 		return new BigDecimal(String.valueOf(ver)).movePointLeft(1).toString();
> 	}
> 
>+	@Override
>+	public void loadExisting(Map options) throws IOException {
>+		boolean localNeedsSync = false;
>+		synchronized (needsSync) {
>+			localNeedsSync = needsSync;
>+		}
>+		if (localNeedsSync) { // Only check sync once for life of this model
>+			IFile file = WorkbenchResourceHelper.getFile(this);
>+			if (!file.isSynchronized(IResource.DEPTH_ZERO))
>+			{
>+				try {
>+					Workspace workspace = (Workspace)file.getWorkspace();
>+					if (workspace.getElementTree().isImmutable())
>+					{
>+						workspace.newWorkingTree();
>+					}
>+					((org.eclipse.core.internal.resources.Resource)file).getLocalManager().refresh(file, IResource.DEPTH_ZERO, true, null);
>+				} catch (CoreException e) {
>+					throw new org.eclipse.emf.ecore.resource.Resource.IOWrappedException(e);
>+				}
>+			}
>+			synchronized (needsSync) {
>+				needsSync = new Boolean(false);
>+			}
>+		}
>+		super.loadExisting(options);
>+	}
> }

Actions: View | Diff

Attachments on bug 303635: 159945