Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2016-03-22 13:34:21 +0000
committerDani Megert2016-03-22 13:34:21 +0000
commitb8821710ffb03f8e7573be209e1ab14e27ba04b4 (patch)
tree6636ee84e8ad7b71190dfe4af058cca4a79b15bf /bundles/org.eclipse.compare/compare
parent622d3b5a9d07990762e58029bd8dffbd2e7df773 (diff)
downloadeclipse.platform.team-b8821710ffb03f8e7573be209e1ab14e27ba04b4.tar.gz
eclipse.platform.team-b8821710ffb03f8e7573be209e1ab14e27ba04b4.tar.xz
eclipse.platform.team-b8821710ffb03f8e7573be209e1ab14e27ba04b4.zip
Revert "Bug 489805 - Move the projects in the team git repository to Java 1.8"
Diffstat (limited to 'bundles/org.eclipse.compare/compare')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java2
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java8
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareHandlerService.java8
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java2
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java2
5 files changed, 11 insertions, 11 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index be41df2cf..c10b0854e 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -2162,7 +2162,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable {
IWorkbenchPart workbenchPart = getCompareConfiguration().getContainer().getWorkbenchPart();
if (workbenchPart != null) {
- IContextService service = workbenchPart.getSite().getService(IContextService.class);
+ IContextService service = (IContextService)workbenchPart.getSite().getService(IContextService.class);
if (service != null) {
service.activateContext("org.eclipse.ui.textEditorScope"); //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java
index efbe3f056..2a18594ed 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java
@@ -319,7 +319,7 @@ public class CompareEditor extends EditorPart implements IReusableEditor, ISavea
}
private void registerSaveable() {
- ISaveablesLifecycleListener lifecycleListener= getSite().getService(ISaveablesLifecycleListener.class);
+ ISaveablesLifecycleListener lifecycleListener= (ISaveablesLifecycleListener) getSite().getService(ISaveablesLifecycleListener.class);
lifecycleListener.handleLifecycleEvent(
new SaveablesLifecycleEvent(this, SaveablesLifecycleEvent.POST_OPEN, internalGetSaveables(true), false));
}
@@ -332,7 +332,7 @@ public class CompareEditor extends EditorPart implements IReusableEditor, ISavea
// Let the workbench know that the old input's saveables are no longer needed
if (knownSaveables != null && !knownSaveables.isEmpty()) {
- ISaveablesLifecycleListener lifecycleListener= getSite().getService(ISaveablesLifecycleListener.class);
+ ISaveablesLifecycleListener lifecycleListener= (ISaveablesLifecycleListener) getSite().getService(ISaveablesLifecycleListener.class);
lifecycleListener.handleLifecycleEvent(
new SaveablesLifecycleEvent(this, SaveablesLifecycleEvent.POST_CLOSE, (Saveable[]) knownSaveables.toArray(new Saveable[knownSaveables.size()]), false));
knownSaveables.clear();
@@ -412,7 +412,7 @@ public class CompareEditor extends EditorPart implements IReusableEditor, ISavea
parent.setData(this);
fPageBook = new PageBook(parent, SWT.NONE);
createCompareControl();
- IContextService service = getSite().getService(IContextService.class);
+ IContextService service = (IContextService)getSite().getService(IContextService.class);
if (service != null) {
service.activateContext("org.eclipse.compare.compareEditorScope"); //$NON-NLS-1$
service.activateContext("org.eclipse.ui.textEditorScope"); //$NON-NLS-1$
@@ -741,7 +741,7 @@ public class CompareEditor extends EditorPart implements IReusableEditor, ISavea
}
public void handleLifecycleEvent(SaveablesLifecycleEvent event) {
- ISaveablesLifecycleListener lifecycleListener= getSite().getService(ISaveablesLifecycleListener.class);
+ ISaveablesLifecycleListener lifecycleListener= (ISaveablesLifecycleListener) getSite().getService(ISaveablesLifecycleListener.class);
if (event.getEventType() == SaveablesLifecycleEvent.POST_CLOSE) {
// We may get a post close for a saveable that is not known to the workbench.
// Only pass on the event for known saveables
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareHandlerService.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareHandlerService.java
index a3b4d4fcc..0037c2db5 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareHandlerService.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareHandlerService.java
@@ -35,13 +35,13 @@ public class CompareHandlerService {
public static CompareHandlerService createFor(ICompareContainer container, Shell shell) {
IServiceLocator serviceLocator = container.getServiceLocator();
if (serviceLocator != null) {
- IHandlerService service = serviceLocator.getService(IHandlerService.class);
+ IHandlerService service = (IHandlerService)serviceLocator.getService(IHandlerService.class);
if (service != null)
return new CompareHandlerService(container, null);
}
if (container.getWorkbenchPart() == null && shell != null) {
// We're in a dialog so we can use an active shell expression
- IHandlerService service = PlatformUI.getWorkbench().getService(IHandlerService.class);
+ IHandlerService service = (IHandlerService)PlatformUI.getWorkbench().getService(IHandlerService.class);
if (service != null) {
Expression e = new ActiveShellExpression(shell);
return new CompareHandlerService(container, e);
@@ -83,13 +83,13 @@ public class CompareHandlerService {
if (fHandlerService == null) {
IServiceLocator serviceLocator = fContainer.getServiceLocator();
if (serviceLocator != null) {
- IHandlerService service = serviceLocator.getService(IHandlerService.class);
+ IHandlerService service = (IHandlerService)serviceLocator.getService(IHandlerService.class);
if (service != null)
fHandlerService = service;
}
if (fHandlerService == null && fContainer.getWorkbenchPart() == null && fExpression != null) {
// We're in a dialog so we can use an active shell expression
- IHandlerService service = PlatformUI.getWorkbench().getService(IHandlerService.class);
+ IHandlerService service = (IHandlerService)PlatformUI.getWorkbench().getService(IHandlerService.class);
if (service != null) {
fHandlerService = service;
}
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java
index 7fe0365c6..59797adcf 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java
@@ -839,7 +839,7 @@ public class MergeSourceViewer implements ISelectionChangedListener,
}
private void addSave(IMenuManager menu) {
- ICommandService commandService = fContainer.getWorkbenchPart().getSite().getService(ICommandService.class);
+ ICommandService commandService = (ICommandService) fContainer.getWorkbenchPart().getSite().getService(ICommandService.class);
final Command command= commandService.getCommand(IWorkbenchCommandConstants.FILE_SAVE);
final IHandler handler = command.getHandler();
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
index 4d231c054..6283b3190 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
@@ -845,7 +845,7 @@ public class Utilities {
public static void schedule(Job job, IWorkbenchSite site) {
if (site != null) {
- IWorkbenchSiteProgressService siteProgress = site.getAdapter(IWorkbenchSiteProgressService.class);
+ IWorkbenchSiteProgressService siteProgress = (IWorkbenchSiteProgressService) site.getAdapter(IWorkbenchSiteProgressService.class);
if (siteProgress != null) {
siteProgress.schedule(job, 0, true /* use half-busy cursor */);
return;

Back to the top