[jbosstools-commits] JBoss Tools SVN: r17811 - in trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink: xpl and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: dgolovin
Date: 2009-09-30 03:46:46 -0400 (Wed, 30 Sep 2009)
New Revision: 17811

Modified:
   trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/HyperlinkDetector.java
   trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/BaseHyperlinkDetector.java
Log:
code cleanup 

Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/HyperlinkDetector.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/HyperlinkDetector.java	2009-09-29 20:19:58 UTC (rev 17810)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/HyperlinkDetector.java	2009-09-30 07:46:46 UTC (rev 17811)
@@ -20,8 +20,18 @@
 import org.jboss.tools.common.text.ext.util.AxisUtil;
 
 public class HyperlinkDetector extends BaseHyperlinkDetector {
+    
+	private static HyperlinkDetector fInstance;
 
-
+    /**
+	 * returns singleton instance of HyperlinkDetector
+	 * 
+	 * @return HyperlinkDetector
+	 */
+	public static HyperlinkDetector getInstance() {
+		return HyperlinkDetectorHolder.INSTANCE;
+	}
+	
 	/**
 	 * Returns the partition types located at offset in the document
 	 * 
@@ -73,4 +83,7 @@
 		return types.toArray(new String[types.size()]);
 	}
 
+	static class HyperlinkDetectorHolder {
+		static HyperlinkDetector INSTANCE = new HyperlinkDetector();	
+	}
 }
\ No newline at end of file

Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/BaseHyperlinkDetector.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/BaseHyperlinkDetector.java	2009-09-29 20:19:58 UTC (rev 17810)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/BaseHyperlinkDetector.java	2009-09-30 07:46:46 UTC (rev 17811)
@@ -23,26 +23,12 @@
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
 import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
 import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
 import org.jboss.tools.common.text.ext.hyperlink.HyperlinkBuilder;
 import org.jboss.tools.common.text.ext.hyperlink.HyperlinkDetector;
 
 public class BaseHyperlinkDetector implements IHyperlinkDetector{
-    private static HyperlinkDetector fInstance;
 
-    /**
-	 * returns singleton instance of HyperlinkDetector
-	 * 
-	 * @return HyperlinkDetector
-	 */
-	public synchronized static HyperlinkDetector getInstance() {
-		if (fInstance == null) {
-			fInstance = new HyperlinkDetector();
-		}
-		return fInstance;
-	}
-
 	public IHyperlink[] getHyperlinks(ITextViewer textViewer, IRegion region) {
 	    IHyperlink[] hyperlinks = null;