Various Patches
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIResourceImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIResourceImpl.java
index d0880f0..052f9bb 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIResourceImpl.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIResourceImpl.java
@@ -336,7 +336,7 @@
{
public Object getNotifier()
{
- return this;
+ return ReferencedXMIResourceImpl.this;
}
public int getFeatureID(Class expectedClass)
{
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/plugin.xml b/plugins/org.eclipse.wst.common.frameworks.ui/plugin.xml
index 21dd329..c9c779e 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/plugin.xml
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/plugin.xml
@@ -55,7 +55,7 @@
<uiContextSensitiveClass
key="org.eclipse.wst.common.frameworks.internal.EnablementDetermination"
context="UI"
- className="org.eclipse.wst.internal.common.frameworks.ui.enablement.UIEnablementManager">
+ className="org.eclipse.wst.common.frameworks.internal.ui.UIEnablementManager">
</uiContextSensitiveClass>
</extension>
<extension
diff --git a/plugins/org.eclipse.wst.validation.ui/plugin.xml b/plugins/org.eclipse.wst.validation.ui/plugin.xml
index 4cec5f0..811d3c1 100644
--- a/plugins/org.eclipse.wst.validation.ui/plugin.xml
+++ b/plugins/org.eclipse.wst.validation.ui/plugin.xml
@@ -32,9 +32,8 @@
<!-- By saying "adaptable=true", this item will appear on both IProject and IJavaProject -->
<extension
point="org.eclipse.ui.popupMenus">
- <objectContribution
- adaptable="true"
- objectClass="org.eclipse.core.resources.IResource"
+ <viewerContribution
+ targetID="#CommonNavigatorPopupMenu"
id="ValidationMenuAction">
<action
label="%VBF_UI_POPUP_RUNVALIDATION"
@@ -43,7 +42,7 @@
enablesFor="+"
id="ValidationAction">
</action>
- </objectContribution>
+ </viewerContribution>
</extension>
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationMenuAction.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationMenuAction.java
index dbb0ea8..229f1c6 100644
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationMenuAction.java
+++ b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationMenuAction.java
@@ -35,7 +35,8 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionDelegate;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
import org.eclipse.wst.common.frameworks.internal.ValidationSelectionHandlerRegistryReader;
import org.eclipse.wst.validation.internal.ConfigurationManager;
import org.eclipse.wst.validation.internal.ProjectConfiguration;
@@ -53,7 +54,7 @@
* This class implements the pop-up menu item "Run Validation" When the item is selected, this
* action triggers a validation of the project, using all configured, enabled validators.
*/
-public class ValidationMenuAction implements IActionDelegate {
+public class ValidationMenuAction implements IViewActionDelegate {
private ISelection _currentSelection = null;
protected static final String SEP = "/"; //$NON-NLS-1$
private Display _currentDisplay = null;
@@ -545,7 +546,13 @@
*
* @see org.eclipse.ui.IActionDelegate2#dispose()
*/
- public void dispose() {
- // TODO Auto-generated method stub
+ public void dispose() {
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
+ */
+ public void init(IViewPart view) {
+
}
}
\ No newline at end of file
