diff --git a/pmd-eclipse-feature/feature.xml b/pmd-eclipse-feature/feature.xml
index 828e7a019a..eda32c7428 100644
--- a/pmd-eclipse-feature/feature.xml
+++ b/pmd-eclipse-feature/feature.xml
@@ -2,7 +2,7 @@
@@ -39,12 +39,12 @@
id="net.sourceforge.pmd.core"
download-size="0"
install-size="0"
- version="3.5.1"/>
+ version="3.6.1"/>
+ version="3.1.5"/>
diff --git a/pmd-eclipse-pmd/lib/pmd-3.6.jar b/pmd-eclipse-pmd/lib/pmd-3.6.jar
index fef6eddc07..9e18dace76 100644
Binary files a/pmd-eclipse-pmd/lib/pmd-3.6.jar and b/pmd-eclipse-pmd/lib/pmd-3.6.jar differ
diff --git a/pmd-eclipse-pmd/plugin.xml b/pmd-eclipse-pmd/plugin.xml
index 582cd4d219..344566f359 100644
--- a/pmd-eclipse-pmd/plugin.xml
+++ b/pmd-eclipse-pmd/plugin.xml
@@ -3,7 +3,7 @@
diff --git a/pmd-eclipse/.pmd b/pmd-eclipse/.pmd
index 44343658fd..54db634c9e 100644
--- a/pmd-eclipse/.pmd
+++ b/pmd-eclipse/.pmd
@@ -1,2 +1,2 @@
-pmd-eclipse source codefalseEmptySynchronizedBlockpmd-eclipseTooManyFieldspmd-eclipseSystemPrintlnpmd-eclipseConfusingTernarypmd-eclipseMethodNamingConventionspmd-eclipseStringToStringpmd-eclipseDefaultLabelNotLastInSwitchStmtpmd-eclipseExcessiveParameterListpmd-eclipseEmptyFinallyBlockpmd-eclipseFinalizeOnlyCallsSuperFinalizepmd-eclipseNullAssignmentpmd-eclipseReturnFromFinallyBlockpmd-eclipseSimpleDateFormatNeedsLocalepmd-eclipseConstructorCallsOverridableMethodpmd-eclipseAvoidDeeplyNestedIfStmtspmd-eclipseEmptyStaticInitializerpmd-eclipseCollapsibleIfStatementspmd-eclipseCloneMethodMustImplementCloneablepmd-eclipseUnnecessaryReturnpmd-eclipseAvoidReassigningParameterspmd-eclipseMissingBreakInSwitchpmd-eclipseEmptyStatementNotInLooppmd-eclipseJumbledIncrementerpmd-eclipseStringInstantiationpmd-eclipseUseStringBufferForStringAppendspmd-eclipseSwitchStmtsShouldHaveDefaultpmd-eclipseFinalizeDoesNotCallSuperFinalizepmd-eclipseUnnecessaryFinalModifierpmd-eclipseCloseConnectionpmd-eclipseCyclomaticComplexitypmd-eclipseAssignmentInOperandpmd-eclipseAvoidFieldNameMatchingTypeNamepmd-eclipseExceptionAsFlowControlpmd-eclipseBadComparisonpmd-eclipseOptimizableToArrayCallpmd-eclipseImportFromSamePackagepmd-eclipseOverrideBothEqualsAndHashcodepmd-eclipseSuspiciousHashcodeMethodNamepmd-eclipseMethodArgumentCouldBeFinalpmd-eclipseSingularFieldpmd-eclipseMoreThanOneLoggerpmd-eclipseEmptyTryBlockpmd-eclipseUnusedModifierpmd-eclipseCouplingBetweenObjectspmd-eclipseBooleanInstantiationpmd-eclipseLoggerIsNotStaticFinalpmd-eclipseExcessiveImportspmd-eclipseForLoopShouldBeWhileLooppmd-eclipseAvoidInstanceofChecksInCatchClausepmd-eclipseInstantiationToGetClasspmd-eclipseAvoidDollarSignspmd-eclipseUnusedPrivateFieldpmd-eclipseCallSuperInConstructorpmd-eclipseIfElseStmtsMustUseBracespmd-eclipseExceptionTypeCheckingpmd-eclipseDontImportJavaLangpmd-eclipseShortMethodNamepmd-eclipseUnusedFormalParameterpmd-eclipseExcessiveMethodLengthpmd-eclipseSuspiciousConstantFieldNamepmd-eclipseAvoidCatchingThrowablepmd-eclipseSimplifyBooleanReturnspmd-eclipseUnnecessaryConstructorpmd-eclipseAvoidFieldNameMatchingMethodNamepmd-eclipseSimplifyBooleanExpressionspmd-eclipseSimplifyStartsWithpmd-eclipseUnusedPrivateMethodpmd-eclipseSwitchDensitypmd-eclipseDontImportSunpmd-eclipseAvoidProtectedFieldInFinalClasspmd-eclipseUnnecessaryParenthesespmd-eclipseExplicitCallToFinalizepmd-eclipseFinalizeShouldBeProtectedpmd-eclipseMissingStaticMethodInNonInstantiatableClasspmd-eclipseDuplicateImportspmd-eclipseWhileLoopsMustUseBracespmd-eclipseUnnecessaryConversionTemporarypmd-eclipseAccessorClassGenerationpmd-eclipseLooseCouplingpmd-eclipseAvoidSynchronizedAtMethodLevelpmd-eclipseMethodWithSameNameAsEnclosingClasspmd-eclipseUseSingletonpmd-eclipseEmptyWhileStmtpmd-eclipseEmptyCatchBlockpmd-eclipseExcessiveClassLengthpmd-eclipseEqualsNullpmd-eclipseFinalFieldCouldBeStaticpmd-eclipseClassNamingConventionspmd-eclipseAbstractNamingpmd-eclipseAvoidThrowingCertainExceptionTypespmd-eclipseFinalizeOverloadedpmd-eclipseUnconditionalIfStatementpmd-eclipseCloneThrowsCloneNotSupportedExceptionpmd-eclipseEmptyFinalizerpmd-eclipseSimplifyConditionalpmd-eclipseAssignmentToNonFinalStaticpmd-eclipseSuspiciousOctalEscapepmd-eclipseUseNotifyAllInsteadOfNotifypmd-eclipseDoubleCheckedLockingpmd-eclipseExcessivePublicCountpmd-eclipseImmutableFieldpmd-eclipseSignatureDeclareThrowsExceptionpmd-eclipseIfStmtsMustUseBracespmd-eclipseOnlyOneReturnpmd-eclipseUnusedImportspmd-eclipseNonCaseLabelInSwitchStatementpmd-eclipseUseArrayListInsteadOfVectorpmd-eclipseAvoidCatchingNPEpmd-eclipseForLoopsMustUseBracespmd-eclipseUseLocaleWithCaseConversionspmd-eclipseAvoidCallingFinalizepmd-eclipseAvoidInstantiatingObjectsInLoopspmd-eclipseLocalVariableCouldBeFinalpmd-eclipseUnusedLocalVariablepmd-eclipseAvoidDuplicateLiteralspmd-eclipseAvoidConcatenatingNonLiteralsInStringBufferpmd-eclipseAbstractClassWithoutAbstractMethodpmd-eclipseEmptySwitchStatementspmd-eclipseProperCloneImplementationpmd-eclipseNonStaticInitializerpmd-eclipseSuspiciousEqualsMethodNamepmd-eclipseAvoidNonConstructorMethodsWithClassNamepmd-eclipseLongVariablepmd-eclipseIdempotentOperationspmd-eclipseEmptyIfStmtpmd-eclipse
\ No newline at end of file
+pmd-eclipse source codefalseUnnecessaryReturnpmd-eclipseIdempotentOperationspmd-eclipseEmptyTryBlockpmd-eclipseBadComparisonpmd-eclipseOverrideBothEqualsAndHashcodepmd-eclipseNonCaseLabelInSwitchStatementpmd-eclipseSwitchDensitypmd-eclipseCloneMethodMustImplementCloneablepmd-eclipseUnusedModifierpmd-eclipseTooManyFieldspmd-eclipseCloneThrowsCloneNotSupportedExceptionpmd-eclipseAvoidDeeplyNestedIfStmtspmd-eclipseFinalizeShouldBeProtectedpmd-eclipseUnusedFormalParameterpmd-eclipseEmptyCatchBlockpmd-eclipseConfusingTernarypmd-eclipseAbstractClassWithoutAbstractMethodpmd-eclipseUnnecessaryParenthesespmd-eclipseUnusedLocalVariablepmd-eclipseIfStmtsMustUseBracespmd-eclipseOnlyOneReturnpmd-eclipseExcessiveMethodLengthpmd-eclipseWhileLoopsMustUseBracespmd-eclipseDontImportJavaLangpmd-eclipseDoubleCheckedLockingpmd-eclipseNullAssignmentpmd-eclipseReturnFromFinallyBlockpmd-eclipseUnusedPrivateMethodpmd-eclipseImportFromSamePackagepmd-eclipseDuplicateImportspmd-eclipseDefaultLabelNotLastInSwitchStmtpmd-eclipseSwitchStmtsShouldHaveDefaultpmd-eclipseFinalizeDoesNotCallSuperFinalizepmd-eclipseAvoidCallingFinalizepmd-eclipseFinalizeOverloadedpmd-eclipseExcessiveImportspmd-eclipseCouplingBetweenObjectspmd-eclipseCollapsibleIfStatementspmd-eclipseMoreThanOneLoggerpmd-eclipseSuspiciousOctalEscapepmd-eclipseSystemPrintlnpmd-eclipseEmptyFinalizerpmd-eclipseIfElseStmtsMustUseBracespmd-eclipseMissingBreakInSwitchpmd-eclipseForLoopShouldBeWhileLooppmd-eclipseEmptyStaticInitializerpmd-eclipseJumbledIncrementerpmd-eclipseLoggerIsNotStaticFinalpmd-eclipseUnusedImportspmd-eclipseInstantiationToGetClasspmd-eclipseCallSuperInConstructorpmd-eclipseFinalFieldCouldBeStaticpmd-eclipseUseSingletonpmd-eclipseAvoidCatchingNPEpmd-eclipseStringInstantiationpmd-eclipseSuspiciousConstantFieldNamepmd-eclipseExcessiveClassLengthpmd-eclipseShortMethodNamepmd-eclipseUnnecessaryConstructorpmd-eclipseAvoidInstantiatingObjectsInLoopspmd-eclipseSimplifyStartsWithpmd-eclipseFinalizeOnlyCallsSuperFinalizepmd-eclipseSimplifyBooleanReturnspmd-eclipseSimplifyBooleanExpressionspmd-eclipseConstructorCallsOverridableMethodpmd-eclipseEmptyIfStmtpmd-eclipseAvoidInstanceofChecksInCatchClausepmd-eclipseEmptySynchronizedBlockpmd-eclipseEmptyWhileStmtpmd-eclipseSimplifyConditionalpmd-eclipseEqualsNullpmd-eclipseUnnecessaryConversionTemporarypmd-eclipseMethodWithSameNameAsEnclosingClasspmd-eclipseAvoidProtectedFieldInFinalClasspmd-eclipseLongVariablepmd-eclipseExcessiveParameterListpmd-eclipseUnusedPrivateFieldpmd-eclipseForLoopsMustUseBracespmd-eclipseOptimizableToArrayCallpmd-eclipseAvoidDollarSignspmd-eclipseLooseCouplingpmd-eclipseUnconditionalIfStatementpmd-eclipseNonStaticInitializerpmd-eclipseAssignmentToNonFinalStaticpmd-eclipseEmptyStatementNotInLooppmd-eclipseImmutableFieldpmd-eclipseMethodNamingConventionspmd-eclipseAssignmentInOperandpmd-eclipseDontImportSunpmd-eclipseUseNotifyAllInsteadOfNotifypmd-eclipseBooleanInstantiationpmd-eclipseSimpleDateFormatNeedsLocalepmd-eclipseEmptyFinallyBlockpmd-eclipseAvoidFieldNameMatchingMethodNamepmd-eclipseExceptionAsFlowControlpmd-eclipseUseLocaleWithCaseConversionspmd-eclipseUseArrayListInsteadOfVectorpmd-eclipseAvoidReassigningParameterspmd-eclipseSignatureDeclareThrowsExceptionpmd-eclipseClassNamingConventionspmd-eclipseSingularFieldpmd-eclipseSuspiciousHashcodeMethodNamepmd-eclipseAvoidSynchronizedAtMethodLevelpmd-eclipseMissingStaticMethodInNonInstantiatableClasspmd-eclipseProperCloneImplementationpmd-eclipseAbstractNamingpmd-eclipseStringToStringpmd-eclipseAvoidDuplicateLiteralspmd-eclipseCyclomaticComplexitypmd-eclipseAvoidFieldNameMatchingTypeNamepmd-eclipseExcessivePublicCountpmd-eclipseAccessorClassGenerationpmd-eclipseSuspiciousEqualsMethodNamepmd-eclipseUseStringBufferForStringAppendspmd-eclipseUnnecessaryFinalModifierpmd-eclipseEmptySwitchStatementspmd-eclipseAvoidCatchingThrowablepmd-eclipseAvoidNonConstructorMethodsWithClassNamepmd-eclipse
\ No newline at end of file
diff --git a/pmd-eclipse/CHANGELOG.txt b/pmd-eclipse/CHANGELOG.txt
index 729297db2b..d4a7ef61b7 100644
--- a/pmd-eclipse/CHANGELOG.txt
+++ b/pmd-eclipse/CHANGELOG.txt
@@ -2,11 +2,13 @@ Change log for the PMD Eclipse plugin
-------------------------------------
-v3.1.5 - 30/03/2006
+v3.1.5 - xx/04/2006
Runtime
-------
. Update to PMD v3.6
+. Fix the default package issue when generating reports
+. Fix BUG#1467817 Change the label of the rebuild_project question
----------------------------------------------------------------------------------------
diff --git a/pmd-eclipse/src/net/sourceforge/pmd/eclipse/cmd/RunnableCommandProcessor.java b/pmd-eclipse/src/net/sourceforge/pmd/eclipse/cmd/RunnableCommandProcessor.java
deleted file mode 100644
index 035c69372e..0000000000
--- a/pmd-eclipse/src/net/sourceforge/pmd/eclipse/cmd/RunnableCommandProcessor.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Created on 3 d�c. 2004
- *
- * Copyright (c) 2004, PMD for Eclipse Development Team
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * The end-user documentation included with the redistribution, if
- * any, must include the following acknowledgement:
- * "This product includes software developed in part by support from
- * the Defense Advanced Research Project Agency (DARPA)"
- * * Neither the name of "PMD for Eclipse Development Team" nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package net.sourceforge.pmd.eclipse.cmd;
-
-import name.herlin.command.AbstractProcessableCommand;
-import name.herlin.command.CommandException;
-import name.herlin.command.CommandProcessor;
-import name.herlin.command.UnsetInputPropertiesException;
-import net.sourceforge.pmd.eclipse.PMDPlugin;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-/**
- * This is a particular processor for Eclipse in order to handle long running
- * commands. It runs commands in a Workspace Runnable
- *
- * @author Philippe Herlin
- * @version $Revision$
- * @deprecated use always a JobCommandProcessor instead
- *
- * $Log$
- * Revision 1.4 2005/10/24 23:35:19 phherlin
- * Make RunnableCommandProcessor deprecated.
- * For long running commands, a JobCommandProcessor should be used instead.
- *
- * Revision 1.3 2005/05/31 20:44:41 phherlin
- * Continuing refactoring
- *
- * Revision 1.2 2005/05/10 21:49:26 phherlin
- * Fix new violations detected by PMD 3.1
- *
- * Revision 1.1 2005/05/07 13:32:04 phherlin
- * Continuing refactoring
- * Fix some PMD violations
- * Fix Bug 1144793
- * Fix Bug 1190624 (at least try)
- *
- * Revision 1.1 2004/12/03 00:22:42 phherlin
- * Continuing the refactoring experiment.
- * Implement the Command framework.
- * Refine the MVC pattern usage.
- *
- *
- */
-public class RunnableCommandProcessor implements CommandProcessor {
- private static final Log log = LogFactory.getLog("net.sourceforge.pmd.eclipse.cmd.RunnableCommandProcessor");
-
- /**
- * @see name.herlin.command.CommandProcessor#processCommand(name.herlin.command.AbstractProcessableCommand)
- */
- public void processCommand(final AbstractProcessableCommand aCommand) throws CommandException {
- log.debug("Begining workspace runnable command " + aCommand.getName());
-
- try {
- if (!aCommand.isReadyToExecute()) {
- throw new UnsetInputPropertiesException();
- }
-
- final IWorkspaceRunnable task = new RunCommandTask(aCommand);
- final IWorkspace workspace = ResourcesPlugin.getWorkspace();
- workspace.run(task, workspace.getRoot(), IWorkspace.AVOID_UPDATE, ((AbstractDefaultCommand) aCommand).getMonitor());
- } catch (CoreException e) {
- throw new CommandException(e);
- } finally {
- log.debug("Ending workspace runnable command " + aCommand.getName());
- }
-
- }
-
- /**
- * @see name.herlin.command.CommandProcessor#waitCommandToFinish(name.herlin.command.AbstractProcessableCommand)
- * Warning: this is an active wait, cycling every 250ms
- */
- // @PMD:REVIEWED:UnusedFormalParameter: by Herlin on 10/05/05 23:46
- public void waitCommandToFinish(final AbstractProcessableCommand aCommand) throws CommandException {
- try {
- if (!aCommand.isTerminated()) {
- aCommand.wait();
- }
- } catch (InterruptedException e) {
- throw new CommandException(e);
- }
- }
-
- /**
- * Process the command as a batch
- * @param monitor
- * @throws CoreException
- */
- private class RunCommandTask implements IWorkspaceRunnable {
- private final AbstractProcessableCommand command;
-
- public RunCommandTask(final AbstractProcessableCommand command) {
- super();
- this.command = command;
- }
-
- // @PMD:REVIEWED:UnusedFormalParameter: by Herlin on 10/05/05 23:48
- public void run(final IProgressMonitor monitor) throws CoreException {
- try {
- this.command.execute();
- synchronized (this.command) {
- this.command.notifyAll();
- }
- } catch (CommandException e) {
- PMDPlugin.getDefault().logError("Error executing command " + this.command.getName(), e);
- throw new CoreException(new Status(IStatus.ERROR, PMDPlugin.PLUGIN_ID, 0, e.getMessage(), e));
- }
- }
- }
-}