### Eclipse Workspace Patch 1.0 #P org.eclipse.ui.ide.application Index: META-INF/MANIFEST.MF =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.ui.ide.application/META-INF/MANIFEST.MF,v retrieving revision 1.2 diff -u -r1.2 MANIFEST.MF --- META-INF/MANIFEST.MF 17 Jan 2007 19:59:23 -0000 1.2 +++ META-INF/MANIFEST.MF 5 Mar 2007 23:01:18 -0000 @@ -13,4 +13,5 @@ org.eclipse.update.configurator, org.eclipse.ui, org.eclipse.ui.forms, - org.eclipse.ui.navigator.resources + org.eclipse.ui.navigator.resources, + org.eclipse.core.net;bundle-version="[1.0.0,2.0.0)" Index: src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java,v retrieving revision 1.2 diff -u -r1.2 IDEWorkbenchAdvisor.java --- src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java 25 Jan 2007 15:16:16 -0000 1.2 +++ src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java 5 Mar 2007 23:01:18 -0000 @@ -18,6 +18,7 @@ import java.util.Map; import java.util.TreeMap; +import org.eclipse.core.net.proxy.IProxyService; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; @@ -72,6 +73,7 @@ import org.eclipse.ui.statushandlers.AbstractStatusHandler; import org.eclipse.update.core.SiteManager; import org.osgi.framework.Bundle; +import org.osgi.framework.ServiceReference; import org.osgi.framework.Version; /** @@ -237,6 +239,7 @@ public void postStartup() { try { refreshFromLocal(); + activateProxyService(); checkUpdates(); ((Workbench) PlatformUI.getWorkbench()).registerService( ISelectionConversionService.class, @@ -251,6 +254,22 @@ } /** + * Activate the proxy service by obtaining it. + */ + private void activateProxyService() { + Bundle bundle = Platform.getBundle("org.eclipse.core.net"); //$NON-NLS-1$ + Object proxyService = null; + if (bundle != null) { + ServiceReference ref = bundle.getBundleContext().getServiceReference(IProxyService.class.getName()); + if (ref != null) + proxyService = bundle.getBundleContext().getService(ref); + } + if (proxyService == null) { + IDEWorkbenchPlugin.log("Proxy service could not be found."); //$NON-NLS-1$ + } + } + + /** * Initialize the listener for settings changes. */ private void initializeSettingsChangeListener() { Index: .settings/org.eclipse.jdt.ui.prefs =================================================================== RCS file: .settings/org.eclipse.jdt.ui.prefs diff -N .settings/org.eclipse.jdt.ui.prefs --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .settings/org.eclipse.jdt.ui.prefs 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,6 @@ +#Sat Mar 03 15:45:10 EST 2007 +eclipse.preferences.version=1 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=java;javax;org;com; +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99