[pmd-devel] SF.net SVN: pmd:[7121] trunk/pmd-eclipse-plugin/plugins/net.sourceforge.pmd .eclipse.plugin

[<hoo...@us...>]

Revision: 7121
          http://pmd.svn.sourceforge.net/pmd/?rev=7121&view=rev
Author:   hooperbloob
Date:     2010-09-02 09:02:55 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
Decorator-related bugfixes

Modified Paths:
--------------
    trunk/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/CHANGELOG.txt
    trunk/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/plugin/PMDPlugin.java
    trunk/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/GeneralPreferencesPage.java

Modified: trunk/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/CHANGELOG.txt
===================================================================
--- trunk/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/CHANGELOG.txt	2010-09-02 07:28:18 UTC (rev 7120)
+++ trunk/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/CHANGELOG.txt	2010-09-02 09:02:55 UTC (rev 7121)
@@ -10,7 +10,7 @@
 .    Allows users to group/edit rules by multiple criteria
 .    New ability to enable/disable rules without removing them
 .    larger editors for the various fields
-.	 new rule creation wizard supports new non-Java languages
+.	 support for non-Java languages
 .    group editing of filter exclusion rules
 .    highlighting of non-default property values
 .    Color-tagged expressions in shown in rule table

Modified: trunk/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/plugin/PMDPlugin.java
===================================================================
--- trunk/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/plugin/PMDPlugin.java	2010-09-02 07:28:18 UTC (rev 7120)
+++ trunk/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/plugin/PMDPlugin.java	2010-09-02 09:02:55 UTC (rev 7121)
@@ -406,6 +406,9 @@
     
     public void changedFiles(Collection<IFile> changedFiles) {
     	
+    	RuleLabelDecorator rld = ruleLabelDecorator();
+    	if (rld == null) return;
+    	
     	Collection<IResource> withParents = new HashSet<IResource>(changedFiles.size() * 2);
     	withParents.addAll(changedFiles);
     	for (IFile file : changedFiles) {
@@ -416,12 +419,8 @@
     		}
     	}
     	
-    	changed( withParents );
+    	rld.changed( withParents );
     }
-    
-	public void changed(Collection<IResource> changedResources) {
-		ruleLabelDecorator().changed(changedResources);
-	}
 	
 	private void addFilesTo(IResource resource, Collection<IResource> allKids) {
 		

Modified: trunk/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/GeneralPreferencesPage.java
===================================================================
--- trunk/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/GeneralPreferencesPage.java	2010-09-02 07:28:18 UTC (rev 7120)
+++ trunk/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/GeneralPreferencesPage.java	2010-09-02 09:02:55 UTC (rev 7121)
@@ -11,6 +11,7 @@
 import net.sourceforge.pmd.eclipse.plugin.UISettings;
 import net.sourceforge.pmd.eclipse.runtime.builder.MarkerUtil;
 import net.sourceforge.pmd.eclipse.runtime.preferences.IPreferences;
+import net.sourceforge.pmd.eclipse.ui.RuleLabelDecorator;
 import net.sourceforge.pmd.eclipse.ui.Shape;
 import net.sourceforge.pmd.eclipse.ui.ShapePicker;
 import net.sourceforge.pmd.eclipse.ui.model.RootRecord;
@@ -645,7 +646,8 @@
     	UISettings.reloadPriorities();
     	
     	// ensure that the decorator gets these new images...
-    	PMDPlugin.getDefault().ruleLabelDecorator().reloadDecorators();
+    	RuleLabelDecorator decorator = PMDPlugin.getDefault().ruleLabelDecorator();
+    	if (decorator != null) decorator.reloadDecorators();
     	
     	RootRecord root = new RootRecord(ResourcesPlugin.getWorkspace().getRoot());
     	Set<IFile> files = MarkerUtil.allMarkedFiles(root);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.