Changeset 632

Timestamp:

04/12/08 09:22:33 (9 months ago)

Author:

markd

Message:

fixes #136

Location:

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

Files:

• editors/CFConfiguration.java (modified) (5 diffs)
• editors/CFMLEditor.java (modified) (4 diffs)
• preferences/CFMLPreferenceManager.java (modified) (1 diff)
• preferences/EditorPreferenceConstants.java (modified) (1 diff)
• preferences/EditorPreferencePage.java (modified) (5 diffs)

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

@@ -93 +93 @@
         private int tabWidth;
         //private CFMLEditor editor;
-        private CFEUndoManager undoManager;
         
         /**
@@ -121 +120 @@
                 //this.editor = editor;
                 preferenceManager = new CFMLPreferenceManager();
-                this.undoManager = new CFEUndoManager(preferenceManager.maxUndoSteps());
+                //this.undoManager = new CFEUndoManager(preferenceManager.maxUndoSteps());
                 indentCFScriptStrategy = new CFScriptIndentStrategy(editor);
                 this.indentTagStrategy = new TagIndentStrategy(editor);
@@ -150 +149 @@
         }
         
+        /*
         public IUndoManager getUndoManager(ISourceViewer sourceViewer) {
                 return this.undoManager;
         }
-        
+        */
         public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
             return new CFAnnotationHover();
@@ -170 +170 @@
          * get the double click strat-m-gee for the view & content type = (section, 
          * partition)
-         */
+         
         public ITextDoubleClickStrategy getDoubleClickStrategy(ISourceViewer sourceViewer,
                 String contentType) 
@@ -179 +179 @@
                 //return doubleClickStrategy;
                 // Spike::
-                // Moved this to org.cfeclipse.cfml.editors.dnd.SelectionCursorListener 
+                // Moved this to org.cfeclipse.cfml.editors.dnd.SelectionCursorListener
                 // so that we can handle ctrl and ctrl+shift modifiers
                 return null;
         }
-
+*/
         ///////////////////////// SCANNERS /////////////////////////////////////////////
         /**

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

@@ -198 +198 @@
 
         private CodeFoldingSetter foldingSetter;
-
-        protected LineNumberRulerColumn fLineNumberRulerColumn;
+//protected LineNumberRulerColumn fLineNumberRulerColumn;
 
         /**
@@ -221 +220 @@
                 // Trim trailing spaces if the option is turned on
                 if (getPreferenceStore().getBoolean(EditorPreferenceConstants.P_RTRIM_ON_SAVE)) {
-                        // Turn off undo manager for text changes
-                        ((CFEUndoManager) this.configuration.getUndoManager(this.getSourceViewer())).listenToTextChanges(false);
 
                         // Perform Trim Trailing Spaces
@@ -229 +226 @@
                         trimAction.run(null);
 
-                        // Turn the undo manager back on
-                        ((CFEUndoManager) this.configuration.getUndoManager(this.getSourceViewer()))
-                                        .listenToTextChanges(true);
                 }
 
@@ -619 +613 @@
                 if (c == null) // ie we are on 3.3 or higher    
                 {
-                        
-                
-                        
                                 return;
-                        
                 }
                 

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

@@ -70 +70 @@
                 ApplicationTemplatesPreferenceConstants.setDefaults(store);
                 SnipExPreferenceConstants.setDefaults(store);
+                MarkOccurrencesPreferenceConstants.setDefaults(store);
         }
         

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

@@ -148 +148 @@
                 store.setDefault(P_INSERT_SPACES_FOR_TABS,false);
                 store.setDefault(P_TAB_WIDTH,4);
-                store.setDefault(P_MAX_UNDO_STEPS,100);
                 store.setDefault(P_BRACKET_MATCHING_COLOR,"255,0,0");
                 store.setDefault(P_BRACKET_MATCHING_ENABLED,true);

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

@@ -39 +39 @@
                 {
                         "Editor Background", EditorPreferenceConstants.P_COLOR_BACKGROUND, null
-                }, {
+                }, /*{
                         "Line numbers",  EditorPreferenceConstants.P_LINE_NUMBER_COLOR, null
-                },{
+                },*/{
                         "Editor toolbars",  EditorPreferenceConstants.P_SHOW_EDITOR_TOOLBAR, null
                 }, {
@@ -134 +134 @@
                 overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, EditorPreferenceConstants.P_COLOR_BACKGROUND));
                 overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, EditorPreferenceConstants.P_CURRENT_LINE_COLOR));
-                overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, EditorPreferenceConstants.P_MAX_UNDO_STEPS));
                 overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, EditorPreferenceConstants.P_CURRENT_LINE_COLOR));
                 overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, EditorPreferenceConstants.P_BRACKET_MATCHING_ENABLED));
@@ -149 +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_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));
@@ -216 +215 @@
                 label = "Insight Delay:";
                 addTextField(appearanceComposite, label, EditorPreferenceConstants.P_INSIGHT_DELAY, 4, 0, true);
-                label = "Undo steps:";
-                addTextField(appearanceComposite, label, EditorPreferenceConstants.P_MAX_UNDO_STEPS, 4, 0, true);
                 label = "Use spaces for tabs";
                 addCheckBox(appearanceComposite, label, EditorPreferenceConstants.P_INSERT_SPACES_FOR_TABS, 0);
@@ -226 +223 @@
                 label = "Show overview &ruler";
                 addCheckBox(appearanceComposite, label, EditorPreferenceConstants.P_SHOW_OVERVIEW_RULER, 0);
-                label = "Show lin&e numbers";
+        /*      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);