First pass at 3.0M5
diff --git a/features/org.eclipse.jem-feature/com.ibm.etools.emf.workbench/plugin.xml b/features/org.eclipse.jem-feature/com.ibm.etools.emf.workbench/plugin.xml index 70ec68e..2a85f6e 100644 --- a/features/org.eclipse.jem-feature/com.ibm.etools.emf.workbench/plugin.xml +++ b/features/org.eclipse.jem-feature/com.ibm.etools.emf.workbench/plugin.xml
@@ -15,7 +15,7 @@ <requires> <import plugin="com.ibm.etools.emf.ecore.utilities" export="true" version="5.1.1" match="equivalent"/> <import plugin="org.apache.xerces" version="4.0.13" match="equivalent"/> - <import plugin="org.eclipse.core.resources" version="2.1.1" match="equivalent"/> + <import plugin="org.eclipse.core.resources" /> <!--import plugin="com.ibm.etools.logging.util" version="5.1.1" match="equivalent"/--> </requires>
diff --git a/plugins/org.eclipse.jem.beaninfo.ui/.project b/plugins/org.eclipse.jem.beaninfo.ui/.project index a133103..138b007 100644 --- a/plugins/org.eclipse.jem.beaninfo.ui/.project +++ b/plugins/org.eclipse.jem.beaninfo.ui/.project
@@ -10,6 +10,7 @@ <project>org.eclipse.jdt.ui</project> <project>org.eclipse.jem.beaninfo</project> <project>org.eclipse.ui</project> + <project>org.eclipse.ui.ide</project> </projects> <buildSpec> <buildCommand>
diff --git a/plugins/org.eclipse.jem.beaninfo.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SearchPathListLabelProvider.java b/plugins/org.eclipse.jem.beaninfo.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SearchPathListLabelProvider.java index 37276e0..5a46fec 100644 --- a/plugins/org.eclipse.jem.beaninfo.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SearchPathListLabelProvider.java +++ b/plugins/org.eclipse.jem.beaninfo.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SearchPathListLabelProvider.java
@@ -11,7 +11,7 @@ *******************************************************************************/ /* * $RCSfile: SearchPathListLabelProvider.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:20:50 $ + * $Revision: 1.1.4.1 $ $Date: 2003/12/08 22:32:20 $ */ import java.net.MalformedURLException; @@ -31,8 +31,8 @@ import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; -import org.eclipse.ui.ISharedImages; import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.ide.IDE; import org.eclipse.ui.internal.misc.OverlayComposite; import org.eclipse.jem.internal.beaninfo.adapters.*; @@ -70,12 +70,12 @@ fVariableImage = reg.get(JavaPluginImages.IMG_OBJS_ENV_VAR); IWorkbench workbench = JavaPlugin.getDefault().getWorkbench(); - fProjectImage = workbench.getSharedImages().getImage(ISharedImages.IMG_OBJ_PROJECT); + fProjectImage = workbench.getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT); fMissingLibaryImage = reg.get(JavaPluginImages.IMG_OBJS_MISSING_JAR); fMissingVariableImage = reg.get(JavaPluginImages.IMG_OBJS_MISSING_ENV_VAR); fMissingFolderImage = reg.get(JavaPluginImages.IMG_OBJS_MISSING_PACKFRAG_ROOT); - fMissingProjectImage = workbench.getSharedImages().getImage(ISharedImages.IMG_OBJ_PROJECT_CLOSED); + fMissingProjectImage = workbench.getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT_CLOSED); fPackageImage = reg.get(JavaPluginImages.IMG_OBJS_PACKAGE);
diff --git a/plugins/org.eclipse.jem.beaninfo.ui/plugin.xml b/plugins/org.eclipse.jem.beaninfo.ui/plugin.xml index 5ea3db3..0d601d4 100644 --- a/plugins/org.eclipse.jem.beaninfo.ui/plugin.xml +++ b/plugins/org.eclipse.jem.beaninfo.ui/plugin.xml
@@ -18,6 +18,7 @@ <import plugin="org.eclipse.ui"/> <import plugin="org.eclipse.jdt.ui"/> <import plugin="org.eclipse.core.resources"/> + <import plugin="org.eclipse.ui.ide"/> </requires>
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaModelListener.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaModelListener.java index a2145a31..0984160 100644 --- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaModelListener.java +++ b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaModelListener.java
@@ -11,7 +11,7 @@ *******************************************************************************/ /* * $RCSfile: JavaModelListener.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:33:53 $ + * $Revision: 1.1.4.1 $ $Date: 2003/12/08 22:32:34 $ */ import org.eclipse.jdt.core.*; @@ -28,7 +28,7 @@ */ public JavaModelListener() { super(); - JavaCore.addElementChangedListener(this, ElementChangedEvent.PRE_AUTO_BUILD | ElementChangedEvent.POST_CHANGE | ElementChangedEvent.POST_RECONCILE); + JavaCore.addElementChangedListener(this, ElementChangedEvent.POST_CHANGE | ElementChangedEvent.POST_RECONCILE); } /** * One or more attributes of one or more elements maintained by
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/ProjectUtilities.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/ProjectUtilities.java index b4f7bbf..0aa0b2d 100644 --- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/ProjectUtilities.java +++ b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/ProjectUtilities.java
@@ -11,7 +11,7 @@ *******************************************************************************/ /* * $RCSfile: ProjectUtilities.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:33:53 $ + * $Revision: 1.1.4.1 $ $Date: 2003/12/08 22:32:34 $ */ import java.net.MalformedURLException; @@ -320,16 +320,18 @@ /** * Hack to force a reload of the .classpath file */ - public static void forceClasspathReload(IProject project) throws JavaModelException { - IJavaProject javaProj = ProjectUtilities.getJavaProject(project); - if (javaProj != null) { - javaProj.close(); - //Hack provided by eclipse team, as this broke in 2.1.1 - JavaModelManager.PerProjectInfo perProjectInfo = JavaModelManager.getJavaModelManager().getPerProjectInfo(project, true/*create if missing*/); - perProjectInfo.classpath = null; - perProjectInfo.lastResolvedClasspath = null; - } - } +// Nobody in VE uses this and it won't compile with 3.0M5, so comment out for now. When J2EE Tools comes around, they +// can see if they need it and fix it then. +// public static void forceClasspathReload(IProject project) throws JavaModelException { +// IJavaProject javaProj = ProjectUtilities.getJavaProject(project); +// if (javaProj != null) { +// javaProj.close(); +// //Hack provided by eclipse team, as this broke in 2.1.1 +// JavaModelManager.PerProjectInfo perProjectInfo = JavaModelManager.getJavaModelManager().getPerProjectInfo(project, true/*create if missing*/); +// perProjectInfo.classpath = null; +// perProjectInfo.lastResolvedClasspath = null; +// } +// } /** * Import the appropriate resources from the specified archive file */