Changeset 671

Timestamp:

10/12/08 06:12:53 (3 months ago)

Author:

markd

Message:

see #38

Location:

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

Files:

• editors/CFConfiguration.java (modified) (2 diffs)
• preferences/CFMLColorsPreferenceConstants.java (modified) (3 diffs)
• preferences/CFMLColorsPreferencePage.java (modified) (1 diff)

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

@@ -567 +567 @@
                                                         CFMLColorsPreferenceConstants.P_COLOR_CFCOMMENT
                                         )
-                                )
+                                ),
+                                colorManager.getColor(
+                                        preferenceManager.getColor(
+                                                        CFMLColorsPreferenceConstants.P_COLOR_BACKGROUND_CFCOMMENT
+                                        )
+                                ), tabWidth
                         )
                 );
@@ -775 +780 @@
 // System.out.println("CFConfiguration property change listener notified." + event.getProperty());
                 String prop = event.getProperty(); 
-        boolean setting = ((Boolean)event.getNewValue()).booleanValue();
-                System.out.println("The Property we are setting is: " + prop + " [" + setting + "]");
+                Object newValue = event.getNewValue();
+                
+                boolean setting = false;
+                Object settingObj = null;
+                
+                if(newValue instanceof Boolean){
+                        setting = ((Boolean)newValue).booleanValue();
+                }
+                else {
+                        settingObj = newValue;
+                }
+    //  boolean setting = ((Boolean)event.getNewValue()).booleanValue();
+        //      System.out.println("The Property we are setting is: " + prop + " [" + setting + "]");
         
                 if(prop.equals(EditorPreferenceConstants.P_INSIGHT_DELAY)) {

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

@@ -40 +40 @@
         public static final String P_COLOR_CFCOMMENT = "cfcommentColor";
 
+        /** Preference key identifier for cfml comment */
+        public static final String P_COLOR_BACKGROUND_CFCOMMENT = "cfcommentBackgroundColor";
+
         /** Preference key identifier for cfscript text color*/
         public static final String P_COLOR_CFSCRIPT_TEXT = "cfscriptTextColor";
@@ -78 +81 @@
          *      <li>P_COLOR_CFNUMBER - "255,10,10"</li>
          *      <li>P_COLOR_CFCOMMENT - "128,128,128"</li>
+         *      <li>P_COLOR_BACKGROUND_CFCOMMENT - "16,74,10"</li>
          *      <li>P_COLOR_CFSCRIPT_TEXT - "0,0,0"</li>
          *      <li>P_COLOR_CFSCRIPT_KEYWORD - "0,0,255"</li>
@@ -97 +101 @@
                 store.setDefault(P_COLOR_CFNUMBER,"255,10,10");
                 store.setDefault(P_COLOR_CFCOMMENT,"128,128,128");
+                store.setDefault(P_COLOR_BACKGROUND_CFCOMMENT,"16,74,10");
                 store.setDefault(P_COLOR_CFSCRIPT_TEXT,"0,0,0");
                 store.setDefault(P_COLOR_CFSCRIPT_KEYWORD,"0,0,255");

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

@@ -56 +56 @@
                 addField(new ColorFieldEditor(CFMLColorsPreferenceConstants.P_COLOR_DEFAULT_TEXT,"Default &Text:",getFieldEditorParent()));
                 addField(new ColorFieldEditor(CFMLColorsPreferenceConstants.P_COLOR_CFCOMMENT,"CFML &Comment:",getFieldEditorParent()));
+                addField(new ColorFieldEditor(CFMLColorsPreferenceConstants.P_COLOR_BACKGROUND_CFCOMMENT,"CFML Comment &BackGround:",getFieldEditorParent()));
                 addField(new ColorFieldEditor(CFMLColorsPreferenceConstants.P_COLOR_CFTAG,"CFML &Tag:",getFieldEditorParent()));
                 addField(new ColorFieldEditor(CFMLColorsPreferenceConstants.P_COLOR_TAGLIB_TAG,"Taglib &Tag:",getFieldEditorParent()));