Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2016-10-25 13:56:12 -0400
committerSergey Prigogin2016-10-29 14:07:22 -0400
commit72807f9d1ce8366b103d8dab892fd55388286d42 (patch)
tree08a29b3db1b3f717d3c6d202ff6a4b1bcc3849e1
parent0184c987caf65aef45ba64d52d73953f59fce02f (diff)
downloadeclipse.platform.team-72807f9d1ce8366b103d8dab892fd55388286d42.tar.gz
eclipse.platform.team-72807f9d1ce8366b103d8dab892fd55388286d42.tar.xz
eclipse.platform.team-72807f9d1ce8366b103d8dab892fd55388286d42.zip
Bug 506520 - Add @Override to org.eclipse.compare.examples
Change-Id: I89bf6c015d7194d125c8a0d0be2d9d5951f3c04d Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r--examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/KeyValuePairStructureCreator.java8
-rw-r--r--examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/TextMergeViewerCreator.java1
2 files changed, 9 insertions, 0 deletions
diff --git a/examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/KeyValuePairStructureCreator.java b/examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/KeyValuePairStructureCreator.java
index 6ffbe3fef..2f6a26077 100644
--- a/examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/KeyValuePairStructureCreator.java
+++ b/examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/KeyValuePairStructureCreator.java
@@ -52,6 +52,7 @@ public class KeyValuePairStructureCreator implements IStructureCreator {
/*
* @see ITypedElement#getName
*/
+ @Override
public String getName() {
return this.getId();
}
@@ -60,6 +61,7 @@ public class KeyValuePairStructureCreator implements IStructureCreator {
* Every key/value pair is of type "kvtxt". We register a TextMergeViewer for it.
* @see ITypedElement#getType
*/
+ @Override
public String getType() {
return "kvtxt"; //$NON-NLS-1$
}
@@ -67,6 +69,7 @@ public class KeyValuePairStructureCreator implements IStructureCreator {
/*
* @see ITypedElement#getImage
*/
+ @Override
public Image getImage() {
return CompareUI.getImage(getType());
}
@@ -80,6 +83,7 @@ public class KeyValuePairStructureCreator implements IStructureCreator {
/*
* This title will be shown in the title bar of the structure compare pane.
*/
+ @Override
public String getName() {
return Util.getString("KeyValuePairStructureCreator.title"); //$NON-NLS-1$
}
@@ -87,6 +91,7 @@ public class KeyValuePairStructureCreator implements IStructureCreator {
/*
* Returns a node.
*/
+ @Override
public IStructureComparator getStructure(Object input) {
if (!(input instanceof IStreamContentAccessor))
@@ -131,6 +136,7 @@ public class KeyValuePairStructureCreator implements IStructureCreator {
return null;
}
+ @Override
public void save(IStructureComparator structure, Object input) {
if (input instanceof IEditableContent && structure instanceof KeyValueNode) {
IDocument doc= ((KeyValueNode)structure).getDocument();
@@ -140,6 +146,7 @@ public class KeyValuePairStructureCreator implements IStructureCreator {
}
}
+ @Override
public String getContents(Object node, boolean ignoreWhitespace) {
if (node instanceof KeyValueNode) {
String s= ((KeyValueNode)node).getValue();
@@ -150,6 +157,7 @@ public class KeyValuePairStructureCreator implements IStructureCreator {
return null;
}
+ @Override
public IStructureComparator locate(Object path, Object source) {
return null;
}
diff --git a/examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/TextMergeViewerCreator.java b/examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/TextMergeViewerCreator.java
index 397a49eb4..e417d316f 100644
--- a/examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/TextMergeViewerCreator.java
+++ b/examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/TextMergeViewerCreator.java
@@ -25,6 +25,7 @@ import org.eclipse.compare.contentmergeviewer.TextMergeViewer;
*/
public class TextMergeViewerCreator implements IViewerCreator {
+ @Override
public Viewer createViewer(Composite parent, CompareConfiguration mp) {
return new TextMergeViewer(parent, mp);
}

Back to the top