Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2016-02-09 09:02:37 +0000
committerAlexander Kurtakov2016-02-10 07:57:09 +0000
commit0b3de15c83fddb6e45d1372ffdf88504e8951d1e (patch)
tree1a473bc6a5e0fe325fb6900b9bac630409450ae8 /bundles/org.eclipse.swt/Eclipse SWT Browser
parent1a375bfbb7dca92b102db09891a18eeb80d671f2 (diff)
downloadeclipse.platform.swt-0b3de15c83fddb6e45d1372ffdf88504e8951d1e.tar.gz
eclipse.platform.swt-0b3de15c83fddb6e45d1372ffdf88504e8951d1e.tar.xz
eclipse.platform.swt-0b3de15c83fddb6e45d1372ffdf88504e8951d1e.zip
Bug 483640 - Add missing annotations to SWT after the move to Java 7
Add missing @Override annotation for interface methods. Change-Id: Ibce185467807acd2dc5e6b71fda643a3947f60eb Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Browser')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/LocationAdapter.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/ProgressAdapter.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/VisibilityWindowAdapter.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java12
4 files changed, 20 insertions, 4 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/LocationAdapter.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/LocationAdapter.java
index 2c8efcf21a..e306d56fbb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/LocationAdapter.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/LocationAdapter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2016 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
@@ -25,9 +25,11 @@ package org.eclipse.swt.browser;
*/
public abstract class LocationAdapter implements LocationListener {
+@Override
public void changing(LocationEvent event) {
}
+@Override
public void changed(LocationEvent event) {
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/ProgressAdapter.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/ProgressAdapter.java
index 7d0b024fe8..1cfd6ae678 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/ProgressAdapter.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/ProgressAdapter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2016 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
@@ -25,9 +25,11 @@ package org.eclipse.swt.browser;
*/
public abstract class ProgressAdapter implements ProgressListener {
+@Override
public void changed(ProgressEvent event) {
}
+@Override
public void completed(ProgressEvent event) {
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/VisibilityWindowAdapter.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/VisibilityWindowAdapter.java
index aa0383052b..7886aca05a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/VisibilityWindowAdapter.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/VisibilityWindowAdapter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2016 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
@@ -25,9 +25,11 @@ package org.eclipse.swt.browser;
*/
public abstract class VisibilityWindowAdapter implements VisibilityWindowListener {
+@Override
public void hide(WindowEvent event) {
}
+@Override
public void show(WindowEvent event) {
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java
index 6a42229a69..02d12bf500 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2015 IBM Corporation and others.
+ * Copyright (c) 2003, 2016 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
@@ -145,6 +145,7 @@ class IE extends WebBrowser {
static {
NativeClearSessions = new Runnable() {
+ @Override
public void run() {
if (OS.IsPPC) return;
OS.InternetSetOption (0, OS.INTERNET_OPTION_END_BROWSER_SESSION, 0, 0);
@@ -152,6 +153,7 @@ class IE extends WebBrowser {
};
NativeGetCookie = new Runnable () {
+ @Override
public void run () {
if (OS.IsPPC) return;
TCHAR url = new TCHAR (0, CookieUrl, true);
@@ -180,6 +182,7 @@ class IE extends WebBrowser {
};
NativeSetCookie = new Runnable () {
+ @Override
public void run () {
if (OS.IsPPC) return;
TCHAR url = new TCHAR (0, CookieUrl, true);
@@ -346,6 +349,7 @@ public void create(Composite parent, int style) {
if (result == 0 || result == OS.ERROR_FILE_NOT_FOUND) {
if (OS.RegSetValueEx(key[0], lpValueName, 0, OS.REG_DWORD, new int[] {version}, 4) == 0) {
parent.getDisplay().addListener(SWT.Dispose, new Listener() {
+ @Override
public void handleEvent(Event event) {
long /*int*/[] key = new long /*int*/[1];
if (OS.RegOpenKeyEx(OS.HKEY_CURRENT_USER, subkey, 0, OS.KEY_WRITE, key) == 0) {
@@ -364,12 +368,14 @@ public void create(Composite parent, int style) {
auto = new OleAutomation(site);
domListener = new OleListener() {
+ @Override
public void handleEvent (OleEvent e) {
handleDOMEvent(e);
}
};
Listener listener = new Listener() {
+ @Override
public void handleEvent(Event e) {
switch (e.type) {
case SWT.Dispose: {
@@ -465,6 +471,7 @@ public void create(Composite parent, int style) {
site.addListener(SWT.Traverse, listener);
OleListener oleListener = new OleListener() {
+ @Override
public void handleEvent(OleEvent event) {
/* callbacks are asynchronous, auto could be disposed */
if (auto != null) {
@@ -607,6 +614,7 @@ public void create(Composite parent, int style) {
if (delaySetText) {
delaySetText = false;
browser.getDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
if (browser.isDisposed() || html == null) return;
setHTML(html);
@@ -820,6 +828,7 @@ public void create(Composite parent, int style) {
COM.MoveMemory(pCancel, new short[] {COM.VARIANT_TRUE}, 2);
}
browser.getDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
if (browser.isDisposed()) return;
/*
@@ -1005,6 +1014,7 @@ public void create(Composite parent, int style) {
* the Close event and dispose the Browser in an async block.
*/
browser.getDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
if (browser.isDisposed()) return;
WindowEvent newEvent = new WindowEvent(browser);

Back to the top