diff options
author | Neil Hauge | 2013-08-23 16:25:31 +0000 |
---|---|---|
committer | Neil Hauge | 2013-08-23 16:26:04 +0000 |
commit | a72bce3f98f3cbcfa5ba1fd58a8dc2fd565c6e0a (patch) | |
tree | adfc6164bdd13f0a3cc1964847907ef4029bec02 /jpa | |
parent | 1f7defc1e4032e24e7e1ae5cf38dbc4468b53287 (diff) | |
download | webtools.dali-a72bce3f98f3cbcfa5ba1fd58a8dc2fd565c6e0a.tar.gz webtools.dali-a72bce3f98f3cbcfa5ba1fd58a8dc2fd565c6e0a.tar.xz webtools.dali-a72bce3f98f3cbcfa5ba1fd58a8dc2fd565c6e0a.zip |
409608 - Remove temp fix for: Intermittent failure on JPA project creation when starting Eclipse.
Diffstat (limited to 'jpa')
-rw-r--r-- | jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java index 1b618f18da..0c9c9d3bea 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java @@ -30,7 +30,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.content.IContentType; import org.eclipse.core.runtime.jobs.ISchedulingRule; @@ -280,14 +279,7 @@ public abstract class AbstractJpaProject } protected ProjectResourceLocator buildProjectResourceLocator() { - Object resourceLocator = this.project.getAdapter(ProjectResourceLocator.class); - //Hack fix to ensure the adatper can be successfully loaded as there are currently problems in the platform - //in this area. See bugs 405320 and 408506. This fix is essentially a delay mechanism but appears to - //fully resolve the issue. This temp fix should be removed when bug 408506 is fixed in the platform. - if (resourceLocator == null) { - resourceLocator = Platform.getAdapterManager().loadAdapter(this.project, ProjectResourceLocator.class.getName()); - } - return (ProjectResourceLocator) resourceLocator; + return (ProjectResourceLocator) this.project.getAdapter(ProjectResourceLocator.class); } protected JavaResourceTypeCache buildExternalJavaResourceTypeCache() { |