From 43ffd14b5da2be7fb396ba0012030db61cb17fc9 Mon Sep 17 00:00:00 2001
From: Sudeep Kanav <kanav@fortiss.org>
Date: Mon, 27 Nov 2017 18:23:20 +0000
Subject: [PATCH] changed ForTISS to fortiss refs 2591

---
 .../org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java  | 3 +--
 .../base/ui/annotation/HierarchicalNameComparator.java       | 5 ++---
 .../editingsupport/AnnotationEditingSupportBase.java         | 5 ++---
 .../ui/annotation/editingsupport/CheckBoxEditingSupport.java | 5 ++---
 .../ui/annotation/editingsupport/ComboBoxEditingSupport.java | 5 ++---
 .../ui/annotation/editingsupport/EditingSupportFactory.java  | 5 ++---
 .../editingsupport/ElementCommentEditingSupport.java         | 5 ++---
 .../annotation/editingsupport/ElementEditingSupportBase.java | 5 ++---
 .../annotation/editingsupport/ElementNameEditingSupport.java | 5 ++---
 .../base/ui/annotation/editingsupport/LabelValueMapping.java | 5 ++---
 .../annotation/editingsupport/MultiSelectionCellEditor.java  | 3 +--
 .../editingsupport/MultiSelectionEditingSupport.java         | 3 +--
 .../ui/annotation/editingsupport/TextEditingSupport.java     | 5 ++---
 .../ui/annotation/labelprovider/AnnotationLabelProvider.java | 5 ++---
 .../labelprovider/ElementCommentLabelProvider.java           | 5 ++---
 .../annotation/labelprovider/ElementLabelProviderBase.java   | 5 ++---
 .../annotation/labelprovider/ElementNameLabelProvider.java   | 5 ++---
 .../base/ui/annotation/labelprovider/LabelProviderBase.java  | 5 ++---
 .../ui/annotation/labelprovider/LabelProviderFactory.java    | 5 ++---
 .../base/ui/annotation/view/AnnotationViewPartBase.java      | 5 ++---
 .../tooling/base/ui/annotation/view/IAnnotationViewPart.java | 5 ++---
 .../base/ui/annotation/view/generic/ColumnHandle.java        | 5 ++---
 .../view/generic/CreateAnnotationInstanceColumn.java         | 3 +--
 .../ui/annotation/view/generic/GenericAnnotationView.java    | 5 ++---
 .../view/generic/HierarchicalNameViewerComparator.java       | 5 ++---
 .../ui/annotation/view/generic/filter/AnnotationFilter.java  | 5 ++---
 .../view/generic/filter/AnnotationFilterWidget.java          | 5 ++---
 .../ui/annotation/view/generic/filter/TextFocusListener.java | 5 ++---
 .../base/ui/compose/ConstraintBasedProcessCompositor.java    | 5 ++---
 .../base/ui/contentprovider/TableContentProviderBase.java    | 5 ++---
 ...ractDecoratedStyledTextCellDatabindingEditingSupport.java | 5 ++---
 .../AbstractDecoratedTextCellDatabindingEditingSupport.java  | 5 ++---
 .../AbstractStyledTextCellDatabindingEditingSupport.java     | 5 ++---
 .../AbstractTextCellDatabindingEditingSupport.java           | 5 ++---
 .../fortiss/tooling/base/ui/databinding/FloatValidator.java  | 5 ++---
 .../fortiss/tooling/base/ui/databinding/IntValidator.java    | 5 ++---
 .../base/ui/databinding/NumberPositiveZeroValidator.java     | 5 ++---
 .../src/org/fortiss/tooling/base/ui/dialog/ButtonDialog.java | 5 ++---
 .../org/fortiss/tooling/base/ui/dialog/ButtonDialogGUI.java  | 5 ++---
 .../fortiss/tooling/base/ui/dialog/CheckBoxTreeDialog.java   | 5 ++---
 .../tooling/base/ui/dialog/ElementTreeMultiSelectDialog.java | 5 ++---
 .../base/ui/dialog/ElementTreeMultiSelectDialogGUI.java      | 5 ++---
 .../base/ui/dialog/ElementTreeSingleSelectDialog.java        | 5 ++---
 .../base/ui/dialog/ElementTreeSingleSelectDialogGUI.java     | 5 ++---
 .../fortiss/tooling/base/ui/dialog/IDialogEditSupport.java   | 5 ++---
 .../fortiss/tooling/base/ui/dialog/MessageUtilsExtended.java | 5 ++---
 .../base/ui/dialog/ModelElementTreeContentProvider.java      | 5 ++---
 .../ui/dialog/ModelElementWithRefCopyMessageHandler.java     | 5 ++---
 .../tooling/base/ui/dialog/MultiFieldInputDialog.java        | 5 ++---
 .../tooling/base/ui/dialog/MultiRootTreeContentProvider.java | 5 ++---
 .../ui/dnd/gef/ConnectionCompositionDropTargetListener.java  | 5 ++---
 .../ui/dnd/gef/ElementCompositionDropTargetListener.java     | 5 ++---
 .../ui/dnd/jface/ViewerElementCompositionDropAdapter.java    | 5 ++---
 .../tooling/base/ui/editor/AdvancedTreeViewerEditorBase.java | 3 +--
 .../tooling/base/ui/editor/AllocationDiagramEditorBase.java  | 5 ++---
 .../tooling/base/ui/editor/CommonDiagramEditorBase.java      | 3 +--
 .../tooling/base/ui/editor/ConstraintBasedProcessEditor.java | 5 ++---
 .../fortiss/tooling/base/ui/editor/DiagramEditorBase.java    | 3 +--
 .../fortiss/tooling/base/ui/editor/DiagramKeyHandler.java    | 5 ++---
 .../org/fortiss/tooling/base/ui/editor/FormsEditorBase.java  | 5 ++---
 .../org/fortiss/tooling/base/ui/editor/GEFEditorBase.java    | 3 +--
 .../fortiss/tooling/base/ui/editor/StyledTextCellEditor.java | 5 ++---
 .../fortiss/tooling/base/ui/editor/TreeViewerEditorBase.java | 3 +--
 .../tooling/base/ui/editpart/ConnectionEditPartBase.java     | 3 +--
 .../tooling/base/ui/editpart/ConnectorEditPartBase.java      | 3 +--
 .../tooling/base/ui/editpart/DiagramEditPartBase.java        | 3 +--
 .../tooling/base/ui/editpart/ElementEditPartBase.java        | 3 +--
 .../tooling/base/ui/editpart/ExtendedLayerRootEditPart.java  | 5 ++---
 .../tooling/base/ui/editpart/FreeConnectorEditPartBase.java  | 5 ++---
 .../tooling/base/ui/editpart/GraphicalEditPartBase.java      | 3 +--
 .../tooling/base/ui/editpart/PositionedEditPartBase.java     | 3 +--
 .../base/ui/editpart/StickyConnectorEditPartBase.java        | 5 ++---
 .../tooling/base/ui/editpart/SubDiagramEditPartBase.java     | 3 +--
 .../allocation/AllocationConnectionEditPartBase.java         | 5 ++---
 .../editpart/allocation/AllocationDiagramEditPartBase.java   | 5 ++---
 .../editpart/allocation/AllocationElementEditPartBase.java   | 5 ++---
 .../allocation/AllocationFreeConnectorEditPartBase.java      | 5 ++---
 .../ui/editpart/allocation/AllocationPositionService.java    | 5 ++---
 .../allocation/AllocationStickyConnectorEditPartBase.java    | 5 ++---
 .../allocation/AllocationSubDiagramEditPartBase.java         | 5 ++---
 .../ui/editpart/allocation/IAllocationPositionService.java   | 5 ++---
 .../ui/editpart/anchor/InsetChopBoxConnectionAnchor.java     | 3 +--
 .../base/ui/editpart/command/AllocationConnectCommand.java   | 5 ++---
 .../ui/editpart/command/ChangeBoundsRequestCommandBase.java  | 5 ++---
 .../tooling/base/ui/editpart/command/ConnectCommand.java     | 3 +--
 .../base/ui/editpart/command/MoveWithinDiagramCommand.java   | 5 ++---
 .../base/ui/editpart/command/MoveWithinElementCommand.java   | 5 ++---
 .../tooling/base/ui/editpart/command/ReconnectCommand.java   | 3 +--
 .../tooling/base/ui/editpart/command/RemoveCommand.java      | 5 ++---
 .../base/ui/editpart/command/bendpoint/CommandBase.java      | 5 ++---
 .../base/ui/editpart/command/bendpoint/CreateCommand.java    | 5 ++---
 .../base/ui/editpart/command/bendpoint/DeleteCommand.java    | 5 ++---
 .../base/ui/editpart/command/bendpoint/MoveCommand.java      | 5 ++---
 .../tooling/base/ui/editpart/figure/AntiAliasedEllipse.java  | 5 ++---
 .../tooling/base/ui/editpart/figure/DecoratorFigure.java     | 5 ++---
 .../tooling/base/ui/editpart/figure/PrettyInsetEllipse.java  | 5 ++---
 .../base/ui/editpart/figure/PrettyRoundedRectangle.java      | 5 ++---
 .../tooling/base/ui/editpart/figure/TransparentLabel.java    | 5 ++---
 .../AllocationDirectConnectionAndReconnectionEditPolicy.java | 5 ++---
 .../base/ui/editpart/policy/DiagramLayoutEditPolicy.java     | 5 ++---
 .../policy/DirectConnectionAndReconnectionEditPolicy.java    | 3 +--
 .../base/ui/editpart/policy/ElementLayoutEditPolicy.java     | 5 ++---
 .../policy/ElementMoveAndSouthEastResizeEditPolicy.java      | 5 ++---
 .../ui/editpart/policy/RelayCreateCommandEditPolicyBase.java | 3 +--
 .../tooling/base/ui/editpart/policy/RemoveEditPolicy.java    | 3 +--
 .../ui/editpart/policy/StickyConnectorMoveEditPolicy.java    | 5 ++---
 .../editpart/request/CreateConnectionCompositionRequest.java | 5 ++---
 .../ui/editpart/request/CreateElementCompositionRequest.java | 5 ++---
 .../tooling/base/ui/extension/base/ConnectorHandlerBase.java | 5 ++---
 .../base/ui/extension/base/HierarchicElementHandlerBase.java | 5 ++---
 .../org/fortiss/tooling/base/ui/fieldassist/FieldAssist.java | 5 ++---
 .../base/ui/fieldassist/FieldAssistImageRegistry.java        | 5 ++---
 .../tooling/base/ui/fieldassist/IProposalProvider.java       | 5 ++---
 .../tooling/base/ui/fieldassist/ProposalProviderBase.java    | 5 ++---
 .../tooling/base/ui/fieldassist/StaticProposalProvider.java  | 5 ++---
 .../ui/internal/command/GEF2ToolingKernelCommandStack.java   | 3 +--
 .../base/ui/layout/DiagramLayoutConfigurationBase.java       | 5 ++---
 .../ui/layout/EllipseCurveLayoutDiagramConfiguration.java    | 5 ++---
 .../tooling/base/ui/layout/IDiagramLayoutConfiguration.java  | 5 ++---
 .../ui/layout/RectangleGridLayoutDiagramConfiguration.java   | 5 ++---
 .../fortiss/tooling/base/ui/layout/auto/AutoLayoutMenu.java  | 3 +--
 .../fortiss/tooling/base/ui/layout/auto/IAutoLayouter.java   | 5 ++---
 .../tooling/base/ui/layout/auto/KielerAutoLayouter.java      | 5 ++---
 .../tooling/base/ui/library/AddElementToLibraryBase.java     | 5 ++---
 .../tooling/base/ui/library/LibrarySelectionDialog.java      | 5 ++---
 .../tooling/base/ui/preferences/MainPreferencePage.java      | 5 ++---
 .../ui/properties/view/PropertySectionWithCopyPasteBase.java | 5 ++---
 .../ui/tablecell/AbstractIntegerSpinnerEditingSupport.java   | 5 ++---
 .../tooling/base/ui/tablecell/CheckBoxEditingSupport.java    | 5 ++---
 .../tooling/base/ui/tablecell/CheckBoxLabelProvider.java     | 5 ++---
 .../tooling/base/ui/tablecell/IconNameLabelProvider.java     | 5 ++---
 .../tooling/base/ui/utils/AbstractNameEditingSupport.java    | 5 ++---
 .../src/org/fortiss/tooling/base/ui/utils/ActionUtils.java   | 5 ++---
 .../tooling/base/ui/utils/ConstraintsBaseUIUtils.java        | 5 ++---
 .../fortiss/tooling/base/ui/utils/DecorationIconUtils.java   | 5 ++---
 .../fortiss/tooling/base/ui/utils/DragAndDropBaseUtils.java  | 5 ++---
 .../fortiss/tooling/base/ui/utils/EllipseLayoutUIUtils.java  | 5 ++---
 .../trunk/src/org/fortiss/tooling/base/ui/utils/GCUtils.java | 5 ++---
 .../org/fortiss/tooling/base/ui/utils/LayoutDataUIUtils.java | 3 +--
 .../fortiss/tooling/base/ui/utils/PropertiesViewUtils.java   | 5 ++---
 .../tooling/base/ui/utils/RectangleLayoutUIUtils.java        | 3 +--
 .../org/fortiss/tooling/base/ui/utils/SnapToGridUtils.java   | 5 ++---
 .../src/org/fortiss/tooling/base/ui/utils/StatusUtils.java   | 5 ++---
 .../org/fortiss/tooling/base/ui/utils/TableViewerUtils.java  | 5 ++---
 .../src/org/fortiss/tooling/base/ui/utils/ZoomUIUtils.java   | 3 +--
 .../org/fortiss/tooling/base/ui/widget/ExtendedCCombo.java   | 5 ++---
 .../trunk/src/org/fortiss/tooling/base/ToolingBase.java      | 5 ++---
 .../src/org/fortiss/tooling/base/ToolingBaseActivator.java   | 3 +--
 .../org/fortiss/tooling/base/annotation/AnnotationEntry.java | 5 ++---
 .../tooling/base/annotation/AnnotationValueService.java      | 5 ++---
 .../tooling/base/annotation/IAnnotationValueService.java     | 5 ++---
 .../base/annotation/valueprovider/AnnotationInstSpec.java    | 5 ++---
 .../valueprovider/DerivedAnnotationValueProviderBase.java    | 5 ++---
 .../DynamicInstanceAnnotationValueProviderBase.java          | 3 +--
 .../valueprovider/EStructuralFeatureDescriptor.java          | 5 ++---
 .../valueprovider/EStructuralFeatureValueProviderBase.java   | 5 ++---
 .../annotation/valueprovider/IAnnotationValueProvider.java   | 5 ++---
 .../base/annotation/valueprovider/ValueProviderBase.java     | 5 ++---
 .../tooling/base/compose/ConnectionCompositorBase.java       | 5 ++---
 .../base/compose/ConnectorConnectionCompositorBase.java      | 5 ++---
 .../ConnectorHierarchicElementConnectionCompositorBase.java  | 5 ++---
 .../base/compose/ConstraintInstanceContainerCompositor.java  | 5 ++---
 .../base/compose/HierarchicElementCompositorBase.java        | 5 ++---
 .../compose/HierarchicElementConnectionCompositorBase.java   | 5 ++---
 .../HierarchicElementConnectorConnectionCompositorBase.java  | 5 ++---
 .../base/compose/LogMessageUserInteractionContext.java       | 5 ++---
 .../tooling/base/compose/ModelElementCompositorBase.java     | 5 ++---
 .../tooling/base/compose/ModelElementWithRefCopyMessage.java | 5 ++---
 .../tooling/base/dnd/AllocationConnectionDragContext.java    | 5 ++---
 .../org/fortiss/tooling/base/dnd/ConnectionDragContext.java  | 3 +--
 .../org/fortiss/tooling/base/dnd/ConnectionDropContext.java  | 3 +--
 .../src/org/fortiss/tooling/base/dnd/ElementDropContext.java | 3 +--
 .../fortiss/tooling/base/internal/ToolingBaseInternal.java   | 5 ++---
 .../fortiss/tooling/base/layout/DefaultLayoutConstants.java  | 5 ++---
 .../org/fortiss/tooling/base/layout/LayoutKeyConstants.java  | 3 +--
 .../tooling/base/library/ModelElementLibraryService.java     | 5 ++---
 .../fortiss/tooling/base/migration/IDMigrationProvider.java  | 5 ++---
 .../RemoveDuplicatedAnnotationsMigrationProvider.java        | 5 ++---
 .../model/base/impl/DerivedAnnotationBaseStaticImpl.java     | 5 ++---
 .../base/model/base/impl/LibraryElementBaseStaticImpl.java   | 5 ++---
 .../base/model/element/impl/IModelElementStaticImpl.java     | 5 ++---
 .../tooling/base/model/layout/impl/DimensionStaticImpl.java  | 5 ++---
 .../tooling/base/model/layout/impl/PointStaticImpl.java      | 5 ++---
 .../tooling/base/model/layout/impl/RectangleStaticImpl.java  | 5 ++---
 .../trunk/src/org/fortiss/tooling/base/utils/AngleUtils.java | 5 ++---
 .../src/org/fortiss/tooling/base/utils/AnnotationUtils.java  | 5 ++---
 .../src/org/fortiss/tooling/base/utils/BaseMathUtils.java    | 5 ++---
 .../fortiss/tooling/base/utils/BaseModelElementUtils.java    | 5 ++---
 .../org/fortiss/tooling/base/utils/ConstraintsBaseUtils.java | 5 ++---
 .../src/org/fortiss/tooling/base/utils/DimensionUtils.java   | 5 ++---
 .../org/fortiss/tooling/base/utils/EllipseLayoutUtils.java   | 5 ++---
 .../src/org/fortiss/tooling/base/utils/LayoutDataUtils.java  | 3 +--
 .../tooling/base/utils/LayoutModelElementFactory.java        | 5 ++---
 .../src/org/fortiss/tooling/base/utils/MigrationUtils.java   | 5 ++---
 .../fortiss/tooling/base/utils/OffsetOrientationUtils.java   | 3 +--
 .../trunk/src/org/fortiss/tooling/base/utils/PointUtils.java | 5 ++---
 .../src/org/fortiss/tooling/base/utils/PointsUtils.java      | 5 ++---
 .../org/fortiss/tooling/base/utils/RectangleLayoutUtils.java | 3 +--
 .../src/org/fortiss/tooling/base/utils/SnapToGridUtils.java  | 5 ++---
 .../src/org/fortiss/tooling/base/utils/SystemUtils.java      | 5 ++---
 .../tooling/base/utils/VisualizationModelElementFactory.java | 5 ++---
 .../trunk/src/org/fortiss/tooling/base/utils/ZoomUtils.java  | 3 +--
 .../gmf/runtime/draw2d/ui/figures/PolylineConnectionEx.java  | 5 ++---
 .../org/eclipse/jface/viewers/TableLabelProviderBase.java    | 5 ++---
 .../org/eclipse/ui/actions/TextStyledTextActionHandler.java  | 5 ++---
 .../src/org/fortiss/tooling/common/TK2CommonActivator.java   | 5 ++---
 .../src/org/fortiss/tooling/common/util/LambdaUtils.java     | 5 ++---
 .../tooling/graphicsGL/ui/ToolingGraphicsGLUIActivator.java  | 3 +--
 .../src/org/fortiss/tooling/graphicsGL/ui/camera/Camera.java | 5 ++---
 .../graphicsGL/ui/camera/MovingCameraWithPitchAndYaw.java    | 5 ++---
 .../org/fortiss/tooling/graphicsGL/ui/draw/LwjglCanvas.java  | 5 ++---
 .../tooling/graphicsGL/ui/draw/LwjglRenderThread.java        | 5 ++---
 .../tooling/graphicsGL/ui/editor/EditorStatusBarItem.java    | 5 ++---
 .../graphicsGL/ui/editor/Graphical3DCompositeBase.java       | 5 ++---
 .../tooling/graphicsGL/ui/editor/Graphical3DEditorBase.java  | 5 ++---
 .../tooling/graphicsGL/ui/editor/Graphical3DViewBase.java    | 5 ++---
 .../src/org/fortiss/tooling/graphicsGL/ui/light/Light.java   | 5 ++---
 .../fortiss/tooling/graphicsGL/ui/light/Light3DLight.java    | 5 ++---
 .../tooling/graphicsGL/ui/objects/CompositeViewObject.java   | 5 ++---
 .../tooling/graphicsGL/ui/objects/Graph3DViewObject.java     | 5 ++---
 .../tooling/graphicsGL/ui/objects/Object3DViewObject.java    | 5 ++---
 .../tooling/graphicsGL/ui/objects/PickableObjectBase.java    | 5 ++---
 .../fortiss/tooling/graphicsGL/ui/objects/RotatedObject.java | 5 ++---
 .../fortiss/tooling/graphicsGL/ui/objects/ScaledObject.java  | 5 ++---
 .../tooling/graphicsGL/ui/objects/ViewObjectBase.java        | 5 ++---
 .../tooling/graphicsGL/ui/objects/WrappedViewObjectBase.java | 5 ++---
 .../tooling/graphicsGL/ui/picker/ModelObjectPicker.java      | 5 ++---
 .../org/fortiss/tooling/graphicsGL/ui/util/ColorUtil.java    | 5 ++---
 .../fortiss/tooling/graphicsGL/ui/util/FloatBufferUtils.java | 5 ++---
 .../org/fortiss/tooling/graphicsGL/ui/util/GLPrimitives.java | 5 ++---
 .../org/fortiss/tooling/graphicsGL/ui/util/Graph3DUtil.java  | 5 ++---
 .../test/org/fortiss/tooling/graphicsGL/ui/Test3DEditor.java | 5 ++---
 .../fortiss/tooling/graphicsGL/ui/Test3DEditorBinding.java   | 5 ++---
 .../tooling/graphicsGL/ToolingGraphicsGLActivator.java       | 5 ++---
 .../graphicsGL/model/scene/impl/Light3DStaticImpl.java       | 5 ++---
 .../tooling/graphicsGL/util/Graph3DModelElementFactory.java  | 5 ++---
 .../graphicsGL/util/Graphics3DModelElementFactory.java       | 5 ++---
 .../tooling/graphicsGL/util/Mesh3DModelElementFactory.java   | 5 ++---
 .../org/fortiss/tooling/graphicsGL/util/OBJLoaderUtil.java   | 5 ++---
 .../tooling/graphicsGL/util/Scene3DModelElementFactory.java  | 5 ++---
 .../src/org/fortiss/tooling/kernel/ui/ESharedImages.java     | 5 ++---
 .../src/org/fortiss/tooling/kernel/ui/ToolingKernelUI.java   | 5 ++---
 .../fortiss/tooling/kernel/ui/ToolingKernelUIActivator.java  | 3 +--
 .../ui/dnd/CompositionServiceLocalCopyPasteTransfer.java     | 5 ++---
 .../kernel/ui/dnd/CompositionServiceLocalDNDTransfer.java    | 5 ++---
 .../ui/dnd/ConnectionCompositionDragSourceAdapter.java       | 5 ++---
 .../ui/dnd/ConnectionCompositionDropTargetAdapter.java       | 5 ++---
 .../tooling/kernel/ui/dnd/ConnectionCompositionSource.java   | 5 ++---
 .../kernel/ui/dnd/ElementCompositionDragSourceAdapter.java   | 5 ++---
 .../kernel/ui/dnd/ElementCompositionDropTargetAdapter.java   | 5 ++---
 .../tooling/kernel/ui/dnd/ElementCompositionSource.java      | 5 ++---
 .../kernel/ui/extension/IAllocationEditPartFactory.java      | 5 ++---
 .../fortiss/tooling/kernel/ui/extension/IConstraintUI.java   | 5 ++---
 .../tooling/kernel/ui/extension/IContextMenuContributor.java | 5 ++---
 .../ui/extension/IContextMenuMultiSelectionContributor.java  | 5 ++---
 .../tooling/kernel/ui/extension/IEditPartFactory.java        | 5 ++---
 .../fortiss/tooling/kernel/ui/extension/IModelEditor.java    | 5 ++---
 .../tooling/kernel/ui/extension/IModelEditorBinding.java     | 5 ++---
 .../tooling/kernel/ui/extension/IModelElementHandler.java    | 5 ++---
 .../fortiss/tooling/kernel/ui/extension/ITutorialStepUI.java | 5 ++---
 .../tooling/kernel/ui/extension/ITutorialUIProvider.java     | 5 ++---
 .../kernel/ui/extension/ITutorialUIWhitelistProvider.java    | 5 ++---
 .../kernel/ui/extension/ModelEditorNotAvailableBinding.java  | 3 +--
 .../tooling/kernel/ui/extension/base/ConstraintUIBases.java  | 5 ++---
 .../ui/extension/base/ContextMenuSubMenuContributorBase.java | 5 ++---
 .../tooling/kernel/ui/extension/base/EObjectActionBase.java  | 5 ++---
 .../ui/extension/base/EReferencePropertySectionBase.java     | 5 ++---
 .../fortiss/tooling/kernel/ui/extension/base/EditorBase.java | 5 ++---
 .../kernel/ui/extension/base/ModelEditorBindingBase.java     | 5 ++---
 .../kernel/ui/extension/base/ModelElementHandlerBase.java    | 5 ++---
 .../kernel/ui/extension/base/MultiEObjectActionBase.java     | 5 ++---
 .../base/NamedCommentedModelElementHandlerBase.java          | 5 ++---
 .../kernel/ui/extension/base/PropertySectionBase.java        | 5 ++---
 .../kernel/ui/extension/base/TutorialStepUIAtomicBase.java   | 5 ++---
 .../base/TutorialStepUIAtomicWithWhitelistBase.java          | 5 ++---
 .../ui/extension/base/TutorialStepUICompositeBase.java       | 5 ++---
 .../base/TutorialStepUICompositeWithWhitelistBase.java       | 5 ++---
 .../kernel/ui/extension/data/ContextMenuContextProvider.java | 5 ++---
 .../fortiss/tooling/kernel/ui/internal/ActionService.java    | 5 ++---
 .../kernel/ui/internal/AllocationEditPartFactoryService.java | 5 ++---
 .../tooling/kernel/ui/internal/ConstraintLabelDecorator.java | 5 ++---
 .../tooling/kernel/ui/internal/ContextMenuService.java       | 3 +--
 .../tooling/kernel/ui/internal/EditPartFactoryService.java   | 3 +--
 .../fortiss/tooling/kernel/ui/internal/MarkerService.java    | 3 +--
 .../kernel/ui/internal/MarkerServiceLabelDecorator.java      | 5 ++---
 .../kernel/ui/internal/ModelEditorBindingService.java        | 3 +--
 .../kernel/ui/internal/ModelElementHandlerService.java       | 3 +--
 .../fortiss/tooling/kernel/ui/internal/NavigatorService.java | 3 +--
 .../tooling/kernel/ui/internal/ToolingKernelUIInternal.java  | 5 ++---
 .../tooling/kernel/ui/internal/TutorialUIService.java        | 5 ++---
 .../tooling/kernel/ui/internal/actions/CopyAction.java       | 5 ++---
 .../tooling/kernel/ui/internal/actions/CutAction.java        | 5 ++---
 .../tooling/kernel/ui/internal/actions/DeleteAction.java     | 5 ++---
 .../tooling/kernel/ui/internal/actions/PasteAction.java      | 5 ++---
 .../tooling/kernel/ui/internal/actions/RedoAction.java       | 5 ++---
 .../tooling/kernel/ui/internal/actions/RenameAction.java     | 5 ++---
 .../tooling/kernel/ui/internal/actions/SelectAllAction.java  | 5 ++---
 .../tooling/kernel/ui/internal/actions/UndoAction.java       | 5 ++---
 .../ui/internal/databinding/EObjectObservableValue.java      | 5 ++---
 .../kernel/ui/internal/editor/ActionBarContributor.java      | 5 ++---
 .../kernel/ui/internal/editor/ExtendableMultiPageEditor.java | 5 ++---
 .../kernel/ui/internal/editor/IActionContributingEditor.java | 5 ++---
 .../kernel/ui/internal/editor/ModelElementEditorInput.java   | 5 ++---
 .../kernel/ui/internal/editor/TutorialStepUIDefaultGUI.java  | 5 ++---
 .../kernel/ui/internal/editor/TutorialStepUIEditor.java      | 5 ++---
 .../kernel/ui/internal/editor/TutorialStepUIEditorInput.java | 5 ++---
 .../kernel/ui/internal/introspection/KISSViewPart.java       | 5 ++---
 .../ui/internal/introspection/KISSViewerContentProvider.java | 5 ++---
 .../kernel/ui/internal/introspection/KISSViewerGUI.java      | 5 ++---
 .../ui/internal/introspection/KISSViewerLabelProvider.java   | 5 ++---
 .../internal/introspection/details/DetailsUIHandlerBase.java | 5 ++---
 .../introspection/details/KISSDetailsUIRegistry.java         | 5 ++---
 ...nEditPartFactoryServiceIntrospectionDetailsUIHandler.java | 5 ++---
 ...ectionCompositorServiceIntrospectionDetailsUIHandler.java | 5 ++---
 ...onstraintCheckerServiceIntrospectionDetailsUIHandler.java | 5 ++---
 .../ConstraintServiceIntrospectionDetailsUIHandler.java      | 5 ++---
 .../ConstraintUIServiceIntrospectionDetailsUIHandler.java    | 5 ++---
 .../ContextMenuServiceIntrospectionDetailsUIHandler.java     | 5 ++---
 .../details/handler/CopyClassNameToClipBoardRunnable.java    | 5 ++---
 .../EObjectAware2IntrospectionDetailsUIHandlerBase.java      | 5 ++---
 .../EObjectAwareIntrospectionDetailsUIHandlerBase.java       | 5 ++---
 ...ResourceStorageProviderIntrospectionDetailsUIHandler.java | 5 ++---
 .../EditPartFactoryServiceIntrospectionDetailsUIHandler.java | 5 ++---
 ...lementCompositorServiceIntrospectionDetailsUIHandler.java | 5 ++---
 .../details/handler/IntrospectionDetailsUIHandlerBase.java   | 5 ++---
 .../handler/LibraryServiceIntrospectionDetailsUIHandler.java | 5 ++---
 .../MigrationServiceIntrospectionDetailsUIHandler.java       | 5 ++---
 ...delEditorBindingServiceIntrospectionDetailsUIHandler.java | 5 ++---
 ...elElementHandlerServiceIntrospectionDetailsUIHandler.java | 5 ++---
 .../PersistencyServiceIntrospectionDetailsUIHandler.java     | 5 ++---
 .../PrototypeServiceIntrospectionDetailsUIHandler.java       | 5 ++---
 .../details/handler/TableViewerPatternFilter.java            | 5 ++---
 .../TransformationServiceIntrospectionDetailsUIHandler.java  | 5 ++---
 ...cationEditPartFactoryServiceIntrospectionDetailsItem.java | 5 ++---
 .../items/ConstraintUIServiceIntrospectionDetailsItem.java   | 5 ++---
 .../items/ContextMenuServiceIntrospectionDetailsItem.java    | 5 ++---
 .../EditPartFactoryServiceIntrospectionDetailsItem.java      | 5 ++---
 .../ModelEditorBindingServiceIntrospectionDetailsItem.java   | 5 ++---
 .../ModelElementHandlerServiceIntrospectionDetailsItem.java  | 5 ++---
 .../kernel/ui/internal/perspective/StoragePerspective.java   | 3 +--
 .../internal/properties/ElementWithURIPropertySection.java   | 5 ++---
 .../ui/internal/properties/IdLabeledPropertySection.java     | 5 ++---
 .../internal/properties/NamedCommentedPropertySection.java   | 5 ++---
 .../ui/internal/properties/PropertiesAdapterFactory.java     | 5 ++---
 .../tooling/kernel/ui/internal/views/DoubleClick.java        | 5 ++---
 .../tooling/kernel/ui/internal/views/LibraryView.java        | 5 ++---
 .../ui/internal/views/LibraryViewDragSourceAdapter.java      | 5 ++---
 .../kernel/ui/internal/views/LinkWithEditorPartListener.java | 5 ++---
 .../kernel/ui/internal/views/MarkerViewContentProvider.java  | 5 ++---
 .../tooling/kernel/ui/internal/views/MarkerViewPart.java     | 5 ++---
 .../tooling/kernel/ui/internal/views/MarkerViewerGUI.java    | 5 ++---
 .../ui/internal/views/NavigatorTreeContentProvider.java      | 5 ++---
 .../kernel/ui/internal/views/NavigatorTreeContentSorter.java | 5 ++---
 .../tooling/kernel/ui/internal/views/NavigatorViewPart.java  | 5 ++---
 .../ExtendableMultiPageEditorPageChangeListener.java         | 5 ++---
 .../ConstraintViolationAwareLabelProviderBase.java           | 5 ++---
 .../kernel/ui/presentation/ModelElementLabelProvider.java    | 5 ++---
 .../TutorialDefinitionModelElementLabelProvider.java         | 5 ++---
 .../fortiss/tooling/kernel/ui/service/IActionService.java    | 3 +--
 .../kernel/ui/service/IAllocationEditPartFactoryService.java | 5 ++---
 .../tooling/kernel/ui/service/IContextMenuService.java       | 3 +--
 .../tooling/kernel/ui/service/IEditPartFactoryService.java   | 3 +--
 .../fortiss/tooling/kernel/ui/service/IMarkerService.java    | 3 +--
 .../kernel/ui/service/IModelEditorBindingService.java        | 3 +--
 .../kernel/ui/service/IModelElementHandlerService.java       | 3 +--
 .../fortiss/tooling/kernel/ui/service/INavigatorService.java | 3 +--
 .../tooling/kernel/ui/service/ITutorialUIService.java        | 5 ++---
 .../src/org/fortiss/tooling/kernel/ui/util/ActionUtils.java  | 5 ++---
 .../fortiss/tooling/kernel/ui/util/ConstraintsUIUtils.java   | 5 ++---
 .../org/fortiss/tooling/kernel/ui/util/CopyPasteUtils.java   | 3 +--
 .../org/fortiss/tooling/kernel/ui/util/DataBindingUtils.java | 5 ++---
 .../org/fortiss/tooling/kernel/ui/util/DragAndDropUtils.java | 5 ++---
 .../tooling/kernel/ui/util/EObjectSelectionUtils.java        | 5 ++---
 .../src/org/fortiss/tooling/kernel/ui/util/EditorUtils.java  | 5 ++---
 .../org/fortiss/tooling/kernel/ui/util/ObservableUtils.java  | 5 ++---
 .../tooling/kernel/ui/util/PropertiesConstantUtils.java      | 3 +--
 .../org/fortiss/tooling/kernel/ui/util/SelectionUtils.java   | 5 ++---
 .../tooling/kernel/ui/util/TutorialUIServiceUtils.java       | 5 ++---
 .../src/org/fortiss/tooling/kernel/ui/util/UndoRedoImpl.java | 5 ++---
 .../org/fortiss/tooling/kernel/ui/util/WidgetsFactory.java   | 5 ++---
 .../trunk/src/org/fortiss/tooling/kernel/ToolingKernel.java  | 5 ++---
 .../org/fortiss/tooling/kernel/ToolingKernelActivator.java   | 3 +--
 .../fortiss/tooling/kernel/constraint/ConstraintMessage.java | 3 +--
 .../tooling/kernel/constraint/IdConsistencyChecker.java      | 3 +--
 .../kernel/constraint/IdConsistencyConstraintViolation.java  | 3 +--
 .../tooling/kernel/constraint/IdUniquenessChecker.java       | 3 +--
 .../kernel/constraint/IdUniquenessConstraintViolation.java   | 3 +--
 .../tooling/kernel/extension/IConnectionCompositor.java      | 5 ++---
 .../org/fortiss/tooling/kernel/extension/IConstraint.java    | 5 ++---
 .../fortiss/tooling/kernel/extension/IConstraintChecker.java | 5 ++---
 .../kernel/extension/IEclipseResourcePostLoadProvider.java   | 5 ++---
 .../extension/IEclipseResourceStorageLocationProvider.java   | 5 ++---
 .../fortiss/tooling/kernel/extension/IElementCompositor.java | 5 ++---
 .../tooling/kernel/extension/ILibraryElementHandler.java     | 5 ++---
 .../fortiss/tooling/kernel/extension/IMigrationProvider.java | 5 ++---
 .../fortiss/tooling/kernel/extension/IPrototypeProvider.java | 5 ++---
 .../fortiss/tooling/kernel/extension/IStorageProvider.java   | 5 ++---
 .../tooling/kernel/extension/ITransformationProvider.java    | 5 ++---
 .../fortiss/tooling/kernel/extension/ITutorialProvider.java  | 5 ++---
 .../org/fortiss/tooling/kernel/extension/ITutorialStep.java  | 5 ++---
 .../tooling/kernel/extension/ITutorialWhitelistProvider.java | 5 ++---
 .../fortiss/tooling/kernel/extension/LogMessageHandler.java  | 5 ++---
 .../tooling/kernel/extension/base/ConstraintBases.java       | 5 ++---
 .../tooling/kernel/extension/base/ConstraintCheckerBase.java | 5 ++---
 .../kernel/extension/base/ConstraintViolationBase.java       | 5 ++---
 .../tooling/kernel/extension/base/ElementCompositorBase.java | 5 ++---
 .../extension/base/MultiViolationConstraintCheckerBase.java  | 5 ++---
 .../tooling/kernel/extension/base/PrototypeProviderBase.java | 5 ++---
 .../base/RemoveUnknownFeatureMigrationProviderBase.java      | 5 ++---
 .../extension/base/TransformationContextChainBase.java       | 5 ++---
 .../kernel/extension/base/TransformationProviderBase.java    | 5 ++---
 .../kernel/extension/base/TutorialBlacklistAllProvider.java  | 5 ++---
 .../kernel/extension/base/TutorialWhitelistAllProvider.java  | 5 ++---
 .../kernel/extension/data/IConnectionCompositionContext.java | 2 +-
 .../tooling/kernel/extension/data/IConstraintViolation.java  | 5 ++---
 .../kernel/extension/data/IElementCompositionContext.java    | 2 +-
 .../tooling/kernel/extension/data/ILogMessageContext.java    | 5 ++---
 .../tooling/kernel/extension/data/ITopLevelElement.java      | 5 ++---
 .../kernel/extension/data/ITransformationContext.java        | 5 ++---
 .../tooling/kernel/extension/data/LibraryPrototype.java      | 5 ++---
 .../fortiss/tooling/kernel/extension/data/LogMessage.java    | 5 ++---
 .../kernel/extension/data/LogMessageWithException.java       | 5 ++---
 .../extension/data/ModelElementTransformationContext.java    | 5 ++---
 .../tooling/kernel/extension/data/ModelStorageError.java     | 5 ++---
 .../org/fortiss/tooling/kernel/extension/data/Prototype.java | 5 ++---
 .../tooling/kernel/extension/data/PrototypeCategory.java     | 5 ++---
 .../kernel/extension/data/TransformationProviderChain.java   | 5 ++---
 .../tooling/kernel/extension/data/TutorialAtomicStep.java    | 5 ++---
 .../tooling/kernel/extension/data/TutorialCompositeStep.java | 5 ++---
 .../tooling/kernel/extension/data/TutorialStepBase.java      | 5 ++---
 .../exception/ChainTransformationFailedException.java        | 5 ++---
 .../extension/exception/TransformationFailedException.java   | 5 ++---
 .../fortiss/tooling/kernel/internal/CommandStackService.java | 3 +--
 .../tooling/kernel/internal/ConnectionCompositorService.java | 3 +--
 .../tooling/kernel/internal/ConstraintCheckerService.java    | 3 +--
 .../tooling/kernel/internal/DummyTopLevelElement.java        | 5 ++---
 .../tooling/kernel/internal/ElementCompositorService.java    | 3 +--
 .../tooling/kernel/internal/LibraryPrototypeProvider.java    | 5 ++---
 .../org/fortiss/tooling/kernel/internal/LibraryService.java  | 3 +--
 .../org/fortiss/tooling/kernel/internal/LoggingService.java  | 5 ++---
 .../fortiss/tooling/kernel/internal/MigrationService.java    | 5 ++---
 .../fortiss/tooling/kernel/internal/PersistencyService.java  | 3 +--
 .../fortiss/tooling/kernel/internal/PrototypeService.java    | 3 +--
 .../tooling/kernel/internal/ToolingKernelInternal.java       | 5 ++---
 .../tooling/kernel/internal/TransformationService.java       | 3 +--
 .../org/fortiss/tooling/kernel/internal/TutorialService.java | 5 ++---
 .../internal/storage/eclipse/AutoUndoCommandStack.java       | 5 ++---
 .../internal/storage/eclipse/EMFTransactionalCommand.java    | 5 ++---
 .../storage/eclipse/EclipseResourceStorageService.java       | 5 ++---
 .../kernel/internal/storage/eclipse/ModelContext.java        | 5 ++---
 .../storage/eclipse/NonDirtyingEMFTransactionalCommand.java  | 5 ++---
 .../kernel/introspection/IIntrospectionDetailsItem.java      | 5 ++---
 .../tooling/kernel/introspection/IIntrospectionItem.java     | 5 ++---
 .../kernel/introspection/IIntrospectiveKernelService.java    | 5 ++---
 .../introspection/KernelIntrospectionSystemService.java      | 5 ++---
 .../ConnectionCompositorServiceIntrospectionDetailsItem.java | 5 ++---
 .../ConstraintCheckerServiceIntrospectionDetailsItem.java    | 5 ++---
 ...onstraintVerificationServiceIntrospectionDetailsItem.java | 5 ++---
 .../items/EObjectAware2IntrospectionDetailsItemBase.java     | 5 ++---
 .../items/EObjectAwareIntrospectionDetailsItemBase.java      | 5 ++---
 ...clipseResourceStorageServiceIntrospectionDetailsItem.java | 5 ++---
 .../ElementCompositorServiceIntrospectionDetailsItem.java    | 5 ++---
 .../items/HandlerListIntrospectionDetailsItemBase.java       | 5 ++---
 .../kernel/introspection/items/IntrospectionItemBase.java    | 5 ++---
 .../items/LibraryServiceIntrospectionDetailsItem.java        | 5 ++---
 .../items/MigrationServiceIntrospectionDetailsItem.java      | 5 ++---
 .../items/PersistencyServiceIntrospectionDetailsItem.java    | 5 ++---
 .../items/PrototypeServiceIntrospectionDetailsItem.java      | 5 ++---
 .../items/TransformationServiceIntrospectionDetailsItem.java | 5 ++---
 .../fortiss/tooling/kernel/service/ICommandStackService.java | 3 +--
 .../tooling/kernel/service/IConnectionCompositorService.java | 3 +--
 .../tooling/kernel/service/IConstraintCheckerService.java    | 3 +--
 .../kernel/service/IEclipseResourceStorageService.java       | 5 ++---
 .../tooling/kernel/service/IElementCompositorService.java    | 3 +--
 .../kernel/service/IKernelIntrospectionSystemService.java    | 5 ++---
 .../org/fortiss/tooling/kernel/service/ILibraryService.java  | 5 ++---
 .../org/fortiss/tooling/kernel/service/ILoggingService.java  | 5 ++---
 .../fortiss/tooling/kernel/service/IMigrationService.java    | 3 +--
 .../fortiss/tooling/kernel/service/IPersistencyService.java  | 3 +--
 .../fortiss/tooling/kernel/service/IPrototypeService.java    | 3 +--
 .../tooling/kernel/service/ITransformationService.java       | 5 ++---
 .../org/fortiss/tooling/kernel/service/ITutorialService.java | 5 ++---
 .../kernel/service/base/EObjectAware2ServiceBase.java        | 5 ++---
 .../tooling/kernel/service/base/EObjectAwareServiceBase.java | 5 ++---
 .../fortiss/tooling/kernel/service/base/IEObjectAware.java   | 5 ++---
 .../fortiss/tooling/kernel/service/base/IEObjectAware2.java  | 5 ++---
 .../fortiss/tooling/kernel/service/base/IObjectAware.java    | 5 ++---
 .../fortiss/tooling/kernel/service/base/IObjectAware2.java   | 5 ++---
 .../tooling/kernel/service/base/ObjectAware2ServiceBase.java | 5 ++---
 .../tooling/kernel/service/base/ObjectAwareServiceBase.java  | 5 ++---
 .../kernel/service/listener/IPersistencyServiceListener.java | 5 ++---
 .../kernel/service/listener/ITutorialServiceListener.java    | 5 ++---
 .../org/fortiss/tooling/kernel/utils/CompositionUtils.java   | 5 ++---
 .../org/fortiss/tooling/kernel/utils/ConstraintsUtils.java   | 5 ++---
 .../org/fortiss/tooling/kernel/utils/EMFResourceUtils.java   | 5 ++---
 .../fortiss/tooling/kernel/utils/EcoreSerializerBase.java    | 5 ++---
 .../src/org/fortiss/tooling/kernel/utils/EcoreUtils.java     | 5 ++---
 .../fortiss/tooling/kernel/utils/ExtensionPointUtils.java    | 3 +--
 .../org/fortiss/tooling/kernel/utils/IdentifierUtils.java    | 5 ++---
 .../src/org/fortiss/tooling/kernel/utils/JavaUtils.java      | 5 ++---
 .../tooling/kernel/utils/KernelModelElementUtils.java        | 5 ++---
 .../src/org/fortiss/tooling/kernel/utils/LoggingUtils.java   | 3 +--
 .../src/org/fortiss/tooling/kernel/utils/MigrationUtils.java | 5 ++---
 .../org/fortiss/tooling/kernel/utils/PrototypesUtils.java    | 5 ++---
 .../src/org/fortiss/tooling/kernel/utils/ResourceUtils.java  | 5 ++---
 .../fortiss/tooling/kernel/utils/TransformationUtils.java    | 5 ++---
 .../src/org/fortiss/tooling/kernel/utils/UniqueIDUtils.java  | 5 ++---
 .../src/org/fortiss/tooling/spiderchart/example/Sample.java  | 5 ++---
 .../src/org/fortiss/tooling/spiderchart/model/AxisBase.java  | 5 ++---
 .../org/fortiss/tooling/spiderchart/model/DataSeries.java    | 5 ++---
 .../org/fortiss/tooling/spiderchart/model/DoubleAxis.java    | 5 ++---
 .../fortiss/tooling/spiderchart/model/EnumerationAxis.java   | 5 ++---
 .../org/fortiss/tooling/spiderchart/model/SpiderChart.java   | 5 ++---
 .../src/org/fortiss/tooling/spiderchart/style/AxisStyle.java | 5 ++---
 .../org/fortiss/tooling/spiderchart/style/ChartStyle.java    | 5 ++---
 .../fortiss/tooling/spiderchart/style/ColorStyleBase.java    | 5 ++---
 .../fortiss/tooling/spiderchart/style/DataSeriesStyle.java   | 5 ++---
 .../src/org/fortiss/tooling/spiderchart/style/FillStyle.java | 5 ++---
 .../src/org/fortiss/tooling/spiderchart/style/FontStyle.java | 5 ++---
 .../org/fortiss/tooling/spiderchart/style/LegendStyle.java   | 5 ++---
 .../src/org/fortiss/tooling/spiderchart/style/LineStyle.java | 5 ++---
 .../src/org/fortiss/tooling/spiderchart/util/AxisUtils.java  | 5 ++---
 .../src/org/fortiss/tooling/spiderchart/util/FontUtils.java  | 5 ++---
 .../org/fortiss/tooling/spiderchart/util/RGBColorUtils.java  | 5 ++---
 .../tooling/spiderchart/widget/SpiderChartLegendWidget.java  | 5 ++---
 .../tooling/spiderchart/widget/SpiderChartSWTCanvas.java     | 5 ++---
 .../tooling/spiderchart/widget/SpiderChartTitleWidget.java   | 5 ++---
 .../tooling/spiderchart/widget/SpiderChartViewer.java        | 5 ++---
 .../tooling/spiderchart/widget/SpiderChartWidget.java        | 5 ++---
 .../tooling/spiderchart/widget/SpiderChartWidgetBase.java    | 5 ++---
 530 files changed, 979 insertions(+), 1507 deletions(-)

diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java
index 3534047a4..d8705222c 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/HierarchicalNameComparator.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/HierarchicalNameComparator.java
index 2bf6cab1f..1321a366e 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/HierarchicalNameComparator.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/HierarchicalNameComparator.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/AnnotationEditingSupportBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/AnnotationEditingSupportBase.java
index 9b554484f..8b7c5b73e 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/AnnotationEditingSupportBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/AnnotationEditingSupportBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/CheckBoxEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/CheckBoxEditingSupport.java
index 7cb0dd538..da01fabab 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/CheckBoxEditingSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/CheckBoxEditingSupport.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/ComboBoxEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/ComboBoxEditingSupport.java
index a81ab6d18..6d576481f 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/ComboBoxEditingSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/ComboBoxEditingSupport.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/EditingSupportFactory.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/EditingSupportFactory.java
index 2da5d3686..9560b5bd3 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/EditingSupportFactory.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/EditingSupportFactory.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/ElementCommentEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/ElementCommentEditingSupport.java
index efb0c20da..d0541f32e 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/ElementCommentEditingSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/ElementCommentEditingSupport.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/ElementEditingSupportBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/ElementEditingSupportBase.java
index 6e6a50a18..f3a24374e 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/ElementEditingSupportBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/ElementEditingSupportBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/ElementNameEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/ElementNameEditingSupport.java
index 90c51ec7a..18f647b7d 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/ElementNameEditingSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/ElementNameEditingSupport.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/LabelValueMapping.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/LabelValueMapping.java
index a3affa414..dc60b1972 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/LabelValueMapping.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/LabelValueMapping.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/MultiSelectionCellEditor.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/MultiSelectionCellEditor.java
index ff4e9a716..b3e9f413b 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/MultiSelectionCellEditor.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/MultiSelectionCellEditor.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/MultiSelectionEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/MultiSelectionEditingSupport.java
index 2fad3490d..6be7ae276 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/MultiSelectionEditingSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/MultiSelectionEditingSupport.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/TextEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/TextEditingSupport.java
index 27fbbaccb..137652a9c 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/TextEditingSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/TextEditingSupport.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/AnnotationLabelProvider.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/AnnotationLabelProvider.java
index 648fc494a..2a6ac85bb 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/AnnotationLabelProvider.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/AnnotationLabelProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/ElementCommentLabelProvider.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/ElementCommentLabelProvider.java
index 86792a487..85396576d 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/ElementCommentLabelProvider.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/ElementCommentLabelProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/ElementLabelProviderBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/ElementLabelProviderBase.java
index 1e1135965..68e2ed2dc 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/ElementLabelProviderBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/ElementLabelProviderBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/ElementNameLabelProvider.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/ElementNameLabelProvider.java
index b612076b3..95ff3c550 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/ElementNameLabelProvider.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/ElementNameLabelProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/LabelProviderBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/LabelProviderBase.java
index 618ea201d..ef3111bcb 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/LabelProviderBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/LabelProviderBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/LabelProviderFactory.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/LabelProviderFactory.java
index d0eaeedc4..6b0bf9a29 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/LabelProviderFactory.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/LabelProviderFactory.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/AnnotationViewPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/AnnotationViewPartBase.java
index 484878df5..3263679d3 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/AnnotationViewPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/AnnotationViewPartBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/IAnnotationViewPart.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/IAnnotationViewPart.java
index 849dd2547..445104069 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/IAnnotationViewPart.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/IAnnotationViewPart.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/ColumnHandle.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/ColumnHandle.java
index 49668ca62..3be2015e0 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/ColumnHandle.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/ColumnHandle.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/CreateAnnotationInstanceColumn.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/CreateAnnotationInstanceColumn.java
index 469bc0870..a176dbc94 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/CreateAnnotationInstanceColumn.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/CreateAnnotationInstanceColumn.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/GenericAnnotationView.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/GenericAnnotationView.java
index 6dbbae97a..2c46a0dcd 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/GenericAnnotationView.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/GenericAnnotationView.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/HierarchicalNameViewerComparator.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/HierarchicalNameViewerComparator.java
index b6560535d..c72db260c 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/HierarchicalNameViewerComparator.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/HierarchicalNameViewerComparator.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/filter/AnnotationFilter.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/filter/AnnotationFilter.java
index 0af2cb041..e98aeb2e9 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/filter/AnnotationFilter.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/filter/AnnotationFilter.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/filter/AnnotationFilterWidget.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/filter/AnnotationFilterWidget.java
index 7781296ff..9e63099e6 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/filter/AnnotationFilterWidget.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/filter/AnnotationFilterWidget.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/filter/TextFocusListener.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/filter/TextFocusListener.java
index 101e38963..2f495be64 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/filter/TextFocusListener.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/filter/TextFocusListener.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/ConstraintBasedProcessCompositor.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/ConstraintBasedProcessCompositor.java
index 069b12129..d3d58d6a0 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/ConstraintBasedProcessCompositor.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/compose/ConstraintBasedProcessCompositor.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 ForTISS GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/contentprovider/TableContentProviderBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/contentprovider/TableContentProviderBase.java
index 2a1c40ad6..e4c90b5e8 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/contentprovider/TableContentProviderBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/contentprovider/TableContentProviderBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedStyledTextCellDatabindingEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedStyledTextCellDatabindingEditingSupport.java
index 54ab104e0..cc4fa0cad 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedStyledTextCellDatabindingEditingSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedStyledTextCellDatabindingEditingSupport.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellDatabindingEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellDatabindingEditingSupport.java
index dd3905d4a..5558e59e0 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellDatabindingEditingSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellDatabindingEditingSupport.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractStyledTextCellDatabindingEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractStyledTextCellDatabindingEditingSupport.java
index c98318064..c6c850701 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractStyledTextCellDatabindingEditingSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractStyledTextCellDatabindingEditingSupport.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellDatabindingEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellDatabindingEditingSupport.java
index 2c2049109..f74e29064 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellDatabindingEditingSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellDatabindingEditingSupport.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/FloatValidator.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/FloatValidator.java
index a850e8b51..5424e2dd8 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/FloatValidator.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/FloatValidator.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/IntValidator.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/IntValidator.java
index 94eb24a66..f766cf92d 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/IntValidator.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/IntValidator.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/NumberPositiveZeroValidator.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/NumberPositiveZeroValidator.java
index 3912ed560..8c2cb5a37 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/NumberPositiveZeroValidator.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/NumberPositiveZeroValidator.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ButtonDialog.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ButtonDialog.java
index 4b1ad0b28..fd918b647 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ButtonDialog.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ButtonDialog.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ButtonDialogGUI.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ButtonDialogGUI.java
index 3516cf240..85d617eb4 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ButtonDialogGUI.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ButtonDialogGUI.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/CheckBoxTreeDialog.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/CheckBoxTreeDialog.java
index de7c8a47e..a2a871961 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/CheckBoxTreeDialog.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/CheckBoxTreeDialog.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2013 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2013 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeMultiSelectDialog.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeMultiSelectDialog.java
index 8959e1313..b044b8b35 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeMultiSelectDialog.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeMultiSelectDialog.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeMultiSelectDialogGUI.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeMultiSelectDialogGUI.java
index 6e7719de8..af549b455 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeMultiSelectDialogGUI.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeMultiSelectDialogGUI.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeSingleSelectDialog.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeSingleSelectDialog.java
index 60c2e49af..84d35775e 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeSingleSelectDialog.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeSingleSelectDialog.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeSingleSelectDialogGUI.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeSingleSelectDialogGUI.java
index d9f38161f..7225fc2e4 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeSingleSelectDialogGUI.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeSingleSelectDialogGUI.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/IDialogEditSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/IDialogEditSupport.java
index 9de481391..75122ad05 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/IDialogEditSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/IDialogEditSupport.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/MessageUtilsExtended.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/MessageUtilsExtended.java
index 3acafad16..d209fb79c 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/MessageUtilsExtended.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/MessageUtilsExtended.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ModelElementTreeContentProvider.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ModelElementTreeContentProvider.java
index 4dfb3ee5a..5a28b1ff5 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ModelElementTreeContentProvider.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ModelElementTreeContentProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ModelElementWithRefCopyMessageHandler.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ModelElementWithRefCopyMessageHandler.java
index dbf27f930..775da4b26 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ModelElementWithRefCopyMessageHandler.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ModelElementWithRefCopyMessageHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/MultiFieldInputDialog.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/MultiFieldInputDialog.java
index 5247204da..1edc75b36 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/MultiFieldInputDialog.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/MultiFieldInputDialog.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/MultiRootTreeContentProvider.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/MultiRootTreeContentProvider.java
index 1786b93e6..8560aaab9 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/MultiRootTreeContentProvider.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/MultiRootTreeContentProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/gef/ConnectionCompositionDropTargetListener.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/gef/ConnectionCompositionDropTargetListener.java
index fc8ddb034..4807d9ca5 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/gef/ConnectionCompositionDropTargetListener.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/gef/ConnectionCompositionDropTargetListener.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/gef/ElementCompositionDropTargetListener.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/gef/ElementCompositionDropTargetListener.java
index c0e851660..996a23f63 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/gef/ElementCompositionDropTargetListener.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/gef/ElementCompositionDropTargetListener.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/jface/ViewerElementCompositionDropAdapter.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/jface/ViewerElementCompositionDropAdapter.java
index 2e4fd77ad..d28a441a9 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/jface/ViewerElementCompositionDropAdapter.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/jface/ViewerElementCompositionDropAdapter.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/AdvancedTreeViewerEditorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/AdvancedTreeViewerEditorBase.java
index 16a9f2ccf..5d933cdb1 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/AdvancedTreeViewerEditorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/AdvancedTreeViewerEditorBase.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2017 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/AllocationDiagramEditorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/AllocationDiagramEditorBase.java
index 63c1a5c3c..f5082b482 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/AllocationDiagramEditorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/AllocationDiagramEditorBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/CommonDiagramEditorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/CommonDiagramEditorBase.java
index c7cd5bb20..eb2eac393 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/CommonDiagramEditorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/CommonDiagramEditorBase.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/ConstraintBasedProcessEditor.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/ConstraintBasedProcessEditor.java
index 5e18126a9..59e6f512c 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/ConstraintBasedProcessEditor.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/ConstraintBasedProcessEditor.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 ForTISS GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/DiagramEditorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/DiagramEditorBase.java
index 7ca2ecc75..a1e6aa6e7 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/DiagramEditorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/DiagramEditorBase.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/DiagramKeyHandler.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/DiagramKeyHandler.java
index b25e94cc4..8b02cd6a4 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/DiagramKeyHandler.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/DiagramKeyHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/FormsEditorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/FormsEditorBase.java
index a32460c4e..1adbbdce0 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/FormsEditorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/FormsEditorBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/GEFEditorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/GEFEditorBase.java
index d4eca7059..71d838f55 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/GEFEditorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/GEFEditorBase.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/StyledTextCellEditor.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/StyledTextCellEditor.java
index 5c69d036f..48cf98946 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/StyledTextCellEditor.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/StyledTextCellEditor.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2013 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2013 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/TreeViewerEditorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/TreeViewerEditorBase.java
index 119afe364..dfcfb197b 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/TreeViewerEditorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/TreeViewerEditorBase.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectionEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectionEditPartBase.java
index 334b91db6..205c5a216 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectionEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectionEditPartBase.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectorEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectorEditPartBase.java
index f12e3141e..0bae07c61 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectorEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectorEditPartBase.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/DiagramEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/DiagramEditPartBase.java
index 58d482026..3a0cd0316 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/DiagramEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/DiagramEditPartBase.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ElementEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ElementEditPartBase.java
index 7d93faf8f..98d7320ce 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ElementEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ElementEditPartBase.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ExtendedLayerRootEditPart.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ExtendedLayerRootEditPart.java
index bf9478c7e..7cac053d0 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ExtendedLayerRootEditPart.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ExtendedLayerRootEditPart.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/FreeConnectorEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/FreeConnectorEditPartBase.java
index 210d15dec..e68da4b8c 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/FreeConnectorEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/FreeConnectorEditPartBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/GraphicalEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/GraphicalEditPartBase.java
index ac870df9d..a3ab94bb9 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/GraphicalEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/GraphicalEditPartBase.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/PositionedEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/PositionedEditPartBase.java
index 8f2d80eda..c45caf4dd 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/PositionedEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/PositionedEditPartBase.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/StickyConnectorEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/StickyConnectorEditPartBase.java
index 8edef2e3b..3ecbee3c9 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/StickyConnectorEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/StickyConnectorEditPartBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/SubDiagramEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/SubDiagramEditPartBase.java
index 2992c9b84..ee94419fa 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/SubDiagramEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/SubDiagramEditPartBase.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationConnectionEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationConnectionEditPartBase.java
index fcac07618..93bc5381c 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationConnectionEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationConnectionEditPartBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationDiagramEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationDiagramEditPartBase.java
index 0e7e2fabc..be62c253d 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationDiagramEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationDiagramEditPartBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationElementEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationElementEditPartBase.java
index 86394a9bb..a8764984b 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationElementEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationElementEditPartBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationFreeConnectorEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationFreeConnectorEditPartBase.java
index ec7f117b2..b415614e6 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationFreeConnectorEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationFreeConnectorEditPartBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationPositionService.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationPositionService.java
index cbfa94abe..3e3742067 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationPositionService.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationPositionService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationStickyConnectorEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationStickyConnectorEditPartBase.java
index 223c02f7a..74a8ad83c 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationStickyConnectorEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationStickyConnectorEditPartBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationSubDiagramEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationSubDiagramEditPartBase.java
index 247e7f9c5..db5791a16 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationSubDiagramEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationSubDiagramEditPartBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/IAllocationPositionService.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/IAllocationPositionService.java
index e1e40bebe..f74950554 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/IAllocationPositionService.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/IAllocationPositionService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/anchor/InsetChopBoxConnectionAnchor.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/anchor/InsetChopBoxConnectionAnchor.java
index b9a43c049..dc6fd9ec1 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/anchor/InsetChopBoxConnectionAnchor.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/anchor/InsetChopBoxConnectionAnchor.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/AllocationConnectCommand.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/AllocationConnectCommand.java
index 4f12a8537..22b6b55c1 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/AllocationConnectCommand.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/AllocationConnectCommand.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/ChangeBoundsRequestCommandBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/ChangeBoundsRequestCommandBase.java
index 0d6360b50..c0401cbc4 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/ChangeBoundsRequestCommandBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/ChangeBoundsRequestCommandBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/ConnectCommand.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/ConnectCommand.java
index 18b509bcd..b358025fa 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/ConnectCommand.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/ConnectCommand.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/MoveWithinDiagramCommand.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/MoveWithinDiagramCommand.java
index 188506774..72b3ad6b6 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/MoveWithinDiagramCommand.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/MoveWithinDiagramCommand.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/MoveWithinElementCommand.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/MoveWithinElementCommand.java
index 3ce55ddda..04fdb007b 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/MoveWithinElementCommand.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/MoveWithinElementCommand.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/ReconnectCommand.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/ReconnectCommand.java
index b2a93f771..4805cd9a5 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/ReconnectCommand.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/ReconnectCommand.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/RemoveCommand.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/RemoveCommand.java
index 3385bb16c..53e4f666a 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/RemoveCommand.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/RemoveCommand.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/bendpoint/CommandBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/bendpoint/CommandBase.java
index c6ddf70e4..3a703a2e8 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/bendpoint/CommandBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/bendpoint/CommandBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/bendpoint/CreateCommand.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/bendpoint/CreateCommand.java
index 04bf35a92..b5209d924 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/bendpoint/CreateCommand.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/bendpoint/CreateCommand.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/bendpoint/DeleteCommand.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/bendpoint/DeleteCommand.java
index 162dd44ff..d49879b8b 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/bendpoint/DeleteCommand.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/bendpoint/DeleteCommand.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/bendpoint/MoveCommand.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/bendpoint/MoveCommand.java
index 5179b29e5..591bd1d25 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/bendpoint/MoveCommand.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/bendpoint/MoveCommand.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/AntiAliasedEllipse.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/AntiAliasedEllipse.java
index fa02ce9a5..ed28d8b60 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/AntiAliasedEllipse.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/AntiAliasedEllipse.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/DecoratorFigure.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/DecoratorFigure.java
index 935d0f7fc..4e891d508 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/DecoratorFigure.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/DecoratorFigure.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyInsetEllipse.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyInsetEllipse.java
index 10ee43dbe..b618d600d 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyInsetEllipse.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyInsetEllipse.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyRoundedRectangle.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyRoundedRectangle.java
index fa8e7f394..286ddb0fa 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyRoundedRectangle.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyRoundedRectangle.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/TransparentLabel.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/TransparentLabel.java
index 1c06709db..fb5942ff0 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/TransparentLabel.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/TransparentLabel.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/AllocationDirectConnectionAndReconnectionEditPolicy.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/AllocationDirectConnectionAndReconnectionEditPolicy.java
index 627ff7211..cff2a9823 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/AllocationDirectConnectionAndReconnectionEditPolicy.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/AllocationDirectConnectionAndReconnectionEditPolicy.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/DiagramLayoutEditPolicy.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/DiagramLayoutEditPolicy.java
index 12a86a0e8..51a78611d 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/DiagramLayoutEditPolicy.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/DiagramLayoutEditPolicy.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/DirectConnectionAndReconnectionEditPolicy.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/DirectConnectionAndReconnectionEditPolicy.java
index 70a28e933..302426a61 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/DirectConnectionAndReconnectionEditPolicy.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/DirectConnectionAndReconnectionEditPolicy.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ElementLayoutEditPolicy.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ElementLayoutEditPolicy.java
index a9ed64384..9b4853ea8 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ElementLayoutEditPolicy.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ElementLayoutEditPolicy.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ElementMoveAndSouthEastResizeEditPolicy.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ElementMoveAndSouthEastResizeEditPolicy.java
index 2fa85092b..e8e776584 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ElementMoveAndSouthEastResizeEditPolicy.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ElementMoveAndSouthEastResizeEditPolicy.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/RelayCreateCommandEditPolicyBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/RelayCreateCommandEditPolicyBase.java
index 9eabcc0d8..3c472536c 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/RelayCreateCommandEditPolicyBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/RelayCreateCommandEditPolicyBase.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/RemoveEditPolicy.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/RemoveEditPolicy.java
index abac057b4..64f4b5cab 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/RemoveEditPolicy.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/RemoveEditPolicy.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/StickyConnectorMoveEditPolicy.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/StickyConnectorMoveEditPolicy.java
index 65e3dc7e8..7727704c3 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/StickyConnectorMoveEditPolicy.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/StickyConnectorMoveEditPolicy.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/request/CreateConnectionCompositionRequest.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/request/CreateConnectionCompositionRequest.java
index 1c57a2e7a..7b458c871 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/request/CreateConnectionCompositionRequest.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/request/CreateConnectionCompositionRequest.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/request/CreateElementCompositionRequest.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/request/CreateElementCompositionRequest.java
index e4f721363..55e025a37 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/request/CreateElementCompositionRequest.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/request/CreateElementCompositionRequest.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/extension/base/ConnectorHandlerBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/extension/base/ConnectorHandlerBase.java
index 6c90157c0..c99e56a8d 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/extension/base/ConnectorHandlerBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/extension/base/ConnectorHandlerBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/extension/base/HierarchicElementHandlerBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/extension/base/HierarchicElementHandlerBase.java
index 3738c9f68..58a687db8 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/extension/base/HierarchicElementHandlerBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/extension/base/HierarchicElementHandlerBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/FieldAssist.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/FieldAssist.java
index 44ba4c8a6..888a359b7 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/FieldAssist.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/FieldAssist.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/FieldAssistImageRegistry.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/FieldAssistImageRegistry.java
index 10201f271..48dc64ca4 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/FieldAssistImageRegistry.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/FieldAssistImageRegistry.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/IProposalProvider.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/IProposalProvider.java
index b28f5dd10..f8a27bd49 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/IProposalProvider.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/IProposalProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/ProposalProviderBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/ProposalProviderBase.java
index 60ce446de..a9cc51e35 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/ProposalProviderBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/ProposalProviderBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/StaticProposalProvider.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/StaticProposalProvider.java
index 52e829e75..c4fa5d9c6 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/StaticProposalProvider.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/StaticProposalProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/internal/command/GEF2ToolingKernelCommandStack.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/internal/command/GEF2ToolingKernelCommandStack.java
index ab8ce221b..67c6c6d3f 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/internal/command/GEF2ToolingKernelCommandStack.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/internal/command/GEF2ToolingKernelCommandStack.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/DiagramLayoutConfigurationBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/DiagramLayoutConfigurationBase.java
index 0321880e4..16ac67dbf 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/DiagramLayoutConfigurationBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/DiagramLayoutConfigurationBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/EllipseCurveLayoutDiagramConfiguration.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/EllipseCurveLayoutDiagramConfiguration.java
index 1b8184c8b..b5eb39571 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/EllipseCurveLayoutDiagramConfiguration.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/EllipseCurveLayoutDiagramConfiguration.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/IDiagramLayoutConfiguration.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/IDiagramLayoutConfiguration.java
index a59df0257..3c5fd1495 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/IDiagramLayoutConfiguration.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/IDiagramLayoutConfiguration.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/RectangleGridLayoutDiagramConfiguration.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/RectangleGridLayoutDiagramConfiguration.java
index 7aa9cbd19..4d3397e40 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/RectangleGridLayoutDiagramConfiguration.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/RectangleGridLayoutDiagramConfiguration.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/AutoLayoutMenu.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/AutoLayoutMenu.java
index a4a07117a..f08f68adf 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/AutoLayoutMenu.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/AutoLayoutMenu.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2015 ForTISS GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/IAutoLayouter.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/IAutoLayouter.java
index 542383082..2823ed179 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/IAutoLayouter.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/IAutoLayouter.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2017 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2017 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/KielerAutoLayouter.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/KielerAutoLayouter.java
index a29dcce96..0e01d09a6 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/KielerAutoLayouter.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/KielerAutoLayouter.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/library/AddElementToLibraryBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/library/AddElementToLibraryBase.java
index 96f5e5692..e5a319573 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/library/AddElementToLibraryBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/library/AddElementToLibraryBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2013 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2013 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/library/LibrarySelectionDialog.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/library/LibrarySelectionDialog.java
index f654228c3..1bc977e9f 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/library/LibrarySelectionDialog.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/library/LibrarySelectionDialog.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/preferences/MainPreferencePage.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/preferences/MainPreferencePage.java
index 5a31965d4..8a740e17e 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/preferences/MainPreferencePage.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/preferences/MainPreferencePage.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/properties/view/PropertySectionWithCopyPasteBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/properties/view/PropertySectionWithCopyPasteBase.java
index 8e335328d..11344335a 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/properties/view/PropertySectionWithCopyPasteBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/properties/view/PropertySectionWithCopyPasteBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/AbstractIntegerSpinnerEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/AbstractIntegerSpinnerEditingSupport.java
index 111c6e9b5..372e40e04 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/AbstractIntegerSpinnerEditingSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/AbstractIntegerSpinnerEditingSupport.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2017 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2017 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/CheckBoxEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/CheckBoxEditingSupport.java
index a71ae4664..4be4ce676 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/CheckBoxEditingSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/CheckBoxEditingSupport.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/CheckBoxLabelProvider.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/CheckBoxLabelProvider.java
index 88bf0aebc..b4be12209 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/CheckBoxLabelProvider.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/CheckBoxLabelProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/IconNameLabelProvider.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/IconNameLabelProvider.java
index 08a4525fd..b13d1d672 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/IconNameLabelProvider.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/IconNameLabelProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/AbstractNameEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/AbstractNameEditingSupport.java
index 0d1741914..146046ce5 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/AbstractNameEditingSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/AbstractNameEditingSupport.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 ForTISS GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/ActionUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/ActionUtils.java
index f8b5fe4be..2fa2b0259 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/ActionUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/ActionUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/ConstraintsBaseUIUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/ConstraintsBaseUIUtils.java
index 4812a27b8..047255da8 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/ConstraintsBaseUIUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/ConstraintsBaseUIUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/DecorationIconUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/DecorationIconUtils.java
index b7d980362..d07957a42 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/DecorationIconUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/DecorationIconUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/DragAndDropBaseUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/DragAndDropBaseUtils.java
index f2e47d3dd..fd72d9dac 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/DragAndDropBaseUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/DragAndDropBaseUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/EllipseLayoutUIUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/EllipseLayoutUIUtils.java
index 58580d96e..365da04a4 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/EllipseLayoutUIUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/EllipseLayoutUIUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/GCUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/GCUtils.java
index 370aedd82..bdc76ada7 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/GCUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/GCUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/LayoutDataUIUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/LayoutDataUIUtils.java
index 9f88ee3dd..24e52e14b 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/LayoutDataUIUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/LayoutDataUIUtils.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/PropertiesViewUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/PropertiesViewUtils.java
index eabb26d19..43ff2294b 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/PropertiesViewUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/PropertiesViewUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/RectangleLayoutUIUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/RectangleLayoutUIUtils.java
index c75faca77..5dd388913 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/RectangleLayoutUIUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/RectangleLayoutUIUtils.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/SnapToGridUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/SnapToGridUtils.java
index 3b0db63dd..e62d35df6 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/SnapToGridUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/SnapToGridUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/StatusUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/StatusUtils.java
index baa464b09..a4f1259ae 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/StatusUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/StatusUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/TableViewerUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/TableViewerUtils.java
index f7cca6032..1385811a8 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/TableViewerUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/TableViewerUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/ZoomUIUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/ZoomUIUtils.java
index 6ce2a96ea..32ae362b9 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/ZoomUIUtils.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/ZoomUIUtils.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/widget/ExtendedCCombo.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/widget/ExtendedCCombo.java
index 38d5742e8..c838b7917 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/widget/ExtendedCCombo.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/widget/ExtendedCCombo.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/ToolingBase.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/ToolingBase.java
index 277d48b6c..2fbb08e57 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/ToolingBase.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/ToolingBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/ToolingBaseActivator.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/ToolingBaseActivator.java
index c614bfc89..796d4e2fd 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/ToolingBaseActivator.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/ToolingBaseActivator.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/AnnotationEntry.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/AnnotationEntry.java
index 69c450d20..f6b48d2ca 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/AnnotationEntry.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/AnnotationEntry.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/AnnotationValueService.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/AnnotationValueService.java
index 68d198b6b..ecb12761f 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/AnnotationValueService.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/AnnotationValueService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/IAnnotationValueService.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/IAnnotationValueService.java
index 536cf1709..987407a70 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/IAnnotationValueService.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/IAnnotationValueService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/AnnotationInstSpec.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/AnnotationInstSpec.java
index 556b94c71..a02dc761f 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/AnnotationInstSpec.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/AnnotationInstSpec.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/DerivedAnnotationValueProviderBase.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/DerivedAnnotationValueProviderBase.java
index 22d5da397..8389c436e 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/DerivedAnnotationValueProviderBase.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/DerivedAnnotationValueProviderBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/DynamicInstanceAnnotationValueProviderBase.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/DynamicInstanceAnnotationValueProviderBase.java
index 8ed919b2e..bbd1db5e5 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/DynamicInstanceAnnotationValueProviderBase.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/DynamicInstanceAnnotationValueProviderBase.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/EStructuralFeatureDescriptor.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/EStructuralFeatureDescriptor.java
index 804ee80e3..d5d7d774b 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/EStructuralFeatureDescriptor.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/EStructuralFeatureDescriptor.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/EStructuralFeatureValueProviderBase.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/EStructuralFeatureValueProviderBase.java
index 79ca289eb..21d9ba731 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/EStructuralFeatureValueProviderBase.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/EStructuralFeatureValueProviderBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/IAnnotationValueProvider.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/IAnnotationValueProvider.java
index 2faa969d6..95225194b 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/IAnnotationValueProvider.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/IAnnotationValueProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/ValueProviderBase.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/ValueProviderBase.java
index 1bffa9462..1ee458937 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/ValueProviderBase.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/ValueProviderBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ConnectionCompositorBase.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ConnectionCompositorBase.java
index 1c306918b..fc33b6c01 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ConnectionCompositorBase.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ConnectionCompositorBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2013 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2013 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ConnectorConnectionCompositorBase.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ConnectorConnectionCompositorBase.java
index b7230f374..817c3862f 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ConnectorConnectionCompositorBase.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ConnectorConnectionCompositorBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ConnectorHierarchicElementConnectionCompositorBase.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ConnectorHierarchicElementConnectionCompositorBase.java
index 48f0d9905..9c49a789b 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ConnectorHierarchicElementConnectionCompositorBase.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ConnectorHierarchicElementConnectionCompositorBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2013 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2013 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ConstraintInstanceContainerCompositor.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ConstraintInstanceContainerCompositor.java
index ceb0b7324..72208482e 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ConstraintInstanceContainerCompositor.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ConstraintInstanceContainerCompositor.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 ForTISS GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/HierarchicElementCompositorBase.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/HierarchicElementCompositorBase.java
index e0c26b5a2..587857356 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/HierarchicElementCompositorBase.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/HierarchicElementCompositorBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/HierarchicElementConnectionCompositorBase.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/HierarchicElementConnectionCompositorBase.java
index bff05aa45..da93d528d 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/HierarchicElementConnectionCompositorBase.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/HierarchicElementConnectionCompositorBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/HierarchicElementConnectorConnectionCompositorBase.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/HierarchicElementConnectorConnectionCompositorBase.java
index 3d419ac64..cf0068627 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/HierarchicElementConnectorConnectionCompositorBase.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/HierarchicElementConnectorConnectionCompositorBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2013 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2013 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/LogMessageUserInteractionContext.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/LogMessageUserInteractionContext.java
index 6c3f7e422..4a80535f5 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/LogMessageUserInteractionContext.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/LogMessageUserInteractionContext.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ModelElementCompositorBase.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ModelElementCompositorBase.java
index cfe6fc82a..a6d43f0d4 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ModelElementCompositorBase.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ModelElementCompositorBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ModelElementWithRefCopyMessage.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ModelElementWithRefCopyMessage.java
index c41ae7b6c..9e006bcf2 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ModelElementWithRefCopyMessage.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/compose/ModelElementWithRefCopyMessage.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/dnd/AllocationConnectionDragContext.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/dnd/AllocationConnectionDragContext.java
index a9c2faa65..a9b1a0ede 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/dnd/AllocationConnectionDragContext.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/dnd/AllocationConnectionDragContext.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/dnd/ConnectionDragContext.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/dnd/ConnectionDragContext.java
index 7309e0fcc..399b2b054 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/dnd/ConnectionDragContext.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/dnd/ConnectionDragContext.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/dnd/ConnectionDropContext.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/dnd/ConnectionDropContext.java
index 0d749a58f..d1074ee8a 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/dnd/ConnectionDropContext.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/dnd/ConnectionDropContext.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/dnd/ElementDropContext.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/dnd/ElementDropContext.java
index bf8114551..9c10d6839 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/dnd/ElementDropContext.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/dnd/ElementDropContext.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/internal/ToolingBaseInternal.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/internal/ToolingBaseInternal.java
index d606d779d..e0ceea3d9 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/internal/ToolingBaseInternal.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/internal/ToolingBaseInternal.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/layout/DefaultLayoutConstants.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/layout/DefaultLayoutConstants.java
index c5e0c93c5..9e451a487 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/layout/DefaultLayoutConstants.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/layout/DefaultLayoutConstants.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/layout/LayoutKeyConstants.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/layout/LayoutKeyConstants.java
index 598a20717..16cbec5ee 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/layout/LayoutKeyConstants.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/layout/LayoutKeyConstants.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/library/ModelElementLibraryService.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/library/ModelElementLibraryService.java
index d8558d9e1..4bc5d1b68 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/library/ModelElementLibraryService.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/library/ModelElementLibraryService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/migration/IDMigrationProvider.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/migration/IDMigrationProvider.java
index 7d421d998..ce7062f13 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/migration/IDMigrationProvider.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/migration/IDMigrationProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2013 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2013 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/migration/RemoveDuplicatedAnnotationsMigrationProvider.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/migration/RemoveDuplicatedAnnotationsMigrationProvider.java
index 5c2ed5ea9..f5eb209a8 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/migration/RemoveDuplicatedAnnotationsMigrationProvider.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/migration/RemoveDuplicatedAnnotationsMigrationProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2013 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2013 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/base/impl/DerivedAnnotationBaseStaticImpl.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/base/impl/DerivedAnnotationBaseStaticImpl.java
index 328ace916..87cb5f009 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/base/impl/DerivedAnnotationBaseStaticImpl.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/base/impl/DerivedAnnotationBaseStaticImpl.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/base/impl/LibraryElementBaseStaticImpl.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/base/impl/LibraryElementBaseStaticImpl.java
index 05d82f7e3..de43e4723 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/base/impl/LibraryElementBaseStaticImpl.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/base/impl/LibraryElementBaseStaticImpl.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2013 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2013 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/element/impl/IModelElementStaticImpl.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/element/impl/IModelElementStaticImpl.java
index 2598b5502..df89d9d6c 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/element/impl/IModelElementStaticImpl.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/element/impl/IModelElementStaticImpl.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2013 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2013 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/layout/impl/DimensionStaticImpl.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/layout/impl/DimensionStaticImpl.java
index ed5416e57..428316874 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/layout/impl/DimensionStaticImpl.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/layout/impl/DimensionStaticImpl.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/layout/impl/PointStaticImpl.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/layout/impl/PointStaticImpl.java
index 7cfe9c85e..4a770c08d 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/layout/impl/PointStaticImpl.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/layout/impl/PointStaticImpl.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/layout/impl/RectangleStaticImpl.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/layout/impl/RectangleStaticImpl.java
index 63823bd5c..dd985e66f 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/layout/impl/RectangleStaticImpl.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/layout/impl/RectangleStaticImpl.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/AngleUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/AngleUtils.java
index 55cb0f4d8..daac5fb5a 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/AngleUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/AngleUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/AnnotationUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/AnnotationUtils.java
index c42a6a03c..637fb9e0d 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/AnnotationUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/AnnotationUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/BaseMathUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/BaseMathUtils.java
index f5436744e..94e46b6c4 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/BaseMathUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/BaseMathUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/BaseModelElementUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/BaseModelElementUtils.java
index 587b0c801..3f55a6424 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/BaseModelElementUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/BaseModelElementUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/ConstraintsBaseUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/ConstraintsBaseUtils.java
index 073b6a33d..dccdcec26 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/ConstraintsBaseUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/ConstraintsBaseUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/DimensionUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/DimensionUtils.java
index b6ec257fa..5a7690e3b 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/DimensionUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/DimensionUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/EllipseLayoutUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/EllipseLayoutUtils.java
index 3b2457aec..defe6a5c1 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/EllipseLayoutUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/EllipseLayoutUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/LayoutDataUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/LayoutDataUtils.java
index a537aa4a1..096aac6ae 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/LayoutDataUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/LayoutDataUtils.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/LayoutModelElementFactory.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/LayoutModelElementFactory.java
index 7ed5386eb..5a099a071 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/LayoutModelElementFactory.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/LayoutModelElementFactory.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/MigrationUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/MigrationUtils.java
index c309aefcd..60f3f2dac 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/MigrationUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/MigrationUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/OffsetOrientationUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/OffsetOrientationUtils.java
index 6dd8da845..beeca2df4 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/OffsetOrientationUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/OffsetOrientationUtils.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/PointUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/PointUtils.java
index 12263a885..3f619387c 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/PointUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/PointUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/PointsUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/PointsUtils.java
index 66247c9c5..12a0b9951 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/PointsUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/PointsUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/RectangleLayoutUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/RectangleLayoutUtils.java
index 410110606..6d7d17e26 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/RectangleLayoutUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/RectangleLayoutUtils.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/SnapToGridUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/SnapToGridUtils.java
index 8660f2160..c64c4264b 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/SnapToGridUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/SnapToGridUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/SystemUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/SystemUtils.java
index 24331059f..23c73baab 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/SystemUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/SystemUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2013 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2013 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/VisualizationModelElementFactory.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/VisualizationModelElementFactory.java
index 9b6f85e83..68aaca1aa 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/VisualizationModelElementFactory.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/VisualizationModelElementFactory.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/ZoomUtils.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/ZoomUtils.java
index 7e1ccdc17..af38937dd 100644
--- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/ZoomUtils.java
+++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/utils/ZoomUtils.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/gmf/runtime/draw2d/ui/figures/PolylineConnectionEx.java b/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/gmf/runtime/draw2d/ui/figures/PolylineConnectionEx.java
index c22d31072..ed20080cb 100644
--- a/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/gmf/runtime/draw2d/ui/figures/PolylineConnectionEx.java
+++ b/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/gmf/runtime/draw2d/ui/figures/PolylineConnectionEx.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/jface/viewers/TableLabelProviderBase.java b/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/jface/viewers/TableLabelProviderBase.java
index 5593596ea..116ae816e 100644
--- a/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/jface/viewers/TableLabelProviderBase.java
+++ b/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/jface/viewers/TableLabelProviderBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2013 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2013 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/ui/actions/TextStyledTextActionHandler.java b/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/ui/actions/TextStyledTextActionHandler.java
index e7673f225..a23ce4bc0 100644
--- a/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/ui/actions/TextStyledTextActionHandler.java
+++ b/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/ui/actions/TextStyledTextActionHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.common/trunk/src/org/fortiss/tooling/common/TK2CommonActivator.java b/org.fortiss.tooling.common/trunk/src/org/fortiss/tooling/common/TK2CommonActivator.java
index 527b463a2..b51fbf77d 100644
--- a/org.fortiss.tooling.common/trunk/src/org/fortiss/tooling/common/TK2CommonActivator.java
+++ b/org.fortiss.tooling.common/trunk/src/org/fortiss/tooling/common/TK2CommonActivator.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.common/trunk/src/org/fortiss/tooling/common/util/LambdaUtils.java b/org.fortiss.tooling.common/trunk/src/org/fortiss/tooling/common/util/LambdaUtils.java
index 01942c4e5..cedf027a3 100644
--- a/org.fortiss.tooling.common/trunk/src/org/fortiss/tooling/common/util/LambdaUtils.java
+++ b/org.fortiss.tooling.common/trunk/src/org/fortiss/tooling/common/util/LambdaUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 ForTISS GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/ToolingGraphicsGLUIActivator.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/ToolingGraphicsGLUIActivator.java
index 290d6fd02..8079aa3d6 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/ToolingGraphicsGLUIActivator.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/ToolingGraphicsGLUIActivator.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/camera/Camera.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/camera/Camera.java
index 2f75e293a..13f935400 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/camera/Camera.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/camera/Camera.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/camera/MovingCameraWithPitchAndYaw.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/camera/MovingCameraWithPitchAndYaw.java
index 72a3199b7..c9d81ff0b 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/camera/MovingCameraWithPitchAndYaw.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/camera/MovingCameraWithPitchAndYaw.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/draw/LwjglCanvas.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/draw/LwjglCanvas.java
index 1e04d9335..9f86aa7ca 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/draw/LwjglCanvas.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/draw/LwjglCanvas.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/draw/LwjglRenderThread.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/draw/LwjglRenderThread.java
index 0701a02e6..ae3a42345 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/draw/LwjglRenderThread.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/draw/LwjglRenderThread.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/editor/EditorStatusBarItem.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/editor/EditorStatusBarItem.java
index fd8ba8602..442a4466a 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/editor/EditorStatusBarItem.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/editor/EditorStatusBarItem.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/editor/Graphical3DCompositeBase.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/editor/Graphical3DCompositeBase.java
index e718b2419..e6c70a1f8 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/editor/Graphical3DCompositeBase.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/editor/Graphical3DCompositeBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/editor/Graphical3DEditorBase.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/editor/Graphical3DEditorBase.java
index fbc43e504..754a5947f 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/editor/Graphical3DEditorBase.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/editor/Graphical3DEditorBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/editor/Graphical3DViewBase.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/editor/Graphical3DViewBase.java
index 0b2007a31..dc01cb755 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/editor/Graphical3DViewBase.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/editor/Graphical3DViewBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/light/Light.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/light/Light.java
index 37d2763a1..f760bc719 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/light/Light.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/light/Light.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/light/Light3DLight.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/light/Light3DLight.java
index 634fad3f1..bbb0a0a47 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/light/Light3DLight.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/light/Light3DLight.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/CompositeViewObject.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/CompositeViewObject.java
index 079846d22..a18358f3d 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/CompositeViewObject.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/CompositeViewObject.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/Graph3DViewObject.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/Graph3DViewObject.java
index 2473a2b58..335f8c83b 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/Graph3DViewObject.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/Graph3DViewObject.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/Object3DViewObject.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/Object3DViewObject.java
index 642a3f0f4..645bafc54 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/Object3DViewObject.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/Object3DViewObject.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/PickableObjectBase.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/PickableObjectBase.java
index 5cd6966e7..08d88a4c0 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/PickableObjectBase.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/PickableObjectBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/RotatedObject.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/RotatedObject.java
index 58d5ef655..82a881a29 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/RotatedObject.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/RotatedObject.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/ScaledObject.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/ScaledObject.java
index f26f129a7..075cac699 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/ScaledObject.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/ScaledObject.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/ViewObjectBase.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/ViewObjectBase.java
index cabfe3336..d64bb8a56 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/ViewObjectBase.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/ViewObjectBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/WrappedViewObjectBase.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/WrappedViewObjectBase.java
index 2faf1ffda..3f8576089 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/WrappedViewObjectBase.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/WrappedViewObjectBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/picker/ModelObjectPicker.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/picker/ModelObjectPicker.java
index 4ac1b61a0..ac619d1fb 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/picker/ModelObjectPicker.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/picker/ModelObjectPicker.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/ColorUtil.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/ColorUtil.java
index ee113a7f5..95dc005ee 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/ColorUtil.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/ColorUtil.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2013 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2013 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/FloatBufferUtils.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/FloatBufferUtils.java
index a93176e9c..828a4578f 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/FloatBufferUtils.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/FloatBufferUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/GLPrimitives.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/GLPrimitives.java
index 4b382e06b..cfbdf18da 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/GLPrimitives.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/GLPrimitives.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/Graph3DUtil.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/Graph3DUtil.java
index 8e1f2576a..57b232a2b 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/Graph3DUtil.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/Graph3DUtil.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/test-src/test/org/fortiss/tooling/graphicsGL/ui/Test3DEditor.java b/org.fortiss.tooling.graphicsGL.ui/trunk/test-src/test/org/fortiss/tooling/graphicsGL/ui/Test3DEditor.java
index 445fe1856..372525586 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/test-src/test/org/fortiss/tooling/graphicsGL/ui/Test3DEditor.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/test-src/test/org/fortiss/tooling/graphicsGL/ui/Test3DEditor.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/test-src/test/org/fortiss/tooling/graphicsGL/ui/Test3DEditorBinding.java b/org.fortiss.tooling.graphicsGL.ui/trunk/test-src/test/org/fortiss/tooling/graphicsGL/ui/Test3DEditorBinding.java
index f9be39997..94d044e29 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/test-src/test/org/fortiss/tooling/graphicsGL/ui/Test3DEditorBinding.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/test-src/test/org/fortiss/tooling/graphicsGL/ui/Test3DEditorBinding.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/ToolingGraphicsGLActivator.java b/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/ToolingGraphicsGLActivator.java
index f7464c39d..c0a37c439 100644
--- a/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/ToolingGraphicsGLActivator.java
+++ b/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/ToolingGraphicsGLActivator.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/model/scene/impl/Light3DStaticImpl.java b/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/model/scene/impl/Light3DStaticImpl.java
index 18c2d23e2..72c0ff8c9 100644
--- a/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/model/scene/impl/Light3DStaticImpl.java
+++ b/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/model/scene/impl/Light3DStaticImpl.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2013 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2013 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/util/Graph3DModelElementFactory.java b/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/util/Graph3DModelElementFactory.java
index 0294c68d8..ca3199a1c 100644
--- a/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/util/Graph3DModelElementFactory.java
+++ b/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/util/Graph3DModelElementFactory.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/util/Graphics3DModelElementFactory.java b/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/util/Graphics3DModelElementFactory.java
index 0711546c9..60b156f30 100644
--- a/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/util/Graphics3DModelElementFactory.java
+++ b/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/util/Graphics3DModelElementFactory.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/util/Mesh3DModelElementFactory.java b/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/util/Mesh3DModelElementFactory.java
index ad0d46178..79b918218 100644
--- a/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/util/Mesh3DModelElementFactory.java
+++ b/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/util/Mesh3DModelElementFactory.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/util/OBJLoaderUtil.java b/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/util/OBJLoaderUtil.java
index 545fa4719..070e63b45 100644
--- a/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/util/OBJLoaderUtil.java
+++ b/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/util/OBJLoaderUtil.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/util/Scene3DModelElementFactory.java b/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/util/Scene3DModelElementFactory.java
index 9e7eda544..e2018534e 100644
--- a/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/util/Scene3DModelElementFactory.java
+++ b/org.fortiss.tooling.graphicsGL/trunk/src/org/fortiss/tooling/graphicsGL/util/Scene3DModelElementFactory.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/ESharedImages.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/ESharedImages.java
index 7791c78a6..bc255e633 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/ESharedImages.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/ESharedImages.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/ToolingKernelUI.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/ToolingKernelUI.java
index 991c97478..58c472675 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/ToolingKernelUI.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/ToolingKernelUI.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/ToolingKernelUIActivator.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/ToolingKernelUIActivator.java
index 12b5b6b0c..afc508234 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/ToolingKernelUIActivator.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/ToolingKernelUIActivator.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/CompositionServiceLocalCopyPasteTransfer.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/CompositionServiceLocalCopyPasteTransfer.java
index 1427cb18f..2695633b2 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/CompositionServiceLocalCopyPasteTransfer.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/CompositionServiceLocalCopyPasteTransfer.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/CompositionServiceLocalDNDTransfer.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/CompositionServiceLocalDNDTransfer.java
index d912fe0b5..4ece984c0 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/CompositionServiceLocalDNDTransfer.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/CompositionServiceLocalDNDTransfer.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ConnectionCompositionDragSourceAdapter.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ConnectionCompositionDragSourceAdapter.java
index 92eca8959..d64005a73 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ConnectionCompositionDragSourceAdapter.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ConnectionCompositionDragSourceAdapter.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ConnectionCompositionDropTargetAdapter.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ConnectionCompositionDropTargetAdapter.java
index a2e3665e8..2be93f9ae 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ConnectionCompositionDropTargetAdapter.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ConnectionCompositionDropTargetAdapter.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ConnectionCompositionSource.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ConnectionCompositionSource.java
index 84852f728..bc01b1b9e 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ConnectionCompositionSource.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ConnectionCompositionSource.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ElementCompositionDragSourceAdapter.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ElementCompositionDragSourceAdapter.java
index 7cbb5a24b..e4f7081fe 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ElementCompositionDragSourceAdapter.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ElementCompositionDragSourceAdapter.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ElementCompositionDropTargetAdapter.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ElementCompositionDropTargetAdapter.java
index f6063772a..c00b2edce 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ElementCompositionDropTargetAdapter.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ElementCompositionDropTargetAdapter.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ElementCompositionSource.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ElementCompositionSource.java
index 27b20386d..f2e53a4f8 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ElementCompositionSource.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/dnd/ElementCompositionSource.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IAllocationEditPartFactory.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IAllocationEditPartFactory.java
index d0b6b3541..1e3acd23b 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IAllocationEditPartFactory.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IAllocationEditPartFactory.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IConstraintUI.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IConstraintUI.java
index b16733d1b..6aa95ef02 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IConstraintUI.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IConstraintUI.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IContextMenuContributor.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IContextMenuContributor.java
index 355ba7cac..9e4696df3 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IContextMenuContributor.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IContextMenuContributor.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IContextMenuMultiSelectionContributor.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IContextMenuMultiSelectionContributor.java
index c6f30da27..fc1a06bda 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IContextMenuMultiSelectionContributor.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IContextMenuMultiSelectionContributor.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IEditPartFactory.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IEditPartFactory.java
index 247582e34..6cf8203d0 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IEditPartFactory.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IEditPartFactory.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IModelEditor.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IModelEditor.java
index f1c56c660..4fe90e199 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IModelEditor.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IModelEditor.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IModelEditorBinding.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IModelEditorBinding.java
index d7601b101..88e947987 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IModelEditorBinding.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IModelEditorBinding.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IModelElementHandler.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IModelElementHandler.java
index 048126af9..0c90b42b3 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IModelElementHandler.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IModelElementHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/ITutorialStepUI.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/ITutorialStepUI.java
index cdb4c6a76..42355dd98 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/ITutorialStepUI.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/ITutorialStepUI.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/ITutorialUIProvider.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/ITutorialUIProvider.java
index 1a416fd9e..c5fecda72 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/ITutorialUIProvider.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/ITutorialUIProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/ITutorialUIWhitelistProvider.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/ITutorialUIWhitelistProvider.java
index 58cc02872..943e6ebe4 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/ITutorialUIWhitelistProvider.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/ITutorialUIWhitelistProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/ModelEditorNotAvailableBinding.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/ModelEditorNotAvailableBinding.java
index bb07a125a..215ac2446 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/ModelEditorNotAvailableBinding.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/ModelEditorNotAvailableBinding.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2017 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ConstraintUIBases.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ConstraintUIBases.java
index 4f2b9c0fa..4627730dd 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ConstraintUIBases.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ConstraintUIBases.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ContextMenuSubMenuContributorBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ContextMenuSubMenuContributorBase.java
index 4613c7655..c211602d3 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ContextMenuSubMenuContributorBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ContextMenuSubMenuContributorBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/EObjectActionBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/EObjectActionBase.java
index 0925fcd3a..2a3657087 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/EObjectActionBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/EObjectActionBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/EReferencePropertySectionBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/EReferencePropertySectionBase.java
index fc6d1daa5..842a2398d 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/EReferencePropertySectionBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/EReferencePropertySectionBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/EditorBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/EditorBase.java
index 4a2641a31..26add492a 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/EditorBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/EditorBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ModelEditorBindingBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ModelEditorBindingBase.java
index 4290b4cef..3b5009bf6 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ModelEditorBindingBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ModelEditorBindingBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ModelElementHandlerBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ModelElementHandlerBase.java
index 5d34217cd..44e5d0669 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ModelElementHandlerBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ModelElementHandlerBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/MultiEObjectActionBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/MultiEObjectActionBase.java
index bc4cabec8..d274ab6d1 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/MultiEObjectActionBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/MultiEObjectActionBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/NamedCommentedModelElementHandlerBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/NamedCommentedModelElementHandlerBase.java
index c0afddbdb..80fea65fc 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/NamedCommentedModelElementHandlerBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/NamedCommentedModelElementHandlerBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/PropertySectionBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/PropertySectionBase.java
index 2a35dcc09..b30ed394f 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/PropertySectionBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/PropertySectionBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/TutorialStepUIAtomicBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/TutorialStepUIAtomicBase.java
index 8d5c53231..0ffae2a61 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/TutorialStepUIAtomicBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/TutorialStepUIAtomicBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/TutorialStepUIAtomicWithWhitelistBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/TutorialStepUIAtomicWithWhitelistBase.java
index 889b36f95..1443bffcd 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/TutorialStepUIAtomicWithWhitelistBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/TutorialStepUIAtomicWithWhitelistBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/TutorialStepUICompositeBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/TutorialStepUICompositeBase.java
index ca0615fc2..bd3b147f3 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/TutorialStepUICompositeBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/TutorialStepUICompositeBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/TutorialStepUICompositeWithWhitelistBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/TutorialStepUICompositeWithWhitelistBase.java
index 89077b468..0c0f1ce33 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/TutorialStepUICompositeWithWhitelistBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/TutorialStepUICompositeWithWhitelistBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/data/ContextMenuContextProvider.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/data/ContextMenuContextProvider.java
index 1490d727f..3aa43cc1f 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/data/ContextMenuContextProvider.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/data/ContextMenuContextProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ActionService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ActionService.java
index 4c571b85c..2f66c59e2 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ActionService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ActionService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/AllocationEditPartFactoryService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/AllocationEditPartFactoryService.java
index 159e7d72b..9555aacaf 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/AllocationEditPartFactoryService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/AllocationEditPartFactoryService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ConstraintLabelDecorator.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ConstraintLabelDecorator.java
index f6d9697a7..9a79f0516 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ConstraintLabelDecorator.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ConstraintLabelDecorator.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ContextMenuService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ContextMenuService.java
index dfdb58caf..d9ec36090 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ContextMenuService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ContextMenuService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/EditPartFactoryService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/EditPartFactoryService.java
index c72b29719..275f98091 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/EditPartFactoryService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/EditPartFactoryService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java
index e722995aa..7e7b95bf7 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/MarkerServiceLabelDecorator.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/MarkerServiceLabelDecorator.java
index 347ba9fb4..ddaf7f2cf 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/MarkerServiceLabelDecorator.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/MarkerServiceLabelDecorator.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelEditorBindingService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelEditorBindingService.java
index 0262bf15a..635160c30 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelEditorBindingService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelEditorBindingService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelElementHandlerService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelElementHandlerService.java
index f67846a27..d5824d7b1 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelElementHandlerService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelElementHandlerService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/NavigatorService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/NavigatorService.java
index 7afb4708a..c7791645d 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/NavigatorService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/NavigatorService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ToolingKernelUIInternal.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ToolingKernelUIInternal.java
index 6c8b2b640..819ef786d 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ToolingKernelUIInternal.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ToolingKernelUIInternal.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/TutorialUIService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/TutorialUIService.java
index c9e1a7174..e15add037 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/TutorialUIService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/TutorialUIService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/CopyAction.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/CopyAction.java
index aac757240..bc18f641a 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/CopyAction.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/CopyAction.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/CutAction.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/CutAction.java
index 0480fab89..fbc9f130f 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/CutAction.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/CutAction.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/DeleteAction.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/DeleteAction.java
index 42a866b37..b6af7eff8 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/DeleteAction.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/DeleteAction.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/PasteAction.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/PasteAction.java
index dbd3e3f16..36ab20e83 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/PasteAction.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/PasteAction.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/RedoAction.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/RedoAction.java
index f07f9d6e7..e19d9a2c9 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/RedoAction.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/RedoAction.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/RenameAction.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/RenameAction.java
index d207b422f..ec56af07a 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/RenameAction.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/RenameAction.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/SelectAllAction.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/SelectAllAction.java
index b86158e2c..b5b4c906b 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/SelectAllAction.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/SelectAllAction.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/UndoAction.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/UndoAction.java
index bd3a292b2..2afbbb69c 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/UndoAction.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/UndoAction.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/databinding/EObjectObservableValue.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/databinding/EObjectObservableValue.java
index 121856701..56d3298e5 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/databinding/EObjectObservableValue.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/databinding/EObjectObservableValue.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/ActionBarContributor.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/ActionBarContributor.java
index 26c8707a3..e88858c48 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/ActionBarContributor.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/ActionBarContributor.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/ExtendableMultiPageEditor.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/ExtendableMultiPageEditor.java
index 2244bc195..4f3f77e25 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/ExtendableMultiPageEditor.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/ExtendableMultiPageEditor.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/IActionContributingEditor.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/IActionContributingEditor.java
index cd3d4b60d..11cc51d3e 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/IActionContributingEditor.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/IActionContributingEditor.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/ModelElementEditorInput.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/ModelElementEditorInput.java
index 2c5780464..169d29e01 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/ModelElementEditorInput.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/ModelElementEditorInput.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/TutorialStepUIDefaultGUI.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/TutorialStepUIDefaultGUI.java
index 2982bea26..44ef74c70 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/TutorialStepUIDefaultGUI.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/TutorialStepUIDefaultGUI.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/TutorialStepUIEditor.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/TutorialStepUIEditor.java
index c1f4aac9f..f69bc0c70 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/TutorialStepUIEditor.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/TutorialStepUIEditor.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/TutorialStepUIEditorInput.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/TutorialStepUIEditorInput.java
index 5c113a3c6..2b5e4b0ff 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/TutorialStepUIEditorInput.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/editor/TutorialStepUIEditorInput.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/KISSViewPart.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/KISSViewPart.java
index 15cb826b8..3a6092e78 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/KISSViewPart.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/KISSViewPart.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/KISSViewerContentProvider.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/KISSViewerContentProvider.java
index da5e4cd36..8ece84e8c 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/KISSViewerContentProvider.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/KISSViewerContentProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2013 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2013 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/KISSViewerGUI.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/KISSViewerGUI.java
index 10ebfa2de..d369c390b 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/KISSViewerGUI.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/KISSViewerGUI.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/KISSViewerLabelProvider.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/KISSViewerLabelProvider.java
index 6dfd178a7..fdd4fe536 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/KISSViewerLabelProvider.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/KISSViewerLabelProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/DetailsUIHandlerBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/DetailsUIHandlerBase.java
index 5976ceda4..da8872e80 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/DetailsUIHandlerBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/DetailsUIHandlerBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/KISSDetailsUIRegistry.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/KISSDetailsUIRegistry.java
index 6ad19ec50..29ab273a1 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/KISSDetailsUIRegistry.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/KISSDetailsUIRegistry.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/AllocationEditPartFactoryServiceIntrospectionDetailsUIHandler.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/AllocationEditPartFactoryServiceIntrospectionDetailsUIHandler.java
index a9ccb57bf..127e8f72d 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/AllocationEditPartFactoryServiceIntrospectionDetailsUIHandler.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/AllocationEditPartFactoryServiceIntrospectionDetailsUIHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ConnectionCompositorServiceIntrospectionDetailsUIHandler.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ConnectionCompositorServiceIntrospectionDetailsUIHandler.java
index 7a8f5dbc6..62c4d8e24 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ConnectionCompositorServiceIntrospectionDetailsUIHandler.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ConnectionCompositorServiceIntrospectionDetailsUIHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ConstraintCheckerServiceIntrospectionDetailsUIHandler.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ConstraintCheckerServiceIntrospectionDetailsUIHandler.java
index bc0844933..ff642c6a2 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ConstraintCheckerServiceIntrospectionDetailsUIHandler.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ConstraintCheckerServiceIntrospectionDetailsUIHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ConstraintServiceIntrospectionDetailsUIHandler.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ConstraintServiceIntrospectionDetailsUIHandler.java
index b7fdeb34c..6d0b26873 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ConstraintServiceIntrospectionDetailsUIHandler.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ConstraintServiceIntrospectionDetailsUIHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ConstraintUIServiceIntrospectionDetailsUIHandler.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ConstraintUIServiceIntrospectionDetailsUIHandler.java
index 63cef1c5a..527471e44 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ConstraintUIServiceIntrospectionDetailsUIHandler.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ConstraintUIServiceIntrospectionDetailsUIHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ContextMenuServiceIntrospectionDetailsUIHandler.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ContextMenuServiceIntrospectionDetailsUIHandler.java
index b4d8b8f60..6c6a11ec3 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ContextMenuServiceIntrospectionDetailsUIHandler.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ContextMenuServiceIntrospectionDetailsUIHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/CopyClassNameToClipBoardRunnable.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/CopyClassNameToClipBoardRunnable.java
index 98fc42c5b..d5de2c002 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/CopyClassNameToClipBoardRunnable.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/CopyClassNameToClipBoardRunnable.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/EObjectAware2IntrospectionDetailsUIHandlerBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/EObjectAware2IntrospectionDetailsUIHandlerBase.java
index 4837b8172..9df04cd3d 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/EObjectAware2IntrospectionDetailsUIHandlerBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/EObjectAware2IntrospectionDetailsUIHandlerBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/EObjectAwareIntrospectionDetailsUIHandlerBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/EObjectAwareIntrospectionDetailsUIHandlerBase.java
index 0f4d61cad..264336584 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/EObjectAwareIntrospectionDetailsUIHandlerBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/EObjectAwareIntrospectionDetailsUIHandlerBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/EclipseResourceStorageProviderIntrospectionDetailsUIHandler.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/EclipseResourceStorageProviderIntrospectionDetailsUIHandler.java
index 629978678..f140f80c7 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/EclipseResourceStorageProviderIntrospectionDetailsUIHandler.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/EclipseResourceStorageProviderIntrospectionDetailsUIHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/EditPartFactoryServiceIntrospectionDetailsUIHandler.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/EditPartFactoryServiceIntrospectionDetailsUIHandler.java
index 715ad8c63..16077e832 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/EditPartFactoryServiceIntrospectionDetailsUIHandler.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/EditPartFactoryServiceIntrospectionDetailsUIHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ElementCompositorServiceIntrospectionDetailsUIHandler.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ElementCompositorServiceIntrospectionDetailsUIHandler.java
index ef98142e8..15ca94a3a 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ElementCompositorServiceIntrospectionDetailsUIHandler.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ElementCompositorServiceIntrospectionDetailsUIHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/IntrospectionDetailsUIHandlerBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/IntrospectionDetailsUIHandlerBase.java
index 401d8c4b2..71c3a6ddc 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/IntrospectionDetailsUIHandlerBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/IntrospectionDetailsUIHandlerBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/LibraryServiceIntrospectionDetailsUIHandler.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/LibraryServiceIntrospectionDetailsUIHandler.java
index 3e354531f..9d00528b6 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/LibraryServiceIntrospectionDetailsUIHandler.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/LibraryServiceIntrospectionDetailsUIHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/MigrationServiceIntrospectionDetailsUIHandler.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/MigrationServiceIntrospectionDetailsUIHandler.java
index 2b3a098c0..6220b5b46 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/MigrationServiceIntrospectionDetailsUIHandler.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/MigrationServiceIntrospectionDetailsUIHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ModelEditorBindingServiceIntrospectionDetailsUIHandler.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ModelEditorBindingServiceIntrospectionDetailsUIHandler.java
index 3cf2e6706..7c5fc7968 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ModelEditorBindingServiceIntrospectionDetailsUIHandler.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ModelEditorBindingServiceIntrospectionDetailsUIHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ModelElementHandlerServiceIntrospectionDetailsUIHandler.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ModelElementHandlerServiceIntrospectionDetailsUIHandler.java
index 96608c03f..5f306a174 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ModelElementHandlerServiceIntrospectionDetailsUIHandler.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/ModelElementHandlerServiceIntrospectionDetailsUIHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/PersistencyServiceIntrospectionDetailsUIHandler.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/PersistencyServiceIntrospectionDetailsUIHandler.java
index f16ff7b7e..754dac51e 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/PersistencyServiceIntrospectionDetailsUIHandler.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/PersistencyServiceIntrospectionDetailsUIHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/PrototypeServiceIntrospectionDetailsUIHandler.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/PrototypeServiceIntrospectionDetailsUIHandler.java
index b5c3fcd50..72600799c 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/PrototypeServiceIntrospectionDetailsUIHandler.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/PrototypeServiceIntrospectionDetailsUIHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/TableViewerPatternFilter.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/TableViewerPatternFilter.java
index 981e0082c..24bcb5a0f 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/TableViewerPatternFilter.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/TableViewerPatternFilter.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/TransformationServiceIntrospectionDetailsUIHandler.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/TransformationServiceIntrospectionDetailsUIHandler.java
index 2cdb5c53c..e4d73a44c 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/TransformationServiceIntrospectionDetailsUIHandler.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/TransformationServiceIntrospectionDetailsUIHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/AllocationEditPartFactoryServiceIntrospectionDetailsItem.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/AllocationEditPartFactoryServiceIntrospectionDetailsItem.java
index da8eaf974..585eac03b 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/AllocationEditPartFactoryServiceIntrospectionDetailsItem.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/AllocationEditPartFactoryServiceIntrospectionDetailsItem.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/ConstraintUIServiceIntrospectionDetailsItem.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/ConstraintUIServiceIntrospectionDetailsItem.java
index c90fa3eb1..1aac98581 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/ConstraintUIServiceIntrospectionDetailsItem.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/ConstraintUIServiceIntrospectionDetailsItem.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/ContextMenuServiceIntrospectionDetailsItem.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/ContextMenuServiceIntrospectionDetailsItem.java
index 6ce448a19..92dab0c30 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/ContextMenuServiceIntrospectionDetailsItem.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/ContextMenuServiceIntrospectionDetailsItem.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/EditPartFactoryServiceIntrospectionDetailsItem.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/EditPartFactoryServiceIntrospectionDetailsItem.java
index ae3acdec7..03eb534a1 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/EditPartFactoryServiceIntrospectionDetailsItem.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/EditPartFactoryServiceIntrospectionDetailsItem.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/ModelEditorBindingServiceIntrospectionDetailsItem.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/ModelEditorBindingServiceIntrospectionDetailsItem.java
index d7967a908..b943fa2fa 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/ModelEditorBindingServiceIntrospectionDetailsItem.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/ModelEditorBindingServiceIntrospectionDetailsItem.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/ModelElementHandlerServiceIntrospectionDetailsItem.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/ModelElementHandlerServiceIntrospectionDetailsItem.java
index 0b900c205..f34994921 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/ModelElementHandlerServiceIntrospectionDetailsItem.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/items/ModelElementHandlerServiceIntrospectionDetailsItem.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/perspective/StoragePerspective.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/perspective/StoragePerspective.java
index 1a8af1339..3ba711e2a 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/perspective/StoragePerspective.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/perspective/StoragePerspective.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/ElementWithURIPropertySection.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/ElementWithURIPropertySection.java
index 006df93e6..0840ff4dd 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/ElementWithURIPropertySection.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/ElementWithURIPropertySection.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/IdLabeledPropertySection.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/IdLabeledPropertySection.java
index 7abe3a303..1c2f2e8a6 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/IdLabeledPropertySection.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/IdLabeledPropertySection.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/NamedCommentedPropertySection.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/NamedCommentedPropertySection.java
index 48f97280f..e3ae28b36 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/NamedCommentedPropertySection.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/NamedCommentedPropertySection.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/PropertiesAdapterFactory.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/PropertiesAdapterFactory.java
index 930d9eefa..eb4126b78 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/PropertiesAdapterFactory.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/PropertiesAdapterFactory.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/DoubleClick.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/DoubleClick.java
index d1053fff5..3cda90707 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/DoubleClick.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/DoubleClick.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LibraryView.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LibraryView.java
index 130bc6a34..771f76fd3 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LibraryView.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LibraryView.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LibraryViewDragSourceAdapter.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LibraryViewDragSourceAdapter.java
index a0ec522f5..6b2119926 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LibraryViewDragSourceAdapter.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LibraryViewDragSourceAdapter.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LinkWithEditorPartListener.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LinkWithEditorPartListener.java
index 0432153ce..e586d24e3 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LinkWithEditorPartListener.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LinkWithEditorPartListener.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/MarkerViewContentProvider.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/MarkerViewContentProvider.java
index ecdd80e0f..663817a25 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/MarkerViewContentProvider.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/MarkerViewContentProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2013 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2013 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/MarkerViewPart.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/MarkerViewPart.java
index d711d5402..e77440334 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/MarkerViewPart.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/MarkerViewPart.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/MarkerViewerGUI.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/MarkerViewerGUI.java
index 1511b89e4..b7662b6de 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/MarkerViewerGUI.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/MarkerViewerGUI.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorTreeContentProvider.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorTreeContentProvider.java
index 90f869bb4..e510a5e50 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorTreeContentProvider.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorTreeContentProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorTreeContentSorter.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorTreeContentSorter.java
index cbf121e99..003e7002d 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorTreeContentSorter.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorTreeContentSorter.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorViewPart.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorViewPart.java
index 55183d893..e8887d1d2 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorViewPart.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorViewPart.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/listener/ExtendableMultiPageEditorPageChangeListener.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/listener/ExtendableMultiPageEditorPageChangeListener.java
index d737828a3..f2c104fa8 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/listener/ExtendableMultiPageEditorPageChangeListener.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/listener/ExtendableMultiPageEditorPageChangeListener.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/presentation/ConstraintViolationAwareLabelProviderBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/presentation/ConstraintViolationAwareLabelProviderBase.java
index adc78c9fa..b929903d3 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/presentation/ConstraintViolationAwareLabelProviderBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/presentation/ConstraintViolationAwareLabelProviderBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/presentation/ModelElementLabelProvider.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/presentation/ModelElementLabelProvider.java
index f1cdbbccc..27cdd6888 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/presentation/ModelElementLabelProvider.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/presentation/ModelElementLabelProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/presentation/TutorialDefinitionModelElementLabelProvider.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/presentation/TutorialDefinitionModelElementLabelProvider.java
index c96b087f9..a119d38a9 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/presentation/TutorialDefinitionModelElementLabelProvider.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/presentation/TutorialDefinitionModelElementLabelProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IActionService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IActionService.java
index 3f051f857..7e3854a42 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IActionService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IActionService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IAllocationEditPartFactoryService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IAllocationEditPartFactoryService.java
index 1933ed423..71bbed6e8 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IAllocationEditPartFactoryService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IAllocationEditPartFactoryService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IContextMenuService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IContextMenuService.java
index ed9d83af0..1fbb35472 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IContextMenuService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IContextMenuService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IEditPartFactoryService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IEditPartFactoryService.java
index b5fcca2c4..75e71110a 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IEditPartFactoryService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IEditPartFactoryService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IMarkerService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IMarkerService.java
index 96e145f99..fe1a55f58 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IMarkerService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IMarkerService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IModelEditorBindingService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IModelEditorBindingService.java
index 6a1192425..2729a8afb 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IModelEditorBindingService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IModelEditorBindingService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IModelElementHandlerService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IModelElementHandlerService.java
index c58a37582..1430693fe 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IModelElementHandlerService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IModelElementHandlerService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/INavigatorService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/INavigatorService.java
index 6f316bc6b..1c401cd67 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/INavigatorService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/INavigatorService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/ITutorialUIService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/ITutorialUIService.java
index dba4fad7c..b5b4a7123 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/ITutorialUIService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/ITutorialUIService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ActionUtils.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ActionUtils.java
index 1b34b1b35..af8973177 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ActionUtils.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ActionUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ConstraintsUIUtils.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ConstraintsUIUtils.java
index 677dab96a..663a56836 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ConstraintsUIUtils.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ConstraintsUIUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/CopyPasteUtils.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/CopyPasteUtils.java
index 0c0bf86a4..e78db991e 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/CopyPasteUtils.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/CopyPasteUtils.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/DataBindingUtils.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/DataBindingUtils.java
index 5fbd72a73..87eed436b 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/DataBindingUtils.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/DataBindingUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/DragAndDropUtils.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/DragAndDropUtils.java
index 7e7fa6866..909941af0 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/DragAndDropUtils.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/DragAndDropUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/EObjectSelectionUtils.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/EObjectSelectionUtils.java
index d7da835cf..916e8414c 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/EObjectSelectionUtils.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/EObjectSelectionUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/EditorUtils.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/EditorUtils.java
index d7b47e689..3c4bc0c4c 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/EditorUtils.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/EditorUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ObservableUtils.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ObservableUtils.java
index de97e0839..957135050 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ObservableUtils.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ObservableUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/PropertiesConstantUtils.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/PropertiesConstantUtils.java
index 37cf2d628..9adfece57 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/PropertiesConstantUtils.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/PropertiesConstantUtils.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/SelectionUtils.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/SelectionUtils.java
index 79fe87c7d..0ab098f91 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/SelectionUtils.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/SelectionUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/TutorialUIServiceUtils.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/TutorialUIServiceUtils.java
index 6dd44bdc6..0bf92fcaf 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/TutorialUIServiceUtils.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/TutorialUIServiceUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/UndoRedoImpl.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/UndoRedoImpl.java
index 411095710..c7615148f 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/UndoRedoImpl.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/UndoRedoImpl.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/WidgetsFactory.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/WidgetsFactory.java
index 2c2ca41e6..1098ae24f 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/WidgetsFactory.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/WidgetsFactory.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/ToolingKernel.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/ToolingKernel.java
index 6024d0ce8..aada09c74 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/ToolingKernel.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/ToolingKernel.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/ToolingKernelActivator.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/ToolingKernelActivator.java
index 106e01e25..5f6aded5e 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/ToolingKernelActivator.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/ToolingKernelActivator.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/constraint/ConstraintMessage.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/constraint/ConstraintMessage.java
index 476791ba7..df57076ef 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/constraint/ConstraintMessage.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/constraint/ConstraintMessage.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/constraint/IdConsistencyChecker.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/constraint/IdConsistencyChecker.java
index a87a2103e..9bd73b8f0 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/constraint/IdConsistencyChecker.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/constraint/IdConsistencyChecker.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/constraint/IdConsistencyConstraintViolation.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/constraint/IdConsistencyConstraintViolation.java
index cf7db177c..427fcd521 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/constraint/IdConsistencyConstraintViolation.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/constraint/IdConsistencyConstraintViolation.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/constraint/IdUniquenessChecker.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/constraint/IdUniquenessChecker.java
index 396290b96..2290110df 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/constraint/IdUniquenessChecker.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/constraint/IdUniquenessChecker.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/constraint/IdUniquenessConstraintViolation.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/constraint/IdUniquenessConstraintViolation.java
index 8bc4f2ac8..865e612dc 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/constraint/IdUniquenessConstraintViolation.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/constraint/IdUniquenessConstraintViolation.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IConnectionCompositor.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IConnectionCompositor.java
index 5413979c6..2a839d119 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IConnectionCompositor.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IConnectionCompositor.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IConstraint.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IConstraint.java
index a634e1f0e..e5e95efa8 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IConstraint.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IConstraint.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IConstraintChecker.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IConstraintChecker.java
index f9582ce76..fda37725b 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IConstraintChecker.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IConstraintChecker.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IEclipseResourcePostLoadProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IEclipseResourcePostLoadProvider.java
index 8e6bdd6a6..fc5b1fe70 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IEclipseResourcePostLoadProvider.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IEclipseResourcePostLoadProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IEclipseResourceStorageLocationProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IEclipseResourceStorageLocationProvider.java
index 397da63ba..4154b7703 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IEclipseResourceStorageLocationProvider.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IEclipseResourceStorageLocationProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IElementCompositor.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IElementCompositor.java
index d11077f43..dfe01da7a 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IElementCompositor.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IElementCompositor.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ILibraryElementHandler.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ILibraryElementHandler.java
index 0f2ee962e..6666d08e3 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ILibraryElementHandler.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ILibraryElementHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IMigrationProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IMigrationProvider.java
index 6bafecc09..91c0edc4e 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IMigrationProvider.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IMigrationProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IPrototypeProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IPrototypeProvider.java
index 386cd661f..d695231c0 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IPrototypeProvider.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IPrototypeProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IStorageProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IStorageProvider.java
index dcc59b8bb..9c9b99447 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IStorageProvider.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IStorageProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ITransformationProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ITransformationProvider.java
index 3c3524d6f..035a9c330 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ITransformationProvider.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ITransformationProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ITutorialProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ITutorialProvider.java
index 28791de85..f15002a85 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ITutorialProvider.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ITutorialProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ITutorialStep.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ITutorialStep.java
index a9527eb0c..f1f527767 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ITutorialStep.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ITutorialStep.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ITutorialWhitelistProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ITutorialWhitelistProvider.java
index 763798c15..01aee6ae3 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ITutorialWhitelistProvider.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/ITutorialWhitelistProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/LogMessageHandler.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/LogMessageHandler.java
index 022a0b487..669b56638 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/LogMessageHandler.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/LogMessageHandler.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/ConstraintBases.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/ConstraintBases.java
index 0dea1c206..b3c6cb141 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/ConstraintBases.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/ConstraintBases.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/ConstraintCheckerBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/ConstraintCheckerBase.java
index 7d46fdc74..39f43e69f 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/ConstraintCheckerBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/ConstraintCheckerBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/ConstraintViolationBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/ConstraintViolationBase.java
index 2842d916f..d6ebfad90 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/ConstraintViolationBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/ConstraintViolationBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/ElementCompositorBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/ElementCompositorBase.java
index 77d3f3deb..127bbb84b 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/ElementCompositorBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/ElementCompositorBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2014 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2014 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/MultiViolationConstraintCheckerBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/MultiViolationConstraintCheckerBase.java
index 99d218231..5fa219631 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/MultiViolationConstraintCheckerBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/MultiViolationConstraintCheckerBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/PrototypeProviderBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/PrototypeProviderBase.java
index 3e8994a90..1494c51b0 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/PrototypeProviderBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/PrototypeProviderBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/RemoveUnknownFeatureMigrationProviderBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/RemoveUnknownFeatureMigrationProviderBase.java
index d489544bc..b8ff14d91 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/RemoveUnknownFeatureMigrationProviderBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/RemoveUnknownFeatureMigrationProviderBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/TransformationContextChainBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/TransformationContextChainBase.java
index 67f7a0186..712eccf53 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/TransformationContextChainBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/TransformationContextChainBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/TransformationProviderBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/TransformationProviderBase.java
index c0cca0bdb..097e53c19 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/TransformationProviderBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/TransformationProviderBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/TutorialBlacklistAllProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/TutorialBlacklistAllProvider.java
index fce12d96f..02fbc0c19 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/TutorialBlacklistAllProvider.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/TutorialBlacklistAllProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/TutorialWhitelistAllProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/TutorialWhitelistAllProvider.java
index 80275aa81..3726a0d68 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/TutorialWhitelistAllProvider.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/TutorialWhitelistAllProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/IConnectionCompositionContext.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/IConnectionCompositionContext.java
index 496e4e949..67a9ebab2 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/IConnectionCompositionContext.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/IConnectionCompositionContext.java
@@ -1,7 +1,7 @@
 /*--------------------------------------------------------------------------+
 
 |                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/IConstraintViolation.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/IConstraintViolation.java
index a379afee5..886bcad2a 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/IConstraintViolation.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/IConstraintViolation.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/IElementCompositionContext.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/IElementCompositionContext.java
index 739866b84..930ee0864 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/IElementCompositionContext.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/IElementCompositionContext.java
@@ -1,7 +1,7 @@
 /*--------------------------------------------------------------------------+
 
 |                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/ILogMessageContext.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/ILogMessageContext.java
index 7e1697922..86b05687f 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/ILogMessageContext.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/ILogMessageContext.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/ITopLevelElement.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/ITopLevelElement.java
index 8c571bae1..3da088a59 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/ITopLevelElement.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/ITopLevelElement.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/ITransformationContext.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/ITransformationContext.java
index 5934b3ee4..9fb2ff505 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/ITransformationContext.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/ITransformationContext.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/LibraryPrototype.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/LibraryPrototype.java
index 3aa1f2602..c8ab0a302 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/LibraryPrototype.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/LibraryPrototype.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/LogMessage.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/LogMessage.java
index 5c4e1105d..0433846a5 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/LogMessage.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/LogMessage.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/LogMessageWithException.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/LogMessageWithException.java
index 18c8863cd..954aa2254 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/LogMessageWithException.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/LogMessageWithException.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/ModelElementTransformationContext.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/ModelElementTransformationContext.java
index 7b7efb039..a49c4ad9b 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/ModelElementTransformationContext.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/ModelElementTransformationContext.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/ModelStorageError.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/ModelStorageError.java
index c4218338c..b6ce4cafe 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/ModelStorageError.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/ModelStorageError.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2013 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2013 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/Prototype.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/Prototype.java
index 3d3016154..2308f9435 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/Prototype.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/Prototype.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/PrototypeCategory.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/PrototypeCategory.java
index 849319f42..77836edb1 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/PrototypeCategory.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/PrototypeCategory.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/TransformationProviderChain.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/TransformationProviderChain.java
index 9f454b608..cf6affac3 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/TransformationProviderChain.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/TransformationProviderChain.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/TutorialAtomicStep.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/TutorialAtomicStep.java
index 2be5e40cd..ca21d11f8 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/TutorialAtomicStep.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/TutorialAtomicStep.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/TutorialCompositeStep.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/TutorialCompositeStep.java
index 1f4b8cdaf..d1ba65e47 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/TutorialCompositeStep.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/TutorialCompositeStep.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/TutorialStepBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/TutorialStepBase.java
index eb636f40b..edb4db913 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/TutorialStepBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/data/TutorialStepBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/exception/ChainTransformationFailedException.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/exception/ChainTransformationFailedException.java
index 09271cb95..3f5b674cf 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/exception/ChainTransformationFailedException.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/exception/ChainTransformationFailedException.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/exception/TransformationFailedException.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/exception/TransformationFailedException.java
index 0ff5fd727..783dd310a 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/exception/TransformationFailedException.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/exception/TransformationFailedException.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/CommandStackService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/CommandStackService.java
index e1b206173..6980b839c 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/CommandStackService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/CommandStackService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ConnectionCompositorService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ConnectionCompositorService.java
index 0194d8d8e..a9bfa0b2d 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ConnectionCompositorService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ConnectionCompositorService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ConstraintCheckerService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ConstraintCheckerService.java
index 5c989d1cd..fe694c536 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ConstraintCheckerService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ConstraintCheckerService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/DummyTopLevelElement.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/DummyTopLevelElement.java
index b3040edb3..96374cea7 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/DummyTopLevelElement.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/DummyTopLevelElement.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ElementCompositorService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ElementCompositorService.java
index 8d56a83ca..1e0e7c191 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ElementCompositorService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ElementCompositorService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/LibraryPrototypeProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/LibraryPrototypeProvider.java
index f1d5fe976..5f37f7112 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/LibraryPrototypeProvider.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/LibraryPrototypeProvider.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/LibraryService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/LibraryService.java
index 66af8208c..3e1d0e74c 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/LibraryService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/LibraryService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/LoggingService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/LoggingService.java
index e2892cb70..01592df31 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/LoggingService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/LoggingService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/MigrationService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/MigrationService.java
index 7fc3fb438..eacb50342 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/MigrationService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/MigrationService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2013 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2013 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PersistencyService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PersistencyService.java
index d0aaa1d97..de7a0f469 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PersistencyService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PersistencyService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PrototypeService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PrototypeService.java
index 41dff1021..457e5a7d6 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PrototypeService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PrototypeService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ToolingKernelInternal.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ToolingKernelInternal.java
index 4a87bb4a4..986ed7e4e 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ToolingKernelInternal.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ToolingKernelInternal.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/TransformationService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/TransformationService.java
index 8760edd8b..3ad234b31 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/TransformationService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/TransformationService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/TutorialService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/TutorialService.java
index 76c7a6981..e530ce68d 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/TutorialService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/TutorialService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/AutoUndoCommandStack.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/AutoUndoCommandStack.java
index 0d33a8ea4..1dc99a7d7 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/AutoUndoCommandStack.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/AutoUndoCommandStack.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EMFTransactionalCommand.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EMFTransactionalCommand.java
index 5942e5d2c..b1f365184 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EMFTransactionalCommand.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EMFTransactionalCommand.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageService.java
index 05eb2cef0..ed4bd0bfb 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/ModelContext.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/ModelContext.java
index 78511e06d..ab3d915f5 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/ModelContext.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/ModelContext.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/NonDirtyingEMFTransactionalCommand.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/NonDirtyingEMFTransactionalCommand.java
index e18610288..6a34233ed 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/NonDirtyingEMFTransactionalCommand.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/NonDirtyingEMFTransactionalCommand.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2013 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2013 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/IIntrospectionDetailsItem.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/IIntrospectionDetailsItem.java
index ddaf22337..1b39542d1 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/IIntrospectionDetailsItem.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/IIntrospectionDetailsItem.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/IIntrospectionItem.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/IIntrospectionItem.java
index 68c1c876a..3c3129c50 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/IIntrospectionItem.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/IIntrospectionItem.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/IIntrospectiveKernelService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/IIntrospectiveKernelService.java
index 21c41cf1f..117be28b9 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/IIntrospectiveKernelService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/IIntrospectiveKernelService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/KernelIntrospectionSystemService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/KernelIntrospectionSystemService.java
index f48887b79..8065cfd18 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/KernelIntrospectionSystemService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/KernelIntrospectionSystemService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/ConnectionCompositorServiceIntrospectionDetailsItem.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/ConnectionCompositorServiceIntrospectionDetailsItem.java
index e4aedd9e7..77c6dd7e4 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/ConnectionCompositorServiceIntrospectionDetailsItem.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/ConnectionCompositorServiceIntrospectionDetailsItem.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/ConstraintCheckerServiceIntrospectionDetailsItem.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/ConstraintCheckerServiceIntrospectionDetailsItem.java
index cb67ae470..689895561 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/ConstraintCheckerServiceIntrospectionDetailsItem.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/ConstraintCheckerServiceIntrospectionDetailsItem.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/ConstraintVerificationServiceIntrospectionDetailsItem.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/ConstraintVerificationServiceIntrospectionDetailsItem.java
index 5e99595bf..957286373 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/ConstraintVerificationServiceIntrospectionDetailsItem.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/ConstraintVerificationServiceIntrospectionDetailsItem.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/EObjectAware2IntrospectionDetailsItemBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/EObjectAware2IntrospectionDetailsItemBase.java
index 816ff2524..7f75d2498 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/EObjectAware2IntrospectionDetailsItemBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/EObjectAware2IntrospectionDetailsItemBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/EObjectAwareIntrospectionDetailsItemBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/EObjectAwareIntrospectionDetailsItemBase.java
index fe0b33440..21fe7f728 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/EObjectAwareIntrospectionDetailsItemBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/EObjectAwareIntrospectionDetailsItemBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/EclipseResourceStorageServiceIntrospectionDetailsItem.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/EclipseResourceStorageServiceIntrospectionDetailsItem.java
index 2f9d9fcc0..e4e8f9ea3 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/EclipseResourceStorageServiceIntrospectionDetailsItem.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/EclipseResourceStorageServiceIntrospectionDetailsItem.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/ElementCompositorServiceIntrospectionDetailsItem.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/ElementCompositorServiceIntrospectionDetailsItem.java
index 2640c7a15..8fceb3057 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/ElementCompositorServiceIntrospectionDetailsItem.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/ElementCompositorServiceIntrospectionDetailsItem.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/HandlerListIntrospectionDetailsItemBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/HandlerListIntrospectionDetailsItemBase.java
index 336e3827a..d3d19efee 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/HandlerListIntrospectionDetailsItemBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/HandlerListIntrospectionDetailsItemBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/IntrospectionItemBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/IntrospectionItemBase.java
index e18f2351a..866a3da65 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/IntrospectionItemBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/IntrospectionItemBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/LibraryServiceIntrospectionDetailsItem.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/LibraryServiceIntrospectionDetailsItem.java
index 59a4e60dd..bea563eff 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/LibraryServiceIntrospectionDetailsItem.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/LibraryServiceIntrospectionDetailsItem.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/MigrationServiceIntrospectionDetailsItem.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/MigrationServiceIntrospectionDetailsItem.java
index 673d0e745..97d19a689 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/MigrationServiceIntrospectionDetailsItem.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/MigrationServiceIntrospectionDetailsItem.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/PersistencyServiceIntrospectionDetailsItem.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/PersistencyServiceIntrospectionDetailsItem.java
index a7577476f..e921e494a 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/PersistencyServiceIntrospectionDetailsItem.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/PersistencyServiceIntrospectionDetailsItem.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/PrototypeServiceIntrospectionDetailsItem.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/PrototypeServiceIntrospectionDetailsItem.java
index 1a6b0b9ab..20d6060d8 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/PrototypeServiceIntrospectionDetailsItem.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/PrototypeServiceIntrospectionDetailsItem.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/TransformationServiceIntrospectionDetailsItem.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/TransformationServiceIntrospectionDetailsItem.java
index ea3beb053..34c7d2e52 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/TransformationServiceIntrospectionDetailsItem.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/introspection/items/TransformationServiceIntrospectionDetailsItem.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ICommandStackService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ICommandStackService.java
index afe24a83b..ffe4bb968 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ICommandStackService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ICommandStackService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IConnectionCompositorService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IConnectionCompositorService.java
index 116fa3952..30e4b2b80 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IConnectionCompositorService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IConnectionCompositorService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IConstraintCheckerService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IConstraintCheckerService.java
index d5bfb535a..b1b0411c0 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IConstraintCheckerService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IConstraintCheckerService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IEclipseResourceStorageService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IEclipseResourceStorageService.java
index 54c6632a8..be8f2ccb2 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IEclipseResourceStorageService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IEclipseResourceStorageService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IElementCompositorService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IElementCompositorService.java
index c5d2b2dae..d583f1198 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IElementCompositorService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IElementCompositorService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IKernelIntrospectionSystemService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IKernelIntrospectionSystemService.java
index b87dab29f..bfc5adc26 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IKernelIntrospectionSystemService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IKernelIntrospectionSystemService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ILibraryService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ILibraryService.java
index 7864c10ab..1b90337aa 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ILibraryService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ILibraryService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ILoggingService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ILoggingService.java
index e09f71137..c2d707102 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ILoggingService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ILoggingService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2015 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2015 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IMigrationService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IMigrationService.java
index bbe27949e..9ab17328f 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IMigrationService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IMigrationService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IPersistencyService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IPersistencyService.java
index 51cce4368..b124f54cc 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IPersistencyService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IPersistencyService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IPrototypeService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IPrototypeService.java
index 3528eedf3..8e0d33823 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IPrototypeService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IPrototypeService.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ITransformationService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ITransformationService.java
index a7e4487db..3669cdfcd 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ITransformationService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ITransformationService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ITutorialService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ITutorialService.java
index 468564db5..c2c35ee6c 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ITutorialService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/ITutorialService.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/EObjectAware2ServiceBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/EObjectAware2ServiceBase.java
index b948c4f3f..32618ab96 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/EObjectAware2ServiceBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/EObjectAware2ServiceBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/EObjectAwareServiceBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/EObjectAwareServiceBase.java
index bfe7404bb..819399d25 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/EObjectAwareServiceBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/EObjectAwareServiceBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/IEObjectAware.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/IEObjectAware.java
index b85e9df01..860d5dafe 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/IEObjectAware.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/IEObjectAware.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/IEObjectAware2.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/IEObjectAware2.java
index 9cfc34749..992ec97a6 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/IEObjectAware2.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/IEObjectAware2.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/IObjectAware.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/IObjectAware.java
index 36afc3916..4061aa23a 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/IObjectAware.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/IObjectAware.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/IObjectAware2.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/IObjectAware2.java
index 2dec38447..80f9a6a0c 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/IObjectAware2.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/IObjectAware2.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAware2ServiceBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAware2ServiceBase.java
index 067456eb5..c5091b18f 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAware2ServiceBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAware2ServiceBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAwareServiceBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAwareServiceBase.java
index 32351b647..20e06b554 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAwareServiceBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAwareServiceBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/listener/IPersistencyServiceListener.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/listener/IPersistencyServiceListener.java
index e08b27a0f..b35151ab1 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/listener/IPersistencyServiceListener.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/listener/IPersistencyServiceListener.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/listener/ITutorialServiceListener.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/listener/ITutorialServiceListener.java
index 5eb4235cd..7e56878a2 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/listener/ITutorialServiceListener.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/listener/ITutorialServiceListener.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/CompositionUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/CompositionUtils.java
index 3437a29a7..e08cae81e 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/CompositionUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/CompositionUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ConstraintsUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ConstraintsUtils.java
index ef0e7ece4..84e43307c 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ConstraintsUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ConstraintsUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/EMFResourceUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/EMFResourceUtils.java
index aceb697b8..3427ab369 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/EMFResourceUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/EMFResourceUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/EcoreSerializerBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/EcoreSerializerBase.java
index 505f1bbb9..39b212c50 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/EcoreSerializerBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/EcoreSerializerBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/EcoreUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/EcoreUtils.java
index c4c90a903..d1d7d4457 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/EcoreUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/EcoreUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ExtensionPointUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ExtensionPointUtils.java
index 06ce36711..ec1c30a82 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ExtensionPointUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ExtensionPointUtils.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2005-2010 Technische Universitaet Muenchen                     |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/IdentifierUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/IdentifierUtils.java
index 88428c010..0d43d2b81 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/IdentifierUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/IdentifierUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/JavaUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/JavaUtils.java
index 309634f87..a7a3c0ebf 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/JavaUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/JavaUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/KernelModelElementUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/KernelModelElementUtils.java
index bcc6ab21a..06e7cb26f 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/KernelModelElementUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/KernelModelElementUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/LoggingUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/LoggingUtils.java
index 2242c2578..937deec54 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/LoggingUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/LoggingUtils.java
@@ -1,5 +1,4 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
+/*-------------------------------------------------------------------------+
 | Copyright 2005-2010 Technische Universitaet Muenchen                     |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/MigrationUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/MigrationUtils.java
index 3335262b8..841f016b7 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/MigrationUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/MigrationUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2013 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2013 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/PrototypesUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/PrototypesUtils.java
index ebe35fe49..73ac2755a 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/PrototypesUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/PrototypesUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ResourceUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ResourceUtils.java
index 0b7673797..319fd9953 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ResourceUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ResourceUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/TransformationUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/TransformationUtils.java
index a59fbd5dc..b2a5f31f0 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/TransformationUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/TransformationUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2011 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2011 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/UniqueIDUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/UniqueIDUtils.java
index e16237975..4c06da960 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/UniqueIDUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/UniqueIDUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2012 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2012 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/example/Sample.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/example/Sample.java
index 13ec4b6f2..881569796 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/example/Sample.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/example/Sample.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/AxisBase.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/AxisBase.java
index 2a719d192..fce0e4535 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/AxisBase.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/AxisBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/DataSeries.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/DataSeries.java
index 0bcc60123..3b318c160 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/DataSeries.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/DataSeries.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/DoubleAxis.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/DoubleAxis.java
index 418a33931..52d993ff9 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/DoubleAxis.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/DoubleAxis.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/EnumerationAxis.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/EnumerationAxis.java
index 118566da0..f65629498 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/EnumerationAxis.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/EnumerationAxis.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/SpiderChart.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/SpiderChart.java
index 46d823dc5..b26cbe008 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/SpiderChart.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/SpiderChart.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/AxisStyle.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/AxisStyle.java
index 1623cdc84..07d504435 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/AxisStyle.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/AxisStyle.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/ChartStyle.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/ChartStyle.java
index aac707e18..b2ae1308f 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/ChartStyle.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/ChartStyle.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/ColorStyleBase.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/ColorStyleBase.java
index ba72a90d9..c94e3c1ce 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/ColorStyleBase.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/ColorStyleBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/DataSeriesStyle.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/DataSeriesStyle.java
index f528eecf4..d3e532e0b 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/DataSeriesStyle.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/DataSeriesStyle.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/FillStyle.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/FillStyle.java
index 16f2bc69d..0700ac872 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/FillStyle.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/FillStyle.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/FontStyle.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/FontStyle.java
index 96b68673c..c5792734d 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/FontStyle.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/FontStyle.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/LegendStyle.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/LegendStyle.java
index c3a473a16..76afde001 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/LegendStyle.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/LegendStyle.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/LineStyle.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/LineStyle.java
index 74f18f280..c5a14bfc2 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/LineStyle.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/LineStyle.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/util/AxisUtils.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/util/AxisUtils.java
index b7144d33c..b2ec39b8c 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/util/AxisUtils.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/util/AxisUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/util/FontUtils.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/util/FontUtils.java
index 955058872..2d2e006db 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/util/FontUtils.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/util/FontUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/util/RGBColorUtils.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/util/RGBColorUtils.java
index a41cd4b91..2b5e7f5ae 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/util/RGBColorUtils.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/util/RGBColorUtils.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartLegendWidget.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartLegendWidget.java
index 25f230c15..7befb3920 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartLegendWidget.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartLegendWidget.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartSWTCanvas.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartSWTCanvas.java
index eb145f922..3ad70a9ff 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartSWTCanvas.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartSWTCanvas.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartTitleWidget.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartTitleWidget.java
index fdd9d3d63..4553d00c2 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartTitleWidget.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartTitleWidget.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartViewer.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartViewer.java
index 40608b818..c96098973 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartViewer.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartViewer.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartWidget.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartWidget.java
index a96e666ec..969e11307 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartWidget.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartWidget.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartWidgetBase.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartWidgetBase.java
index c5b23c588..ac0703773 100644
--- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartWidgetBase.java
+++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartWidgetBase.java
@@ -1,6 +1,5 @@
-/*--------------------------------------------------------------------------+
-|                                                                          |
-| Copyright 2016 fortiss GmbH                     |
+/*-------------------------------------------------------------------------+
+| Copyright 2016 fortiss GmbH                                              |
 |                                                                          |
 | Licensed under the Apache License, Version 2.0 (the "License");          |
 | you may not use this file except in compliance with the License.         |
-- 
GitLab