From 9fe581335424643e4b13160d3f4bd286ef8a9b7d Mon Sep 17 00:00:00 2001
From: Ryan Gustafson <rgustav@users.sourceforge.net>
Date: Thu, 28 Feb 2008 04:46:07 +0000
Subject: [PATCH] Fix 1903578 - Ensure plugin XML element ids are unique with
 the document.

Gah, guess those IDs are used in the code.  Reverted them to the minimum changes needed to fix the message from Eclipse.  I checked to ensure the changed IDs are not referenced in the code.

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@5818 51baf565-9d33-0410-a72c-fc3788e3496d
---
 pmd-eclipse-plugin/pmd-eclipse-ui/plugin.xml | 32 ++++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pmd-eclipse-plugin/pmd-eclipse-ui/plugin.xml b/pmd-eclipse-plugin/pmd-eclipse-ui/plugin.xml
index 09cf8496bf..de75bd0a00 100644
--- a/pmd-eclipse-plugin/pmd-eclipse-ui/plugin.xml
+++ b/pmd-eclipse-plugin/pmd-eclipse-ui/plugin.xml
@@ -101,7 +101,7 @@
                class="net.sourceforge.pmd.ui.actions.PMDRemoveMarkersAction"
                menubarPath="pmd.menu/group"
                enablesFor="+"
-               id="net.sourceforge.pmd.ui.pmdPopupRemoveMarkersAction">
+               id="net.sourceforge.pmd.ui.pmdRemoveMarkersAction">
          </action>
          <action
                label="%action.checkcpd"
@@ -117,7 +117,7 @@
                class="net.sourceforge.pmd.ui.actions.ClearReviewsAction"
                menubarPath="pmd.menu/group"
                enablesFor="+"
-               id="net.sourceforge.pmd.ui.pmdPopupClearReviewsAction">
+               id="net.sourceforge.pmd.ui.pmdClearReviewsAction">
          </action>
          <action
                label="%action.generatereport"
@@ -155,7 +155,7 @@
                class="net.sourceforge.pmd.ui.actions.PMDRemoveMarkersAction"
                menubarPath="pmd.menu/group"
                enablesFor="+"
-               id="net.sourceforge.pmd.ui.pmdFolderRemoveMarkersAction">
+               id="net.sourceforge.pmd.ui.pmdRemoveMarkersAction">
          </action>
          <action
                label="%action.clearreviews"
@@ -163,7 +163,7 @@
                class="net.sourceforge.pmd.ui.actions.ClearReviewsAction"
                menubarPath="pmd.menu/group"
                enablesFor="+"
-               id="net.sourceforge.pmd.ui.pmdFolderClearReviewsAction">
+               id="net.sourceforge.pmd.ui.pmdClearReviewsAction">
          </action>
       </objectContribution>
       <objectContribution
@@ -185,7 +185,7 @@
                class="net.sourceforge.pmd.ui.actions.PMDCheckAction"
                menubarPath="pmd.menu/group"
                enablesFor="+"
-               id="net.sourceforge.pmd.ui.pmdFileCheckFileAction">
+               id="net.sourceforge.pmd.ui.pmdCheckFileAction">
          </action>
          <action
                label="%action.clearpmd"
@@ -193,7 +193,7 @@
                class="net.sourceforge.pmd.ui.actions.PMDRemoveMarkersAction"
                menubarPath="pmd.menu/group"
                enablesFor="+"
-               id="net.sourceforge.pmd.ui.pmdFileRemoveMarkersAction">
+               id="net.sourceforge.pmd.ui.pmdRemoveMarkersAction">
          </action>
          <action
                label="%action.ast"
@@ -209,7 +209,7 @@
                class="net.sourceforge.pmd.ui.actions.ClearReviewsAction"
                menubarPath="pmd.menu/group"
                enablesFor="+"
-               id="net.sourceforge.pmd.ui.pmdFileClearReviewsAction">
+               id="net.sourceforge.pmd.ui.pmdClearReviewsAction">
          </action>
       </objectContribution>
       <viewerContribution
@@ -218,18 +218,18 @@
          <action
                class="net.sourceforge.pmd.ui.actions.PMDRemoveMarkersAction"
                icon="icons/pmd-icon-16.gif"
-               id="net.sourceforge.pmd.ui.pmdTaskListRemoveAllMarkersAction"
+               id="net.sourceforge.pmd.ui.pmdRemoveAllMarkersAction"
                label="%action.clearall"
                menubarPath="additions">
          </action>
       </viewerContribution>
       <viewerContribution
-            id="net.sourceforge.pmd.ui.pmdViolationViewContribution"
+            id="net.sourceforge.pmd.ui.pmdVioaltionViewContribution"
             targetID="net.sourceforge.pmd.ui.views.ViolationView">
          <action
                class="net.sourceforge.pmd.ui.actions.PMDRemoveMarkersAction"
                icon="icons/pmd-icon-16.gif"
-               id="net.sourceforge.pmd.ui.pmdViolationViewRemoveAllMarkersAction"
+               id="net.sourceforge.pmd.ui.pmdRemoveAllMarkersAction"
                label="%action.clearall"
                menubarPath="additions">
          </action>
@@ -242,7 +242,7 @@
                icon="icons/pmd-icon-16.gif"
                class="net.sourceforge.pmd.ui.actions.ClearReviewsAction"
                menubarPath="additions"
-               id="net.sourceforge.pmd.ui.pmdOutlineClearReviewsAction"/>
+               id="net.sourceforge.pmd.ui.pmdClearReviewsAction"/>
       </viewerContribution>
       <objectContribution
             adaptable="true"
@@ -252,19 +252,19 @@
       </objectContribution>
       <objectContribution
             adaptable="false"
-            id="net.sourceforge.pmd.ui.pmdRemoveMarkersContribution"
+            id="net.sourceforge.pmd.ui.pmdOverviewContribution"
             objectClass="net.sourceforge.pmd.ui.model.AbstractPMDRecord">
          <action
                class="net.sourceforge.pmd.ui.actions.PMDRemoveMarkersAction"
                enablesFor="+"
                icon="icons/pmd-icon-16.gif"
-               id="net.sourceforge.pmd.ui.pmdPackageRemoveMarkersAction"
+               id="net.sourceforge.pmd.ui.pmdRemoveMarkersAction"
                label="%action.clearpmd"
                menubarPath="additions"/>
       </objectContribution>
       <objectContribution
             adaptable="false"
-            id="net.sourceforge.pmd.ui.pmdCheckPackageContribution"
+            id="net.sourceforge.pmd.ui.pmdOverviewContribution"
             objectClass="net.sourceforge.pmd.ui.model.PackageRecord">
          <action
                class="net.sourceforge.pmd.ui.actions.PMDCheckAction"
@@ -276,13 +276,13 @@
       </objectContribution>                 
       <objectContribution
             adaptable="false"
-            id="net.sourceforge.pmd.ui.pmdCheckFileContribution"
+            id="net.sourceforge.pmd.ui.pmdOverviewContribution"
             objectClass="net.sourceforge.pmd.ui.model.FileRecord">
          <action
                class="net.sourceforge.pmd.ui.actions.PMDCheckAction"
                enablesFor="+"
                icon="icons/pmd-icon-16.gif"
-               id="net.sourceforge.pmd.ui.pmdCheckFileAction"
+               id="net.sourceforge.pmd.ui.pmdFileCheckProjectAction"
                label="%action.checkpmd"
                menubarPath="additions"/>
       </objectContribution>