From de70098bd177e80eceb8a813af1ad80958ee2775 Mon Sep 17 00:00:00 2001 From: Wojciech Sudol Date: Wed, 5 Mar 2014 18:53:32 +0100 Subject: Bug 429633 - [Progress] New e4 progress view causes 184! compile warnings in official build Change-Id: Ibb35cb746608080ee714f43b5ccf27b04e3fec02 Signed-off-by: Wojciech Sudol --- .../META-INF/MANIFEST.MF | 3 ++- .../org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF | 8 ++++---- bundles/org.eclipse.e4.ui.progress/build.properties | 4 ++-- .../examples/programmatic_progress_view.e4xmi | 2 +- bundles/org.eclipse.e4.ui.progress/plugin.properties | 12 ++++++++++++ bundles/org.eclipse.e4.ui.progress/plugin.xml | 4 ---- bundles/org.eclipse.e4.ui.progress/pom.xml | 14 ++++++++++++++ .../eclipse/e4/ui/progress/IProgressConstants.java | 2 +- .../e4/ui/progress/ProgrammaticProgressView.java | 20 ++++++++++---------- .../eclipse/e4/ui/progress/ProgressViewAddon.java | 2 ++ .../e4/ui/progress/internal/FinishedJobs.java | 1 - .../eclipse/e4/ui/progress/internal/ImageTools.java | 2 +- .../progress/internal/JobsViewPreferenceDialog.java | 4 ++-- .../e4/ui/progress/internal/PreferenceStore.java | 9 ++------- .../eclipse/e4/ui/progress/internal/Preferences.java | 5 +---- .../ui/progress/internal/ProgressAnimationItem.java | 17 ----------------- .../e4/ui/progress/internal/ProgressInfoItem.java | 8 ++------ .../e4/ui/progress/internal/ProgressManager.java | 3 +-- .../e4/ui/progress/internal/ProgressManagerUtil.java | 2 +- .../internal/ProgressMonitorFocusJobDialog.java | 3 +-- .../internal/ProgressViewerContentProvider.java | 2 -- .../eclipse/e4/ui/progress/internal/Services.java | 2 +- .../e4/ui/progress/internal/legacy/StatusUtil.java | 2 +- .../META-INF/MANIFEST.MF | 6 ++---- .../org.eclipse.e4.ui.examples.job/build.properties | 3 +-- .../job_factory_view.e4xmi | 2 +- .../programmatic_progress_view.e4xmi | 2 +- 27 files changed, 66 insertions(+), 78 deletions(-) create mode 100644 bundles/org.eclipse.e4.ui.progress/plugin.properties delete mode 100644 bundles/org.eclipse.e4.ui.progress/plugin.xml diff --git a/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF index c89fdf1abd3..4edc58c6b6f 100644 --- a/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF @@ -21,7 +21,8 @@ Export-Package: org.eclipse.e4.core.commands; org.eclipse.e4.ui.workbench, org.eclipse.e4.ui.workbench.renderers.swt, org.eclipse.ui.workbench, - org.eclipse.e4.ui.workbench.swt", + org.eclipse.e4.ui.workbench.swt, + org.eclipse.e4.ui.progress", org.eclipse.e4.core.commands.internal;x-friends:="org.eclipse.e4.ui.bindings,org.eclipse.ui.workbench" Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.6.0,4.0.0)", org.eclipse.e4.core.di;bundle-version="0.9.0" diff --git a/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF index 7e16ce305e0..0dcfb61d6c7 100644 --- a/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF @@ -1,8 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Progress Bundle-SymbolicName: org.eclipse.e4.ui.progress;singleton:=true Bundle-Version: 0.1.0.qualifier +Bundle-Name: %pluginName +Bundle-Vendor: %providerName +Bundle-Localization: plugin Require-Bundle: org.eclipse.core.jobs;bundle-version="3.5.400", org.eclipse.equinox.common;bundle-version="3.6.200", org.eclipse.osgi;bundle-version="3.10.0", @@ -24,7 +26,5 @@ Require-Bundle: org.eclipse.core.jobs;bundle-version="3.5.400", Import-Package: javax.annotation;version="1.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.e4.ui.progress;x-internal:=true, - org.eclipse.e4.ui.progress.internal;x-internal:=true, - org.eclipse.e4.ui.progress.internal.legacy;x-internal:=true +Export-Package: org.eclipse.e4.ui.progress Service-Component: OSGI-INF/progress.xml diff --git a/bundles/org.eclipse.e4.ui.progress/build.properties b/bundles/org.eclipse.e4.ui.progress/build.properties index 9bc820f1626..74d9ea5652d 100644 --- a/bundles/org.eclipse.e4.ui.progress/build.properties +++ b/bundles/org.eclipse.e4.ui.progress/build.properties @@ -2,8 +2,8 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ OSGI-INF/,\ - plugin.xml,\ - icons/ + icons/,\ + plugin.properties source.. = src/ src.includes = examples/,\ pom.xml diff --git a/bundles/org.eclipse.e4.ui.progress/examples/programmatic_progress_view.e4xmi b/bundles/org.eclipse.e4.ui.progress/examples/programmatic_progress_view.e4xmi index d00f988787c..c18dff97915 100644 --- a/bundles/org.eclipse.e4.ui.progress/examples/programmatic_progress_view.e4xmi +++ b/bundles/org.eclipse.e4.ui.progress/examples/programmatic_progress_view.e4xmi @@ -4,7 +4,7 @@ - + View categoryTag:General active diff --git a/bundles/org.eclipse.e4.ui.progress/plugin.properties b/bundles/org.eclipse.e4.ui.progress/plugin.properties new file mode 100644 index 00000000000..be371c73fd7 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.progress/plugin.properties @@ -0,0 +1,12 @@ +############################################################################### +# Copyright (c) 2010, 2014 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +pluginName = Eclipse e4 Progress View +providerName = Eclipse.org diff --git a/bundles/org.eclipse.e4.ui.progress/plugin.xml b/bundles/org.eclipse.e4.ui.progress/plugin.xml deleted file mode 100644 index 4d8a6316736..00000000000 --- a/bundles/org.eclipse.e4.ui.progress/plugin.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/bundles/org.eclipse.e4.ui.progress/pom.xml b/bundles/org.eclipse.e4.ui.progress/pom.xml index df11148b89e..1b12f3dd0e4 100644 --- a/bundles/org.eclipse.e4.ui.progress/pom.xml +++ b/bundles/org.eclipse.e4.ui.progress/pom.xml @@ -18,4 +18,18 @@ org.eclipse.e4.ui.progress 0.1.0-SNAPSHOT eclipse-plugin + + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho.version} + + + -warn:-raw,unchecked + + + + + diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/IProgressConstants.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/IProgressConstants.java index a87a0d02560..00258855baa 100644 --- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/IProgressConstants.java +++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/IProgressConstants.java @@ -161,5 +161,5 @@ public interface IProgressConstants { public static final QualifiedName SHOW_IN_TASKBAR_ICON_PROPERTY = new QualifiedName( PROPERTY_PREFIX, "inTaskBarIcon"); //$NON-NLS-1$ - public static final String RUN_IN_BACKGROUND = "RUN_IN_BACKGROUND"; + public static final String RUN_IN_BACKGROUND = "RUN_IN_BACKGROUND"; //$NON-NLS-1$ } diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/ProgrammaticProgressView.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/ProgrammaticProgressView.java index 1d18d94f398..ed1605c4922 100644 --- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/ProgrammaticProgressView.java +++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/ProgrammaticProgressView.java @@ -42,7 +42,7 @@ import org.eclipse.swt.widgets.Composite; */ public class ProgrammaticProgressView { - private static final String CLEAR_ALL_ICON_URI = "platform:/plugin/org.eclipse.e4.ui.progress/icons/full/elcl16/progress_remall.png"; + private static final String CLEAR_ALL_ICON_URI = "platform:/plugin/org.eclipse.e4.ui.progress/icons/full/elcl16/progress_remall.png"; //$NON-NLS-1$ DetailedProgressViewer viewer; @@ -104,23 +104,23 @@ public class ProgrammaticProgressView { private void createCommands() { clearAllCommand = modelService.createModelElement(MCommand.class); - clearAllCommand.setElementId("clearAllCommand"); - clearAllCommand.setCommandName("clearAllCommand"); + clearAllCommand.setElementId("clearAllCommand"); //$NON-NLS-1$ + clearAllCommand.setCommandName("clearAllCommand"); //$NON-NLS-1$ application.getCommands().add(clearAllCommand); showPreferencesCommand = modelService.createModelElement(MCommand.class); - showPreferencesCommand.setElementId("showPreferencesCommand"); - showPreferencesCommand.setCommandName("showPreferencesCommand"); + showPreferencesCommand.setElementId("showPreferencesCommand"); //$NON-NLS-1$ + showPreferencesCommand.setCommandName("showPreferencesCommand"); //$NON-NLS-1$ application.getCommands().add(showPreferencesCommand); MHandler clearAllHandler = modelService.createModelElement(MHandler.class); clearAllHandler.setCommand(clearAllCommand); - clearAllHandler.setContributionURI("bundleclass://org.eclipse.e4.ui.progress/org.eclipse.e4.ui.progress.ClearAllHandler"); + clearAllHandler.setContributionURI("bundleclass://org.eclipse.e4.ui.progress/org.eclipse.e4.ui.progress.ClearAllHandler"); //$NON-NLS-1$ part.getHandlers().add(clearAllHandler); MHandler showPreferencesHandler = modelService.createModelElement(MHandler.class); showPreferencesHandler.setCommand(showPreferencesCommand); - showPreferencesHandler.setContributionURI("bundleclass://org.eclipse.e4.ui.progress/org.eclipse.e4.ui.progress.ShowPreferencesHandler"); + showPreferencesHandler.setContributionURI("bundleclass://org.eclipse.e4.ui.progress/org.eclipse.e4.ui.progress.ShowPreferencesHandler"); //$NON-NLS-1$ part.getHandlers().add(showPreferencesHandler); } @@ -137,16 +137,16 @@ public class ProgrammaticProgressView { part.setToolbar(toolBar); MHandledMenuItem clearAllMenuItem = modelService.createModelElement(MHandledMenuItem.class); - clearAllMenuItem.setLabel("Clear All"); + clearAllMenuItem.setLabel("Clear All"); //$NON-NLS-1$ clearAllMenuItem.setIconURI(CLEAR_ALL_ICON_URI); clearAllMenuItem.setCommand(clearAllCommand); MHandledMenuItem preferencesMenuItem = modelService.createModelElement(MHandledMenuItem.class); - preferencesMenuItem.setLabel("Preferences"); + preferencesMenuItem.setLabel("Preferences"); //$NON-NLS-1$ preferencesMenuItem.setCommand(showPreferencesCommand); MMenu menu = modelService.createModelElement(MMenu.class); - menu.getTags().add("ViewMenu"); // required + menu.getTags().add("ViewMenu"); // required //$NON-NLS-1$ menu.getChildren().add(clearAllMenuItem); menu.getChildren().add(preferencesMenuItem); diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/ProgressViewAddon.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/ProgressViewAddon.java index 6ffc67c9ea4..caf841270ac 100644 --- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/ProgressViewAddon.java +++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/ProgressViewAddon.java @@ -17,6 +17,7 @@ import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.ui.model.application.MApplication; import org.eclipse.e4.ui.progress.internal.PreferenceStore; +import org.eclipse.e4.ui.progress.internal.Preferences; import org.eclipse.e4.ui.progress.internal.ProgressManager; import org.eclipse.e4.ui.progress.internal.Services; @@ -25,6 +26,7 @@ public class ProgressViewAddon { @PostConstruct public void init(MApplication application, IEclipseContext context) { IEclipseContext appContext = application.getContext(); + appContext.set(Preferences.class, ContextInjectionFactory.make(Preferences.class, appContext)); appContext.set(PreferenceStore.class, ContextInjectionFactory.make(PreferenceStore.class, appContext)); ContextInjectionFactory.make(Services.class, context); ProgressManager progressManager = ContextInjectionFactory.make(ProgressManager.class, context); diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/FinishedJobs.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/FinishedJobs.java index d148d4f9f91..69ef66d4817 100644 --- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/FinishedJobs.java +++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/FinishedJobs.java @@ -24,7 +24,6 @@ import org.eclipse.core.commands.common.EventManager; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.e4.core.di.annotations.Creatable; -import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.model.application.MApplication; import org.eclipse.e4.ui.progress.IDisposableAction; import org.eclipse.e4.ui.progress.IProgressConstants; diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ImageTools.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ImageTools.java index 702d876957d..0ea85998e06 100644 --- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ImageTools.java +++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ImageTools.java @@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Display; public class ImageTools { - private static final String ICONS_LOCATION = "/icons/full/"; + private static final String ICONS_LOCATION = "/icons/full/"; //$NON-NLS-1$ protected static ImageTools instance; diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/JobsViewPreferenceDialog.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/JobsViewPreferenceDialog.java index 77561189cbe..161cbc8eb76 100644 --- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/JobsViewPreferenceDialog.java +++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/JobsViewPreferenceDialog.java @@ -61,12 +61,12 @@ public class JobsViewPreferenceDialog extends ViewSettingsDialog { editArea.setLayout(new GridLayout()); editArea.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL)); - runInBackground = new BooleanFieldEditor(IProgressConstants.RUN_IN_BACKGROUND, ProgressMessages.JobsViewPreferenceDialog_RunInBackground, editArea);//$NON-NLS-1$ + runInBackground = new BooleanFieldEditor(IProgressConstants.RUN_IN_BACKGROUND, ProgressMessages.JobsViewPreferenceDialog_RunInBackground, editArea); runInBackground.setPreferenceName(IProgressConstants.RUN_IN_BACKGROUND); runInBackground.setPreferenceStore(preferenceStore); runInBackground.load(); - showSystemJob = new BooleanFieldEditor(IProgressConstants.SHOW_SYSTEM_JOBS, ProgressMessages.JobsViewPreferenceDialog_ShowSystemJobs, editArea);//$NON-NLS-1$ + showSystemJob = new BooleanFieldEditor(IProgressConstants.SHOW_SYSTEM_JOBS, ProgressMessages.JobsViewPreferenceDialog_ShowSystemJobs, editArea); showSystemJob.setPreferenceName(IProgressConstants.SHOW_SYSTEM_JOBS); showSystemJob.setPreferenceStore(preferenceStore); showSystemJob.load(); diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/PreferenceStore.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/PreferenceStore.java index 84f8e1df7eb..69a0db6532b 100644 --- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/PreferenceStore.java +++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/PreferenceStore.java @@ -11,15 +11,10 @@ package org.eclipse.e4.ui.progress.internal; -import javax.inject.Inject; - import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.util.IPropertyChangeListener; public class PreferenceStore implements IPreferenceStore { - - @Inject - private Preferences preferences; @Override public void addPropertyChangeListener(IPropertyChangeListener listener) { @@ -67,7 +62,7 @@ public class PreferenceStore implements IPreferenceStore { @Override public String getDefaultString(String name) { - return ""; + return ""; //$NON-NLS-1$ } @Override @@ -92,7 +87,7 @@ public class PreferenceStore implements IPreferenceStore { @Override public String getString(String name) { - return ""; + return ""; //$NON-NLS-1$ } @Override diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/Preferences.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/Preferences.java index 3709abae08a..77c142ecd05 100644 --- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/Preferences.java +++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/Preferences.java @@ -14,13 +14,10 @@ package org.eclipse.e4.ui.progress.internal; import java.util.Map; import javax.inject.Inject; -import javax.inject.Singleton; -import org.eclipse.e4.core.di.annotations.Creatable; import org.eclipse.e4.ui.model.application.MApplication; -@Creatable -@Singleton + public class Preferences { private static Map preferences; diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressAnimationItem.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressAnimationItem.java index 010748959aa..76cbd2654e6 100644 --- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressAnimationItem.java +++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressAnimationItem.java @@ -10,22 +10,14 @@ *******************************************************************************/ package org.eclipse.e4.ui.progress.internal; -import java.net.URL; - import org.eclipse.core.commands.ParameterizedCommand; -import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.e4.core.commands.EHandlerService; import org.eclipse.e4.core.services.statusreporter.StatusReporter; import org.eclipse.e4.ui.progress.IProgressConstants; import org.eclipse.e4.ui.progress.internal.legacy.PlatformUI; -import org.eclipse.e4.ui.progress.internal.legacy.StatusAdapter; import org.eclipse.jface.action.IAction; -import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.util.Util; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; @@ -147,17 +139,8 @@ public class ProgressAnimationItem extends AnimationItem implements prop = job.getProperty(IProgressConstants.COMMAND_PROPERTY); if (prop instanceof ParameterizedCommand) { ParameterizedCommand command = (ParameterizedCommand) prop; - Exception exception = null; getEHandlerService().executeHandler(command); removeTopElement(ji); - - if (exception != null) { - Status status = new Status(IStatus.ERROR, IProgressConstants.PLUGIN_ID, - exception.getMessage(), exception); - getStatusReporter().report(status, - StatusReporter.LOG | StatusReporter.SHOW, null); - } - } } diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressInfoItem.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressInfoItem.java index 5eb083df34c..c4fc84b2fc2 100644 --- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressInfoItem.java +++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressInfoItem.java @@ -11,8 +11,6 @@ package org.eclipse.e4.ui.progress.internal; -import com.ibm.icu.text.DateFormat; - import java.net.URL; import java.util.ArrayList; import java.util.Date; @@ -20,11 +18,8 @@ import java.util.Iterator; import java.util.List; import org.eclipse.core.commands.ParameterizedCommand; -import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.e4.core.commands.EHandlerService; import org.eclipse.e4.ui.progress.IProgressConstants; @@ -52,7 +47,6 @@ import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Link; @@ -62,6 +56,8 @@ import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolItem; import org.osgi.framework.FrameworkUtil; +import com.ibm.icu.text.DateFormat; + /** * ProgressInfoItem is the item used to show jobs. diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressManager.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressManager.java index b9f24bc13bb..70d606a1c0c 100644 --- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressManager.java +++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressManager.java @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.Hashtable; import java.util.Iterator; import java.util.Map; @@ -113,7 +112,7 @@ public class ProgressManager extends ProgressProvider { - private static final String IMAGE_KEY = "org.eclipse.ui.progress.images"; //$NON-NLS-1$ +// private static final String IMAGE_KEY = "org.eclipse.ui.progress.images"; //$NON-NLS-1$ @Inject @Optional diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressManagerUtil.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressManagerUtil.java index 8ac0406e9fa..a0338ccbb97 100644 --- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressManagerUtil.java +++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressManagerUtil.java @@ -113,7 +113,7 @@ public class ProgressManagerUtil { */ static void logException(Throwable exception) { Services.getInstance().getLogService().log(LogService.LOG_ERROR, - exception.getMessage() == null ? "" : exception.getMessage(), + exception.getMessage() == null ? "" : exception.getMessage(), //$NON-NLS-1$ exception); } diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressMonitorFocusJobDialog.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressMonitorFocusJobDialog.java index 6a9845c8e62..d1109fdedea 100644 --- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressMonitorFocusJobDialog.java +++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressMonitorFocusJobDialog.java @@ -27,7 +27,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; @@ -103,7 +102,7 @@ class ProgressMonitorFocusJobDialog extends ProgressMonitorJobsDialog { * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ public void widgetSelected(SelectionEvent e) { - Rectangle shellPosition = getShell().getBounds(); + // Rectangle shellPosition = getShell().getBounds(); job.setProperty(IProgressConstants.PROPERTY_IN_DIALOG, Boolean.FALSE); finishedRun(); diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressViewerContentProvider.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressViewerContentProvider.java index 00629345965..60bdef791bb 100644 --- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressViewerContentProvider.java +++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressViewerContentProvider.java @@ -14,8 +14,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import javax.inject.Inject; - import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/Services.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/Services.java index 7c5c8a8fda4..8d24f2cc9b3 100644 --- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/Services.java +++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/Services.java @@ -41,7 +41,7 @@ public class Services { @Inject @Optional @Named(IServiceConstants.ACTIVE_SHELL) - public Shell shell; + private Shell shell; @Inject private MApplication mApplication; diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/legacy/StatusUtil.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/legacy/StatusUtil.java index 61bfacee7b8..a298b55d59e 100644 --- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/legacy/StatusUtil.java +++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/legacy/StatusUtil.java @@ -187,7 +187,7 @@ public class StatusUtil { //TODO localize // return WorkbenchMessages.StatusUtil_errorOccurred; - return "ERROR OCCURRED"; + return "ERROR OCCURRED"; //$NON-NLS-1$ } diff --git a/examples/org.eclipse.e4.ui.examples.job/META-INF/MANIFEST.MF b/examples/org.eclipse.e4.ui.examples.job/META-INF/MANIFEST.MF index 0bc4c867ea7..d5d5d0628f0 100644 --- a/examples/org.eclipse.e4.ui.examples.job/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.e4.ui.examples.job/META-INF/MANIFEST.MF @@ -1,11 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Progress Examples Plug-in +Bundle-Name: e4 Progress Examples Plug-in Bundle-SymbolicName: org.eclipse.e4.ui.examples.job;singleton:=true Bundle-Version: 0.1.0.qualifier -Bundle-ClassPath: ProgressExamples.jar Bundle-Vendor: Eclipse.org -Bundle-Localization: plugin Export-Package: org.eclipse.e4.ui.examples.jobs, org.eclipse.e4.ui.examples.jobs.views Require-Bundle: org.eclipse.core.resources, @@ -15,7 +13,7 @@ Require-Bundle: org.eclipse.core.resources, org.eclipse.swt, org.eclipse.e4.ui.di, org.eclipse.jface;bundle-version="3.10.0" -Eclipse-AutoStart: true +Bundle-ActivationPolicy: lazy Import-Package: javax.annotation;version="1.1.0", javax.inject;version="1.0.0", org.eclipse.e4.core.contexts, diff --git a/examples/org.eclipse.e4.ui.examples.job/build.properties b/examples/org.eclipse.e4.ui.examples.job/build.properties index 384a829a54b..c52f2e27f92 100644 --- a/examples/org.eclipse.e4.ui.examples.job/build.properties +++ b/examples/org.eclipse.e4.ui.examples.job/build.properties @@ -1,6 +1,5 @@ -source.ProgressExamples.jar = src/ +source.. = src/ bin.includes = plugin.xml,\ icons/,\ *.jar,\ - ProgressExamples.jar,\ META-INF/ diff --git a/examples/org.eclipse.e4.ui.examples.job/job_factory_view.e4xmi b/examples/org.eclipse.e4.ui.examples.job/job_factory_view.e4xmi index e5ab7414243..32374d1a321 100644 --- a/examples/org.eclipse.e4.ui.examples.job/job_factory_view.e4xmi +++ b/examples/org.eclipse.e4.ui.examples.job/job_factory_view.e4xmi @@ -1,7 +1,7 @@ - + View categoryTag:General diff --git a/examples/org.eclipse.e4.ui.examples.job/programmatic_progress_view.e4xmi b/examples/org.eclipse.e4.ui.examples.job/programmatic_progress_view.e4xmi index d00f988787c..c18dff97915 100644 --- a/examples/org.eclipse.e4.ui.examples.job/programmatic_progress_view.e4xmi +++ b/examples/org.eclipse.e4.ui.examples.job/programmatic_progress_view.e4xmi @@ -4,7 +4,7 @@ - + View categoryTag:General active -- cgit v1.2.3