From 2f5a834dab80bfe2603f47308af707fa989691d7 Mon Sep 17 00:00:00 2001 From: Brian Remedios Date: Tue, 5 Oct 2010 03:49:35 +0000 Subject: [PATCH] !!! git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@7151 51baf565-9d33-0410-a72c-fc3788e3496d --- .../net/sourceforge/pmd/eclipse/ui/editors/xpath.properties | 2 +- .../src/net/sourceforge/pmd/eclipse/ui/nls/StringKeys.java | 6 ++++++ .../pmd/eclipse/ui/preferences/GeneralPreferencesPage.java | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/editors/xpath.properties b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/editors/xpath.properties index 9fa3c60957..70d925ed64 100644 --- a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/editors/xpath.properties +++ b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/editors/xpath.properties @@ -5,4 +5,4 @@ varnamedelimiter=$ multilinecommentstart=/* multilinecommentend=*/ punctuation=(){};:?<>=+-*/&|~!%.[] -keywords=AdditiveExpression AllocationExpression Annotation ArgumentList Arguments ArrayDimsAndInits ArrayInitializer Assignment AssignmentOperator Block BlockStatement BreakStatement BooleanLiteral CastExpression CatchStatement ClassOrInterfaceBody ClassOrInterfaceDeclaration ClassOrInterfaceBodyDeclaration ClassOrInterfaceType ConditionalExpression ConditionalAndExpression ConditionalOrExpression ConstructorDeclaration ContinueStatement DoLoop Element EmptyStatement EqualityExpression ExplicitConstructorInvocation Expression ExtendsList FieldDeclaration FinallyStatement ForLoop ForInLoop ForStatement FormalParameter FormalParameters IfStatement ImplementsList ImportDeclaration Initializer InstanceOfExpression LabeledStatement Literal LocalVariableDeclaration MarkerAnnotation MethodDeclaration MethodDeclarator Name NameList NullLiteral NumberLiteral PackageDeclaration PrimaryExpression PrimaryPrefix PrimarySuffix PrimitiveType ReferenceType RelationalExpression ResultType ReturnStatement Statement StatementExpression SwitchLabel SwitchStatement SynchronizedStatement ThrowStatement TryStatement Type TypeArgument TypeArguments TypeDeclaration TypeParameter TypeParameters VariableDeclaration VariableDeclarator VariableDeclaratorId VariableInitializer UnaryExpression UnaryExpressionNotPlusMinus WhileLoop WhileStatement \ No newline at end of file +keywords=AdditiveExpression AllocationExpression Annotation ArgumentList Arguments ArrayDimsAndInits ArrayInitializer Assignment AssignmentOperator Block BlockStatement BreakStatement BooleanLiteral CastExpression CatchStatement ClassOrInterfaceBody ClassOrInterfaceDeclaration ClassOrInterfaceBodyDeclaration ClassOrInterfaceType CompilationUnit ConditionalExpression ConditionalAndExpression ConditionalOrExpression ConstructorDeclaration ContinueStatement DoLoop Element EmptyStatement EqualityExpression ExplicitConstructorInvocation Expression ExtendsList FieldDeclaration FinallyStatement ForLoop ForInLoop ForStatement FormalParameter FormalParameters IfStatement ImplementsList ImportDeclaration Initializer InstanceOfExpression LabeledStatement Literal LocalVariableDeclaration MarkerAnnotation MethodDeclaration MethodDeclarator Name NameList NullLiteral NumberLiteral PackageDeclaration PrimaryExpression PrimaryPrefix PrimarySuffix PrimitiveType ReferenceType RelationalExpression ResultType ReturnStatement Statement StatementExpression SwitchLabel SwitchStatement SynchronizedStatement ThrowStatement TryStatement Type TypeArgument TypeArguments TypeDeclaration TypeParameter TypeParameters VariableDeclaration VariableDeclarator VariableDeclaratorId VariableInitializer UnaryExpression UnaryExpressionNotPlusMinus WhileLoop WhileStatement \ No newline at end of file diff --git a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/nls/StringKeys.java b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/nls/StringKeys.java index b934707dd9..17c7451322 100644 --- a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/nls/StringKeys.java +++ b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/nls/StringKeys.java @@ -353,6 +353,12 @@ public class StringKeys { public static final String PRIORITY_COLUMN_COLOR = "priority.column.color"; public static final String PRIORITY_COLUMN_DESC = "priority.column.description"; + public static final String NODE_COLUMN_NAME = "node.column.name"; + public static final String NODE_IMAGE_DATA = "node.column.image_data"; + public static final String NODE_LINE_NUM = "node.column.line_num"; + public static final String NODE_DERIVED = "node.column.derived"; + public static final String NODE_IMG_OR_DERIVED = "node.column.img_or_derived"; + /** * This class is not meant to be instantiated * diff --git a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/GeneralPreferencesPage.java b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/GeneralPreferencesPage.java index 80e38df4ef..70de7418b7 100644 --- a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/GeneralPreferencesPage.java +++ b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/GeneralPreferencesPage.java @@ -10,15 +10,15 @@ import net.sourceforge.pmd.eclipse.plugin.PMDPlugin; 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.BasicTableLabelProvider; 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; import net.sourceforge.pmd.eclipse.ui.nls.StringKeys; -import net.sourceforge.pmd.eclipse.ui.priority.PriorityColumnDescriptor; +import net.sourceforge.pmd.eclipse.ui.priority.PriorityColumnUI; import net.sourceforge.pmd.eclipse.ui.priority.PriorityDescriptor; import net.sourceforge.pmd.eclipse.ui.priority.PriorityDescriptorCache; -import net.sourceforge.pmd.eclipse.ui.priority.PriorityTableLabelProvider; import net.sourceforge.pmd.util.StringUtil; import org.apache.log4j.Level; @@ -224,7 +224,7 @@ public class GeneralPreferencesPage extends PreferencePage implements IWorkbench public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } public Object[] getElements(Object inputElement) { return (RulePriority[])inputElement; } }; - PriorityTableLabelProvider labelProvider = new PriorityTableLabelProvider(PriorityColumnDescriptor.VisibleColumns); + BasicTableLabelProvider labelProvider = new BasicTableLabelProvider(PriorityColumnUI.VisibleColumns); tableViewer = new TableViewer(group, SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION); Table table = tableViewer.getTable();