[overlord-commits] Overlord SVN: r132 - cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model.

[overlord-commits at lists.jboss.org]

Author: objectiser
Date: 2008-07-08 12:44:07 -0400 (Tue, 08 Jul 2008)
New Revision: 132

Modified:
   cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java
Log:
Changed mechanism for obtaining resource from classpath entry, as previous internal JavaModel approach was not supported in Eclipse 3.4.

Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java	2008-07-08 02:53:49 UTC (rev 131)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java	2008-07-08 16:44:07 UTC (rev 132)
@@ -546,18 +546,13 @@
 						ResourcesPlugin.getWorkspace().getRoot().findMember(entry.getPath());
 					String projectPath = 
 						JavaCore.create(project.getProject()).getOutputLocation().toPortableString();
-							fullPath = wsPath + projectPath;
+					fullPath = wsPath + projectPath;
 				} else {
-					// TODO: Need to find alternative to this internal class (JavaModel)
-					Object resource = 
-						JavaModel.getTarget(ResourcesPlugin.getWorkspace().getRoot(),entry.getPath(),true);
-	
-					if (resource instanceof IResource) {
-						IResource iFile = (IResource) resource;
-						fullPath = iFile.getLocation().toPortableString();
-					} else if (resource instanceof java.io.File) {
-						java.io.File resfile = (java.io.File) resource;
-						fullPath = resfile.getAbsolutePath();
+					IResource res=ResourcesPlugin.getWorkspace().getRoot().findMember(entry.getPath());
+					if (res != null) {
+						fullPath = res.getLocation().toPortableString();
+					} else {
+						logger.severe("Failed to locate resource for '"+entry.getPath()+"'");
 					}
 				}