phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NPE fix & misc

Browse Source 
git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@7267 51baf565-9d33-0410-a72c-fc3788e3496d
This commit is contained in:
Brian Remedios
2011-09-16 06:02:21 +00:00
parent 11f5efc448
commit c11832e723
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/editors/TypeText.java
View File

@ -3,7 +3,6 @@ package net.sourceforge.pmd.eclipse.ui.preferences.editors;
import net.sourceforge.pmd.util.ClassUtil; import net.sourceforge.pmd.util.ClassUtil;
import net.sourceforge.pmd.util.StringUtil; import net.sourceforge.pmd.util.StringUtil;
import org.eclipse.jdt.core.JavaConventions;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.ModifyListener;
@ -130,7 +129,8 @@ public class TypeText extends Composite {
} }
// FIXME - incorporate this // FIXME - incorporate this
// JavaConventions.validateClassFileName(typeStr, sourceLevel, complianceLevel); // IJavaProject project = getJavaProject();
// IStatus status = JavaConventions.validateClassFileName(typeStr, project.getOption(JavaCore.COMPILER_SOURCE, true), project.getOption(JavaCore.COMPILER_COMPLIANCE, true));
try { try {
return Class.forName(typeStr); return Class.forName(typeStr);

1
pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/util/UniqueItemsAsShapeBuilder.java
View File

@ -95,6 +95,7 @@ public class UniqueItemsAsShapeBuilder extends AbstractCellPainterBuilder {
if (event.index != columnIndex) return; if (event.index != columnIndex) return;
Object item = ((TreeItem)event.item).getData(); Object item = ((TreeItem)event.item).getData();
if (item == null) return;
Set<Comparable<?>> items = RuleUtil.uniqueItemsIn(item, getter); Set<Comparable<?>> items = RuleUtil.uniqueItemsIn(item, getter);
event.width = width + (items.size() * width); event.width = width + (items.size() * width);