Get JEM Tests working in build process. They had been failing for a bit.
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/CreateRegistryJobHandler.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/CreateRegistryJobHandler.java index 35386d7..7ba9188 100644 --- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/CreateRegistryJobHandler.java +++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/CreateRegistryJobHandler.java
@@ -10,7 +10,7 @@ *******************************************************************************/ /* * $RCSfile: CreateRegistryJobHandler.java,v $ - * $Revision: 1.6 $ $Date: 2004/06/11 15:35:03 $ + * $Revision: 1.7 $ $Date: 2004/06/14 16:07:26 $ */ package org.eclipse.jem.internal.beaninfo.adapters; @@ -60,18 +60,29 @@ Job currentJob = jobManager.currentJob(); if (currentJob == null || (!currentJob.belongsTo(ResourcesPlugin.FAMILY_AUTO_BUILD) && !currentJob.belongsTo(ResourcesPlugin.FAMILY_MANUAL_BUILD))) { // See if autojob is waiting or sleeping. - Job[] autojobs = jobManager.find(ResourcesPlugin.FAMILY_AUTO_BUILD); - for (int i = 0; i < autojobs.length; i++) { - int state = autojobs[i].getState(); - if (state == Job.WAITING || state == Job.SLEEPING) { - BeaninfoPlugin.getPlugin().getLogger().log("Build job waiting when trying to start beaninfo registry. Possible race.", Level.WARNING); // $NON-NLS-1$ - break; + if (isAutoWaiting()) { + try { + Thread.sleep(200); // Wait just .2 seconds to give build a chance to start. If it is still not started, then just go on. + } catch (InterruptedException e) { } + if (isAutoWaiting()) + BeaninfoPlugin.getPlugin().getLogger().log("Build job waiting when trying to start beaninfo registry. Possible race.", Level.WARNING); // $NON-NLS-1$ } } jobHandler.processCreateRegistry(nature); } + + private static boolean isAutoWaiting() { + Job[] autojobs = Platform.getJobManager().find(ResourcesPlugin.FAMILY_AUTO_BUILD); + for (int i = 0; i < autojobs.length; i++) { + int state = autojobs[i].getState(); + if (state == Job.WAITING || state == Job.SLEEPING) + return true; + } + return false; + } + /** * Process the create of the registry. This should be overridden to
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEProxyFactoryRegistry.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEProxyFactoryRegistry.java index 84e2865..fa78e87 100644 --- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEProxyFactoryRegistry.java +++ b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEProxyFactoryRegistry.java
@@ -11,7 +11,7 @@ *******************************************************************************/ /* * $RCSfile: IDEProxyFactoryRegistry.java,v $ - * $Revision: 1.3 $ $Date: 2004/06/02 15:57:12 $ + * $Revision: 1.4 $ $Date: 2004/06/14 16:07:27 $ */ import java.net.URL; @@ -57,8 +57,11 @@ * @see java.lang.ClassLoader#findClass(java.lang.String) */ protected Class findClass(String name) throws ClassNotFoundException { - Class c = bundle.loadClass(name); - return c != null ? c : super.findClass(name); + try { + return bundle.loadClass(name); + } catch (ClassNotFoundException e) { + return super.findClass(name); + } } /* (non-Javadoc)