Merge branch 'pr-41'

Author: adangel

ReleaseNotes.md

@@ -26,6 +26,7 @@ Eclipse Update Site:
 *   [#20](https://github.com/pmd/pmd-eclipse-plugin/issues/20): category.xml maybe broken
 *   [#29](https://github.com/pmd/pmd-eclipse-plugin/issues/29): Processing errors without cause
 *   [#32](https://github.com/pmd/pmd-eclipse-plugin/issues/32): Upgrade PMD to 6.2.0
+*   [#42](https://github.com/pmd/pmd-eclipse-plugin/issues/42): Marker colors not updated in all views after change
 *   [#43](https://github.com/pmd/pmd-eclipse-plugin/issues/43): Update unit tests to use new ruleset categories
 
 ### External Contributions
@@ -35,6 +36,7 @@ Eclipse Update Site:
 *   [#37](https://github.com/pmd/pmd-eclipse-plugin/pull/37): Global Priority Filter for Violations Overview/Outline - [Phillip Krall](https://github.com/pkrall520)
 *   [#39](https://github.com/pmd/pmd-eclipse-plugin/pull/39): Show PMD violations overview/outline views when checking code - [Phillip Krall](https://github.com/pkrall520)
 *   [#40](https://github.com/pmd/pmd-eclipse-plugin/pull/40): Only execute PMD when check on save is enabled - [Phillip Krall](https://github.com/pkrall520)
+*   [#41](https://github.com/pmd/pmd-eclipse-plugin/pull/41): Update all views after marker color changed - [Phillip Krall](https://github.com/pkrall520)
 
 
 ## 24-June-2017: 4.0.15.v20170624-2134

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/plugin/PMDPlugin.java

@@ -45,6 +45,8 @@
 import org.eclipse.ui.IDecoratorManager;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IEditorReference;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IViewReference;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
@@ -89,12 +91,12 @@ public class PMDPlugin extends AbstractUIPlugin {
     private static File pluginFolder;
 
     private FileChangeReviewer changeReviewer;
-    public static final String VIOLATIONS_OVERVIEW_ID = "net.sourceforge.pmd.eclipse.ui.views.violationOverview";
-    public static final String VIOLATIONS_OUTLINE_ID = "net.sourceforge.pmd.eclipse.ui.views.violationOutline";
 
     private Map<RGB, Color> coloursByRGB = new HashMap<RGB, Color>();
 
     public static final String PLUGIN_ID = "net.sourceforge.pmd.eclipse.plugin";
+    public static final String VIOLATIONS_OVERVIEW_ID = "net.sourceforge.pmd.eclipse.ui.views.violationOverview"; 
+    public static final String VIOLATIONS_OUTLINE_ID = "net.sourceforge.pmd.eclipse.ui.views.violationOutline"; 
 
     private static Map<IProject, IJavaProject> javaProjectsByIProject = new HashMap<IProject, IJavaProject>();
 
@@ -302,6 +304,55 @@ public void fileChangeListenerEnabled(boolean flag) {
             }
         }
     }
+    
+    /** 
+     * Get a view from the view id. 
+     * @param id id of the view 
+     * @return view 
+     */ 
+    public static IViewPart getView(String id) { 
+        IViewReference[] viewReferences = PlatformUI.getWorkbench() 
+        .getActiveWorkbenchWindow().getActivePage().getViewReferences(); 
+        for (int i = 0; i < viewReferences.length; i++) { 
+            if (id.equals(viewReferences[i].getId())) { 
+                return viewReferences[i].getView(false); 
+            } 
+        } 
+        return null; 
+    } 
+     
+    /** 
+     * refresh a view to the id passed in. 
+     *  
+     * @param viewId id of the view 
+     */ 
+    public void refreshView(final String viewId) { 
+        Display.getDefault().asyncExec(new Runnable() { 
+            @Override 
+            public void run() { 
+                try { 
+                    IViewPart view = getView(viewId); 
+                    if (view == null) { 
+                        return; 
+                    } 
+                    boolean found = false; 
+                    IViewPart[] views = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getViews(); 
+                    for (IViewPart activeView: views) { 
+                        if (activeView.getTitle().equals(view.getTitle())) { 
+                            found = true; 
+                        } 
+                    } 
+                    if (!found) { 
+                        return; 
+                    } 
+                    PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().hideView(view); 
+                    PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(viewId); 
+                } catch (PartInitException e) { 
+                    LOG.error(e); 
+                } 
+            } 
+        }); 
+    } 
 
     /*
      * (non-Javadoc)

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

@@ -42,6 +42,7 @@
 import org.eclipse.swt.widgets.Spinner;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.dialogs.PreferencesUtil;
@@ -825,6 +826,13 @@ private void updateMarkerIcons() {
         RootRecord root = new RootRecord(ResourcesPlugin.getWorkspace().getRoot());
         Set<IFile> files = MarkerUtil.allMarkedFiles(root);
         PMDPlugin.getDefault().changedFiles(files);
+        
+        /* Refresh the views to pick up the marker change */ 
+        PMDPlugin.getDefault().refreshView(PMDPlugin.VIOLATIONS_OVERVIEW_ID); 
+        PMDPlugin.getDefault().refreshView(PMDPlugin.VIOLATIONS_OUTLINE_ID); 
+        PMDPlugin.getDefault().refreshView(IPageLayout.ID_PROJECT_EXPLORER); 
+        PMDPlugin.getDefault().refreshView(IPageLayout.ID_OUTLINE); 
+        
     }
 
     public boolean performCancel() {