|
Lines 66-72
Link Here
|
| 66 |
import org.eclipse.jface.bindings.BindingManagerEvent; |
66 |
import org.eclipse.jface.bindings.BindingManagerEvent; |
| 67 |
import org.eclipse.jface.bindings.IBindingManagerListener; |
67 |
import org.eclipse.jface.bindings.IBindingManagerListener; |
| 68 |
import org.eclipse.jface.databinding.swt.SWTObservables; |
68 |
import org.eclipse.jface.databinding.swt.SWTObservables; |
| 69 |
import org.eclipse.jface.dialogs.ErrorDialog; |
|
|
| 70 |
import org.eclipse.jface.dialogs.IDialogConstants; |
69 |
import org.eclipse.jface.dialogs.IDialogConstants; |
| 71 |
import org.eclipse.jface.dialogs.MessageDialog; |
70 |
import org.eclipse.jface.dialogs.MessageDialog; |
| 72 |
import org.eclipse.jface.dialogs.ProgressMonitorDialog; |
71 |
import org.eclipse.jface.dialogs.ProgressMonitorDialog; |
|
Lines 182-187
Link Here
|
| 182 |
import org.eclipse.ui.services.IServiceLocatorCreator; |
181 |
import org.eclipse.ui.services.IServiceLocatorCreator; |
| 183 |
import org.eclipse.ui.services.ISourceProviderService; |
182 |
import org.eclipse.ui.services.ISourceProviderService; |
| 184 |
import org.eclipse.ui.splash.AbstractSplashHandler; |
183 |
import org.eclipse.ui.splash.AbstractSplashHandler; |
|
|
184 |
import org.eclipse.ui.statushandlers.IStatusAdapterConstants; |
| 185 |
import org.eclipse.ui.statushandlers.StatusAdapter; |
| 185 |
import org.eclipse.ui.statushandlers.StatusManager; |
186 |
import org.eclipse.ui.statushandlers.StatusManager; |
| 186 |
import org.eclipse.ui.swt.IFocusService; |
187 |
import org.eclipse.ui.swt.IFocusService; |
| 187 |
import org.eclipse.ui.themes.IThemeManager; |
188 |
import org.eclipse.ui.themes.IThemeManager; |
|
Lines 195-201
Link Here
|
| 195 |
|
196 |
|
| 196 |
/** |
197 |
/** |
| 197 |
* The workbench class represents the top of the Eclipse user interface. Its |
198 |
* The workbench class represents the top of the Eclipse user interface. Its |
| 198 |
* primary responsability is the management of workbench windows, dialogs, |
199 |
* primary responsibility is the management of workbench windows, dialogs, |
| 199 |
* wizards, and other workbench-related windows. |
200 |
* wizards, and other workbench-related windows. |
| 200 |
* <p> |
201 |
* <p> |
| 201 |
* Note that any code that is run during the creation of a workbench instance |
202 |
* Note that any code that is run during the creation of a workbench instance |
|
Lines 1824-1832
Link Here
|
| 1824 |
StartupThreading.runWithoutExceptions(new StartupRunnable() { |
1825 |
StartupThreading.runWithoutExceptions(new StartupRunnable() { |
| 1825 |
|
1826 |
|
| 1826 |
public void runWithException() throws Throwable { |
1827 |
public void runWithException() throws Throwable { |
| 1827 |
ErrorDialog.openError(null, |
1828 |
StatusAdapter adapter = new StatusAdapter(StatusUtil.newStatus(PlatformUI.PLUGIN_ID, e)); |
| 1828 |
WorkbenchMessages.Problems_Opening_Page, e.getMessage(), e |
1829 |
adapter.setProperty(IStatusAdapterConstants.TITLE_PROPERTY, WorkbenchMessages.Problems_Opening_Page); |
| 1829 |
.getStatus()); |
1830 |
StatusManager.getManager().handle(adapter,StatusManager.SHOW); |
| 1830 |
}}); |
1831 |
}}); |
| 1831 |
} |
1832 |
} |
| 1832 |
} |
1833 |
} |
|
Lines 1919-1930
Link Here
|
| 1919 |
.runWithoutExceptions(new StartupRunnable() { |
1920 |
.runWithoutExceptions(new StartupRunnable() { |
| 1920 |
|
1921 |
|
| 1921 |
public void runWithException() throws Throwable { |
1922 |
public void runWithException() throws Throwable { |
| 1922 |
ErrorDialog |
1923 |
StatusAdapter adapter = new StatusAdapter(restoreResult); |
| 1923 |
.openError( |
1924 |
adapter.setProperty(IStatusAdapterConstants.TITLE_PROPERTY, WorkbenchMessages.Workspace_problemsTitle); |
| 1924 |
null, |
1925 |
StatusManager.getManager().handle(adapter, StatusManager.SHOW); |
| 1925 |
WorkbenchMessages.Workspace_problemsTitle, |
|
|
| 1926 |
WorkbenchMessages.Workbench_problemsRestoringMsg, |
| 1927 |
restoreResult); |
| 1928 |
} |
1926 |
} |
| 1929 |
}); |
1927 |
}); |
| 1930 |
|
1928 |
|
|
Lines 2034-2042
Link Here
|
| 2034 |
StartupThreading.runWithoutExceptions(new StartupRunnable() { |
2032 |
StartupThreading.runWithoutExceptions(new StartupRunnable() { |
| 2035 |
|
2033 |
|
| 2036 |
public void runWithException() throws Throwable { |
2034 |
public void runWithException() throws Throwable { |
| 2037 |
ErrorDialog.openError(null, |
2035 |
StatusAdapter adapter = new StatusAdapter(status); |
| 2038 |
WorkbenchMessages.Workbench_problemsSaving, |
2036 |
adapter.setProperty(IStatusAdapterConstants.TITLE_PROPERTY, WorkbenchMessages.Workbench_problemsSaving); |
| 2039 |
WorkbenchMessages.Workbench_problemsSavingMsg, status); |
2037 |
StatusManager.getManager().handle(adapter, StatusManager.SHOW); |
| 2040 |
}}); |
2038 |
}}); |
| 2041 |
|
2039 |
|
| 2042 |
} |
2040 |
} |
|
Lines 2108-2114
Link Here
|
| 2108 |
IExtension[] extensions = point.getExtensions(); |
2106 |
IExtension[] extensions = point.getExtensions(); |
| 2109 |
ArrayList pluginIds = new ArrayList(extensions.length); |
2107 |
ArrayList pluginIds = new ArrayList(extensions.length); |
| 2110 |
for (int i = 0; i < extensions.length; i++) { |
2108 |
for (int i = 0; i < extensions.length; i++) { |
| 2111 |
String id = extensions[i].getNamespace(); |
2109 |
String id = extensions[i].getNamespaceIdentifier(); |
| 2112 |
if (!pluginIds.contains(id)) { |
2110 |
if (!pluginIds.contains(id)) { |
| 2113 |
pluginIds.add(id); |
2111 |
pluginIds.add(id); |
| 2114 |
} |
2112 |
} |
|
Lines 2161-2168
Link Here
|
| 2161 |
|
2159 |
|
| 2162 |
// if the plugin is not in the set of disabled plugins, then |
2160 |
// if the plugin is not in the set of disabled plugins, then |
| 2163 |
// execute the code to start it |
2161 |
// execute the code to start it |
| 2164 |
if (!disabledPlugins.contains(extension.getNamespace())) { |
2162 |
if (!disabledPlugins.contains(extension.getNamespaceIdentifier())) { |
| 2165 |
monitor.subTask(extension.getNamespace()); |
2163 |
monitor.subTask(extension.getNamespaceIdentifier()); |
| 2166 |
SafeRunner.run(new EarlyStartupRunnable(extension)); |
2164 |
SafeRunner.run(new EarlyStartupRunnable(extension)); |
| 2167 |
} |
2165 |
} |
| 2168 |
monitor.worked(1); |
2166 |
monitor.worked(1); |
|
Lines 3088-3094
Link Here
|
| 3088 |
// if the plugin is not in the set of disabled plugins, |
3086 |
// if the plugin is not in the set of disabled plugins, |
| 3089 |
// then |
3087 |
// then |
| 3090 |
// execute the code to start it |
3088 |
// execute the code to start it |
| 3091 |
if (disabledPlugins.indexOf(extension.getNamespace()) == -1) { |
3089 |
if (disabledPlugins.indexOf(extension.getNamespaceIdentifier()) == -1) { |
| 3092 |
SafeRunner.run(new EarlyStartupRunnable(extension)); |
3090 |
SafeRunner.run(new EarlyStartupRunnable(extension)); |
| 3093 |
} |
3091 |
} |
| 3094 |
} |
3092 |
} |
