fixes for reaction to eclipse 3.2 M5 Integration base
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/CommonEditorUtility.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/CommonEditorUtility.java index bf58cbb..d870788 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/CommonEditorUtility.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/CommonEditorUtility.java
@@ -92,7 +92,7 @@ public static boolean promptToSaveDirtyEditors(List dirtyEditors) { if (dirtyEditors.isEmpty()) return true; - return EditorManager.saveAll(dirtyEditors, true, J2EEUIPlugin.getActiveWorkbenchWindow()); + return EditorManager.saveAll(dirtyEditors, true, true, J2EEUIPlugin.getActiveWorkbenchWindow()); } public static boolean promptToSaveDirtyEditorsInProjects(List projects) {
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/TargetRuntimeExtensionHandlerReader.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/TargetRuntimeExtensionHandlerReader.java index f1b1bcc..f22afe4 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/TargetRuntimeExtensionHandlerReader.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/TargetRuntimeExtensionHandlerReader.java
@@ -20,9 +20,9 @@ import java.util.Collection; import java.util.HashMap; -import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IPluginRegistry; +import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Plugin; import org.eclipse.jem.util.RegistryReader; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; @@ -73,11 +73,12 @@ return false; } try { - Plugin plugin = element.getDeclaringExtension().getDeclaringPluginDescriptor().getPlugin(); + String pluginId = element.getDeclaringExtension().getNamespace(); + Plugin plugin = Platform.getPlugin(pluginId); extension = new TargetRuntimeExtension(plugin, element, group, className); addExtensionPoint(extension); return true; - } catch (CoreException ce) { + } catch (Exception ce) { ce.printStackTrace(); } return false;