Author: akazakov
Date: 2010-12-29 08:22:48 -0500 (Wed, 29 Dec 2010)
New Revision: 27798
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolverFactoryManager.java
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/resource/ResourceFactory.java
Log:
https://issues.jboss.org/browse/JBIDE-8015
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolverFactoryManager.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolverFactoryManager.java 2010-12-29
12:59:07 UTC (rev 27797)
+++
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolverFactoryManager.java 2010-12-29
13:22:48 UTC (rev 27798)
@@ -32,8 +32,6 @@
private static final ELResolverFactoryManager INSTANCE = new
ELResolverFactoryManager();
-// private Map<String, ELResolver[]> resolvers = new HashMap<String,
ELResolver[]>();
-
private ELResolverFactoryManager() {
}
@@ -51,17 +49,13 @@
* @return
*/
public ELResolver[] getResolvers(IResource resource) {
- if(resource==null || !resource.isAccessible()) {
+ if(!resource.isAccessible()) {
return new ELResolver[0];
}
IProject project = resource.getProject();
if (project == null || !project.isAccessible())
return new ELResolver[0];
-// ELResolver[] result = resolvers.get(project.getName());
-// if(result!=null) {
-// return result;
-// }
Set<ELResolver> resolverSet = new HashSet<ELResolver>();
IExtensionRegistry registry = Platform.getExtensionRegistry();
IExtensionPoint extensionPoint =
registry.getExtensionPoint("org.jboss.tools.common.el.core.elResolver");
//$NON-NLS-1$
@@ -104,9 +98,6 @@
}
}
}
-// result = resolverSet.toArray(new ELResolver[resolverSet.size()]);
-// resolvers.put(project.getName(), result);
-// return result;
return resolverSet.toArray(new ELResolver[resolverSet.size()]);
}
}
\ No newline at end of file
Modified:
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/resource/ResourceFactory.java
===================================================================
---
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/resource/ResourceFactory.java 2010-12-29
12:59:07 UTC (rev 27797)
+++
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/resource/ResourceFactory.java 2010-12-29
13:22:48 UTC (rev 27798)
@@ -55,10 +55,10 @@
result = Boolean.TRUE;
} else if(method.equals(IFile.class.getMethod("getFullPath"))){
result = fullPath;
- }
+ } else if(method.equals(IFile.class.getMethod("isAccessible"))){
+ return true;
+ }
return result;
}
-
-
}
-}
+}
\ No newline at end of file