Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Charles David2016-05-17 07:57:15 +0000
committerPierre-Charles David2016-05-17 08:59:02 +0000
commit3440ae5433156a880f1297f094ab7c9ae0f27631 (patch)
tree8a95926d19aa5f489cef37e1232cbcc2e8eda763
parenta1eb96a92a216a922f9cafe4b964affd5a29e113 (diff)
downloadorg.eclipse.sirius-3440ae5433156a880f1297f094ab7c9ae0f27631.tar.gz
org.eclipse.sirius-3440ae5433156a880f1297f094ab7c9ae0f27631.tar.xz
org.eclipse.sirius-3440ae5433156a880f1297f094ab7c9ae0f27631.zip
[482831] Remove IItemStyledLabelProvider support
This API was introduced in EMF 2.10 (Luna), and having it does not seem worth breaking compatibility with earlier versions. Bug: 482831 Change-Id: I74f86e71923ca4626fcb74c8f793fbd5b0b0fbe8 Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.doc/doc/specifier/general/Writing_Queries.html3
-rw-r--r--plugins/org.eclipse.sirius.doc/doc/specifier/general/Writing_Queries.textile1
-rw-r--r--plugins/org.eclipse.sirius.ext.emf.edit/src/org/eclipse/sirius/ext/emf/edit/EditingDomainServices.java18
3 files changed, 0 insertions, 22 deletions
diff --git a/plugins/org.eclipse.sirius.doc/doc/specifier/general/Writing_Queries.html b/plugins/org.eclipse.sirius.doc/doc/specifier/general/Writing_Queries.html
index 863319171d..f00eb0b0a2 100644
--- a/plugins/org.eclipse.sirius.doc/doc/specifier/general/Writing_Queries.html
+++ b/plugins/org.eclipse.sirius.doc/doc/specifier/general/Writing_Queries.html
@@ -394,9 +394,6 @@
<code>org.eclipse.emf.edit.provider.IItemFontProvider</code>
</li>
<li>
- <code>org.eclipse.emf.edit.provider.IItemStyledLabelProvider</code> (only available in EMF 2.10 and later)
- </li>
- <li>
<code>org.eclipse.emf.edit.provider.IStructuredItemContentProvider</code>
</li>
<li>
diff --git a/plugins/org.eclipse.sirius.doc/doc/specifier/general/Writing_Queries.textile b/plugins/org.eclipse.sirius.doc/doc/specifier/general/Writing_Queries.textile
index 9648f73119..1c6a13d1a1 100644
--- a/plugins/org.eclipse.sirius.doc/doc/specifier/general/Writing_Queries.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/specifier/general/Writing_Queries.textile
@@ -175,7 +175,6 @@ Most public methods of the following interfaces are available as services on any
* @org.eclipse.emf.edit.provider.IItemLabelProvider@
* @org.eclipse.emf.edit.provider.IItemColorProvider@
* @org.eclipse.emf.edit.provider.IItemFontProvider@
-* @org.eclipse.emf.edit.provider.IItemStyledLabelProvider@ (only available in EMF 2.10 and later)
* @org.eclipse.emf.edit.provider.IStructuredItemContentProvider@
* @org.eclipse.emf.edit.provider.ITreeItemContentProvider@
* @org.eclipse.emf.edit.provider.ITableItemLabelProvider@
diff --git a/plugins/org.eclipse.sirius.ext.emf.edit/src/org/eclipse/sirius/ext/emf/edit/EditingDomainServices.java b/plugins/org.eclipse.sirius.ext.emf.edit/src/org/eclipse/sirius/ext/emf/edit/EditingDomainServices.java
index 01beb07e3d..caf648d644 100644
--- a/plugins/org.eclipse.sirius.ext.emf.edit/src/org/eclipse/sirius/ext/emf/edit/EditingDomainServices.java
+++ b/plugins/org.eclipse.sirius.ext.emf.edit/src/org/eclipse/sirius/ext/emf/edit/EditingDomainServices.java
@@ -32,7 +32,6 @@ import org.eclipse.emf.edit.provider.IItemFontProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IItemStyledLabelProvider;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITableItemColorProvider;
import org.eclipse.emf.edit.provider.ITableItemFontProvider;
@@ -65,8 +64,6 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
* <li>{@link org.eclipse.emf.edit.provider.IItemLabelProvider}</li>
* <li>{@link org.eclipse.emf.edit.provider.IItemColorProvider}</li>
* <li>{@link org.eclipse.emf.edit.provider.IItemFontProvider}</li>
- * <li>{@link org.eclipse.emf.edit.provider.IItemStyledLabelProvider} (only
- * available in EMF 2.10 and later)</li>
* <li>{@link org.eclipse.emf.edit.provider.IStructuredItemContentProvider}</li>
* <li>{@link org.eclipse.emf.edit.provider.ITreeItemContentProvider}</li>
* <li>{@link org.eclipse.emf.edit.provider.ITableItemLabelProvider}</li>
@@ -258,21 +255,6 @@ public class EditingDomainServices {
}
}
- // Services from IItemStyledLabelProvider (EMF 2.10+)
-
- public IItemStyledLabelProvider getStyledLabelProvider(EObject self) {
- return getAdapter(self, IItemStyledLabelProvider.class);
- }
-
- public Object getStyledProviderStyledText(EObject self) {
- IItemStyledLabelProvider slp = getStyledLabelProvider(self);
- if (slp != null) {
- return slp.getStyledText(self);
- } else {
- return null;
- }
- }
-
// Services from IStructuredItemContentProvider
public IStructuredItemContentProvider getStructuredItemContentProvider(EObject self) {

Back to the top