Formatting, whitespace, checkstyle

Author: adangel

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/AbstractDefaultCommand.java

@@ -236,7 +236,7 @@ protected void beginTask(String name, int totalWork) {
     /**
      * delegate method to monitor.done()
      * 
-     * @see org.eclipse.core.runtime.IProgressMonitor#done
+     * @see org.eclipse.core.runtime.IProgressMonitor#DONE
      */
     protected void done() {
         if (monitor != null) {

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/BuildProjectCommand.java

@@ -54,7 +54,7 @@ public class BuildProjectCommand extends AbstractProjectCommand {
     private static final long serialVersionUID = 1L;
 
     /**
-     * @param name
+     * @param NAME
      */
     public BuildProjectCommand() {
         super("BuildProject", "Rebuild a project.");

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/DetectCutAndPasteCmd.java

@@ -163,7 +163,7 @@ public void reset() {
     }
 
     /**
-     * @param language
+     * @param LANGUAGE
      *            The language to set.
      */
     public void setLanguage(String theLanguage) {

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

@@ -37,9 +37,9 @@ public class PreferenceUIStore {
     private static final char STRING_SEPARATOR = ',';
 
     private static final RuleColumnDescriptor[] DEFAULT_HIDDEN_COLUMNS = new RuleColumnDescriptor[] {
-        RuleTableColumns.externalURL, RuleTableColumns.minLangVers, RuleTableColumns.fixCount,
-        RuleTableColumns.exampleCount, RuleTableColumns.maxLangVers, RuleTableColumns.since,
-        RuleTableColumns.modCount };
+        RuleTableColumns.EXTERNAL_URL, RuleTableColumns.MIN_LANGUAGE_VERSION, RuleTableColumns.FIX_COUNT,
+        RuleTableColumns.EXAMPLE_COUNT, RuleTableColumns.MAX_LANGUAGE_VERSION, RuleTableColumns.SINCE,
+        RuleTableColumns.MOD_COUNT };
 
     private static final boolean DEFAULT_SORT_UP = false;
 

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/dialogs/NewPropertyDialog.java

@@ -175,7 +175,7 @@ private Text buildNameText(Composite parent) {
         final Text text = new Text(parent, SWT.SINGLE | SWT.BORDER);
         setFieldLayoutData(text);
 
-        text.addVerifyListener(RuleUIUtil.RuleNameVerifier);
+        text.addVerifyListener(RuleUIUtil.RULE_NAME_VERIFIER);
 
         text.addListener(SWT.Modify, new Listener() {
             public void handleEvent(Event event) {
@@ -209,7 +209,7 @@ private Text buildLabelField(Composite parent) {
         final Text text = new Text(parent, SWT.SINGLE | SWT.BORDER);
         setFieldLayoutData(text);
 
-        text.addVerifyListener(RuleUIUtil.RuleLabelVerifier);
+        text.addVerifyListener(RuleUIUtil.RULE_LABEL_VERIFIER);
 
         text.addListener(SWT.Modify, new Listener() {
             public void handleEvent(Event event) {

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/model/AbstractPMDRecord.java

@@ -60,6 +60,7 @@ public abstract class AbstractPMDRecord {
     public static final int TYPE_MARKER = 16;
 
     public static final AbstractPMDRecord[] EMPTY_RECORDS = new AbstractPMDRecord[0];
+
     /**
      * @return the Name of the Element
      */
@@ -108,7 +109,8 @@ public List<AbstractPMDRecord> getChildrenAsList() {
     /**
      * Adds a Resource to the Model and returns a new AbstractPMDRecord for it.
      *
-     * @param resource, the Element to insert
+     * @param resource,
+     *            the Element to insert
      * @return a new AbstractPMDRecord with the given Element in it or null if
      *         the Resource does not exist
      */
@@ -118,7 +120,8 @@ public List<AbstractPMDRecord> getChildrenAsList() {
      * Removes a Resource and also deletes the Record for it. Returns the
      * removed Record.
      *
-     * @param resource, the Resource to remove
+     * @param resource,
+     *            the Resource to remove
      * @return the Record for the Resource or null if the Resource does not
      *         exist
      */
@@ -127,22 +130,21 @@ public List<AbstractPMDRecord> getChildrenAsList() {
     /**
      * Gets the number of violations (markers) that belong to a priority.
      *
-     * @param prio priority to search for
+     * @param prio
+     *            priority to search for
      * @return number of found violations
      */
     public abstract int getNumberOfViolationsToPriority(int prio, boolean invertMarkerAndFileRecords);
 
     /**
-     * Gets the counted lines of code (loc).
-     * This works recursive.
+     * Gets the counted lines of code (loc). This works recursive.
      *
      * @return loc lines of code
      */
     public abstract int getLOC();
 
     /**
-     * Gets the number of methods.
-     * This works recursive.
+     * Gets the number of methods. This works recursive.
      *
      * @return number of counted methods
      */
@@ -200,15 +202,17 @@ public IMarker[] findMarkers() {
             }
         }
 
-        return markerList.isEmpty() ? null : markerList.toArray(new IMarker[markerList.size()]); // NOPMD by Herlin on 07/10/06 15:51
+        return markerList.isEmpty() ? null : markerList.toArray(new IMarker[0]);
     }
 
     /**
      * Finds Markers that have a given Attribute with a given Value. Finds
      * children Markers recursively (needs to be stopped by overwriting).
      *
-     * @param attributeName, the Name of the Attribute to search for
-     * @param value, the Value, the Attribute should have
+     * @param attributeName,
+     *            the Name of the Attribute to search for
+     * @param value,
+     *            the Value, the Attribute should have
      * @return a List of Markers that have the given attribute and Value or
      *         null, if no Markers were found
      */
@@ -228,10 +232,11 @@ public IMarker[] findMarkersByAttribute(String attributeName, Object value) {
     }
 
     /**
-     * Finds a Resource and returns the corresponding Record. Recursively searches
-     * the children, needs to be stopped by overwriting.
+     * Finds a Resource and returns the corresponding Record. Recursively
+     * searches the children, needs to be stopped by overwriting.
      *
-     * @param resource, the Resource to search for
+     * @param resource,
+     *            the Resource to search for
      * @return the corresponding AbstractPMDRecord for the Resource or null, if
      *         the Resource could not be found
      */
@@ -245,12 +250,10 @@ public AbstractPMDRecord findResource(IResource resource) {
             // check the children if the Resource exists
             if (thisChild.getResource().equals(resource)) {
                 record = thisChild;
-            }
-
-            // if it is not the current children, but the Type are different
-            // it could be one of the grand children
-            // check this childs children recursively
-            else if (thisChild.getResourceType() != resource.getType()) {
+            } else if (thisChild.getResourceType() != resource.getType()) {
+                // if it is not the current children, but the Type are different
+                // it could be one of the grand children
+                // check this childs children recursively
                 final AbstractPMDRecord grandChild = thisChild.findResource(resource);
                 if (grandChild != null) {
                     record = grandChild;
@@ -265,8 +268,10 @@ record = grandChild;
      * Finds a Resource with a given Name and Type. Checks children recursively
      * (needs to be stopped by overwriting).
      *
-     * @param name, the Name of the Resource
-     * @param type, the Type, one of ROOT, PROJECT, PACKAGE or FILE
+     * @param name,
+     *            the Name of the Resource
+     * @param type,
+     *            the Type, one of ROOT, PROJECT, PACKAGE or FILE
      * @return the Record for the Resource or null, if the Resource could not be
      *         found
      */
@@ -280,10 +285,8 @@ public AbstractPMDRecord findResourceByName(String name, int type) {
             // If type and name are equals, then the record is the one we search
             if (thisChild.getResourceType() == type && thisChild.getName().equalsIgnoreCase(name)) {
                 record = thisChild;
-            }
-
-            // else we check the child's children the same way
-            else {
+            } else {
+                // else we check the child's children the same way
                 final AbstractPMDRecord grandChild = thisChild.findResourceByName(name, type);
                 if (grandChild != null) {
                     record = grandChild;
@@ -295,26 +298,26 @@ record = grandChild;
     }
 
     /**
-     * Finds all Resources with a given Name and Type. Checks children recursively
-     * (needs to be stopped by overwriting).
+     * Finds all Resources with a given Name and Type. Checks children
+     * recursively (needs to be stopped by overwriting).
      *
-     * @param name, the Name of the Resource
-     * @param type, the Type, one of ROOT, PROJECT, PACKAGE or FILE
+     * @param name,
+     *            the Name of the Resource
+     * @param type,
+     *            the Type, one of ROOT, PROJECT, PACKAGE or FILE
      * @return all resources that match the name and type
      */
     public List<AbstractPMDRecord> findResourcesByName(String name, int type) {
         final List<AbstractPMDRecord> records = new ArrayList<AbstractPMDRecord>();
         final List<AbstractPMDRecord> thisChildren = getChildrenAsList();
 
         for (AbstractPMDRecord thisChild : thisChildren) {
-      
+
             // If type and name are equals, then the record is the one we search
             if (thisChild.getResourceType() == type && thisChild.getName().equalsIgnoreCase(name)) {
                 records.add(thisChild);
-            }
-
-            // else we check the child's children the same way
-            else {
+            } else {
+                // else we check the child's children the same way
                 final List<AbstractPMDRecord> grandChilds = thisChild.findResourcesByName(name, type);
                 records.addAll(grandChilds);
             }

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/model/DataflowMethodRecord.java

@@ -39,19 +39,19 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import net.sourceforge.pmd.lang.ast.Node;
-import net.sourceforge.pmd.util.StringUtil;
-import net.sourceforge.pmd.eclipse.runtime.PMDRuntimeConstants;
-import net.sourceforge.pmd.eclipse.runtime.builder.MarkerUtil;
-import net.sourceforge.pmd.eclipse.ui.PMDUiConstants;
-import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
-import net.sourceforge.pmd.eclipse.ui.nls.StringKeys;
-
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.IMethod;
 
+import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
+import net.sourceforge.pmd.eclipse.runtime.PMDRuntimeConstants;
+import net.sourceforge.pmd.eclipse.runtime.builder.MarkerUtil;
+import net.sourceforge.pmd.eclipse.ui.PMDUiConstants;
+import net.sourceforge.pmd.eclipse.ui.nls.StringKeys;
+import net.sourceforge.pmd.lang.ast.Node;
+import net.sourceforge.pmd.util.StringUtil;
+
 /**
  * This class holds information for use with the dataflow view. It contains a
  * Java-Method and the corresponding PMD-Method (SimpleNode) and can return
@@ -67,8 +67,10 @@ public class DataflowMethodRecord {
     /**
      * Constructor
      *
-     * @param javaMethod, the Method of the JavaModel
-     * @param pmdMethod, the corresponding PMD-SimpleNode / ASTMethodDeclaration
+     * @param javaMethod,
+     *            the Method of the JavaModel
+     * @param pmdMethod,
+     *            the corresponding PMD-SimpleNode / ASTMethodDeclaration
      */
     public DataflowMethodRecord(IMethod javaMethod, Node pmdMethod) {
         if (javaMethod == null) {
@@ -110,14 +112,15 @@ public IResource getResource() {
      * @return a List of Anomalies
      */
     public IMarker[] getMarkers() {
-    	// TODO optimize this to avoid creation when no results found
+        // TODO optimize this to avoid creation when no results found
         final List<IMarker> markers = new ArrayList<IMarker>();
         try {
             if (method.getResource().isAccessible()) {
 
                 // we can only find Markers for a file
                 // we use the DFA-Marker-ID set for Dataflow Anomalies
-                final IMarker[] allMarkers = MarkerUtil.findMarkers(method.getResource(), PMDRuntimeConstants.PMD_DFA_MARKER);
+                final IMarker[] allMarkers = MarkerUtil.findMarkers(method.getResource(),
+                        PMDRuntimeConstants.PMD_DFA_MARKER);
 
                 // we only want to get the Markers for this Method,
                 // so we need to "extract" them from the whole List
@@ -197,13 +200,11 @@ private boolean markerIsValid(IMarker marker) {
 
                 // if it is a String, it has to be the Variable
                 // or Message, which shouldn't be empty
-                if (values[k] instanceof String && StringUtil.isEmpty((String)values[k])) {
+                if (values[k] instanceof String && StringUtil.isEmpty((String) values[k])) {
                     isValid = false;
-                }
-
-                // else it is one of the Lines (Line, Line2)
-                // and they also should not be 0
-                else if (values[k] instanceof Number && ((Number) values[k]).intValue() == 0) {
+                } else if (values[k] instanceof Number && ((Number) values[k]).intValue() == 0) {
+                    // else it is one of the Lines (Line, Line2)
+                    // and they also should not be 0
                     isValid = false;
                 }
             }
@@ -237,11 +238,10 @@ private boolean markerIsInList(IMarker marker, List<IMarker> list) {
                 boolean markersAreEqual = true;
                 for (int j = 0; j < listAttr.length; j++) {
                     // compare the String- and Integer-Values
-                    if (markerAttr[j] instanceof String && !((String) markerAttr[j]).equalsIgnoreCase((String) listAttr[j])) {
+                    if (markerAttr[j] instanceof String
+                            && !((String) markerAttr[j]).equalsIgnoreCase((String) listAttr[j])) {
                         markersAreEqual = false;
-                    }
-
-                    else if (markerAttr[j] instanceof Integer && !((Integer) markerAttr[j]).equals(listAttr[j])) {
+                    } else if (markerAttr[j] instanceof Integer && !((Integer) markerAttr[j]).equals(listAttr[j])) {
                         markersAreEqual = false;
                     }
                 }