Changeset 646

Timestamp:

04/17/08 07:45:51 (8 months ago)

Author:

markd

Message:

update into SVN so everyone has the latest

Location:

org.cfeclipse.cfml/trunk/src/org/cfeclipse/cfml

Files:

• editors/CFDoubleClickStrategy.java (modified) (2 diffs)
• editors/CFMLEditor.java (modified) (10 diffs)
• preferences/EditorPreferenceConstants.java (modified) (2 diffs)
• preferences/EditorPreferencePage.java (modified) (2 diffs)

org.cfeclipse.cfml/trunk/src/org/cfeclipse/cfml/editors/CFDoubleClickStrategy.java

@@ -124 +124 @@
                         {
                                 c = doc.getChar(pos);
-                                if(!Character.isJavaIdentifierPart(c) && c != '-')
+                                if(!Character.isJavaIdentifierPart(c) && c != '-' && c != '_')
                                         break;
                                 --pos;
@@ -134 +134 @@
                         int length = doc.getLength();
 
+                                /*
+                                 * We should ignore "_"'s since they are used as variable names, very annoying!
+                                 * 
+                                 */
                         while (pos < length) 
                         {
                                 c = doc.getChar(pos);
-                                if(!Character.isJavaIdentifierPart(c) && c != '-')
+                                if(!Character.isJavaIdentifierPart(c) && c != '-' && c != '_')
                                         break;
                                 ++pos;

org.cfeclipse.cfml/trunk/src/org/cfeclipse/cfml/editors/CFMLEditor.java

@@ -84 +84 @@
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.jface.text.source.IVerticalRuler;
-import org.eclipse.jface.text.source.LineNumberRulerColumn;
 import org.eclipse.jface.text.source.projection.ProjectionSupport;
 import org.eclipse.jface.text.source.projection.ProjectionViewer;
@@ -91 +90 @@
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ST;
 import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.DragSource;
 import org.eclipse.swt.dnd.DropTarget;
-import org.eclipse.swt.dnd.DropTargetAdapter;
 import org.eclipse.swt.dnd.DropTargetEvent;
 import org.eclipse.swt.dnd.DropTargetListener;
@@ -109 +106 @@
 import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.IKeyBindingService;
-import org.eclipse.ui.IWorkbenchPartSite;
 import org.eclipse.ui.dialogs.SaveAsDialog;
 import org.eclipse.ui.dnd.IDragAndDropService;
 import org.eclipse.ui.editors.text.ITextEditorHelpContextIds;
+import org.eclipse.ui.editors.text.TextEditor;
 import org.eclipse.ui.part.FileEditorInput;
 import org.eclipse.ui.part.IShowInSource;
@@ -125 +122 @@
 import org.eclipse.ui.texteditor.SourceViewerDecorationSupport;
 import org.eclipse.ui.texteditor.TextOperationAction;
+import org.eclipse.ui.texteditor.rulers.IColumnSupport;
+import org.eclipse.ui.texteditor.rulers.RulerColumnDescriptor;
+import org.eclipse.ui.texteditor.rulers.RulerColumnRegistry;
 
 
@@ -133 +133 @@
  * the image manager and syntax dictionaries.
  */
-public class CFMLEditor extends AbstractDecoratedTextEditor implements
+public class CFMLEditor extends TextEditor implements
                 IPropertyChangeListener, IShowInSource {
         
@@ -198 +198 @@
 
         private CodeFoldingSetter foldingSetter;
-//protected LineNumberRulerColumn fLineNumberRulerColumn;
+
 
         /**
@@ -209 +209 @@
 
         private DragSource dragsource;
+        private Object columnSupport;
 
         
@@ -299 +300 @@
         protected void initializeEditor() {
                 setEditorContextMenuId("#CFMLEditorContext"); //$NON-NLS-1$
-                setRulerContextMenuId("#TextRulerContext"); //$NON-NLS-1$
+                setRulerContextMenuId("#RulerContext"); //$NON-NLS-1$
                 setHelpContextId(ITextEditorHelpContextIds.TEXT_EDITOR);
                 setPreferenceStore(CFMLPlugin.getDefault().getPreferenceStore());
@@ -315 +316 @@
         public void createPartControl(Composite parent) {
             
-            
+                
+                
                 /* TODO: hook this up to a button
                  * Check the preferences, and add a toolbar */
@@ -593 +595 @@
         }
 
-        public IVerticalRuler verticalRuler() {
-
-                return this.getVerticalRuler();
-        }
+        
 
         private void createDragAndDrop(ProjectionViewer projectionViewer) {

org.cfeclipse.cfml/trunk/src/org/cfeclipse/cfml/preferences/EditorPreferenceConstants.java

@@ -51 +51 @@
         public static final String P_TAB_INDENTS_CURRENT_LINE   = "cfeclipse.editor.tabIndentsCurrentLine";
 
-        /** Preference key identifier for showing the line number ruler */
-        public static final String P_SHOW_LINE_NUMBERS = AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER;
 
         /** Preference key identifier for trimming trailing spaces when you save */
@@ -151 +149 @@
                 store.setDefault(P_BRACKET_MATCHING_ENABLED,true);
                 store.setDefault(P_TAB_INDENTS_CURRENT_LINE,true);
-                store.setDefault(P_SHOW_LINE_NUMBERS,true);
                 store.setDefault(P_RTRIM_ON_SAVE,false);
                 store.setDefault(P_LINE_NUMBER_COLOR,"0,0,0");

org.cfeclipse.cfml/trunk/src/org/cfeclipse/cfml/preferences/EditorPreferencePage.java

@@ -148 +148 @@
                 overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, EditorPreferenceConstants.P_SHOW_OVERVIEW_RULER));
                 overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, EditorPreferenceConstants.P_LINE_NUMBER_COLOR));
-                //overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, EditorPreferenceConstants.P_SHOW_LINE_NUMBERS));
                 overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, EditorPreferenceConstants.P_SHOW_EDITOR_TOOLBAR));
                 overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, EditorPreferenceConstants.P_ENABLE_CUSTOM_CARETS));
@@ -223 +222 @@
                 label = "Show overview &ruler";
                 addCheckBox(appearanceComposite, label, EditorPreferenceConstants.P_SHOW_OVERVIEW_RULER, 0);
-        /*      label = "Show lin&e numbers";
-                addCheckBox(appearanceComposite, label, EditorPreferenceConstants.P_SHOW_LINE_NUMBERS, 0);
-        */      
                 label = "Show Editor Toolbar";
                 addCheckBox(appearanceComposite, label, EditorPreferenceConstants.P_SHOW_EDITOR_TOOLBAR, 0);