diff options
-rw-r--r-- | plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF | 3 | ||||
-rw-r--r-- | plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml | 189 | ||||
-rw-r--r-- | plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLTypedElementCellLabelProvider.java (renamed from plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/UMLTypedElementCellLabelProvider.java) | 3 |
3 files changed, 101 insertions, 94 deletions
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF index 0df810bd327..3b05833e3d9 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF @@ -21,8 +21,7 @@ Require-Bundle: org.eclipse.papyrus.infra.widgets;bundle-version="1.0.2", org.apache.commons.lang, com.google.guava;bundle-version="11.0.0", org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.2", - org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.2", - org.eclipse.uml2.uml;bundle-version="5.0.1" + org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.2" Export-Package: org.eclipse.papyrus.infra.nattable, org.eclipse.papyrus.infra.nattable.celleditor, org.eclipse.papyrus.infra.nattable.celleditor.config, diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml index bd02a0ecee9..8ea97582d1c 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml @@ -1,92 +1,99 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.papyrus.infra.nattable.celleditor.configuration">
- <configuration
- class="org.eclipse.papyrus.uml.nattable.config.UMLFeatureCellEditorConfig"
- order="500">
- </configuration>
- </extension>
- <extension
- point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">
- <labelProvider
- priority="1300"
- provider="org.eclipse.papyrus.uml.nattable.provider.StereotypePropertyHeaderLabelProvider">
- <labelProviderContext
- context="org.eclipse.papyrus.infra.nattable.header.labelprovider">
- </labelProviderContext>
- <labelProviderContext
- context="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider">
- </labelProviderContext>
- </labelProvider>
- <labelProvider
- priority="1800"
- provider="org.eclipse.papyrus.uml.nattable.provider.UMLUnlimitedNaturalLabelProvider">
- <labelProviderContext
- context="org.eclipse.papyrus.infra.nattable.body.labelprovider">
- </labelProviderContext>
- </labelProvider>
- <labelProvider
- priority="1900"
- provider="org.eclipse.papyrus.uml.nattable.provider.StereotypePropertyCellLabelProvider">
- <labelProviderContext
- context="org.eclipse.papyrus.infra.nattable.body.labelprovider">
- </labelProviderContext>
- </labelProvider>
- </extension>
- <extension
- point="org.eclipse.papyrus.infra.nattable.axismanager">
- <axisManager
- id="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager"
- manager="org.eclipse.papyrus.uml.nattable.manager.axis.UMLStereotypePropertyAxisManager">
- </axisManager>
- <axisManager
- id="org.eclipse.papyrus.uml.nattable.element.axis.manager"
- manager="org.eclipse.papyrus.uml.nattable.manager.axis.UMLElementAxisManager">
- </axisManager>
- <axisManager
- id="org.eclipse.papyrus.uml.nattable.feature.axis.manager"
- manager="org.eclipse.papyrus.uml.nattable.manager.axis.UMLFeatureAxisManager">
- </axisManager>
- </extension>
- <extension
- point="org.eclipse.papyrus.infra.nattable.cellmanager">
- <cellManager
- id="org.eclipse.papyrus.uml.nattable.uml.feature.cell.manager"
- manager="org.eclipse.papyrus.uml.nattable.manager.cell.UMLFeatureCellManager"
- order="450">
- </cellManager>
- <cellManager
- id="org.eclipse.papyrus.uml.nattable.uml.stereotype.property.cell.manager"
- manager="org.eclipse.papyrus.uml.nattable.manager.cell.StereotypePropertyCellManager"
- order="500">
- </cellManager>
- </extension>
- <extension
- point="org.eclipse.papyrus.infra.nattable.tester">
- <tester
- class="org.eclipse.papyrus.uml.nattable.tester.IsUMLElementTester"
- id="org.eclipse.papyrus.uml.nattable.tester.isumlelement">
- </tester>
- </extension>
- <extension
- point="org.eclipse.ui.menus">
- <menuContribution
- allPopups="true"
- class="org.eclipse.papyrus.uml.nattable.menu.CreateColumnStereotypePropertyMenuFactory"
- locationURI="popup:org.eclipse.ui.popup.any">
- </menuContribution>
- <menuContribution
- allPopups="true"
- class="org.eclipse.papyrus.uml.nattable.menu.CreateRowStereotypePropertyMenuFactory"
- locationURI="popup:org.eclipse.ui.popup.any">
- </menuContribution>
- </extension>
- <extension
- point="org.eclipse.papyrus.infra.nattable.paste.postactions">
- <postAction
- postActionClass="org.eclipse.papyrus.uml.nattable.paste.ApplyStereotypePastePostAction">
- </postAction>
+<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.4"?> +<plugin> + <extension + point="org.eclipse.papyrus.infra.nattable.celleditor.configuration"> + <configuration + class="org.eclipse.papyrus.uml.nattable.config.UMLFeatureCellEditorConfig" + order="500"> + </configuration> </extension> -</plugin>
+ <extension + point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider"> + <labelProvider + priority="1300" + provider="org.eclipse.papyrus.uml.nattable.provider.StereotypePropertyHeaderLabelProvider"> + <labelProviderContext + context="org.eclipse.papyrus.infra.nattable.header.labelprovider"> + </labelProviderContext> + <labelProviderContext + context="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider"> + </labelProviderContext> + </labelProvider> + <labelProvider + priority="1800" + provider="org.eclipse.papyrus.uml.nattable.provider.UMLUnlimitedNaturalLabelProvider"> + <labelProviderContext + context="org.eclipse.papyrus.infra.nattable.body.labelprovider"> + </labelProviderContext> + </labelProvider> + <labelProvider + priority="1900" + provider="org.eclipse.papyrus.uml.nattable.provider.StereotypePropertyCellLabelProvider"> + <labelProviderContext + context="org.eclipse.papyrus.infra.nattable.body.labelprovider"> + </labelProviderContext> + </labelProvider> + <labelProvider + priority="1700" + provider="org.eclipse.papyrus.uml.nattable.provider.UMLTypedElementCellLabelProvider"> + <labelProviderContext + context="org.eclipse.papyrus.infra.nattable.body.labelprovider"> + </labelProviderContext> + </labelProvider> + </extension> + <extension + point="org.eclipse.papyrus.infra.nattable.axismanager"> + <axisManager + id="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager" + manager="org.eclipse.papyrus.uml.nattable.manager.axis.UMLStereotypePropertyAxisManager"> + </axisManager> + <axisManager + id="org.eclipse.papyrus.uml.nattable.element.axis.manager" + manager="org.eclipse.papyrus.uml.nattable.manager.axis.UMLElementAxisManager"> + </axisManager> + <axisManager + id="org.eclipse.papyrus.uml.nattable.feature.axis.manager" + manager="org.eclipse.papyrus.uml.nattable.manager.axis.UMLFeatureAxisManager"> + </axisManager> + </extension> + <extension + point="org.eclipse.papyrus.infra.nattable.cellmanager"> + <cellManager + id="org.eclipse.papyrus.uml.nattable.uml.feature.cell.manager" + manager="org.eclipse.papyrus.uml.nattable.manager.cell.UMLFeatureCellManager" + order="450"> + </cellManager> + <cellManager + id="org.eclipse.papyrus.uml.nattable.uml.stereotype.property.cell.manager" + manager="org.eclipse.papyrus.uml.nattable.manager.cell.StereotypePropertyCellManager" + order="500"> + </cellManager> + </extension> + <extension + point="org.eclipse.papyrus.infra.nattable.tester"> + <tester + class="org.eclipse.papyrus.uml.nattable.tester.IsUMLElementTester" + id="org.eclipse.papyrus.uml.nattable.tester.isumlelement"> + </tester> + </extension> + <extension + point="org.eclipse.ui.menus"> + <menuContribution + allPopups="true" + class="org.eclipse.papyrus.uml.nattable.menu.CreateColumnStereotypePropertyMenuFactory" + locationURI="popup:org.eclipse.ui.popup.any"> + </menuContribution> + <menuContribution + allPopups="true" + class="org.eclipse.papyrus.uml.nattable.menu.CreateRowStereotypePropertyMenuFactory" + locationURI="popup:org.eclipse.ui.popup.any"> + </menuContribution> + </extension> + <extension + point="org.eclipse.papyrus.infra.nattable.paste.postactions"> + <postAction + postActionClass="org.eclipse.papyrus.uml.nattable.paste.ApplyStereotypePastePostAction"> + </postAction> + </extension> +</plugin> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/UMLTypedElementCellLabelProvider.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLTypedElementCellLabelProvider.java index 0e297a26e2a..2ca0882d483 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/UMLTypedElementCellLabelProvider.java +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLTypedElementCellLabelProvider.java @@ -11,8 +11,9 @@ * *****************************************************************************/ -package org.eclipse.papyrus.infra.nattable.provider; +package org.eclipse.papyrus.uml.nattable.provider; +import org.eclipse.papyrus.infra.nattable.provider.GenericCellLabelProvider; import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService; import org.eclipse.uml2.uml.TypedElement; |