Allow resetting PMD Marker shapes/images to default

Author: adangel

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/preferences/impl/PreferencesManagerImpl.java

@@ -105,7 +105,7 @@ class PreferencesManagerImpl implements IPreferencesManager {
                         StringKeys.VIEW_TOOLTIP_FILTER_PRIORITY, null, Shape.triangleRight, new RGB(255, 0, 0), 13)); // red
         DEFAULT_DESCRIPTORS_BY_PRIORITY.put(RulePriority.MEDIUM_HIGH,
                 new PriorityDescriptor(RulePriority.MEDIUM_HIGH, StringKeys.VIEW_FILTER_PRIORITY_2,
-                        StringKeys.VIEW_TOOLTIP_FILTER_PRIORITY, null, Shape.triangleRight, new RGB(0, 255, 255), 13)); // yellow
+                        StringKeys.VIEW_TOOLTIP_FILTER_PRIORITY, null, Shape.triangleRight, new RGB(0, 255, 255), 13)); // cyan
         DEFAULT_DESCRIPTORS_BY_PRIORITY.put(RulePriority.MEDIUM,
                 new PriorityDescriptor(RulePriority.MEDIUM, StringKeys.VIEW_FILTER_PRIORITY_3,
                         StringKeys.VIEW_TOOLTIP_FILTER_PRIORITY, null, Shape.triangleRight, new RGB(0, 255, 0), 13)); // green

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/ShapePicker.java

@@ -57,13 +57,13 @@ public ShapePicker(Composite parent, int style, int theItemWidth) {
 
         itemWidth = theItemWidth;
 
-        ShapePicker.this.addPaintListener(new PaintListener() {
+        addPaintListener(new PaintListener() {
             public void paintControl(PaintEvent pe) {
                 doPaint(pe);
             }
         });
 
-        ShapePicker.this.addMouseMoveListener(new MouseMoveListener() {
+        addMouseMoveListener(new MouseMoveListener() {
             public void mouseMove(MouseEvent e) {
                 if (!getEnabled()) {
                     return;
@@ -77,7 +77,7 @@ public void mouseMove(MouseEvent e) {
             }
         });
 
-        ShapePicker.this.addMouseListener(new MouseListener() {
+        this.addMouseListener(new MouseListener() {
             public void mouseDoubleClick(MouseEvent e) {
             }
 
@@ -98,7 +98,7 @@ public void mouseUp(MouseEvent e) {
             }
         });
 
-        ShapePicker.this.addFocusListener(new FocusListener() {
+        addFocusListener(new FocusListener() {
             public void focusGained(FocusEvent e) {
                 redraw();
             }

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

@@ -751,6 +751,14 @@ public static void setText(Text field, String txt) {
      * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
      */
     protected void performDefaults() {
+        for (RulePriority priority : RulePriority.values()) {
+            PriorityDescriptor defaultDescriptor = PMDPlugin.getDefault().getPreferencesManager().defaultDescriptorFor(priority);
+            PriorityDescriptor descriptor = PriorityDescriptorCache.INSTANCE.descriptorFor(priority);
+            descriptor.shape.shape = defaultDescriptor.shape.shape;
+            descriptor.shape.rgbColor = defaultDescriptor.shape.rgbColor;
+            descriptor.label = defaultDescriptor.label;
+        }
+        tableViewer.refresh();
 
         setText(additionalCommentText, IPreferences.REVIEW_ADDITIONAL_COMMENT_DEFAULT);
 

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/priority/PriorityDescriptorCache.java

@@ -43,7 +43,7 @@ public void loadFromPreferences() {
         IPreferences preferences = preferencesManager().loadPreferences();
         for (RulePriority rp : UISettings.currentPriorities(true)) {
             // note: the priority descriptors are cloned here, so that any changes to them
-            // does not automatically get stored. Changes might occur while configuring the
+            // do not automatically get stored. Changes might occur while configuring the
             // preferences, but the user might cancel.
             uiDescriptorsByPriority.put(rp, preferences.getPriorityDescriptor(rp).clone());
         }
@@ -55,7 +55,10 @@ public void storeInPreferences() {
         IPreferences prefs = mgr.loadPreferences();
 
         for (Map.Entry<RulePriority, PriorityDescriptor> entry : uiDescriptorsByPriority.entrySet()) {
-            prefs.setPriorityDescriptor(entry.getKey(), entry.getValue());
+            // note: the priority descriptors are cloned here, so that any changes to them
+            // do not automatically get stored. Changes might occur while configuring the
+            // preferences, but the user might cancel.
+            prefs.setPriorityDescriptor(entry.getKey(), entry.getValue().clone());
         }
         prefs.sync();
         // recreate images with the changed settings