Fixed: Avoid warning on Europa.

> !MESSAGE A handler conflict occurred.  This may disable some commands.

diff --git a/net.sourceforge.phpeclipse.externaltools/plugin.xml b/net.sourceforge.phpeclipse.externaltools/plugin.xml
index 669fc72..03fe24c 100644 (file)
--- a/net.sourceforge.phpeclipse.externaltools/plugin.xml
+++ b/net.sourceforge.phpeclipse.externaltools/plugin.xml
@@ -294,7 +294,7 @@
          <objectContribution
                        objectClass="org.eclipse.core.resources.IFile"
                        nameFilter="*.php"
-                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction.php">
                 <action
                           label="Run External PHP Parser"
                           class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"
@@ -305,7 +305,7 @@
          <objectContribution
                        objectClass="org.eclipse.core.resources.IFile"
                        nameFilter="*.php3"
-                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction.php3">
                 <action
                           label="Run External PHP Parser"
                           class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"
@@ -316,7 +316,7 @@
          <objectContribution
                        objectClass="org.eclipse.core.resources.IFile"
                        nameFilter="*.php4"
-                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction.php4">
                 <action
                           label="Run External PHP Parser"
                           class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"
@@ -327,7 +327,7 @@
          <objectContribution
                        objectClass="org.eclipse.core.resources.IFile"
                        nameFilter="*.php5"
-                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction.php5">
                 <action
                           label="Run External PHP Parser"
                           class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"
@@ -338,7 +338,7 @@
          <objectContribution
                        objectClass="org.eclipse.core.resources.IFile"
                        nameFilter="*.module"
-                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction.module">
                 <action
                           label="Run External PHP Parser"
                           class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"
@@ -349,7 +349,7 @@
          <objectContribution
                        objectClass="org.eclipse.core.resources.IFile"
                        nameFilter="*.inc"
-                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
+                       id="net.sourceforge.phpdt.externaltools.actions.externalParserAction.inc">
                 <action
                           label="Run External PHP Parser"
                           class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index d546f9a..55fbc41 100644 (file)
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -458,7 +458,7 @@
          <objectContribution
                        objectClass="org.eclipse.core.resources.IFile"
                        nameFilter="*.php"
-                       id="net.sourceforge.phpeclipse.actions.popupShowAction">
+                       id="net.sourceforge.phpeclipse.actions.popupShowAction.php">
                 <action
                           label="Open PHP Browser"
                           class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -469,7 +469,7 @@
          <objectContribution
                        objectClass="org.eclipse.core.resources.IFile"
                        nameFilter="*.php3"
-                       id="net.sourceforge.phpeclipse.actions.popupShowAction">
+                       id="net.sourceforge.phpeclipse.actions.popupShowAction.php3">
                 <action
                           label="Open PHP Browser"
                           class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -480,7 +480,7 @@
          <objectContribution
                        objectClass="org.eclipse.core.resources.IFile"
                        nameFilter="*.php4"
-                       id="net.sourceforge.phpeclipse.actions.popupShowAction">
+                       id="net.sourceforge.phpeclipse.actions.popupShowAction.php4">
                 <action
                           label="Open PHP Browser"
                           class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -491,7 +491,7 @@
          <objectContribution
                        objectClass="org.eclipse.core.resources.IFile"
                        nameFilter="*.php5"
-                       id="net.sourceforge.phpeclipse.actions.popupShowAction">
+                       id="net.sourceforge.phpeclipse.actions.popupShowAction.php5">
                 <action
                           label="Open PHP Browser"
                           class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -502,7 +502,7 @@
          <objectContribution
                        objectClass="org.eclipse.core.resources.IFile"
                        nameFilter="*.module"
-                       id="net.sourceforge.phpeclipse.actions.popupShowAction">
+                       id="net.sourceforge.phpeclipse.actions.popupShowAction.module">
                 <action
                           label="Open PHP Browser"
                           class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -513,7 +513,7 @@
          <objectContribution
                        objectClass="org.eclipse.core.resources.IFile"
                        nameFilter="*.inc"
-                       id="net.sourceforge.phpeclipse.actions.popupShowAction">
+                       id="net.sourceforge.phpeclipse.actions.popupShowAction.inc">
                 <action
                           label="Open PHP Browser"
                           class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -524,7 +524,7 @@
          <objectContribution
                        objectClass="org.eclipse.core.resources.IFile"
                        nameFilter="*.phtml"
-                       id="net.sourceforge.phpeclipse.actions.popupShowAction">
+                       id="net.sourceforge.phpeclipse.actions.popupShowAction.phtml">
                 <action
                           label="Open PHP Browser"
                           class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -535,7 +535,7 @@
          <objectContribution
                        objectClass="org.eclipse.core.resources.IFile"
                        nameFilter="*.html"
-                       id="net.sourceforge.phpeclipse.actions.popupShowAction">
+                       id="net.sourceforge.phpeclipse.actions.popupShowAction.html">
                 <action
                           label="Open PHP Browser"
                           class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -546,7 +546,7 @@
                        <objectContribution
                        objectClass="org.eclipse.core.resources.IFile"
                        nameFilter="*.htm"
-                       id="net.sourceforge.phpeclipse.actions.popupShowAction">
+                       id="net.sourceforge.phpeclipse.actions.popupShowAction.htm">
                 <action
                           label="Open PHP Browser"
                           class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -557,7 +557,7 @@
          <objectContribution
                        objectClass="org.eclipse.core.resources.IFile"
                        nameFilter="*.xml"
-                       id="net.sourceforge.phpeclipse.actions.popupShowAction">
+                       id="net.sourceforge.phpeclipse.actions.popupShowAction.xml">
                 <action
                           label="Open PHP Browser"
                           class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"