[jbosstools-commits] JBoss Tools SVN: r33726 - trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/outline.

Author: dgolovin Date: 2011-08-09 13:41:34 -0400 (Tue, 09 Aug 2011) New Revision: 33726 Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/outline/OutlineLabelProvider.java Log: JBIDE-9498 NullPointerException in Freemarker IDE on certain files fixed Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/outline/OutlineLabelProvider.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/outline/OutlineLabelProvider.java 2011-08-09 17:22:41 UTC (rev 33725) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/outline/OutlineLabelProvider.java 2011-08-09 17:41:34 UTC (rev 33726) @@ -38,21 +38,22 @@ } public Image getImage(Object anElement) { - if (null == anElement) - return null; + Image result = null; if (anElement instanceof Item) { - return ImageManager.getImage(((Item) anElement).getTreeImage()); + String imageName = ((Item) anElement).getTreeImage(); + if(imageName != null) { + result = ImageManager.getImage(imageName); + } } - else { - return null; - } + return result; } public String getText(Object anElement) { - if (anElement instanceof Item) - return ((Item) anElement).getTreeDisplay(); - else - return null; + String text = null; + if (anElement instanceof Item) { + text = ((Item) anElement).getTreeDisplay(); + } + return text; } public void dispose() {