Author: dgeraskov Date: 2012-04-04 10:00:46 -0400 (Wed, 04 Apr 2012) New Revision: 40035 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java Log: https://issues.jboss.org/browse/JBIDE-11467 File path could be either absolute to file system or relative to project class path Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2012-04-04 13:39:36 UTC (rev 40034) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2012-04-04 14:00:46 UTC (rev 40035) @@ -21,7 +21,6 @@ import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.jdt.core.IJavaProject; @@ -295,7 +294,26 @@ HibernateJptPlugin.logException(e); } - IResource res= ResourcesPlugin.getWorkspace().getRoot().findMember(path); + IJavaProject jProject = getJpaProject().getJavaProject(); + IResource res = null; + if (jProject != null){ + try { + IPackageFragmentRoot[] allPackageFragmentRoots = jProject.getAllPackageFragmentRoots(); + for (IPackageFragmentRoot iPackageFragmentRoot : allPackageFragmentRoots) { + if (!iPackageFragmentRoot.isArchive()){ + IResource sourceFolder = iPackageFragmentRoot.getResource(); + if (sourceFolder instanceof IContainer) { + IContainer folder = (IContainer) sourceFolder; + if ((res = folder.findMember(path)) != null){ + break; + } + } + } + } + } catch (JavaModelException e) { + //ignore + } + } if (res != null) { int resType= res.getType(); if (resType != IResource.FILE) { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java 2012-04-04 13:39:36 UTC (rev 40034) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java 2012-04-04 14:00:46 UTC (rev 40035) @@ -254,8 +254,7 @@ IResource res = root.findMember(cfgFile); if ( res != null && res.exists() && res.getType() == IResource.FILE) { JpaProject jpaProject = HibernatePropertiesComposite.this.getSubject().getJpaProject(); - IProject project = jpaProject.getProject(); - IJavaProject jProject = JavaCore.create(project); + IJavaProject jProject = jpaProject.getJavaProject(); if (jProject != null){ try { IPackageFragmentRoot[] allPackageFragmentRoots = jProject.getAllPackageFragmentRoots();