[jbosstools-commits] JBoss Tools SVN: r22629 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor.

[jbosstools-commits at lists.jboss.org]

Author: dgeraskov
Date: 2010-06-08 09:02:06 -0400 (Tue, 08 Jun 2010)
New Revision: 22629

Modified:
   trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditor.java
Log:
https://jira.jboss.org/browse/JBIDE-5805

Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditor.java	2010-06-08 12:41:30 UTC (rev 22628)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditor.java	2010-06-08 13:02:06 UTC (rev 22629)
@@ -28,10 +28,14 @@
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IDocumentExtension3;
 import org.eclipse.jface.text.ITextListener;
 import org.eclipse.jface.text.ITextViewer;
 import org.eclipse.jface.text.TextEvent;
+import org.eclipse.jface.text.source.DefaultCharacterPairMatcher;
+import org.eclipse.jface.text.source.ICharacterPairMatcher;
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.jface.text.source.IVerticalRuler;
 import org.eclipse.jface.text.source.projection.ProjectionSupport;
@@ -51,6 +55,7 @@
 import org.eclipse.ui.texteditor.DefaultRangeIndicator;
 import org.eclipse.ui.texteditor.IDocumentProvider;
 import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
+import org.eclipse.ui.texteditor.SourceViewerDecorationSupport;
 import org.eclipse.ui.texteditor.TextOperationAction;
 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
 import org.hibernate.Session;
@@ -59,8 +64,8 @@
 import org.hibernate.console.QueryPage;
 import org.hibernate.console.execution.ExecutionContext.Command;
 import org.hibernate.eclipse.console.AbstractQueryEditor;
+import org.hibernate.eclipse.console.HibernateConsoleMessages;
 import org.hibernate.eclipse.console.HibernateConsolePlugin;
-import org.hibernate.eclipse.console.HibernateConsoleMessages;
 import org.hibernate.eclipse.console.views.IQueryParametersPage;
 import org.hibernate.eclipse.console.views.QueryPageTabView;
 import org.hibernate.eclipse.console.views.QueryParametersPage;
@@ -213,7 +218,8 @@
 	protected ISourceViewer createSourceViewer( Composite parent, IVerticalRuler ruler, int styles ) {
 	    HQLSourceViewer viewer = new HQLSourceViewer( parent, ruler, getOverviewRuler(), isOverviewRulerVisible(),
 	            styles );
-
+	    // ensure decoration support has been created and configured.
+		getSourceViewerDecorationSupport(viewer);
 	    return viewer;
 	}
 
@@ -377,13 +383,33 @@
 	 *
 	 * @see org.eclipse.ui.editors.text.TextEditor#initializeEditor()
 	 */
-	    protected void initializeEditor() {
-	        super.initializeEditor();
-	        setSourceViewerConfiguration( createSourceViewerConfiguration() );
-	        setRangeIndicator( new DefaultRangeIndicator() );
-	    }
+	protected void initializeEditor() {
+	    super.initializeEditor();
+	    setSourceViewerConfiguration( createSourceViewerConfiguration() );
+	    setRangeIndicator( new DefaultRangeIndicator() );
+	}
 
+	public final static String HQL_EDITOR_MATCHING_BRACKETS = "matchingBrackets"; //$NON-NLS-1$
+	public final static String HQL_EDITOR_MATCHING_BRACKETS_COLOR = "matchingBracketsColor"; //$NON-NLS-1$
 
+    @Override
+    protected void configureSourceViewerDecorationSupport(
+    		SourceViewerDecorationSupport support) {
+    	super.configureSourceViewerDecorationSupport(support);		
+
+    	char[] matchChars = {'(', ')', '[', ']', '{', '}'}; //which brackets to match		
+    	ICharacterPairMatcher matcher = new DefaultCharacterPairMatcher(matchChars ,
+    			IDocumentExtension3.DEFAULT_PARTITIONING);
+    	support.setCharacterPairMatcher(matcher);
+    	support.setMatchingCharacterPainterPreferenceKeys(HQL_EDITOR_MATCHING_BRACKETS,HQL_EDITOR_MATCHING_BRACKETS_COLOR);
+
+    	//Enable bracket highlighting in the preference store
+    	IPreferenceStore store = getPreferenceStore();
+    	store.setDefault(HQL_EDITOR_MATCHING_BRACKETS, true);
+    	store.setDefault(HQL_EDITOR_MATCHING_BRACKETS_COLOR, "128,128,128"); //$NON-NLS-1$
+    }
+
+
 	    /**
 	 * Sets the document setup participant object associated with this editor to
 	 * the given object. The setup participant sets the partitioning type for