Author: dgolovin Date: 2010-11-05 18:20:39 -0400 (Fri, 05 Nov 2010) New Revision: 26312 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ElVarSearcher.java Log: Code cleanup for ElVarSearcher class Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ElVarSearcher.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ElVarSearcher.java 2010-11-05 22:17:43 UTC (rev 26311) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ElVarSearcher.java 2010-11-05 22:20:39 UTC (rev 26312) @@ -111,36 +111,32 @@ */ public static IndexedRegion getNodeAt(IFile file, int documentOffset) { - - if (file == null) - return null; - IndexedRegion node = null; - IModelManager mm = StructuredModelManager.getModelManager(); - IStructuredModel model = null; - if (mm != null) { - try { - model = mm.getModelForRead(file); - } catch (IOException e) { - ELCorePlugin.getDefault().logError(e); - return null; - } catch (CoreException e) { - ELCorePlugin.getDefault().logError(e); - return null; - } - } - try { - if (model != null) { - int lastOffset = documentOffset; - node = model.getIndexedRegion(documentOffset); - while (node == null && lastOffset >= 0) { - lastOffset--; - node = model.getIndexedRegion(lastOffset); + if (file != null) { + IModelManager mm = StructuredModelManager.getModelManager(); + IStructuredModel model = null; + if (mm != null) { + try { + model = mm.getModelForRead(file); + if (model != null) { + int lastOffset = documentOffset; + node = model.getIndexedRegion(documentOffset); + while (node == null && lastOffset >= 0) { + lastOffset--; + node = model.getIndexedRegion(lastOffset); + } + } + } catch (IOException e) { + ELCorePlugin.getDefault().logError(e); + node = null; + } catch (CoreException e) { + ELCorePlugin.getDefault().logError(e); + node = null; + } finally { + if (model != null) + model.releaseFromRead(); } } - } finally { - if (model != null) - model.releaseFromRead(); } return node; }