diff options
Diffstat (limited to 'extraplugins/diagram-definition')
170 files changed, 313 insertions, 622 deletions
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/BoundsItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/BoundsItemProvider.java index 342b84e07b4..983e1ec9933 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/BoundsItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/BoundsItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -29,10 +27,8 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.Bounds; import org.eclipse.papyrus.dd.dc.DCPackage; - import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DCItemProviderAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DCItemProviderAdapterFactory.java index 3064e401bde..4764a31e476 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DCItemProviderAdapterFactory.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DCItemProviderAdapterFactory.java @@ -17,7 +17,6 @@ import java.util.Collection; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notifier; - import org.eclipse.emf.edit.provider.ChangeNotifier; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; @@ -29,7 +28,6 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.INotifyChangedListener; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; - import org.eclipse.papyrus.dd.dc.util.DCAdapterFactory; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DimensionItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DimensionItemProvider.java index 58c9e67779c..ce36891ce09 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DimensionItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DimensionItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -29,10 +27,8 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCPackage; import org.eclipse.papyrus.dd.dc.Dimension; - import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/PointItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/PointItemProvider.java index 8ea73f3f2bc..65c1d557d03 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/PointItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/PointItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -29,10 +27,8 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCPackage; import org.eclipse.papyrus.dd.dc.Point; - import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java index bdeb5cef98a..074690c794d 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java @@ -13,6 +13,7 @@ package org.eclipse.papyrus.dd.dg.provider; import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java index e6a3c3ec3d9..ddf4c8213e6 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -30,9 +28,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.dg.Circle; import org.eclipse.papyrus.dd.dg.DGPackage; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java index 6ff584d6ed3..0607b976607 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java @@ -16,7 +16,6 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -25,7 +24,6 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; - import org.eclipse.papyrus.dd.dg.ClipPath; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java index e2a7a5222bb..dc7fc69fbe8 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java @@ -16,7 +16,6 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -25,7 +24,6 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; - import org.eclipse.papyrus.dd.dg.ClosePath; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java index 31f2f9535b3..2e75778a9d6 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -28,9 +26,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.dg.CubicCurveTo; import org.eclipse.papyrus.dd.dg.DGPackage; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java index 58447194c59..4fab4ac1631 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java @@ -17,7 +17,6 @@ import java.util.Collection; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notifier; - import org.eclipse.emf.edit.provider.ChangeNotifier; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; @@ -31,7 +30,6 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.INotifyChangedListener; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; - import org.eclipse.papyrus.dd.dg.util.DGAdapterFactory; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java index c00068e50ec..eab7b7dc639 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -31,10 +29,8 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Definition; - import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java index 1b83cb58b45..401ff888e46 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java @@ -16,11 +16,8 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -31,11 +28,9 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dg.DGFactory; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Definitions; - import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java index 4033e52d3f1..a29e61953a9 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -28,9 +26,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Ellipse; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java index 7f3d2b98896..d5815e9d89d 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -30,9 +28,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.EllipticalArcTo; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java index 26041193895..dd72fbbc60c 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java @@ -13,6 +13,7 @@ package org.eclipse.papyrus.dd.dg.provider; import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java index c6557c0cc3c..f0210465dd6 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java @@ -12,15 +12,12 @@ package org.eclipse.papyrus.dd.dg.provider; import java.awt.Color; - import java.util.Collection; import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -33,10 +30,8 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.GradientStop; - import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java index 5921af7125f..0fb67d18452 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -30,7 +28,6 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dg.DGFactory; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Group; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java index d97925ecf0f..21796e8c30f 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -30,9 +28,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Image; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java index 412aedc6a96..5034bd870f1 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -28,9 +26,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Line; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java index 579815b1e08..8f22bb620f5 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -28,9 +26,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.LineTo; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java index b40085a0e64..64545d5edb5 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java @@ -13,6 +13,7 @@ package org.eclipse.papyrus.dd.dg.provider; import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java index 5f99c21d398..8826109e9ac 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java @@ -16,7 +16,6 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -26,7 +25,6 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.MarkedElement; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java index 9cdfe166a05..4e6d4b36b0a 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -28,9 +26,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Marker; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java index e232f83322d..536f93e59ce 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java @@ -16,7 +16,6 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -28,7 +27,6 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Matrix; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java index c6d67e9e447..a0493f978e1 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -28,9 +26,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.MoveTo; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java index 4c31268dea7..2809a9399e8 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java @@ -12,15 +12,12 @@ package org.eclipse.papyrus.dd.dg.provider; import java.awt.Color; - import java.util.Collection; import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -33,10 +30,8 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Paint; - import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java index 6bee61b06e4..d9120757a29 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -28,7 +26,6 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dg.DGFactory; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.PaintServer; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java index 38d68fff4ae..564ed12a14a 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -31,10 +29,8 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.PathCommand; - import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java index 1cf1b09df8c..f3b6cd8166a 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -28,7 +26,6 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dg.DGFactory; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Path; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java index 65f85a4678c..eeb4d7b1f0c 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -28,9 +26,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.dg.DGFactory; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Pattern; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java index 6d6602b0f6f..dae4c16ad9a 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -28,9 +26,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Polygon; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java index 4d2dbffd19b..34ca08c49ae 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -28,9 +26,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Polyline; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java index dd4d6f298fe..49727d5bdb0 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -28,9 +26,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.QuadraticCurveTo; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java index 9c55902e81a..f807d4425b0 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java @@ -16,7 +16,6 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; @@ -29,7 +28,6 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.RadialGradient; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java index 1d493b9ed53..a5a8ab39434 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -30,9 +28,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Rectangle; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java index 7f10ade221a..995aaada5b5 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -30,7 +28,6 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dg.DGFactory; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.RootCanvas; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java index c939a17acf3..640ab6426be 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -30,9 +28,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Rotate; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java index 2fcea9a082a..7b5e34cee65 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java @@ -16,7 +16,6 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -28,7 +27,6 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Scale; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java index d153785270a..5bbfe988f82 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java @@ -16,7 +16,6 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -28,7 +27,6 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Skew; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java index bd4734bc800..4ecc2f6b5ba 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java @@ -16,11 +16,8 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -33,11 +30,9 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dg.DGFactory; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Style; - import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java index 3775a4065e5..8709873c1df 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java @@ -16,11 +16,8 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -31,11 +28,9 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dg.DGFactory; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.StyleRule; - import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java index 5b22dca9491..04d2078d08f 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -31,11 +29,9 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.ElementKind; import org.eclipse.papyrus.dd.dg.StyleSelector; - import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java index d58c77d9026..a856d31f53f 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java @@ -16,11 +16,8 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -31,11 +28,9 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dg.DGFactory; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.StyleSheet; - import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java index dd2268979c9..24ba53368d3 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -30,9 +28,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Text; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java index 3e12737fe66..41b7d40ad84 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -28,7 +26,6 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemProviderAdapter; - import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java index f97ca54d235..0d31128ab0e 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java @@ -16,7 +16,6 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -28,7 +27,6 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Translate; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java index f06d5ecd73a..015d8bf6c86 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -29,9 +27,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Use; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java index b78b637b200..187596115a8 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java @@ -17,7 +17,6 @@ import java.util.Collection; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notifier; - import org.eclipse.emf.edit.provider.ChangeNotifier; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; @@ -31,7 +30,6 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.INotifyChangedListener; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; - import org.eclipse.papyrus.dd.di.util.DIAdapterFactory; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java index 61fff8bbf57..9a12e4c3046 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java @@ -13,6 +13,7 @@ package org.eclipse.papyrus.dd.di.provider; import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java index 257833a149d..5267f529963 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java @@ -16,7 +16,6 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -28,7 +27,6 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.di.DIPackage; import org.eclipse.papyrus.dd.di.Diagram; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java index 0db724c4565..93341de8db8 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java @@ -13,6 +13,7 @@ package org.eclipse.papyrus.dd.di.provider; import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java index bd445c5a91a..d1cde4c45cf 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -28,9 +26,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.di.DIPackage; import org.eclipse.papyrus.dd.di.Shape; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java index 41619241b83..ba459e2b1ae 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -28,7 +26,6 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemProviderAdapter; - import org.eclipse.papyrus.dd.edit.DDEditPlugin; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java index da161cf0e5c..97c075906c0 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java @@ -12,7 +12,6 @@ package org.eclipse.papyrus.dd.edit; import org.eclipse.emf.common.EMFPlugin; - import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.ecore.provider.EcoreEditPlugin; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGModelWizard.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGModelWizard.java index faf21f109b9..dbf8ff4739d 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGModelWizard.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGModelWizard.java @@ -21,77 +21,52 @@ import java.util.Map; import java.util.MissingResourceException; import java.util.StringTokenizer; +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.Path; import org.eclipse.emf.common.CommonPlugin; - import org.eclipse.emf.common.util.URI; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClassifier; - +import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; - import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; - -import org.eclipse.emf.ecore.EObject; - import org.eclipse.emf.ecore.xmi.XMLResource; - import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; - -import org.eclipse.core.runtime.IProgressMonitor; - import org.eclipse.jface.dialogs.MessageDialog; - +import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; - +import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.wizard.Wizard; import org.eclipse.jface.wizard.WizardPage; - +import org.eclipse.papyrus.dd.dg.DGFactory; +import org.eclipse.papyrus.dd.dg.DGPackage; +import org.eclipse.papyrus.dd.edit.DDEditPlugin; +import org.eclipse.papyrus.dd.editor.DDEditorPlugin; import org.eclipse.swt.SWT; - -import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.ModifyEvent; - +import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; - import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; - import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; - -import org.eclipse.ui.actions.WorkspaceModifyOperation; - -import org.eclipse.ui.dialogs.WizardNewFileCreationPage; - -import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.ui.part.ISetSelectionTarget; - -import org.eclipse.papyrus.dd.dg.DGFactory; -import org.eclipse.papyrus.dd.dg.DGPackage; -import org.eclipse.papyrus.dd.edit.DDEditPlugin; - -import org.eclipse.core.runtime.Path; - -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.StructuredSelection; - -import org.eclipse.papyrus.dd.editor.DDEditorPlugin; - import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PartInitException; +import org.eclipse.ui.actions.WorkspaceModifyOperation; +import org.eclipse.ui.dialogs.WizardNewFileCreationPage; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.ui.part.ISetSelectionTarget; /** * This is a wizard to create a new DG model file. diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java index 36995306dd2..50f8cbd487f 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java @@ -14,7 +14,6 @@ package org.eclipse.papyrus.dd.dc; import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EObject; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java index 07ac4d5d1b3..b81a3fc45d2 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java @@ -14,7 +14,6 @@ package org.eclipse.papyrus.dd.dc; import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EObject; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java index 2e2887b9162..cd22f40f25c 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java @@ -12,23 +12,17 @@ package org.eclipse.papyrus.dd.dc.impl; import java.lang.reflect.InvocationTargetException; - import java.util.Map; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - import org.eclipse.papyrus.dd.dc.Bounds; import org.eclipse.papyrus.dd.dc.DCPackage; - import org.eclipse.papyrus.dd.dc.util.DCValidator; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java index a21b03ac578..77abe57c473 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java @@ -17,12 +17,14 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.impl.EFactoryImpl; - import org.eclipse.emf.ecore.plugin.EcorePlugin; - -import org.eclipse.papyrus.dd.dc.*; +import org.eclipse.papyrus.dd.dc.Bounds; +import org.eclipse.papyrus.dd.dc.DCFactory; +import org.eclipse.papyrus.dd.dc.DCPackage; +import org.eclipse.papyrus.dd.dc.Dimension; +import org.eclipse.papyrus.dd.dc.KnownColor; +import org.eclipse.papyrus.dd.dc.Point; /** * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java index 6bfba45362f..dbea5cf755e 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java @@ -12,6 +12,7 @@ package org.eclipse.papyrus.dd.dc.impl; import java.awt.Color; + import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java index fb7d667a1f7..4b9e04fb8ee 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java @@ -12,23 +12,17 @@ package org.eclipse.papyrus.dd.dc.impl; import java.lang.reflect.InvocationTargetException; - import java.util.Map; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - import org.eclipse.papyrus.dd.dc.DCPackage; import org.eclipse.papyrus.dd.dc.Dimension; - import org.eclipse.papyrus.dd.dc.util.DCValidator; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java index 5344e5c0ebc..4648c39612c 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java @@ -12,12 +12,9 @@ package org.eclipse.papyrus.dd.dc.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - import org.eclipse.papyrus.dd.dc.DCPackage; import org.eclipse.papyrus.dd.dc.Point; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java index 23c1fc17e90..1c3817509ec 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java @@ -13,12 +13,12 @@ package org.eclipse.papyrus.dd.dc.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; - import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; - import org.eclipse.emf.ecore.EObject; - -import org.eclipse.papyrus.dd.dc.*; +import org.eclipse.papyrus.dd.dc.Bounds; +import org.eclipse.papyrus.dd.dc.DCPackage; +import org.eclipse.papyrus.dd.dc.Dimension; +import org.eclipse.papyrus.dd.dc.Point; /** * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java index d9da51e6218..da652b88121 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java @@ -13,10 +13,11 @@ package org.eclipse.papyrus.dd.dc.util; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.util.Switch; - -import org.eclipse.papyrus.dd.dc.*; +import org.eclipse.papyrus.dd.dc.Bounds; +import org.eclipse.papyrus.dd.dc.DCPackage; +import org.eclipse.papyrus.dd.dc.Dimension; +import org.eclipse.papyrus.dd.dc.Point; /** * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java index 1d0d3cd5081..d97f3f07f50 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java @@ -12,20 +12,20 @@ package org.eclipse.papyrus.dd.dc.util; import java.awt.Color; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.util.EObjectValidator; - -import org.eclipse.papyrus.dd.dc.*; +import org.eclipse.papyrus.dd.dc.Bounds; +import org.eclipse.papyrus.dd.dc.DCPackage; +import org.eclipse.papyrus.dd.dc.Dimension; +import org.eclipse.papyrus.dd.dc.KnownColor; +import org.eclipse.papyrus.dd.dc.Point; /** * <!-- begin-user-doc --> The <b>Validator</b> for the model. <!-- end-user-doc diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java index 9776b93d250..10c5033f586 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java @@ -12,6 +12,7 @@ package org.eclipse.papyrus.dd.dg; import java.util.Map; + import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.papyrus.dd.dc.Bounds; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java index 81115bd4422..e79e733c58d 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java @@ -14,7 +14,6 @@ package org.eclipse.papyrus.dd.dg; import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.papyrus.dd.dc.Point; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java index 1ae244f8a53..2045a729452 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java @@ -12,6 +12,7 @@ package org.eclipse.papyrus.dd.dg; import java.util.Map; + import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.ecore.EObject; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java index 89c76c1a38d..b1e4253ec3c 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java @@ -12,7 +12,6 @@ package org.eclipse.papyrus.dd.dg; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EObject; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java index 544f7bacfb1..88288dce508 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java @@ -12,11 +12,9 @@ package org.eclipse.papyrus.dd.dg; import java.awt.Color; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EObject; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java index 2769cb0f949..b00f5383184 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java @@ -12,6 +12,7 @@ package org.eclipse.papyrus.dd.dg; import java.util.Map; + import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java index ed068270b14..f681a6b2fda 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java @@ -12,6 +12,7 @@ package org.eclipse.papyrus.dd.dg; import java.util.Map; + import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.papyrus.dd.dc.Bounds; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java index f5fc85e011c..9da7536ee71 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java @@ -12,6 +12,7 @@ package org.eclipse.papyrus.dd.dg; import java.util.Map; + import org.eclipse.emf.common.util.DiagnosticChain; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java index abd36076bb5..648574d91bb 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java @@ -12,8 +12,8 @@ package org.eclipse.papyrus.dd.dg; import java.awt.Color; - import java.util.Map; + import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.ecore.EObject; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java index cc3d9a02d27..a5db0f313bf 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java @@ -12,6 +12,7 @@ package org.eclipse.papyrus.dd.dg; import java.util.Map; + import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java index d4d447a9832..ad26d5e4c6c 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java @@ -12,7 +12,6 @@ package org.eclipse.papyrus.dd.dg; import org.eclipse.emf.common.util.EList; - import org.eclipse.papyrus.dd.dc.Point; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java index b191f3ed37b..f9ac66c41c2 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java @@ -12,7 +12,6 @@ package org.eclipse.papyrus.dd.dg; import org.eclipse.emf.common.util.EList; - import org.eclipse.papyrus.dd.dc.Point; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java index 261a0a6c12c..657c4060b46 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java @@ -12,6 +12,7 @@ package org.eclipse.papyrus.dd.dg; import java.util.Map; + import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.papyrus.dd.dc.Bounds; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java index 0b4c530aca6..81955caa1bf 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java @@ -15,7 +15,6 @@ import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EObject; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java index 824fea33955..7af3427c323 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java @@ -12,7 +12,6 @@ package org.eclipse.papyrus.dd.dg; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EObject; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java index cd4b245eebd..67a6ab4927b 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java @@ -12,7 +12,6 @@ package org.eclipse.papyrus.dd.dg; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EObject; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java index 3e3239dfb47..e6afadc5cb8 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java @@ -12,6 +12,7 @@ package org.eclipse.papyrus.dd.dg; import java.util.Map; + import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.papyrus.dd.dc.Point; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java index c4f5ba8292b..95709b28f55 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java @@ -12,6 +12,7 @@ package org.eclipse.papyrus.dd.dg; import java.util.Map; + import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.papyrus.dd.dc.Bounds; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java index b6c2d4a1b39..a4ee191d1b8 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java @@ -13,19 +13,16 @@ package org.eclipse.papyrus.dd.dg.impl; import java.lang.reflect.InvocationTargetException; import java.util.Map; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dc.Bounds; - import org.eclipse.papyrus.dd.dg.Canvas; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.util.DGValidator; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CircleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CircleImpl.java index 74abb25fbd3..8446f633b31 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CircleImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CircleImpl.java @@ -12,26 +12,19 @@ package org.eclipse.papyrus.dd.dg.impl; import java.lang.reflect.InvocationTargetException; - import java.util.Map; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dc.Point; - import org.eclipse.papyrus.dd.dg.Circle; import org.eclipse.papyrus.dd.dg.DGPackage; - import org.eclipse.papyrus.dd.dg.util.DGValidator; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClipPathImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClipPathImpl.java index b1a02b6e3a0..245e37acd6b 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClipPathImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClipPathImpl.java @@ -12,7 +12,6 @@ package org.eclipse.papyrus.dd.dg.impl; import org.eclipse.emf.ecore.EClass; - import org.eclipse.papyrus.dd.dg.ClipPath; import org.eclipse.papyrus.dd.dg.DGPackage; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClosePathImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClosePathImpl.java index e21f6b574ff..7bd2549bfa2 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClosePathImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClosePathImpl.java @@ -12,7 +12,6 @@ package org.eclipse.papyrus.dd.dg.impl; import org.eclipse.emf.ecore.EClass; - import org.eclipse.papyrus.dd.dg.ClosePath; import org.eclipse.papyrus.dd.dg.DGPackage; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java index ffa02a47892..f1caa1c0c02 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java @@ -13,14 +13,10 @@ package org.eclipse.papyrus.dd.dg.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dc.Point; - import org.eclipse.papyrus.dd.dg.CubicCurveTo; import org.eclipse.papyrus.dd.dg.DGPackage; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java index 1d647c00029..d84d244d7d1 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java @@ -15,12 +15,49 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.impl.EFactoryImpl; - import org.eclipse.emf.ecore.plugin.EcorePlugin; - -import org.eclipse.papyrus.dd.dg.*; +import org.eclipse.papyrus.dd.dg.Canvas; +import org.eclipse.papyrus.dd.dg.Circle; +import org.eclipse.papyrus.dd.dg.ClipPath; +import org.eclipse.papyrus.dd.dg.ClosePath; +import org.eclipse.papyrus.dd.dg.CubicCurveTo; +import org.eclipse.papyrus.dd.dg.DGFactory; +import org.eclipse.papyrus.dd.dg.DGPackage; +import org.eclipse.papyrus.dd.dg.Definitions; +import org.eclipse.papyrus.dd.dg.ElementKind; +import org.eclipse.papyrus.dd.dg.Ellipse; +import org.eclipse.papyrus.dd.dg.EllipticalArcTo; +import org.eclipse.papyrus.dd.dg.FontDecoration; +import org.eclipse.papyrus.dd.dg.GradientStop; +import org.eclipse.papyrus.dd.dg.Group; +import org.eclipse.papyrus.dd.dg.Image; +import org.eclipse.papyrus.dd.dg.Line; +import org.eclipse.papyrus.dd.dg.LineTo; +import org.eclipse.papyrus.dd.dg.LinearGradient; +import org.eclipse.papyrus.dd.dg.Marker; +import org.eclipse.papyrus.dd.dg.Matrix; +import org.eclipse.papyrus.dd.dg.MoveTo; +import org.eclipse.papyrus.dd.dg.Paint; +import org.eclipse.papyrus.dd.dg.Path; +import org.eclipse.papyrus.dd.dg.Pattern; +import org.eclipse.papyrus.dd.dg.Polygon; +import org.eclipse.papyrus.dd.dg.Polyline; +import org.eclipse.papyrus.dd.dg.QuadraticCurveTo; +import org.eclipse.papyrus.dd.dg.RadialGradient; +import org.eclipse.papyrus.dd.dg.Rectangle; +import org.eclipse.papyrus.dd.dg.RootCanvas; +import org.eclipse.papyrus.dd.dg.Rotate; +import org.eclipse.papyrus.dd.dg.Scale; +import org.eclipse.papyrus.dd.dg.Skew; +import org.eclipse.papyrus.dd.dg.Style; +import org.eclipse.papyrus.dd.dg.StyleRule; +import org.eclipse.papyrus.dd.dg.StyleSelector; +import org.eclipse.papyrus.dd.dg.StyleSheet; +import org.eclipse.papyrus.dd.dg.Text; +import org.eclipse.papyrus.dd.dg.TextAnchor; +import org.eclipse.papyrus.dd.dg.Translate; +import org.eclipse.papyrus.dd.dg.Use; /** * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java index 1c8008f5f0b..029bb578d26 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java @@ -13,16 +13,14 @@ package org.eclipse.papyrus.dd.dg.impl; import java.lang.reflect.InvocationTargetException; import java.util.Map; -import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Definition; import org.eclipse.papyrus.dd.dg.util.DGValidator; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java index 21248c3d76c..fad14ab1375 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java @@ -15,18 +15,13 @@ import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Definition; import org.eclipse.papyrus.dd.dg.Definitions; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipseImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipseImpl.java index 36d9d23ebf9..0185203693a 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipseImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipseImpl.java @@ -13,15 +13,11 @@ package org.eclipse.papyrus.dd.dg.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dc.Dimension; import org.eclipse.papyrus.dd.dc.Point; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Ellipse; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalArcToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalArcToImpl.java index 2162cb31f82..65685f105a2 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalArcToImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalArcToImpl.java @@ -13,15 +13,11 @@ package org.eclipse.papyrus.dd.dg.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dc.Dimension; import org.eclipse.papyrus.dd.dc.Point; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.EllipticalArcTo; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java index 4cfc96d569b..3ffa5a16ea1 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java @@ -12,6 +12,7 @@ package org.eclipse.papyrus.dd.dg.impl; import java.util.Collection; + import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java index 2dd67adbf9a..b3e0467491e 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java @@ -12,25 +12,18 @@ package org.eclipse.papyrus.dd.dg.impl; import java.awt.Color; - import java.lang.reflect.InvocationTargetException; - import java.util.Map; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.GradientStop; - import org.eclipse.papyrus.dd.dg.util.DGValidator; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java index ac1dc116bb9..99b2c630a6d 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java @@ -14,6 +14,7 @@ package org.eclipse.papyrus.dd.dg.impl; import java.lang.reflect.InvocationTargetException; import java.util.Collection; import java.util.Map; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.Diagnostic; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java index 19bd9eecc14..2bd73fa3b78 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java @@ -15,16 +15,12 @@ import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList; import org.eclipse.emf.ecore.util.InternalEList; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.GraphicalElement; import org.eclipse.papyrus.dd.dg.Group; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java index 600026de744..a2c17d92cde 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java @@ -13,19 +13,16 @@ package org.eclipse.papyrus.dd.dg.impl; import java.lang.reflect.InvocationTargetException; import java.util.Map; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dc.Bounds; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Image; import org.eclipse.papyrus.dd.dg.util.DGValidator; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineImpl.java index fd739a61777..14da5d6f3d1 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineImpl.java @@ -13,14 +13,10 @@ package org.eclipse.papyrus.dd.dg.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dc.Point; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Line; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineToImpl.java index dd5a0faba98..56f580d33b6 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineToImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineToImpl.java @@ -13,14 +13,10 @@ package org.eclipse.papyrus.dd.dg.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dc.Point; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.LineTo; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LinearGradientImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LinearGradientImpl.java index 81e66179b31..131433ad418 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LinearGradientImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LinearGradientImpl.java @@ -12,25 +12,19 @@ package org.eclipse.papyrus.dd.dg.impl; import java.lang.reflect.InvocationTargetException; - import java.util.Map; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dc.Point; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.LinearGradient; - import org.eclipse.papyrus.dd.dg.util.DGValidator; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java index f8f9254c53b..a5022101b64 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java @@ -13,16 +13,14 @@ package org.eclipse.papyrus.dd.dg.impl; import java.lang.reflect.InvocationTargetException; import java.util.Map; -import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.MarkedElement; import org.eclipse.papyrus.dd.dg.Marker; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkerImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkerImpl.java index 0e0d33072b9..f104d1930e3 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkerImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkerImpl.java @@ -13,15 +13,11 @@ package org.eclipse.papyrus.dd.dg.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dc.Dimension; import org.eclipse.papyrus.dd.dc.Point; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Marker; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MatrixImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MatrixImpl.java index 900e28b4c0f..c075a9092f1 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MatrixImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MatrixImpl.java @@ -12,11 +12,8 @@ package org.eclipse.papyrus.dd.dg.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Matrix; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MoveToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MoveToImpl.java index 94ea5f46add..04757881049 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MoveToImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MoveToImpl.java @@ -13,14 +13,10 @@ package org.eclipse.papyrus.dd.dg.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dc.Point; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.MoveTo; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java index 96d01c38ef1..70a02fb7043 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java @@ -12,20 +12,17 @@ package org.eclipse.papyrus.dd.dg.impl; import java.awt.Color; - import java.lang.reflect.InvocationTargetException; import java.util.Map; -import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Paint; import org.eclipse.papyrus.dd.dg.PaintServer; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java index 2d522600978..731c4603ec2 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java @@ -14,15 +14,11 @@ package org.eclipse.papyrus.dd.dg.impl; import java.util.Collection; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.PaintServer; import org.eclipse.papyrus.dd.dg.Transform; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathCommandImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathCommandImpl.java index c42cbcb8e08..9601b765032 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathCommandImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathCommandImpl.java @@ -12,12 +12,9 @@ package org.eclipse.papyrus.dd.dg.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.PathCommand; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java index 9a05e800b0c..a5f62ea5f81 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java @@ -13,20 +13,16 @@ package org.eclipse.papyrus.dd.dg.impl; import java.lang.reflect.InvocationTargetException; import java.util.Collection; - import java.util.Map; -import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Path; import org.eclipse.papyrus.dd.dg.PathCommand; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PatternImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PatternImpl.java index 32f4af91aae..bd35f31f1f1 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PatternImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PatternImpl.java @@ -13,14 +13,10 @@ package org.eclipse.papyrus.dd.dg.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dc.Bounds; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.GraphicalElement; import org.eclipse.papyrus.dd.dg.Pattern; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java index dafb47b8c81..92570125878 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java @@ -14,17 +14,12 @@ package org.eclipse.papyrus.dd.dg.impl; import java.util.Collection; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; - import org.eclipse.papyrus.dd.dc.Point; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Polygon; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java index f407f48e38b..9272dcdccc9 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java @@ -14,17 +14,12 @@ package org.eclipse.papyrus.dd.dg.impl; import java.util.Collection; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; - import org.eclipse.papyrus.dd.dc.Point; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Polyline; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java index 3538799eb79..58ac73dacb9 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java @@ -13,14 +13,10 @@ package org.eclipse.papyrus.dd.dg.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dc.Point; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.QuadraticCurveTo; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java index 34840e9586c..24c69fa5b26 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java @@ -12,25 +12,19 @@ package org.eclipse.papyrus.dd.dg.impl; import java.lang.reflect.InvocationTargetException; - import java.util.Map; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dc.Point; import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.RadialGradient; - import org.eclipse.papyrus.dd.dg.util.DGValidator; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java index 82577e70cec..47404ddd61f 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java @@ -13,19 +13,16 @@ package org.eclipse.papyrus.dd.dg.impl; import java.lang.reflect.InvocationTargetException; import java.util.Map; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dc.Bounds; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Rectangle; import org.eclipse.papyrus.dd.dg.util.DGValidator; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java index 86d73ae89ce..3b897fe731f 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java @@ -12,22 +12,16 @@ package org.eclipse.papyrus.dd.dg.impl; import java.awt.Color; - import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.emf.ecore.util.EDataTypeUniqueEList; import org.eclipse.emf.ecore.util.EObjectResolvingEList; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Definitions; import org.eclipse.papyrus.dd.dg.RootCanvas; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RotateImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RotateImpl.java index 6286f18ed51..9641328099e 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RotateImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RotateImpl.java @@ -13,14 +13,10 @@ package org.eclipse.papyrus.dd.dg.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dc.Point; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Rotate; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java index 886e0e130af..301b598aba0 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java @@ -12,22 +12,16 @@ package org.eclipse.papyrus.dd.dg.impl; import java.lang.reflect.InvocationTargetException; - import java.util.Map; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Scale; - import org.eclipse.papyrus.dd.dg.util.DGValidator; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/SkewImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/SkewImpl.java index 7a5dfd32d04..be979fc90ac 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/SkewImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/SkewImpl.java @@ -12,11 +12,8 @@ package org.eclipse.papyrus.dd.dg.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Skew; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java index f8b83437ed2..5e57f58675a 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java @@ -12,31 +12,24 @@ package org.eclipse.papyrus.dd.dg.impl; import java.lang.reflect.InvocationTargetException; - import java.util.Collection; import java.util.Map; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - import org.eclipse.emf.ecore.util.EDataTypeEList; import org.eclipse.emf.ecore.util.InternalEList; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.FontDecoration; import org.eclipse.papyrus.dd.dg.Paint; import org.eclipse.papyrus.dd.dg.Style; - import org.eclipse.papyrus.dd.dg.util.DGValidator; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java index cba09617cd0..75b7c67a550 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java @@ -15,18 +15,13 @@ import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Style; import org.eclipse.papyrus.dd.dg.StyleRule; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java index 19c8504b5ce..2fd2c138ef3 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java @@ -12,6 +12,7 @@ package org.eclipse.papyrus.dd.dg.impl; import java.util.Collection; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java index 926998caff3..fdea6a1be16 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java @@ -14,17 +14,12 @@ package org.eclipse.papyrus.dd.dg.impl; import java.util.Collection; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.StyleRule; import org.eclipse.papyrus.dd.dg.StyleSheet; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java index 1e08deb89cd..510e627a61a 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java @@ -13,19 +13,16 @@ package org.eclipse.papyrus.dd.dg.impl; import java.lang.reflect.InvocationTargetException; import java.util.Map; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dc.Point; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Text; import org.eclipse.papyrus.dd.dg.TextAnchor; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TransformImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TransformImpl.java index 07896a9e069..9e33ae5f390 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TransformImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TransformImpl.java @@ -12,9 +12,7 @@ package org.eclipse.papyrus.dd.dg.impl; import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Transform; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TranslateImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TranslateImpl.java index 97d1853e235..69639290ba8 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TranslateImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TranslateImpl.java @@ -12,11 +12,8 @@ package org.eclipse.papyrus.dd.dg.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.Translate; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java index 12c81158db7..73a1a4ae4bb 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java @@ -13,19 +13,16 @@ package org.eclipse.papyrus.dd.dg.impl; import java.lang.reflect.InvocationTargetException; import java.util.Map; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dc.Bounds; - import org.eclipse.papyrus.dd.dg.DGPackage; import org.eclipse.papyrus.dd.dg.GraphicalElement; import org.eclipse.papyrus.dd.dg.Use; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java index c147447afaa..05b9eb5076a 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java @@ -13,12 +13,52 @@ package org.eclipse.papyrus.dd.dg.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; - import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; - import org.eclipse.emf.ecore.EObject; - -import org.eclipse.papyrus.dd.dg.*; +import org.eclipse.papyrus.dd.dg.Canvas; +import org.eclipse.papyrus.dd.dg.Circle; +import org.eclipse.papyrus.dd.dg.ClipPath; +import org.eclipse.papyrus.dd.dg.ClosePath; +import org.eclipse.papyrus.dd.dg.CubicCurveTo; +import org.eclipse.papyrus.dd.dg.DGPackage; +import org.eclipse.papyrus.dd.dg.Definition; +import org.eclipse.papyrus.dd.dg.Definitions; +import org.eclipse.papyrus.dd.dg.Ellipse; +import org.eclipse.papyrus.dd.dg.EllipticalArcTo; +import org.eclipse.papyrus.dd.dg.Gradient; +import org.eclipse.papyrus.dd.dg.GradientStop; +import org.eclipse.papyrus.dd.dg.GraphicalElement; +import org.eclipse.papyrus.dd.dg.Group; +import org.eclipse.papyrus.dd.dg.Image; +import org.eclipse.papyrus.dd.dg.Line; +import org.eclipse.papyrus.dd.dg.LineTo; +import org.eclipse.papyrus.dd.dg.LinearGradient; +import org.eclipse.papyrus.dd.dg.MarkedElement; +import org.eclipse.papyrus.dd.dg.Marker; +import org.eclipse.papyrus.dd.dg.Matrix; +import org.eclipse.papyrus.dd.dg.MoveTo; +import org.eclipse.papyrus.dd.dg.Paint; +import org.eclipse.papyrus.dd.dg.PaintServer; +import org.eclipse.papyrus.dd.dg.Path; +import org.eclipse.papyrus.dd.dg.PathCommand; +import org.eclipse.papyrus.dd.dg.Pattern; +import org.eclipse.papyrus.dd.dg.Polygon; +import org.eclipse.papyrus.dd.dg.Polyline; +import org.eclipse.papyrus.dd.dg.QuadraticCurveTo; +import org.eclipse.papyrus.dd.dg.RadialGradient; +import org.eclipse.papyrus.dd.dg.Rectangle; +import org.eclipse.papyrus.dd.dg.RootCanvas; +import org.eclipse.papyrus.dd.dg.Rotate; +import org.eclipse.papyrus.dd.dg.Scale; +import org.eclipse.papyrus.dd.dg.Skew; +import org.eclipse.papyrus.dd.dg.Style; +import org.eclipse.papyrus.dd.dg.StyleRule; +import org.eclipse.papyrus.dd.dg.StyleSelector; +import org.eclipse.papyrus.dd.dg.StyleSheet; +import org.eclipse.papyrus.dd.dg.Text; +import org.eclipse.papyrus.dd.dg.Transform; +import org.eclipse.papyrus.dd.dg.Translate; +import org.eclipse.papyrus.dd.dg.Use; /** * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java index 6a364f5297e..0d6e197b810 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java @@ -13,10 +13,51 @@ package org.eclipse.papyrus.dd.dg.util; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.util.Switch; - -import org.eclipse.papyrus.dd.dg.*; +import org.eclipse.papyrus.dd.dg.Canvas; +import org.eclipse.papyrus.dd.dg.Circle; +import org.eclipse.papyrus.dd.dg.ClipPath; +import org.eclipse.papyrus.dd.dg.ClosePath; +import org.eclipse.papyrus.dd.dg.CubicCurveTo; +import org.eclipse.papyrus.dd.dg.DGPackage; +import org.eclipse.papyrus.dd.dg.Definition; +import org.eclipse.papyrus.dd.dg.Definitions; +import org.eclipse.papyrus.dd.dg.Ellipse; +import org.eclipse.papyrus.dd.dg.EllipticalArcTo; +import org.eclipse.papyrus.dd.dg.Gradient; +import org.eclipse.papyrus.dd.dg.GradientStop; +import org.eclipse.papyrus.dd.dg.GraphicalElement; +import org.eclipse.papyrus.dd.dg.Group; +import org.eclipse.papyrus.dd.dg.Image; +import org.eclipse.papyrus.dd.dg.Line; +import org.eclipse.papyrus.dd.dg.LineTo; +import org.eclipse.papyrus.dd.dg.LinearGradient; +import org.eclipse.papyrus.dd.dg.MarkedElement; +import org.eclipse.papyrus.dd.dg.Marker; +import org.eclipse.papyrus.dd.dg.Matrix; +import org.eclipse.papyrus.dd.dg.MoveTo; +import org.eclipse.papyrus.dd.dg.Paint; +import org.eclipse.papyrus.dd.dg.PaintServer; +import org.eclipse.papyrus.dd.dg.Path; +import org.eclipse.papyrus.dd.dg.PathCommand; +import org.eclipse.papyrus.dd.dg.Pattern; +import org.eclipse.papyrus.dd.dg.Polygon; +import org.eclipse.papyrus.dd.dg.Polyline; +import org.eclipse.papyrus.dd.dg.QuadraticCurveTo; +import org.eclipse.papyrus.dd.dg.RadialGradient; +import org.eclipse.papyrus.dd.dg.Rectangle; +import org.eclipse.papyrus.dd.dg.RootCanvas; +import org.eclipse.papyrus.dd.dg.Rotate; +import org.eclipse.papyrus.dd.dg.Scale; +import org.eclipse.papyrus.dd.dg.Skew; +import org.eclipse.papyrus.dd.dg.Style; +import org.eclipse.papyrus.dd.dg.StyleRule; +import org.eclipse.papyrus.dd.dg.StyleSelector; +import org.eclipse.papyrus.dd.dg.StyleSheet; +import org.eclipse.papyrus.dd.dg.Text; +import org.eclipse.papyrus.dd.dg.Transform; +import org.eclipse.papyrus.dd.dg.Translate; +import org.eclipse.papyrus.dd.dg.Use; /** * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java index f02c225c1ba..49fd4a8b5f2 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java @@ -15,15 +15,58 @@ import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.util.EObjectValidator; - -import org.eclipse.papyrus.dd.dg.*; +import org.eclipse.papyrus.dd.dg.Canvas; +import org.eclipse.papyrus.dd.dg.Circle; +import org.eclipse.papyrus.dd.dg.ClipPath; +import org.eclipse.papyrus.dd.dg.ClosePath; +import org.eclipse.papyrus.dd.dg.CubicCurveTo; +import org.eclipse.papyrus.dd.dg.DGPackage; +import org.eclipse.papyrus.dd.dg.Definition; +import org.eclipse.papyrus.dd.dg.Definitions; +import org.eclipse.papyrus.dd.dg.ElementKind; +import org.eclipse.papyrus.dd.dg.Ellipse; +import org.eclipse.papyrus.dd.dg.EllipticalArcTo; +import org.eclipse.papyrus.dd.dg.FontDecoration; +import org.eclipse.papyrus.dd.dg.Gradient; +import org.eclipse.papyrus.dd.dg.GradientStop; +import org.eclipse.papyrus.dd.dg.GraphicalElement; +import org.eclipse.papyrus.dd.dg.Group; +import org.eclipse.papyrus.dd.dg.Image; +import org.eclipse.papyrus.dd.dg.Line; +import org.eclipse.papyrus.dd.dg.LineTo; +import org.eclipse.papyrus.dd.dg.LinearGradient; +import org.eclipse.papyrus.dd.dg.MarkedElement; +import org.eclipse.papyrus.dd.dg.Marker; +import org.eclipse.papyrus.dd.dg.Matrix; +import org.eclipse.papyrus.dd.dg.MoveTo; +import org.eclipse.papyrus.dd.dg.Paint; +import org.eclipse.papyrus.dd.dg.PaintServer; +import org.eclipse.papyrus.dd.dg.Path; +import org.eclipse.papyrus.dd.dg.PathCommand; +import org.eclipse.papyrus.dd.dg.Pattern; +import org.eclipse.papyrus.dd.dg.Polygon; +import org.eclipse.papyrus.dd.dg.Polyline; +import org.eclipse.papyrus.dd.dg.QuadraticCurveTo; +import org.eclipse.papyrus.dd.dg.RadialGradient; +import org.eclipse.papyrus.dd.dg.Rectangle; +import org.eclipse.papyrus.dd.dg.RootCanvas; +import org.eclipse.papyrus.dd.dg.Rotate; +import org.eclipse.papyrus.dd.dg.Scale; +import org.eclipse.papyrus.dd.dg.Skew; +import org.eclipse.papyrus.dd.dg.Style; +import org.eclipse.papyrus.dd.dg.StyleRule; +import org.eclipse.papyrus.dd.dg.StyleSelector; +import org.eclipse.papyrus.dd.dg.StyleSheet; +import org.eclipse.papyrus.dd.dg.Text; +import org.eclipse.papyrus.dd.dg.TextAnchor; +import org.eclipse.papyrus.dd.dg.Transform; +import org.eclipse.papyrus.dd.dg.Translate; +import org.eclipse.papyrus.dd.dg.Use; /** * <!-- begin-user-doc --> The <b>Validator</b> for the model. <!-- end-user-doc diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DiagramElement.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DiagramElement.java index 83e7aff8da8..e0bb4a0cebd 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DiagramElement.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DiagramElement.java @@ -12,7 +12,6 @@ package org.eclipse.papyrus.dd.di; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EObject; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Edge.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Edge.java index b29c8188f6f..e4fdefecca5 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Edge.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Edge.java @@ -12,7 +12,6 @@ package org.eclipse.papyrus.dd.di; import org.eclipse.emf.common.util.EList; - import org.eclipse.papyrus.dd.dc.Point; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIFactoryImpl.java index 03120ecdf7f..9dd9068e12a 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIFactoryImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIFactoryImpl.java @@ -14,12 +14,10 @@ package org.eclipse.papyrus.dd.di.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.impl.EFactoryImpl; - import org.eclipse.emf.ecore.plugin.EcorePlugin; - -import org.eclipse.papyrus.dd.di.*; +import org.eclipse.papyrus.dd.di.DIFactory; +import org.eclipse.papyrus.dd.di.DIPackage; /** * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIPackageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIPackageImpl.java index 044634cb7b0..7413a42d4ca 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIPackageImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIPackageImpl.java @@ -16,11 +16,8 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EcorePackage; - import org.eclipse.emf.ecore.impl.EPackageImpl; - import org.eclipse.papyrus.dd.dc.DCPackage; - import org.eclipse.papyrus.dd.di.DIFactory; import org.eclipse.papyrus.dd.di.DIPackage; import org.eclipse.papyrus.dd.di.Diagram; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramImpl.java index 332f14add19..e75d6823f26 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramImpl.java @@ -12,11 +12,8 @@ package org.eclipse.papyrus.dd.di.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.di.DIPackage; import org.eclipse.papyrus.dd.di.Diagram; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/EdgeImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/EdgeImpl.java index 043eab7ea77..7cbbdd85dbd 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/EdgeImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/EdgeImpl.java @@ -12,6 +12,7 @@ package org.eclipse.papyrus.dd.di.impl; import java.util.Collection; + import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/ShapeImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/ShapeImpl.java index d451414db20..9e6488f009c 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/ShapeImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/ShapeImpl.java @@ -13,14 +13,10 @@ package org.eclipse.papyrus.dd.di.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dc.Bounds; - import org.eclipse.papyrus.dd.di.DIPackage; import org.eclipse.papyrus.dd.di.Shape; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/StyleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/StyleImpl.java index 803a29ef2a8..dbfcafa602a 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/StyleImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/StyleImpl.java @@ -12,9 +12,7 @@ package org.eclipse.papyrus.dd.di.impl; import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - import org.eclipse.papyrus.dd.di.DIPackage; import org.eclipse.papyrus.dd.di.Style; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIAdapterFactory.java index 16f4c5506fd..04e000b8081 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIAdapterFactory.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIAdapterFactory.java @@ -13,12 +13,14 @@ package org.eclipse.papyrus.dd.di.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; - import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; - import org.eclipse.emf.ecore.EObject; - -import org.eclipse.papyrus.dd.di.*; +import org.eclipse.papyrus.dd.di.DIPackage; +import org.eclipse.papyrus.dd.di.Diagram; +import org.eclipse.papyrus.dd.di.DiagramElement; +import org.eclipse.papyrus.dd.di.Edge; +import org.eclipse.papyrus.dd.di.Shape; +import org.eclipse.papyrus.dd.di.Style; /** * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIDerivedUnionAdapter.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIDerivedUnionAdapter.java index 29648252ed1..52ff162a923 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIDerivedUnionAdapter.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIDerivedUnionAdapter.java @@ -12,13 +12,10 @@ package org.eclipse.papyrus.dd.di.util; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.notify.impl.AdapterImpl; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.papyrus.dd.di.DIPackage; import org.eclipse.papyrus.dd.di.Diagram; import org.eclipse.papyrus.dd.di.Edge; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DISwitch.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DISwitch.java index 2ccd9bb9c52..027fbe0a4d6 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DISwitch.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DISwitch.java @@ -13,10 +13,13 @@ package org.eclipse.papyrus.dd.di.util; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.util.Switch; - -import org.eclipse.papyrus.dd.di.*; +import org.eclipse.papyrus.dd.di.DIPackage; +import org.eclipse.papyrus.dd.di.Diagram; +import org.eclipse.papyrus.dd.di.DiagramElement; +import org.eclipse.papyrus.dd.di.Edge; +import org.eclipse.papyrus.dd.di.Shape; +import org.eclipse.papyrus.dd.di.Style; /** * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIEditPlugin.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIEditPlugin.java index dd84671da13..90db262bd2c 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIEditPlugin.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIEditPlugin.java @@ -12,13 +12,9 @@ package org.eclipse.papyrus.umldi.provider; import org.eclipse.emf.common.EMFPlugin; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.ecore.provider.EcoreEditPlugin; - import org.eclipse.papyrus.dd.edit.DDEditPlugin; - import org.eclipse.uml2.uml.edit.UMLEditPlugin; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIItemProviderAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIItemProviderAdapterFactory.java index b333739379f..9e5aa771bb9 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIItemProviderAdapterFactory.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIItemProviderAdapterFactory.java @@ -17,7 +17,6 @@ import java.util.Collection; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notifier; - import org.eclipse.emf.edit.provider.ChangeNotifier; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; @@ -31,7 +30,6 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.INotifyChangedListener; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; - import org.eclipse.papyrus.umldi.util.UMLDIAdapterFactory; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlCompartmentItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlCompartmentItemProvider.java index 987d04e4edd..95736568985 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlCompartmentItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlCompartmentItemProvider.java @@ -16,7 +16,6 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -28,7 +27,6 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.umldi.UMLDIPackage; import org.eclipse.papyrus.umldi.UmlCompartment; import org.eclipse.papyrus.umldi.UmlCompartmentKind; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramElementItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramElementItemProvider.java index 6511402c087..fdf31cf39aa 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramElementItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramElementItemProvider.java @@ -16,11 +16,8 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -31,9 +28,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.di.provider.DiagramElementItemProvider; - import org.eclipse.papyrus.umldi.UMLDIFactory; import org.eclipse.papyrus.umldi.UMLDIPackage; import org.eclipse.papyrus.umldi.UmlDiagramElement; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramItemProvider.java index 93e310babe4..15a217666ad 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramItemProvider.java @@ -16,7 +16,6 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -28,9 +27,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.di.DIPackage; - import org.eclipse.papyrus.umldi.UMLDIPackage; import org.eclipse.papyrus.umldi.UmlDiagram; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlEdgeItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlEdgeItemProvider.java index 65685d1dd5a..6f2c6293a4d 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlEdgeItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlEdgeItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -29,11 +27,8 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.di.DIPackage; - import org.eclipse.papyrus.umldi.UMLDIPackage; import org.eclipse.papyrus.umldi.UmlEdge; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlLabelItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlLabelItemProvider.java index f68a03b43f3..283c35657ec 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlLabelItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlLabelItemProvider.java @@ -16,7 +16,6 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -28,7 +27,6 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.umldi.UMLDIPackage; import org.eclipse.papyrus.umldi.UmlLabel; import org.eclipse.papyrus.umldi.UmlLabelKind; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlShapeItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlShapeItemProvider.java index ada80c76f6c..a4316885bfd 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlShapeItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlShapeItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; import org.eclipse.emf.edit.provider.IItemFontProvider; @@ -28,11 +26,8 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.dc.DCFactory; - import org.eclipse.papyrus.dd.di.DIPackage; - import org.eclipse.papyrus.umldi.UMLDIPackage; import org.eclipse.papyrus.umldi.UmlShape; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlStyleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlStyleItemProvider.java index 9bc8f495975..6c88ff89f6a 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlStyleItemProvider.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlStyleItemProvider.java @@ -16,9 +16,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemColorProvider; @@ -30,9 +28,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.eclipse.papyrus.dd.di.provider.StyleItemProvider; - import org.eclipse.papyrus.umldi.UMLDIPackage; import org.eclipse.papyrus.umldi.UmlStyle; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIActionBarContributor.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIActionBarContributor.java index 562a91868ea..abb5990e630 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIActionBarContributor.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIActionBarContributor.java @@ -19,17 +19,14 @@ import java.util.Map; import java.util.StringTokenizer; import org.eclipse.emf.common.ui.viewer.IViewerProvider; - import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.emf.edit.domain.IEditingDomainProvider; - import org.eclipse.emf.edit.ui.action.ControlAction; import org.eclipse.emf.edit.ui.action.CreateChildAction; import org.eclipse.emf.edit.ui.action.CreateSiblingAction; import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor; import org.eclipse.emf.edit.ui.action.LoadResourceAction; import org.eclipse.emf.edit.ui.action.ValidateAction; - import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ActionContributionItem; import org.eclipse.jface.action.IAction; @@ -41,14 +38,12 @@ import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.action.SubContributionItem; - import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.Viewer; - import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PartInitException; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelWizard.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelWizard.java index 62d9d2debd7..bf5fe08760f 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelWizard.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelWizard.java @@ -21,75 +21,51 @@ import java.util.Map; import java.util.MissingResourceException; import java.util.StringTokenizer; +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.Path; import org.eclipse.emf.common.CommonPlugin; - import org.eclipse.emf.common.util.URI; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClassifier; - +import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; - import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; - -import org.eclipse.emf.ecore.EObject; - import org.eclipse.emf.ecore.xmi.XMLResource; - import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; - -import org.eclipse.core.runtime.IProgressMonitor; - import org.eclipse.jface.dialogs.MessageDialog; - +import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; - +import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.wizard.Wizard; import org.eclipse.jface.wizard.WizardPage; - +import org.eclipse.papyrus.umldi.UMLDIFactory; +import org.eclipse.papyrus.umldi.UMLDIPackage; +import org.eclipse.papyrus.umldi.provider.UMLDIEditPlugin; import org.eclipse.swt.SWT; - -import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.ModifyEvent; - +import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; - import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; - import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; - -import org.eclipse.ui.actions.WorkspaceModifyOperation; - -import org.eclipse.ui.dialogs.WizardNewFileCreationPage; - -import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.ui.part.ISetSelectionTarget; - -import org.eclipse.papyrus.umldi.UMLDIFactory; -import org.eclipse.papyrus.umldi.UMLDIPackage; -import org.eclipse.papyrus.umldi.provider.UMLDIEditPlugin; - -import org.eclipse.core.runtime.Path; - -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.StructuredSelection; - import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PartInitException; +import org.eclipse.ui.actions.WorkspaceModifyOperation; +import org.eclipse.ui.dialogs.WizardNewFileCreationPage; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.ui.part.ISetSelectionTarget; /** * This is a simple wizard for creating a new model file. <!-- begin-user-doc diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIPackage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIPackage.java index ff735d687c5..2df0686b1fc 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIPackage.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIPackage.java @@ -17,7 +17,6 @@ import org.eclipse.emf.ecore.EEnum; import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; - import org.eclipse.papyrus.dd.di.DIPackage; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagramElement.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagramElement.java index b64fb19bec0..10f65437c15 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagramElement.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagramElement.java @@ -12,9 +12,7 @@ package org.eclipse.papyrus.umldi; import org.eclipse.emf.common.util.EList; - import org.eclipse.papyrus.dd.di.DiagramElement; - import org.eclipse.uml2.uml.Element; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlStyle.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlStyle.java index d9299ca3bb0..2aaee35167a 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlStyle.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlStyle.java @@ -14,7 +14,6 @@ package org.eclipse.papyrus.umldi; import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.papyrus.dd.di.Style; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIFactoryImpl.java index eadaed58aa7..853a8518525 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIFactoryImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIFactoryImpl.java @@ -15,12 +15,18 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.impl.EFactoryImpl; - import org.eclipse.emf.ecore.plugin.EcorePlugin; - -import org.eclipse.papyrus.umldi.*; +import org.eclipse.papyrus.umldi.UMLDIFactory; +import org.eclipse.papyrus.umldi.UMLDIPackage; +import org.eclipse.papyrus.umldi.UmlCompartment; +import org.eclipse.papyrus.umldi.UmlCompartmentKind; +import org.eclipse.papyrus.umldi.UmlDiagram; +import org.eclipse.papyrus.umldi.UmlEdge; +import org.eclipse.papyrus.umldi.UmlLabel; +import org.eclipse.papyrus.umldi.UmlLabelKind; +import org.eclipse.papyrus.umldi.UmlShape; +import org.eclipse.papyrus.umldi.UmlStyle; /** * <!-- begin-user-doc --> diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIPackageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIPackageImpl.java index da3a1567bd8..fc2c73f85bc 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIPackageImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIPackageImpl.java @@ -12,7 +12,6 @@ package org.eclipse.papyrus.umldi.impl; import org.eclipse.emf.common.util.URI; - import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EEnum; @@ -21,13 +20,9 @@ import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EValidator; - import org.eclipse.emf.ecore.impl.EPackageImpl; - import org.eclipse.papyrus.dd.dc.DCPackage; - import org.eclipse.papyrus.dd.di.DIPackage; - import org.eclipse.papyrus.umldi.UMLDIFactory; import org.eclipse.papyrus.umldi.UMLDIPackage; import org.eclipse.papyrus.umldi.UmlCompartment; @@ -39,9 +34,7 @@ import org.eclipse.papyrus.umldi.UmlLabel; import org.eclipse.papyrus.umldi.UmlLabelKind; import org.eclipse.papyrus.umldi.UmlShape; import org.eclipse.papyrus.umldi.UmlStyle; - import org.eclipse.papyrus.umldi.util.UMLDIValidator; - import org.eclipse.uml2.uml.UMLPackage; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlCompartmentImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlCompartmentImpl.java index 0b95fe0257e..d52b45a07a0 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlCompartmentImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlCompartmentImpl.java @@ -12,11 +12,8 @@ package org.eclipse.papyrus.umldi.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.umldi.UMLDIPackage; import org.eclipse.papyrus.umldi.UmlCompartment; import org.eclipse.papyrus.umldi.UmlCompartmentKind; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramElementImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramElementImpl.java index 07238407a68..b8a636d04a0 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramElementImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramElementImpl.java @@ -15,34 +15,25 @@ import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList; import org.eclipse.emf.ecore.util.EObjectResolvingEList; import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.InternalEList; - import org.eclipse.papyrus.dd.di.DiagramElement; import org.eclipse.papyrus.dd.di.Edge; import org.eclipse.papyrus.dd.di.Style; - import org.eclipse.papyrus.dd.di.impl.DiagramElementImpl; - import org.eclipse.papyrus.umldi.UMLDIPackage; import org.eclipse.papyrus.umldi.UmlDiagramElement; import org.eclipse.papyrus.umldi.UmlEdge; import org.eclipse.papyrus.umldi.UmlStyle; - import org.eclipse.uml2.common.util.DerivedUnionEObjectEList; - import org.eclipse.uml2.uml.Element; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlEdgeImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlEdgeImpl.java index 382404f340e..2f5f2224583 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlEdgeImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlEdgeImpl.java @@ -15,23 +15,16 @@ import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; - import org.eclipse.papyrus.dd.dc.Point; - import org.eclipse.papyrus.dd.di.DIPackage; import org.eclipse.papyrus.dd.di.DiagramElement; import org.eclipse.papyrus.dd.di.Edge; - import org.eclipse.papyrus.umldi.UMLDIPackage; import org.eclipse.papyrus.umldi.UmlDiagramElement; import org.eclipse.papyrus.umldi.UmlEdge; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlLabelImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlLabelImpl.java index 3292eee4d19..8940ea7da6d 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlLabelImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlLabelImpl.java @@ -12,11 +12,8 @@ package org.eclipse.papyrus.umldi.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.umldi.UMLDIPackage; import org.eclipse.papyrus.umldi.UmlLabel; import org.eclipse.papyrus.umldi.UmlLabelKind; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlShapeImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlShapeImpl.java index 6f8ed566b60..c43439eaff5 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlShapeImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlShapeImpl.java @@ -13,17 +13,12 @@ package org.eclipse.papyrus.umldi.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.dc.Bounds; - import org.eclipse.papyrus.dd.di.DIPackage; import org.eclipse.papyrus.dd.di.Shape; - import org.eclipse.papyrus.umldi.UMLDIPackage; import org.eclipse.papyrus.umldi.UmlShape; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlStyleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlStyleImpl.java index 9d20f906e2e..f54274fd185 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlStyleImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlStyleImpl.java @@ -12,24 +12,17 @@ package org.eclipse.papyrus.umldi.impl; import java.lang.reflect.InvocationTargetException; - import java.util.Map; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.papyrus.dd.di.impl.StyleImpl; - import org.eclipse.papyrus.umldi.UMLDIPackage; import org.eclipse.papyrus.umldi.UmlStyle; - import org.eclipse.papyrus.umldi.util.UMLDIValidator; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIAdapterFactory.java index 41597b8b448..cce8c8716b3 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIAdapterFactory.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIAdapterFactory.java @@ -13,18 +13,21 @@ package org.eclipse.papyrus.umldi.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; - import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.papyrus.dd.di.Diagram; import org.eclipse.papyrus.dd.di.DiagramElement; import org.eclipse.papyrus.dd.di.Edge; import org.eclipse.papyrus.dd.di.Shape; import org.eclipse.papyrus.dd.di.Style; - -import org.eclipse.papyrus.umldi.*; +import org.eclipse.papyrus.umldi.UMLDIPackage; +import org.eclipse.papyrus.umldi.UmlCompartment; +import org.eclipse.papyrus.umldi.UmlDiagram; +import org.eclipse.papyrus.umldi.UmlDiagramElement; +import org.eclipse.papyrus.umldi.UmlEdge; +import org.eclipse.papyrus.umldi.UmlLabel; +import org.eclipse.papyrus.umldi.UmlShape; +import org.eclipse.papyrus.umldi.UmlStyle; /** * <!-- begin-user-doc --> diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIDerivedUnionAdapter.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIDerivedUnionAdapter.java index 0af6a9ac19d..68a235351cb 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIDerivedUnionAdapter.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIDerivedUnionAdapter.java @@ -12,15 +12,11 @@ package org.eclipse.papyrus.umldi.util; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.notify.impl.AdapterImpl; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.papyrus.dd.di.DIPackage; - import org.eclipse.papyrus.umldi.UMLDIPackage; import org.eclipse.papyrus.umldi.UmlCompartment; import org.eclipse.papyrus.umldi.UmlDiagram; diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceFactoryImpl.java index 197f0d52aae..f0c79007a34 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceFactoryImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceFactoryImpl.java @@ -12,11 +12,8 @@ package org.eclipse.papyrus.umldi.util; import org.eclipse.emf.common.util.URI; - import org.eclipse.emf.ecore.resource.Resource; - import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl; - import org.eclipse.emf.ecore.xmi.XMLResource; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceImpl.java index b507a504583..ebc7160eee6 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceImpl.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceImpl.java @@ -12,7 +12,6 @@ package org.eclipse.papyrus.umldi.util; import org.eclipse.emf.common.util.URI; - import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl; /** diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDISwitch.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDISwitch.java index 00ebdb4ae17..ec6e67adbc3 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDISwitch.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDISwitch.java @@ -13,16 +13,20 @@ package org.eclipse.papyrus.umldi.util; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.util.Switch; - import org.eclipse.papyrus.dd.di.Diagram; import org.eclipse.papyrus.dd.di.DiagramElement; import org.eclipse.papyrus.dd.di.Edge; import org.eclipse.papyrus.dd.di.Shape; import org.eclipse.papyrus.dd.di.Style; - -import org.eclipse.papyrus.umldi.*; +import org.eclipse.papyrus.umldi.UMLDIPackage; +import org.eclipse.papyrus.umldi.UmlCompartment; +import org.eclipse.papyrus.umldi.UmlDiagram; +import org.eclipse.papyrus.umldi.UmlDiagramElement; +import org.eclipse.papyrus.umldi.UmlEdge; +import org.eclipse.papyrus.umldi.UmlLabel; +import org.eclipse.papyrus.umldi.UmlShape; +import org.eclipse.papyrus.umldi.UmlStyle; /** * <!-- begin-user-doc --> diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIValidator.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIValidator.java index 6a90f682362..0ec8b700008 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIValidator.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIValidator.java @@ -15,15 +15,21 @@ import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.util.EObjectValidator; - -import org.eclipse.papyrus.umldi.*; +import org.eclipse.papyrus.umldi.UMLDIPackage; +import org.eclipse.papyrus.umldi.UmlCompartment; +import org.eclipse.papyrus.umldi.UmlCompartmentKind; +import org.eclipse.papyrus.umldi.UmlDiagram; +import org.eclipse.papyrus.umldi.UmlDiagramElement; +import org.eclipse.papyrus.umldi.UmlEdge; +import org.eclipse.papyrus.umldi.UmlLabel; +import org.eclipse.papyrus.umldi.UmlLabelKind; +import org.eclipse.papyrus.umldi.UmlShape; +import org.eclipse.papyrus.umldi.UmlStyle; /** * <!-- begin-user-doc --> diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIXMLProcessor.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIXMLProcessor.java index 73fea5a52ab..e9ae3f19e67 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIXMLProcessor.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIXMLProcessor.java @@ -14,11 +14,8 @@ package org.eclipse.papyrus.umldi.util; import java.util.Map; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.resource.Resource; - import org.eclipse.emf.ecore.xmi.util.XMLProcessor; - import org.eclipse.papyrus.umldi.UMLDIPackage; /** |