Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/AbstractMergeViewer.java5
-rw-r--r--bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/Activator.java2
-rw-r--r--bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java14
-rw-r--r--bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordViewerCreator.java1
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java1
-rw-r--r--bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/ExportDialog.java5
-rw-r--r--bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PassphraseDialog.java5
7 files changed, 33 insertions, 0 deletions
diff --git a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/AbstractMergeViewer.java b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/AbstractMergeViewer.java
index 6c5b509b5..001e39603 100644
--- a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/AbstractMergeViewer.java
+++ b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/AbstractMergeViewer.java
@@ -59,18 +59,22 @@ public abstract class AbstractMergeViewer extends Viewer {
this.configuration = configuration;
}
+ @Override
public Object getInput() {
return input;
}
+ @Override
public ISelection getSelection() {
return StructuredSelection.EMPTY;
}
+ @Override
public void refresh() {
// Nothing to do
}
+ @Override
public void setInput(Object input) {
this.input = input;
reset();
@@ -91,6 +95,7 @@ public abstract class AbstractMergeViewer extends Viewer {
resultFile = null;
}
+ @Override
public void setSelection(ISelection selection, boolean reveal) {
// Nothing to do
}
diff --git a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/Activator.java b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/Activator.java
index 142fec505..d28e8298d 100644
--- a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/Activator.java
+++ b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/Activator.java
@@ -36,6 +36,7 @@ public class Activator extends Plugin {
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -45,6 +46,7 @@ public class Activator extends Plugin {
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
diff --git a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java
index 1ad9cbd9c..7a21bd98f 100644
--- a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java
+++ b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java
@@ -85,6 +85,7 @@ public class WordMergeViewer extends AbstractMergeViewer implements IFlushable,
super(configuration);
createContentArea(parent);
getControl().addDisposeListener(new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent e) {
handleDispose();
}
@@ -113,6 +114,7 @@ public class WordMergeViewer extends AbstractMergeViewer implements IFlushable,
if (configuration.isRightEditable() || configuration.isLeftEditable()
&& (configuration.isRightEditable() != configuration.isLeftEditable())) {
saveAction = new Action() {
+ @Override
public void run() {
saveDocument();
}
@@ -122,6 +124,7 @@ public class WordMergeViewer extends AbstractMergeViewer implements IFlushable,
}
inplaceAction = new Action(CompareWin32Messages.WordMergeViewer_2, Action.AS_CHECK_BOX) {
+ @Override
public void run() {
toggleInplaceExternalState();
}
@@ -268,8 +271,10 @@ public class WordMergeViewer extends AbstractMergeViewer implements IFlushable,
}
}
+ @Override
public void flush(IProgressMonitor monitor) {
Display.getDefault().syncExec(new Runnable() {
+ @Override
public void run() {
if (isReallyDirty())
saveDocument();
@@ -280,6 +285,7 @@ public class WordMergeViewer extends AbstractMergeViewer implements IFlushable,
protected void toggleInplaceExternalState() {
BusyIndicator.showWhile(Display.getDefault(), new Runnable() {
+ @Override
public void run() {
try {
if (isReallyDirty()) {
@@ -379,10 +385,12 @@ public class WordMergeViewer extends AbstractMergeViewer implements IFlushable,
return CompareWin32Messages.WordMergeViewer_5;
}
+ @Override
public Control getControl() {
return composite;
}
+ @Override
public void setInput(Object input) {
super.setInput(input);
try {
@@ -395,6 +403,7 @@ public class WordMergeViewer extends AbstractMergeViewer implements IFlushable,
private void updateDirtyFlag() {
final Runnable dirtyFlagUpdater = new Runnable() {
+ @Override
public void run() {
if (wordArea.getFrame().isDisposed())
return;
@@ -441,6 +450,7 @@ public class WordMergeViewer extends AbstractMergeViewer implements IFlushable,
for (Object allListener : allListeners) {
final IPropertyChangeListener listener = (IPropertyChangeListener) allListener;
SafeRunner.run(new SafeRunnable() {
+ @Override
public void run() throws Exception {
listener.propertyChange(event);
}
@@ -448,16 +458,19 @@ public class WordMergeViewer extends AbstractMergeViewer implements IFlushable,
}
}
+ @Override
public void addPropertyChangeListener(IPropertyChangeListener listener) {
listeners.add(listener);
}
+ @Override
public void removePropertyChangeListener(IPropertyChangeListener listener) {
listeners.remove(listener);
}
private void handleDispose() {
BusyIndicator.showWhile(Display.getDefault(), new Runnable() {
+ @Override
public void run() {
wordArea.dispose();
formToolkit.dispose();
@@ -466,6 +479,7 @@ public class WordMergeViewer extends AbstractMergeViewer implements IFlushable,
});
}
+ @Override
protected void reset() {
if (wordArea.isOpen()) {
wordArea.close();
diff --git a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordViewerCreator.java b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordViewerCreator.java
index dcf1c2004..8e570d001 100644
--- a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordViewerCreator.java
+++ b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordViewerCreator.java
@@ -24,6 +24,7 @@ import org.eclipse.swt.widgets.Composite;
*/
public class WordViewerCreator implements IViewerCreator {
+ @Override
public Viewer createViewer(Composite parent, CompareConfiguration config) {
return new WordMergeViewer(parent, config);
}
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 78d22a874..785dbef78 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
@@ -975,6 +975,7 @@ public class Utilities {
} else {
image = CompareUIPlugin.getImageDescriptor("elcl16/view_menu.png").createImage(); //$NON-NLS-1$
item.addDisposeListener(new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent e) {
Image img = item.getImage();
if ((img != null) && (!img.isDisposed())) {
diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/ExportDialog.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/ExportDialog.java
index df4c889aa..f60d12771 100644
--- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/ExportDialog.java
+++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/ExportDialog.java
@@ -39,16 +39,19 @@ class ExportDialog extends Dialog{
this.message=message;
}
+ @Override
protected void configureShell(Shell newShell){
super.configureShell(newShell);
newShell.setText(title);
}
+ @Override
public void create(){
super.create();
field.setFocus();
}
+ @Override
protected Control createDialogArea(Composite parent){
initializeDialogUnits(parent);
Composite main=new Composite(parent, SWT.NONE);
@@ -87,6 +90,7 @@ class ExportDialog extends Dialog{
return target;
}
+ @Override
protected void okPressed(){
String _target=field.getText();
if(_target==null||_target.length()==0){
@@ -96,6 +100,7 @@ class ExportDialog extends Dialog{
super.okPressed();
}
+ @Override
protected void cancelPressed(){
target=null;
super.cancelPressed();
diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PassphraseDialog.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PassphraseDialog.java
index e30f18d4c..26589bde7 100644
--- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PassphraseDialog.java
+++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PassphraseDialog.java
@@ -37,16 +37,19 @@ class PassphraseDialog extends Dialog{
this.message=message;
}
+ @Override
protected void configureShell(Shell newShell){
super.configureShell(newShell);
newShell.setText(message);
}
+ @Override
public void create(){
super.create();
passphraseField.setFocus();
}
+ @Override
protected Control createDialogArea(Composite parent){
initializeDialogUnits(parent);
Composite main=new Composite(parent, SWT.NONE);
@@ -88,6 +91,7 @@ class PassphraseDialog extends Dialog{
return passphrase;
}
+ @Override
protected void okPressed(){
String _passphrase=passphraseField.getText();
if(_passphrase==null||_passphrase.length()==0){
@@ -97,6 +101,7 @@ class PassphraseDialog extends Dialog{
super.okPressed();
}
+ @Override
protected void cancelPressed(){
passphrase=null;
super.cancelPressed();

Back to the top