Cleanup AbstractEditorFactory

- Restore source compatibility
- Remove unneeded methods/uncommented code

Author: adangel

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/editors/AbstractEditorFactory.java

@@ -4,11 +4,46 @@
 
 package net.sourceforge.pmd.eclipse.ui.preferences.editors;
 
+import org.eclipse.swt.widgets.Control;
+
+import net.sourceforge.pmd.eclipse.util.ColourManager;
+import net.sourceforge.pmd.properties.PropertyDescriptor;
+import net.sourceforge.pmd.properties.PropertySource;
+
 /**
  * @author Brian Remedios
  * @deprecated This editor factory will be removed without replacement. This was only used for supporting the UI
  *             of the plugin and is considered internal API now.
  */
 @Deprecated // for removal
 public abstract class AbstractEditorFactory<T> extends net.sourceforge.pmd.eclipse.ui.preferences.internal.AbstractEditorFactory<T> {
+    /**
+     * @deprecated not used
+     */
+    @Deprecated // for removal
+    protected static ColourManager colourManager;
+
+
+    /**
+     * Return the value as a string that can be easily recognized and parsed
+     * when we see it again.
+     *
+     * @param value
+     *            Object
+     *
+     * @return String
+     * @deprecated not used
+     */
+    @Deprecated // for removal
+    protected static String asString(Object value) {
+        return value == null ? "" : value.toString();
+    }
+
+    /**
+     * @deprecated not overridden by any subtype, so not used
+     */
+    @Deprecated // for removal
+    protected void adjustRendering(PropertySource source, PropertyDescriptor<?> desc, Control control) {
+        // intended to be overridden
+    }
 }

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/editors/AbstractMultiValueEditorFactory.java

@@ -243,7 +243,6 @@ public void handleEvent(Event event) {      // add new value handler
 
                 renumberLabelsIn(newControls);
                 fillWidget(parentWidget, desc, source);
-                adjustRendering(source, desc, parentWidget);
                 sizeListener.addedRows(1);
                 changeListener.changed(source, desc, newValue);
                 parent.getParent().layout();
@@ -277,7 +276,6 @@ public void handleEvent(Event event) {
     protected void fillWidget(Text textWidget, PropertyDescriptor<List<T>> desc, PropertySource source) {
         List<T> values = valueFor(source, desc);
         textWidget.setText(values == null ? "" : StringUtils.join(values, DELIMITER + ' '));
-        adjustRendering(source, desc, textWidget);
     }
 
 

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/editors/BooleanEditorFactory.java

@@ -65,7 +65,6 @@ public void widgetSelected(SelectionEvent event) {
 
                 source.setProperty(desc, selected);
                 listener.changed(source, desc, selected);
-                adjustRendering(source, desc, butt);
             }
         };
 

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/editors/CharacterEditorFactory.java

@@ -67,7 +67,6 @@ public void handleEvent(Event event) {
 
                 source.setProperty(desc, newValue);
                 listener.changed(source, desc, newValue);
-                adjustRendering(source, desc, text);
             }
         });
 

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/editors/DoubleEditorFactory.java

@@ -62,8 +62,6 @@ public void modifyText(ModifyEvent event) {
 
                 source.setProperty(desc, newValue);
                 listener.changed(source, desc, newValue);
-
-                adjustRendering(source, desc, spinner);
             }
         });
 

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/editors/EnumerationEditorFactory.java

@@ -84,7 +84,6 @@ public void widgetSelected(SelectionEvent e) {
 
                 source.setProperty(desc, newValue);
                 listener.changed(source, desc, newValue);
-                adjustRendering(source, desc, combo);
             }
         });
 

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/editors/IntegerEditorFactory.java

@@ -59,7 +59,6 @@ public void modifyText(ModifyEvent event) {
 
                 source.setProperty(desc, newValue);
                 listener.changed(source, desc, newValue);
-                adjustRendering(source, desc, spinner);
             }
         });
 

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/editors/RegexEditorFactory.java

@@ -77,7 +77,6 @@ public void handleEvent(Event event) {
     protected void fillWidget(Text textWidget, PropertyDescriptor<Pattern> desc, PropertySource source) {
         String val = valueFor(source, desc).pattern();
         textWidget.setText(val);
-        adjustRendering(source, desc, textWidget);
     }
 
 

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/editors/StringEditorFactory.java

@@ -80,7 +80,6 @@ public void handleEvent(Event event) {
     protected void fillWidget(Text textWidget, PropertyDescriptor<String> desc, PropertySource source) {
         String val = valueFor(source, desc);
         textWidget.setText(val == null ? "" : val);
-        adjustRendering(source, desc, textWidget);
     }
 
 

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/internal/AbstractEditorFactory.java

@@ -13,7 +13,6 @@
 import net.sourceforge.pmd.eclipse.ui.preferences.br.EditorFactory;
 import net.sourceforge.pmd.eclipse.ui.preferences.br.SizeChangeListener;
 import net.sourceforge.pmd.eclipse.ui.preferences.br.ValueChangeListener;
-import net.sourceforge.pmd.eclipse.util.ColourManager;
 import net.sourceforge.pmd.properties.PropertyDescriptor;
 import net.sourceforge.pmd.properties.PropertySource;
 
@@ -22,29 +21,11 @@
  */
 public abstract class AbstractEditorFactory<T> implements EditorFactory<T> {
 
-    protected static ColourManager colourManager;
-    // protected static Color overriddenColour;
 
     protected AbstractEditorFactory() {
         // protected default constructor for subclassing
     }
 
-    // private static ColourManager colourManager() {
-    //
-    // if (colourManager != null) return colourManager;
-    // colourManager = ColourManager.managerFor(Display.getDefault());
-    // return colourManager;
-    // }
-
-    // private Color overriddenColour() {
-    //
-    // if (overriddenColour != null) return overriddenColour;
-    //
-    // overriddenColour =
-    // colourManager().colourFor(AbstractRulePanelManager.overridenColourValues);
-    // return overriddenColour;
-    // }
-
     /**
      * Generic control that provides a label/widget pair for the default value.
      * Subclasses can override this to provide additional labels & widgets as
@@ -81,50 +62,4 @@ public Label addLabel(Composite parent, PropertyDescriptor<T> desc) {
         label.setLayoutData(data);
         return label;
     }
-
-    /**
-     * Adjust the display of the control to denote whether it holds onto the
-     * default value or not.
-     *
-     * @param control
-     * @param hasDefaultValue
-     */
-    // protected void adjustRendering(Control control, boolean hasDefaultValue)
-    // {
-    //
-    // Display display = control.getDisplay();
-    //
-    // control.setBackground(
-    // display.getSystemColor(hasDefaultValue ? SWT.COLOR_WHITE :
-    // SWT.COLOR_CYAN)
-    // );
-    // }
-    protected void adjustRendering(PropertySource source, PropertyDescriptor<?> desc, Control control) {
-
-        // return; // don't do it...kinda irritating
-
-        // if (!(rule instanceof RuleReference)) return;
-        //
-        // boolean isOverridden =
-        // ((RuleReference)rule).hasOverriddenProperty(desc);
-        // Display display = control.getDisplay();
-        // Color clr = isOverridden ? overriddenColour() :
-        // display.getSystemColor(SWT.COLOR_WHITE);
-        //
-        // control.setBackground(clr);
-    }
-
-    /**
-     * Return the value as a string that can be easily recognized and parsed
-     * when we see it again.
-     *
-     * @param value
-     *            Object
-     *
-     * @return String
-     */
-    protected static String asString(Object value) {
-        return value == null ? "" : value.toString();
-    }
-
 }