Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Delaigue2017-01-10 05:08:49 -0500
committerLaurent Delaigue2017-01-24 11:15:07 -0500
commitcee52d65077639901b346509e8d5bce740c2793d (patch)
tree07c4ccf89cd045d9361b969d6f5dc9a277a40a6b
parent7ecb59ba813ddb909d2151f04b70d61c5a50a7cc (diff)
downloadorg.eclipse.emf.compare-cee52d65077639901b346509e8d5bce740c2793d.tar.gz
org.eclipse.emf.compare-cee52d65077639901b346509e8d5bce740c2793d.tar.xz
org.eclipse.emf.compare-cee52d65077639901b346509e8d5bce740c2793d.zip
Add @Override and depend on emf.edit 2.10.0+
Change-Id: I551cf7fce4c5e3c43305a5f3b132b5492c00f611 Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
-rw-r--r--plugins/org.eclipse.emf.compare.edit/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/AttributeChangeItemProviderSpec.java1
-rw-r--r--plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ComparisonItemProviderSpec.java2
-rw-r--r--plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ConflictItemProviderSpec.java2
-rw-r--r--plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/FeatureMapChangeItemProviderSpec.java1
-rw-r--r--plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchItemProviderSpec.java1
-rw-r--r--plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchResourceItemProviderSpec.java1
-rw-r--r--plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ReferenceChangeItemProviderSpec.java1
-rw-r--r--plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceAttachmentChangeItemProviderSpec.java1
-rw-r--r--plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceLocationChangeItemProviderSpec.java1
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java2
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/GroupItemProviderAdapter.java2
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/TreeNodeItemProviderSpec.java2
15 files changed, 11 insertions, 18 deletions
diff --git a/plugins/org.eclipse.emf.compare.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.edit/META-INF/MANIFEST.MF
index 0b30c156d..3ba21df3d 100644
--- a/plugins/org.eclipse.emf.compare.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.edit/META-INF/MANIFEST.MF
@@ -22,10 +22,10 @@ Export-Package: org.eclipse.emf.compare.adapterfactory.context,
org.eclipse.emf.compare.provider.utils
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.compare;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.emf.transaction;bundle-version="1.3.0"
+ org.eclipse.emf.edit;bundle-version="2.10.0";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="2.10.0";visibility:=reexport,
+ org.eclipse.emf.transaction;bundle-version="1.3.0",
+ org.eclipse.emf.ecore.edit;visibility:=reexport
Bundle-ActivationPolicy: lazy
Import-Package: com.google.common.annotations;version="[11.0.0,16.0.0)",
com.google.common.base;version="[11.0.0,16.0.0)",
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/AttributeChangeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/AttributeChangeItemProviderSpec.java
index 690a12c3b..785272678 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/AttributeChangeItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/AttributeChangeItemProviderSpec.java
@@ -159,7 +159,6 @@ public class AttributeChangeItemProviderSpec extends AttributeChangeItemProvider
}
}
- /* Missing override : only for EMF 2.10 and later. Do not tag. */
/**
* {@inheritDoc}
*
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ComparisonItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ComparisonItemProviderSpec.java
index 86a8ea29f..74292e3e4 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ComparisonItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ComparisonItemProviderSpec.java
@@ -35,12 +35,12 @@ public class ComparisonItemProviderSpec extends ComparisonItemProvider implement
super(adapterFactory);
}
- /* Missing override : only for EMF 2.10 and later. Do not tag. */
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.provider.IItemStyledLabelProvider#getStyledText(java.lang.Object)
*/
+ @Override
public IStyledString.IComposedStyledString getStyledText(Object object) {
return new ComposedStyledString(getText(object));
}
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ConflictItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ConflictItemProviderSpec.java
index c6d9a0864..db6db4366 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ConflictItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ConflictItemProviderSpec.java
@@ -83,12 +83,12 @@ public class ConflictItemProviderSpec extends ConflictItemProvider implements II
return image;
}
- /* Missing override : only for EMF 2.10 and later. Do not tag. */
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.provider.IItemStyledLabelProvider#getStyledText(java.lang.Object)
*/
+ @Override
public IStyledString.IComposedStyledString getStyledText(Object object) {
Conflict conflict = (Conflict)object;
ComposedStyledString ret = new ComposedStyledString();
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/FeatureMapChangeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/FeatureMapChangeItemProviderSpec.java
index 8de031833..bfcbbe1c8 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/FeatureMapChangeItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/FeatureMapChangeItemProviderSpec.java
@@ -144,7 +144,6 @@ public class FeatureMapChangeItemProviderSpec extends FeatureMapChangeItemProvid
}
}
- /* Missing override : only for EMF 2.10 and later. Do not tag. */
/**
* {@inheritDoc}
*
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchItemProviderSpec.java
index b3f1f2d16..ebfd34d8d 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchItemProviderSpec.java
@@ -147,7 +147,6 @@ public class MatchItemProviderSpec extends MatchItemProvider implements IItemSty
return ret;
}
- /* Missing override : only for EMF 2.10 and later. Do not tag. */
/**
* {@inheritDoc}
*
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchResourceItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchResourceItemProviderSpec.java
index 87a5a31ca..274e28dcd 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchResourceItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchResourceItemProviderSpec.java
@@ -178,7 +178,6 @@ public class MatchResourceItemProviderSpec extends MatchResourceItemProvider imp
return buffer.toString();
}
- /* Missing override : only for EMF 2.10 and later. Do not tag. */
/**
* {@inheritDoc}
*
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ReferenceChangeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ReferenceChangeItemProviderSpec.java
index dd3bf109c..8948952e3 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ReferenceChangeItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ReferenceChangeItemProviderSpec.java
@@ -234,7 +234,6 @@ public class ReferenceChangeItemProviderSpec extends ReferenceChangeItemProvider
}
}
- /* Missing override : only for EMF 2.10 and later. Do not tag. */
/**
* {@inheritDoc}
*
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceAttachmentChangeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceAttachmentChangeItemProviderSpec.java
index 5632886e9..b1f058403 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceAttachmentChangeItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceAttachmentChangeItemProviderSpec.java
@@ -91,7 +91,6 @@ public class ResourceAttachmentChangeItemProviderSpec extends ResourceAttachment
return getStyledText(object).getString();
}
- /* Missing override : only for EMF 2.10 and later. Do not tag. */
/**
* {@inheritDoc}
*
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceLocationChangeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceLocationChangeItemProviderSpec.java
index c97d7de6d..a12dadf93 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceLocationChangeItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceLocationChangeItemProviderSpec.java
@@ -85,7 +85,6 @@ public class ResourceLocationChangeItemProviderSpec extends ResourceLocationChan
return getStyledText(object).getString();
}
- /* Missing override : only for EMF 2.10 and later. Do not tag. */
/**
* {@inheritDoc}
*
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF
index d901706a7..da5a4673c 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui.ide;bundle-version="3.5.0",
org.eclipse.ui.navigator;bundle-version="3.5.0",
org.eclipse.compare;bundle-version="3.5.0",
- org.eclipse.emf.edit.ui;bundle-version="2.5.0",
+ org.eclipse.emf.edit.ui;bundle-version="2.10.0",
org.eclipse.emf.compare.edit;bundle-version="2.0.1",
org.eclipse.emf.compare.ide;bundle-version="2.0.1",
org.eclipse.jface.text;bundle-version="3.5.0",
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java
index c7a8e47c2..325bcb185 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java
@@ -125,13 +125,13 @@ class EMFCompareStructureMergeViewerLabelProvider extends AdapterFactoryLabelPro
return ret;
}
- /* Missing override : only for EMF 2.10 and later. Do not tag. */
/**
* {@inheritDoc}
*
* @see org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider.getStyledText(
* java .lang.Object)
*/
+ @Override
public StyledString getStyledText(Object element) {
final StyledString ret;
if (element instanceof ItemProviderAdapter) {
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF
index 5368b4f23..a4ef1a15f 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
- org.eclipse.emf.edit.ui;bundle-version="2.5.0",
+ org.eclipse.emf.edit.ui;bundle-version="2.10.0",
org.eclipse.emf.compare;bundle-version="2.0.1",
org.eclipse.emf.compare.edit;bundle-version="2.0.1",
org.eclipse.emf.ecore.xmi;bundle-version="2.5.0",
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/GroupItemProviderAdapter.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/GroupItemProviderAdapter.java
index a652a331c..5cdde49a8 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/GroupItemProviderAdapter.java
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/GroupItemProviderAdapter.java
@@ -95,12 +95,12 @@ public class GroupItemProviderAdapter extends ItemProviderAdapter implements IEd
return group.getName();
}
- /* Missing override : only for EMF 2.10 and later. Do not tag. */
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.provider.IItemStyledLabelProvider#getStyledText(java.lang.Object)
*/
+ @Override
public IComposedStyledString getStyledText(Object object) {
return group.getStyledName();
}
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/TreeNodeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/TreeNodeItemProviderSpec.java
index cb6149924..3426e7795 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/TreeNodeItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/TreeNodeItemProviderSpec.java
@@ -158,12 +158,12 @@ public class TreeNodeItemProviderSpec extends TreeNodeItemProvider implements II
}
}
- /* Missing override : only for EMF 2.10 and later. Do not tag. */
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.provider.IItemStyledLabelProvider#getStyledText(java.lang.Object)
*/
+ @Override
public IComposedStyledString getStyledText(Object object) {
TreeNode treeNode = (TreeNode)object;
EObject data = treeNode.getData();

Back to the top