[jbosstools-commits] JBoss Tools SVN: r31495 - trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink.

[jbosstools-commits at lists.jboss.org]

Author: dgolovin
Date: 2011-05-25 19:15:05 -0400 (Wed, 25 May 2011)
New Revision: 31495

Modified:
   trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlink.java
Log:
fix for 

java.lang.NullPointerException
	at org.jboss.tools.jst.text.ext.hyperlink.CSSClassHyperlink.getStyleName(CSSClassHyperlink.java:215)
	at org.jboss.tools.jst.text.ext.hyperlink.CSSClassHyperlink.getHyperlinkText(CSSClassHyperlink.java:301)
	at org.eclipse.jface.text.hyperlink.MultipleHyperlinkPresenter$LinkListInformationControl$LinkLabelProvider.getText(MultipleHyperlinkPresenter.java:131)
	at org.eclipse.jface.viewers.ColumnLabelProvider.update(ColumnLabelProvider.java:36)
	at org.eclipse.jface.viewers.ViewerColumn.refresh(ViewerColumn.java:152)
	at org.eclipse.jface.viewers.AbstractTableViewer.doUpdateItem(AbstractTableViewer.java:399)
	at org.eclipse.jface.viewers.StructuredViewer$UpdateItemSafeRunnable.run(StructuredViewer.java:485)
	at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42)

Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlink.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlink.java	2011-05-25 22:58:54 UTC (rev 31494)
+++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlink.java	2011-05-25 23:15:05 UTC (rev 31495)
@@ -38,6 +38,7 @@
 import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
 import org.jboss.tools.common.text.ext.util.StructuredSelectionHelper;
 import org.jboss.tools.common.text.ext.util.Utils;
+import org.jboss.tools.jst.text.ext.JSTExtensionsPlugin;
 import org.jboss.tools.jst.web.kb.ICSSContainerSupport;
 import org.jboss.tools.jst.web.kb.PageContextFactory;
 import org.jboss.tools.jst.web.kb.PageContextFactory.CSSStyleSheetDescriptor;
@@ -211,11 +212,14 @@
 	 * @return
 	 */
 	protected String getStyleName(IRegion region) {
-		try {
-			return getDocument().get(region.getOffset(), region.getLength());
-		} catch (BadLocationException e) {
-			return null;
+		if(region != null) {
+			try {
+				return getDocument().get(region.getOffset(), region.getLength());
+			} catch (BadLocationException e) {
+				JSTExtensionsPlugin.getPluginLog().logError(e);
+			}
 		}
+		return null;
 	}
 
 	protected IRegion fLastRegion = null;